diff options
author | krion <krion@FreeBSD.org> | 2003-07-28 04:47:04 +0800 |
---|---|---|
committer | krion <krion@FreeBSD.org> | 2003-07-28 04:47:04 +0800 |
commit | a99e26d2505cd8b3ecc4966948e34d57a366b63f (patch) | |
tree | ec7459320b46ac0d0211d6aec34b4a186503e478 | |
parent | c5ac044a29cfbde67732795d2f228b61a7671b16 (diff) | |
download | freebsd-ports-gnome-a99e26d2505cd8b3ecc4966948e34d57a366b63f.tar.gz freebsd-ports-gnome-a99e26d2505cd8b3ecc4966948e34d57a366b63f.tar.zst freebsd-ports-gnome-a99e26d2505cd8b3ecc4966948e34d57a366b63f.zip |
- Update to version 1.1.0
PR: 54903
Submitted by: KATO Tsuguru <tkato@prontomail.com>
Approved by: fjoe (mentor) (implicit)
-rw-r--r-- | math/gretl/Makefile | 17 | ||||
-rw-r--r-- | math/gretl/distinfo | 2 | ||||
-rw-r--r-- | math/gretl/files/patch-cli::Makefile.in | 18 | ||||
-rw-r--r-- | math/gretl/files/patch-configure.in | 52 | ||||
-rw-r--r-- | math/gretl/files/patch-lib::Makefile.in | 30 | ||||
-rw-r--r-- | math/gretl/pkg-plist | 13 | ||||
-rw-r--r-- | misc/gretl/Makefile | 17 | ||||
-rw-r--r-- | misc/gretl/distinfo | 2 | ||||
-rw-r--r-- | misc/gretl/files/patch-cli::Makefile.in | 18 | ||||
-rw-r--r-- | misc/gretl/files/patch-configure.in | 52 | ||||
-rw-r--r-- | misc/gretl/files/patch-lib::Makefile.in | 30 | ||||
-rw-r--r-- | misc/gretl/pkg-plist | 13 |
12 files changed, 90 insertions, 174 deletions
diff --git a/math/gretl/Makefile b/math/gretl/Makefile index b8c488a595b6..7a7480d11f3b 100644 --- a/math/gretl/Makefile +++ b/math/gretl/Makefile @@ -7,7 +7,7 @@ # PORTNAME= gretl -PORTVERSION= 1.0.9 +PORTVERSION= 1.1.0 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,15 +16,17 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Gnu Regression, Econometrics and Time-series Library BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot -LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 +LIB_DEPENDS= lapack.3:${PORTSDIR}/math/lapack \ + gmp.6:${PORTSDIR}/math/libgmp4 RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot USE_BZIP2= yes USE_X_PREFIX= yes -USE_GMAKE= yes WANT_GNOME= yes USE_GNOME= gnometarget gtk20 libxml2 -USE_AUTOCONF_VER= 253 +USE_REINPLACE= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-static --enable-shared --with-gmake @@ -43,10 +45,7 @@ CONFIGURE_ARGS+= --without-gnome PLIST_SUB+= GRETLDATADIR="share" .endif -.if defined(WITH_LAPACK) -LIB_DEPENDS+= lapack.3:${PORTSDIR}/math/lapack -.else -CONFIGURE_ARGS+= --with-lapack=no -.endif +post-patch: + @${REINPLACE_CMD} -e 's|libpng"|libpng12"|g' ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/math/gretl/distinfo b/math/gretl/distinfo index 53973c5b1611..fc0eb2130a32 100644 --- a/math/gretl/distinfo +++ b/math/gretl/distinfo @@ -1 +1 @@ -MD5 (gretl-1.0.9.tar.bz2) = 4c723cb1e275e7ba31d8b7371bbc5133 +MD5 (gretl-1.1.0.tar.bz2) = 72c093f9a975153d5c449ce6506a9e63 diff --git a/math/gretl/files/patch-cli::Makefile.in b/math/gretl/files/patch-cli::Makefile.in index 0064436c325e..b873bef50c5d 100644 --- a/math/gretl/files/patch-cli::Makefile.in +++ b/math/gretl/files/patch-cli::Makefile.in @@ -1,6 +1,6 @@ ---- cli/Makefile.in.orig Mon Apr 28 21:44:49 2003 -+++ cli/Makefile.in Sun May 4 03:10:33 2003 -@@ -9,7 +9,7 @@ +--- cli/Makefile.in.orig Sun Jun 29 04:06:18 2003 ++++ cli/Makefile.in Fri Jul 25 20:49:23 2003 +@@ -9,12 +9,16 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ datadir = @datadir@ @@ -9,9 +9,7 @@ have_readline = @have_readline@ READLINE_LIBS = @READLINE_LIBS@ -@@ -17,6 +17,10 @@ - - GMP_CFLAGS = @GMP_CFLAGS@ + READLINE_CFLAGS = @READLINE_CFLAGS@ +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ @@ -20,16 +18,16 @@ ifeq ($(CC),) CC = gcc endif -@@ -41,7 +45,7 @@ +@@ -39,7 +43,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H --override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(GMP_CFLAGS) $(READLINE_CFLAGS) $(DEFS) -+override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(GMP_CFLAGS) $(READLINE_CFLAGS) $(DEFS) $(CPPFLAGS) +-override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(READLINE_CFLAGS) $(DEFS) ++override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(READLINE_CFLAGS) $(DEFS) $(CPPFLAGS) CLI = gretlcli LIBTOOL = ../libtool -@@ -51,7 +55,7 @@ +@@ -49,7 +53,7 @@ $(CC) -MM -MG -I$(libsrc) $(DEFS) $< >$*.d 2>/dev/null $(CLI): $(OBJS) diff --git a/math/gretl/files/patch-configure.in b/math/gretl/files/patch-configure.in deleted file mode 100644 index 68d83eb1fac6..000000000000 --- a/math/gretl/files/patch-configure.in +++ /dev/null @@ -1,52 +0,0 @@ ---- configure.in.orig Fri May 2 00:17:37 2003 -+++ configure.in Fri May 23 12:31:12 2003 -@@ -169,6 +169,16 @@ - fi, - try_gmp=yes) - -+AC_ARG_WITH(lapack, -+[ --with-lapack Use LAPACK library [default=auto]], -+if test "x${withval}" = "xno" -+then -+ try_lapack=no -+else -+ try_lapack=yes -+fi, -+try_lapack=yes) -+ - AC_ARG_WITH(x-12-arima, - [ --with-x-12-arima include X-12-ARIMA support [default=yes]], - if test "${withval}" = "no" -@@ -277,7 +287,9 @@ - *darwin*) LAPACK_LIBS="-Wl,-framework -Wl,vecLib" - ;; - esac --AM_PATH_LAPACK(, have_lapack="yes") -+if test x"${try_lapack}" != xno ; then -+ AM_PATH_LAPACK(, have_lapack="yes") -+fi - - dnl - dnl Check for gnuplot, and its PNG capacity -@@ -392,7 +404,7 @@ - dnl Check for libpng - dnl - if test ${png_comments} = yes && test ${have_gtk} = "2.0" ; then -- PKG_CHECK_MODULES(PNG, libpng, -+ PKG_CHECK_MODULES(PNG, libpng12, - png_failed="no", - png_failed="yes" - ) -@@ -557,12 +569,6 @@ - echo " - Please install libxml and then reconfigure gretl. - libxml is available from http://xmlsoft.org/ --" -- --elif test "${have_lapack}" = "no" ; then --echo " --Please install lapack and then reconfigure gretl. --Lapack is available from http://www.netlib.org/lapack/ - " - - else diff --git a/math/gretl/files/patch-lib::Makefile.in b/math/gretl/files/patch-lib::Makefile.in index ab1acc2f18d7..5b4f58fedb19 100644 --- a/math/gretl/files/patch-lib::Makefile.in +++ b/math/gretl/files/patch-lib::Makefile.in @@ -1,7 +1,7 @@ ---- lib/Makefile.in.orig Sun May 25 04:04:32 2003 -+++ lib/Makefile.in Tue May 27 09:33:13 2003 -@@ -17,6 +17,11 @@ - FLIB = @FLIB@ +--- lib/Makefile.in.orig Sun Jun 29 04:06:20 2003 ++++ lib/Makefile.in Fri Jul 25 20:47:07 2003 +@@ -18,6 +18,11 @@ + have_gtk = @have_gtk@ +datadir = @datadir@ @@ -12,7 +12,7 @@ ifeq ($(INSTALL_PROGRAM),) INSTALL_PROGRAM = $(INSTALL) -m 755 endif -@@ -31,7 +36,7 @@ +@@ -32,7 +37,7 @@ libdir = $(prefix)/lib includedir = $(prefix)/include/gretl aclocaldir = $(prefix)/share/aclocal @@ -21,16 +21,16 @@ INSTALLDIRS = $(libdir) $(includedir) $(aclocaldir) -@@ -47,7 +52,7 @@ +@@ -48,7 +53,7 @@ - # The LIBS line may need FLIB (-lf2c or equivalent) at some point + # hard-coded -L/usr/local/lib is a bodge!! --LIBS = -lm -ldl -L/usr/local/lib -lz $(XML_LIBS) $(GLIB_LIBS) $(GMP_LIBS) -+LIBS = -lm -lz $(XML_LIBS) $(GLIB_LIBS) $(GMP_LIBS) $(INTL_LIBS) +-LIBS = $(LAPACK_LIBS) -lm -ldl -L/usr/local/lib -lz $(XML_LIBS) $(GLIB_LIBS) $(GMP_LIBS) ++LIBS = $(LAPACK_LIBS) -lm -lz $(XML_LIBS) $(GLIB_LIBS) $(GMP_LIBS) $(INTL_LIBS) #### End of system configuration section. #### -@@ -83,7 +88,7 @@ +@@ -76,7 +81,7 @@ LIBTOOL = ../libtool @@ -39,12 +39,12 @@ COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -@@ -93,7 +98,7 @@ +@@ -86,7 +91,7 @@ - $(LIBGRETL): $(OBJS) $(LOBJS) $(AUX_OBJ) $(AUX_LOBJ) + $(LIBGRETL): $(LOBJS) $(AUX_LOBJ) $(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \ -- -rpath $(prefix)/lib $(LIBS) -version-info 0:8:0 -+ -rpath $(prefix)/lib $(LIBS) -version-info 0:8:0 $(LDFLAGS) +- -rpath $(prefix)/lib $(LIBS) -version-info 0:9:0 ++ -rpath $(prefix)/lib $(LIBS) -version-info 0:9:0 $(LDFLAGS) - -include $(OBJS:.o=.d) + -include $(LOBJS:.lo=.d) diff --git a/math/gretl/pkg-plist b/math/gretl/pkg-plist index 7bebf5cd3fc0..e874a24d56af 100644 --- a/math/gretl/pkg-plist +++ b/math/gretl/pkg-plist @@ -5,16 +5,20 @@ bin/gretlcli %%GNOME:%%etc/gconf/gconf.xml.defaults/schemas/apps/gretl/%gconf.xml %%GNOME:%%etc/gconf/schemas/gretl.schemas include/gretl/calendar.h +include/gretl/clapack_double.h include/gretl/compare.h include/gretl/dataio.h +include/gretl/dbread.h include/gretl/describe.h include/gretl/discrete.h include/gretl/estimate.h +include/gretl/f2c.h include/gretl/generate.h include/gretl/graphing.h include/gretl/gretl_cmdlist.h include/gretl/gretl_commands.h include/gretl/gretl_errors.h +include/gretl/gretl_matrix.h include/gretl/gretl_utils.h include/gretl/gretl_win32.h include/gretl/interact.h @@ -27,6 +31,7 @@ include/gretl/nls.h include/gretl/nonparam.h include/gretl/printout.h include/gretl/pvalues.h +include/gretl/qr_estimate.h include/gretl/random.h include/gretl/strutils.h include/gretl/subsample.h @@ -147,10 +152,12 @@ libdata/pkgconfig/gretl.pc %%GRETLDATADIR%%/gretl/data/data9-8.gdt %%GRETLDATADIR%%/gretl/data/data9-9.gdt %%GRETLDATADIR%%/gretl/data/descriptions +%%GRETLDATADIR%%/gretl/data/ects_nls.gdt %%GRETLDATADIR%%/gretl/data/greene/greene10_3.gdt %%GRETLDATADIR%%/gretl/data/greene/greene11_3.gdt %%GRETLDATADIR%%/gretl/data/greene/greene12_1.gdt %%GRETLDATADIR%%/gretl/data/greene/greene13_1.gdt +%%GRETLDATADIR%%/gretl/data/greene/greene14_1.gdt %%GRETLDATADIR%%/gretl/data/greene/greene18_1.gdt %%GRETLDATADIR%%/gretl/data/greene/greene18_2.gdt %%GRETLDATADIR%%/gretl/data/greene/greene19_1.gdt @@ -163,14 +170,17 @@ libdata/pkgconfig/gretl.pc %%GRETLDATADIR%%/gretl/data/hamilton.gdt %%GRETLDATADIR%%/gretl/data/leverage.gdt %%GRETLDATADIR%%/gretl/data/longley.gdt +%%GRETLDATADIR%%/gretl/data/sw_ch12.gdt %%GRETLDATADIR%%/gretl/db/bcih.bin %%GRETLDATADIR%%/gretl/db/bcih.idx %%GRETLDATADIR%%/gretl/gretl-logo.xpm %%GRETLDATADIR%%/gretl/gretl.hlp %%GRETLDATADIR%%/gretl/gretl.stamp %%GRETLDATADIR%%/gretl/gretlcli.hlp +%%GRETLDATADIR%%/gretl/scripts/ects_nls.inp %%GRETLDATADIR%%/gretl/scripts/greene11_3.inp %%GRETLDATADIR%%/gretl/scripts/greene12_1.inp +%%GRETLDATADIR%%/gretl/scripts/greene14_1.inp %%GRETLDATADIR%%/gretl/scripts/greene14_2.inp %%GRETLDATADIR%%/gretl/scripts/greene18_6.inp %%GRETLDATADIR%%/gretl/scripts/greene19_1.inp @@ -178,6 +188,8 @@ libdata/pkgconfig/gretl.pc %%GRETLDATADIR%%/gretl/scripts/greene8_3.inp %%GRETLDATADIR%%/gretl/scripts/greene9_1.inp %%GRETLDATADIR%%/gretl/scripts/greene9_3.inp +%%GRETLDATADIR%%/gretl/scripts/leverage.inp +%%GRETLDATADIR%%/gretl/scripts/longley.inp %%GRETLDATADIR%%/gretl/scripts/ps10-1.inp %%GRETLDATADIR%%/gretl/scripts/ps10-10.inp %%GRETLDATADIR%%/gretl/scripts/ps10-11.inp @@ -253,6 +265,7 @@ libdata/pkgconfig/gretl.pc %%GRETLDATADIR%%/gretl/scripts/ps9-9.inp %%GRETLDATADIR%%/gretl/scripts/ps_descriptions %%GRETLDATADIR%%/gretl/scripts/pscoin.inp +%%GRETLDATADIR%%/gretl/scripts/sw_ch12.inp %%GRETLDATADIR%%/gretl/scripts/testinp %%GRETLDATADIR%%/gretl/scripts/wg_ps_descriptions %%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/appendices.xml diff --git a/misc/gretl/Makefile b/misc/gretl/Makefile index b8c488a595b6..7a7480d11f3b 100644 --- a/misc/gretl/Makefile +++ b/misc/gretl/Makefile @@ -7,7 +7,7 @@ # PORTNAME= gretl -PORTVERSION= 1.0.9 +PORTVERSION= 1.1.0 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,15 +16,17 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Gnu Regression, Econometrics and Time-series Library BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot -LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 +LIB_DEPENDS= lapack.3:${PORTSDIR}/math/lapack \ + gmp.6:${PORTSDIR}/math/libgmp4 RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot USE_BZIP2= yes USE_X_PREFIX= yes -USE_GMAKE= yes WANT_GNOME= yes USE_GNOME= gnometarget gtk20 libxml2 -USE_AUTOCONF_VER= 253 +USE_REINPLACE= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-static --enable-shared --with-gmake @@ -43,10 +45,7 @@ CONFIGURE_ARGS+= --without-gnome PLIST_SUB+= GRETLDATADIR="share" .endif -.if defined(WITH_LAPACK) -LIB_DEPENDS+= lapack.3:${PORTSDIR}/math/lapack -.else -CONFIGURE_ARGS+= --with-lapack=no -.endif +post-patch: + @${REINPLACE_CMD} -e 's|libpng"|libpng12"|g' ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/misc/gretl/distinfo b/misc/gretl/distinfo index 53973c5b1611..fc0eb2130a32 100644 --- a/misc/gretl/distinfo +++ b/misc/gretl/distinfo @@ -1 +1 @@ -MD5 (gretl-1.0.9.tar.bz2) = 4c723cb1e275e7ba31d8b7371bbc5133 +MD5 (gretl-1.1.0.tar.bz2) = 72c093f9a975153d5c449ce6506a9e63 diff --git a/misc/gretl/files/patch-cli::Makefile.in b/misc/gretl/files/patch-cli::Makefile.in index 0064436c325e..b873bef50c5d 100644 --- a/misc/gretl/files/patch-cli::Makefile.in +++ b/misc/gretl/files/patch-cli::Makefile.in @@ -1,6 +1,6 @@ ---- cli/Makefile.in.orig Mon Apr 28 21:44:49 2003 -+++ cli/Makefile.in Sun May 4 03:10:33 2003 -@@ -9,7 +9,7 @@ +--- cli/Makefile.in.orig Sun Jun 29 04:06:18 2003 ++++ cli/Makefile.in Fri Jul 25 20:49:23 2003 +@@ -9,12 +9,16 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ datadir = @datadir@ @@ -9,9 +9,7 @@ have_readline = @have_readline@ READLINE_LIBS = @READLINE_LIBS@ -@@ -17,6 +17,10 @@ - - GMP_CFLAGS = @GMP_CFLAGS@ + READLINE_CFLAGS = @READLINE_CFLAGS@ +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ @@ -20,16 +18,16 @@ ifeq ($(CC),) CC = gcc endif -@@ -41,7 +45,7 @@ +@@ -39,7 +43,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H --override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(GMP_CFLAGS) $(READLINE_CFLAGS) $(DEFS) -+override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(GMP_CFLAGS) $(READLINE_CFLAGS) $(DEFS) $(CPPFLAGS) +-override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(READLINE_CFLAGS) $(DEFS) ++override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(READLINE_CFLAGS) $(DEFS) $(CPPFLAGS) CLI = gretlcli LIBTOOL = ../libtool -@@ -51,7 +55,7 @@ +@@ -49,7 +53,7 @@ $(CC) -MM -MG -I$(libsrc) $(DEFS) $< >$*.d 2>/dev/null $(CLI): $(OBJS) diff --git a/misc/gretl/files/patch-configure.in b/misc/gretl/files/patch-configure.in deleted file mode 100644 index 68d83eb1fac6..000000000000 --- a/misc/gretl/files/patch-configure.in +++ /dev/null @@ -1,52 +0,0 @@ ---- configure.in.orig Fri May 2 00:17:37 2003 -+++ configure.in Fri May 23 12:31:12 2003 -@@ -169,6 +169,16 @@ - fi, - try_gmp=yes) - -+AC_ARG_WITH(lapack, -+[ --with-lapack Use LAPACK library [default=auto]], -+if test "x${withval}" = "xno" -+then -+ try_lapack=no -+else -+ try_lapack=yes -+fi, -+try_lapack=yes) -+ - AC_ARG_WITH(x-12-arima, - [ --with-x-12-arima include X-12-ARIMA support [default=yes]], - if test "${withval}" = "no" -@@ -277,7 +287,9 @@ - *darwin*) LAPACK_LIBS="-Wl,-framework -Wl,vecLib" - ;; - esac --AM_PATH_LAPACK(, have_lapack="yes") -+if test x"${try_lapack}" != xno ; then -+ AM_PATH_LAPACK(, have_lapack="yes") -+fi - - dnl - dnl Check for gnuplot, and its PNG capacity -@@ -392,7 +404,7 @@ - dnl Check for libpng - dnl - if test ${png_comments} = yes && test ${have_gtk} = "2.0" ; then -- PKG_CHECK_MODULES(PNG, libpng, -+ PKG_CHECK_MODULES(PNG, libpng12, - png_failed="no", - png_failed="yes" - ) -@@ -557,12 +569,6 @@ - echo " - Please install libxml and then reconfigure gretl. - libxml is available from http://xmlsoft.org/ --" -- --elif test "${have_lapack}" = "no" ; then --echo " --Please install lapack and then reconfigure gretl. --Lapack is available from http://www.netlib.org/lapack/ - " - - else diff --git a/misc/gretl/files/patch-lib::Makefile.in b/misc/gretl/files/patch-lib::Makefile.in index ab1acc2f18d7..5b4f58fedb19 100644 --- a/misc/gretl/files/patch-lib::Makefile.in +++ b/misc/gretl/files/patch-lib::Makefile.in @@ -1,7 +1,7 @@ ---- lib/Makefile.in.orig Sun May 25 04:04:32 2003 -+++ lib/Makefile.in Tue May 27 09:33:13 2003 -@@ -17,6 +17,11 @@ - FLIB = @FLIB@ +--- lib/Makefile.in.orig Sun Jun 29 04:06:20 2003 ++++ lib/Makefile.in Fri Jul 25 20:47:07 2003 +@@ -18,6 +18,11 @@ + have_gtk = @have_gtk@ +datadir = @datadir@ @@ -12,7 +12,7 @@ ifeq ($(INSTALL_PROGRAM),) INSTALL_PROGRAM = $(INSTALL) -m 755 endif -@@ -31,7 +36,7 @@ +@@ -32,7 +37,7 @@ libdir = $(prefix)/lib includedir = $(prefix)/include/gretl aclocaldir = $(prefix)/share/aclocal @@ -21,16 +21,16 @@ INSTALLDIRS = $(libdir) $(includedir) $(aclocaldir) -@@ -47,7 +52,7 @@ +@@ -48,7 +53,7 @@ - # The LIBS line may need FLIB (-lf2c or equivalent) at some point + # hard-coded -L/usr/local/lib is a bodge!! --LIBS = -lm -ldl -L/usr/local/lib -lz $(XML_LIBS) $(GLIB_LIBS) $(GMP_LIBS) -+LIBS = -lm -lz $(XML_LIBS) $(GLIB_LIBS) $(GMP_LIBS) $(INTL_LIBS) +-LIBS = $(LAPACK_LIBS) -lm -ldl -L/usr/local/lib -lz $(XML_LIBS) $(GLIB_LIBS) $(GMP_LIBS) ++LIBS = $(LAPACK_LIBS) -lm -lz $(XML_LIBS) $(GLIB_LIBS) $(GMP_LIBS) $(INTL_LIBS) #### End of system configuration section. #### -@@ -83,7 +88,7 @@ +@@ -76,7 +81,7 @@ LIBTOOL = ../libtool @@ -39,12 +39,12 @@ COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -@@ -93,7 +98,7 @@ +@@ -86,7 +91,7 @@ - $(LIBGRETL): $(OBJS) $(LOBJS) $(AUX_OBJ) $(AUX_LOBJ) + $(LIBGRETL): $(LOBJS) $(AUX_LOBJ) $(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \ -- -rpath $(prefix)/lib $(LIBS) -version-info 0:8:0 -+ -rpath $(prefix)/lib $(LIBS) -version-info 0:8:0 $(LDFLAGS) +- -rpath $(prefix)/lib $(LIBS) -version-info 0:9:0 ++ -rpath $(prefix)/lib $(LIBS) -version-info 0:9:0 $(LDFLAGS) - -include $(OBJS:.o=.d) + -include $(LOBJS:.lo=.d) diff --git a/misc/gretl/pkg-plist b/misc/gretl/pkg-plist index 7bebf5cd3fc0..e874a24d56af 100644 --- a/misc/gretl/pkg-plist +++ b/misc/gretl/pkg-plist @@ -5,16 +5,20 @@ bin/gretlcli %%GNOME:%%etc/gconf/gconf.xml.defaults/schemas/apps/gretl/%gconf.xml %%GNOME:%%etc/gconf/schemas/gretl.schemas include/gretl/calendar.h +include/gretl/clapack_double.h include/gretl/compare.h include/gretl/dataio.h +include/gretl/dbread.h include/gretl/describe.h include/gretl/discrete.h include/gretl/estimate.h +include/gretl/f2c.h include/gretl/generate.h include/gretl/graphing.h include/gretl/gretl_cmdlist.h include/gretl/gretl_commands.h include/gretl/gretl_errors.h +include/gretl/gretl_matrix.h include/gretl/gretl_utils.h include/gretl/gretl_win32.h include/gretl/interact.h @@ -27,6 +31,7 @@ include/gretl/nls.h include/gretl/nonparam.h include/gretl/printout.h include/gretl/pvalues.h +include/gretl/qr_estimate.h include/gretl/random.h include/gretl/strutils.h include/gretl/subsample.h @@ -147,10 +152,12 @@ libdata/pkgconfig/gretl.pc %%GRETLDATADIR%%/gretl/data/data9-8.gdt %%GRETLDATADIR%%/gretl/data/data9-9.gdt %%GRETLDATADIR%%/gretl/data/descriptions +%%GRETLDATADIR%%/gretl/data/ects_nls.gdt %%GRETLDATADIR%%/gretl/data/greene/greene10_3.gdt %%GRETLDATADIR%%/gretl/data/greene/greene11_3.gdt %%GRETLDATADIR%%/gretl/data/greene/greene12_1.gdt %%GRETLDATADIR%%/gretl/data/greene/greene13_1.gdt +%%GRETLDATADIR%%/gretl/data/greene/greene14_1.gdt %%GRETLDATADIR%%/gretl/data/greene/greene18_1.gdt %%GRETLDATADIR%%/gretl/data/greene/greene18_2.gdt %%GRETLDATADIR%%/gretl/data/greene/greene19_1.gdt @@ -163,14 +170,17 @@ libdata/pkgconfig/gretl.pc %%GRETLDATADIR%%/gretl/data/hamilton.gdt %%GRETLDATADIR%%/gretl/data/leverage.gdt %%GRETLDATADIR%%/gretl/data/longley.gdt +%%GRETLDATADIR%%/gretl/data/sw_ch12.gdt %%GRETLDATADIR%%/gretl/db/bcih.bin %%GRETLDATADIR%%/gretl/db/bcih.idx %%GRETLDATADIR%%/gretl/gretl-logo.xpm %%GRETLDATADIR%%/gretl/gretl.hlp %%GRETLDATADIR%%/gretl/gretl.stamp %%GRETLDATADIR%%/gretl/gretlcli.hlp +%%GRETLDATADIR%%/gretl/scripts/ects_nls.inp %%GRETLDATADIR%%/gretl/scripts/greene11_3.inp %%GRETLDATADIR%%/gretl/scripts/greene12_1.inp +%%GRETLDATADIR%%/gretl/scripts/greene14_1.inp %%GRETLDATADIR%%/gretl/scripts/greene14_2.inp %%GRETLDATADIR%%/gretl/scripts/greene18_6.inp %%GRETLDATADIR%%/gretl/scripts/greene19_1.inp @@ -178,6 +188,8 @@ libdata/pkgconfig/gretl.pc %%GRETLDATADIR%%/gretl/scripts/greene8_3.inp %%GRETLDATADIR%%/gretl/scripts/greene9_1.inp %%GRETLDATADIR%%/gretl/scripts/greene9_3.inp +%%GRETLDATADIR%%/gretl/scripts/leverage.inp +%%GRETLDATADIR%%/gretl/scripts/longley.inp %%GRETLDATADIR%%/gretl/scripts/ps10-1.inp %%GRETLDATADIR%%/gretl/scripts/ps10-10.inp %%GRETLDATADIR%%/gretl/scripts/ps10-11.inp @@ -253,6 +265,7 @@ libdata/pkgconfig/gretl.pc %%GRETLDATADIR%%/gretl/scripts/ps9-9.inp %%GRETLDATADIR%%/gretl/scripts/ps_descriptions %%GRETLDATADIR%%/gretl/scripts/pscoin.inp +%%GRETLDATADIR%%/gretl/scripts/sw_ch12.inp %%GRETLDATADIR%%/gretl/scripts/testinp %%GRETLDATADIR%%/gretl/scripts/wg_ps_descriptions %%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/appendices.xml |