update to 1.9.12

Feature safe:	yes

6 files changed, 42 insertions, 154 deletions

diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 4545ae6c2e7f..db9c0a23a441 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -1,44 +1,40 @@
-# ex:ts=8
-# Ports collection makefile for:	gretl
-# Date created:			Mar 22, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	gretl
-PORTVERSION=	1.9.9
+PORTVERSION=	1.9.12
 CATEGORIES=	math finance
 MASTER_SITES=	SF
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	GNU Regression, Econometrics, and Time-series Library
 
-LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
+		fftw3:${PORTSDIR}/math/fftw3
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_FORTRAN=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
+USES=		pathfix
 WANT_GNOME=	yes
 
-ALL_TARGET=	# empty
+ALL_TARGET=		# empty
 CONFIGURE_ARGS =	--enable-static --enable-shared --with-gmake \
-			--without-gnome
+			--disable-xdg-utils
+CONFIGURE_ENV=		ac_cv_lib_dl_dlopen=""
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LAPACK_LIBS="${LAPACK} ${BLAS}"
+CONFIGURE_ENV=		LAPACK_LIBS="${LAPACK} ${BLAS}"
 
-MAN1=		gretl.1
+MAN1=			gretl.1
 
 OPTIONS_DEFINE =	ATLAS GUI ODBC OPENMP R
 
-ATLAS_DESC =	Use ATLAS for BLAS and LAPACK
-GUI_DESC=	Build the graphical user interface and plugins
-ODBC_DESC=	Build with unixODBC database support
-OPENMP_DESC=	Use multithreading via OpenMP
-R_DESC=		Build with libR support
+ATLAS_DESC =		Use ATLAS for BLAS and LAPACK
+GUI_DESC=		Graphical user interface and plugins
+R_DESC=			libR support
 
 OPTIONS_DEFAULT=	GUI OPENMP
 
@@ -57,12 +53,15 @@ LAPACK=		-llapack
 
 .if ${PORT_OPTIONS:MGUI}
 CONFIGURE_ARGS+=	--enable-gui=yes
-USE_GNOME=		gnomehier gtksourceview2
+INSTALLS_ICONS=		yes
+USE_GNOME=		gtksourceview2
+USES+=			desktop-file-utils shared-mime-info
 BUILD_DEPENDS+=		gnuplot:${PORTSDIR}/math/gnuplot
 RUN_DEPENDS+=		gnuplot:${PORTSDIR}/math/gnuplot
 PLIST_SUB+=		GUI=""
 .else
-CONFIGURE_ARGS+=	--enable-gui=no
+USE_GNOME=		glib20 libxml2
+CONFIGURE_ARGS+=	--enable-gui=no --enable-xdg=no
 PLIST_SUB+=		GUI="@comment "
 .endif
 
@@ -77,7 +76,7 @@ PLIST_SUB+=		NLS="@comment "
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=	--with-odbc
-LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc:${PORTSDIR}/databases/unixODBC
 PLIST_SUB+=		ODBC=""
 .else
 CONFIGURE_ARGS+=	--without-odbc
@@ -106,40 +105,11 @@ post-patch:
 		{x; s/.*/#include <netinet\/in.h>/; H; x;}' \
 		${WRKSRC}/configure \
 		${WRKSRC}/plugin/mailer.c
-	@${REINPLACE_CMD} -e 's|set term png|set term dumb|g' \
-		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's| DOMAIN| CEPHES_DOMAIN|g' \
 		${WRKSRC}/cephes/iv.c
-	@${REINPLACE_CMD} -e 's|@gnome_prefix@|@prefix@|g' \
-		${WRKSRC}/gnome/gretl.keys.in
-
-.if ${PORT_OPTIONS:MGUI}
-post-install:
-	@${MKDIR} ${PREFIX}/share/applications
-.for _file in gretl.desktop
-	${INSTALL_DATA} ${WRKSRC}/gnome/${_file} ${PREFIX}/share/applications
-.endfor
-	@${MKDIR} ${PREFIX}/share/mime/packages
-.for _file in gretl.xml
-	${INSTALL_DATA} ${WRKSRC}/xdg/${_file} ${PREFIX}/share/mime/packages
-.endfor
-	@${MKDIR} ${PREFIX}/share/mime-info
-.for _file in gretl.keys gretl.mime
-	${INSTALL_DATA} ${WRKSRC}/gnome/${_file} ${PREFIX}/share/mime-info
-.endfor
-	@${MKDIR} ${PREFIX}/share/pixmaps
-.for _file in gnome-application-x-gretldata.png gnome-application-x-gretlsession.png
-	${INSTALL_DATA} ${WRKSRC}/gnome/${_file} ${PREFIX}/share/pixmaps
-.endfor
-.for _file in gretl-logo.xpm gretl.xpm
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/${_file} ${PREFIX}/share/pixmaps
-.endfor
-	@-update-mime-database ${PREFIX}/share/mime
-
-.endif
 
 regression-test test check: build
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} \
-		${MAKE_ARGS} check)
+	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} \
+		${MAKE_ARGS} check
 
 .include <bsd.port.mk>
diff --git a/math/gretl/distinfo b/math/gretl/distinfo
index e07d170f351e..287d3bb7f8fa 100644
--- a/math/gretl/distinfo
+++ b/math/gretl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gretl-1.9.9.tar.bz2) = 87caa9b780cab18e7795de1cc2ef95fee5cda154b72a90006abac60d959229aa
-SIZE (gretl-1.9.9.tar.bz2) = 9260961
+SHA256 (gretl-1.9.12.tar.bz2) = dcca78388b815d56c94eb3fb6ed4d99fa19362aa9e806ab12228f1cf483470c4
+SIZE (gretl-1.9.12.tar.bz2) = 9359175
diff --git a/math/gretl/files/patch-cli::Makefile.in b/math/gretl/files/patch-cli::Makefile.in
deleted file mode 100644
index 0278c76e4bf0..000000000000
--- a/math/gretl/files/patch-cli::Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
---- cli/Makefile.in.orig	2010-08-28 11:10:07.000000000 -0400
-+++ cli/Makefile.in	2011-03-02 07:41:07.000000000 -0500
-@@ -21,6 +21,10 @@
- 
- quiet_build = @quiet_build@
- 
-+CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
-+INTL_LIBS = @LTLIBINTL@
-+
- ifeq ($(CC),)
-   CC = gcc
- endif
-@@ -55,7 +59,7 @@
- 
- DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
- 
--override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(READLINE_CFLAGS) $(DEFS)
-+override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(READLINE_CFLAGS) $(DEFS) $(CPPFLAGS)
- 
- CLI = gretlcli$(EXEEXT)
- LIBTOOL = ../libtool
-@@ -68,7 +72,7 @@
- $(CLI): .deps $(OBJS)
- 	$(LDECHO)
- 	$(AMP)$(LIBTOOL) --mode=link $(CCV) $(LDFLAGS) -o $@ $(OBJS) \
--	$(GRETLLIB) $(READLINE_LIBS)
-+	$(GRETLLIB) $(READLINE_LIBS) $(INTL_LIBS)
- 
- .deps:
- 	$(AMP)mkdir $@
diff --git a/math/gretl/files/patch-lib::Makefile.in b/math/gretl/files/patch-lib::Makefile.in
index 6f68eb5dff5b..abeb39dc5a72 100644
--- a/math/gretl/files/patch-lib::Makefile.in
+++ b/math/gretl/files/patch-lib::Makefile.in
@@ -1,40 +1,11 @@
---- lib/Makefile.in.orig	2011-02-16 09:15:14.000000000 -0500
-+++ lib/Makefile.in	2011-03-02 09:03:21.000000000 -0500
-@@ -38,6 +38,10 @@
-   RPATH = $(DARWIN_RPATH)
- endif
- 
-+CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
-+INTL_LIBS = @LTLIBINTL@
-+
- ifeq ($(INSTALL_PROGRAM),)
-   INSTALL_PROGRAM = $(INSTALL) -m 755
- endif
-@@ -59,14 +63,14 @@
- 
- # Installation directories
- includedir = $(prefix)/include/gretl
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- 
- INSTALLDIRS = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(pkgconfigdir)
+--- lib/Makefile.in.orig	2013-04-20 18:39:30.000000000 -0400
++++ lib/Makefile.in	2013-04-20 18:39:44.000000000 -0400
+@@ -68,7 +68,7 @@
  
  LIBGRETL = libgretl-1.0.la 
  
 -LIBS = $(LAPACK_LIBS) -lm -ldl -lz $(XML_LIBS) \
--	$(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS)
 +LIBS = $(LAPACK_LIBS) -lm -lz $(XML_LIBS) \
-+	$(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS) $(INTL_LIBS)
+ 	$(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS) $(CURL_LIBS)
  
  #### End of system configuration section. ####
- 
-@@ -241,7 +245,7 @@
- LIBTOOL = ../libtool
- 
- override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(XML_CFLAGS) $(GLIB_CFLAGS) \
--	$(GMP_CFLAGS) $(FFTW_CFLAGS) $(RLIB_CFLAGS) -DHAVE_CONFIG_H $(LIBDEF)
-+	$(GMP_CFLAGS) $(FFTW_CFLAGS) $(RLIB_CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H $(LIBDEF)
- 
- COMPILE = $(LIBTOOL) --mode=compile $(CCV) -c $(CFLAGS) 
- 
diff --git a/math/gretl/files/patch-plugin::Makefile.in b/math/gretl/files/patch-plugin::Makefile.in
index 2f683ea1ab17..c7d66c786d8f 100644
--- a/math/gretl/files/patch-plugin::Makefile.in
+++ b/math/gretl/files/patch-plugin::Makefile.in
@@ -1,26 +1,6 @@
---- plugin/Makefile.in.orig	2011-02-14 08:52:57.000000000 -0500
-+++ plugin/Makefile.in	2011-03-02 09:02:20.000000000 -0500
-@@ -12,6 +12,10 @@
- INSTALL = @INSTALL@
- LN = @LN_S@
- 
-+CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
-+INTL_LIBS = @LTLIBINTL@
-+
- build_gui = @build_gui@
- build_mailer = @build_mailer@
- have_odbc = @have_odbc@
-@@ -198,7 +202,7 @@
- 
- override CFLAGS += $(GRETLINC) $(GTK_CFLAGS) $(GMP_CFLAGS) $(MPFR_CFLAGS) \
- 	$(XML_CFLAGS) $(GRETL_LIBOLE2_CFLAGS) $(ZIP_CFLAGS) $(AUDIO_CFLAGS) \
--	$(ODBC_CFLAGS) -I. 
-+	$(ODBC_CFLAGS) -I. $(CPPFLAGS)
- 
- %.lo: %.c
- 	$(CCECHO)
-@@ -340,13 +344,13 @@
+--- plugin/Makefile.in.orig	2013-02-19 10:08:31.000000000 -0500
++++ plugin/Makefile.in	2013-04-20 18:20:25.000000000 -0400
+@@ -350,13 +350,13 @@
  .PHONY: 
  
  install: $(GRETLLIB) $(PLUGINS) $(URCDATA) $(DWDATA) installdirs 
diff --git a/math/gretl/pkg-plist b/math/gretl/pkg-plist
index 937e40b7d0fe..0fa9afb807a8 100644
--- a/math/gretl/pkg-plist
+++ b/math/gretl/pkg-plist
@@ -35,7 +35,6 @@ include/gretl/gretl_panel.h
 include/gretl/gretl_paths.h
 include/gretl/gretl_prn.h
 include/gretl/gretl_restrict.h
-include/gretl/gretl_scalar.h
 include/gretl/gretl_string_table.h
 include/gretl/gretl_untar.h
 include/gretl/gretl_utils.h
@@ -69,6 +68,7 @@ include/gretl/texprint.h
 include/gretl/transforms.h
 include/gretl/tsls.h
 include/gretl/usermat.h
+include/gretl/uservar.h
 include/gretl/var.h
 include/gretl/varprint.h
 include/gretl/vartest.h
@@ -164,6 +164,9 @@ lib/gretl-gtk2/quantreg.so
 lib/gretl-gtk2/range-mean.a
 lib/gretl-gtk2/range-mean.la
 lib/gretl-gtk2/range-mean.so
+lib/gretl-gtk2/reprobit.a
+lib/gretl-gtk2/reprobit.la
+lib/gretl-gtk2/reprobit.so
 lib/gretl-gtk2/sas_import.a
 lib/gretl-gtk2/sas_import.la
 lib/gretl-gtk2/sas_import.so
@@ -194,7 +197,7 @@ lib/gretl-gtk2/vif.so
 lib/libgretl-1.0.a
 lib/libgretl-1.0.la
 lib/libgretl-1.0.so
-lib/libgretl-1.0.so.4
+lib/libgretl-1.0.so.7
 libdata/pkgconfig/gretl.pc
 %%GUI%%share/applications/gretl.desktop
 %%GUI%%%%DATADIR%%/COPYING
@@ -385,15 +388,12 @@ libdata/pkgconfig/gretl.pc
 %%GUI%%%%DATADIR%%/gretl-logo.xpm
 %%DATADIR%%/gretl.stamp
 %%DATADIR%%/gretlcli.hlp
-%%DATADIR%%/gretlcli.hlp.es
 %%DATADIR%%/gretlcli.hlp.it
 %%DATADIR%%/gretlcli.hlp.pt
 %%DATADIR%%/gretlcmd.hlp
-%%DATADIR%%/gretlcmd.hlp.es
 %%DATADIR%%/gretlcmd.hlp.it
 %%DATADIR%%/gretlcmd.hlp.pt
 %%DATADIR%%/gretlgui.hlp
-%%DATADIR%%/gretlgui.hlp.es
 %%DATADIR%%/gretlgui.hlp.it
 %%DATADIR%%/gretlgui.hlp.pt
 %%DATADIR%%/gretlhelp.refs
@@ -553,11 +553,17 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/scripts/ps9-8.inp
 %%DATADIR%%/scripts/ps9-9.inp
 %%DATADIR%%/scripts/ps_descriptions
-%%DATADIR%%/scripts/testinp
 %%DATADIR%%/scripts/wg_ps_descriptions
 %%GUI%%%%DATADIR%%/ui/gretlmain.xml
+%%GUI%%%%DATADIR%%/ui/gretlmodel.xml
 %%GUI%%share/gtksourceview-2.0/language-specs/gnuplot.lang
 %%GUI%%share/gtksourceview-2.0/language-specs/gretl.lang
+%%GUI%%share/icons/hicolor/32x32/apps/gretl.png
+%%GUI%%share/icons/hicolor/32x32/mimetypes/application-gretl.data.png
+%%GUI%%share/icons/hicolor/32x32/mimetypes/application-gretl.session.png
+%%GUI%%share/icons/hicolor/32x32/mimetypes/text-gretl.script.png
+%%GUI%%share/icons/hicolor/48x48/apps/gretl.png
+%%GUI%%share/icons/hicolor/64x64/apps/gretl.png
 %%NLS%%share/locale/cs/LC_MESSAGES/gretl.mo
 %%NLS%%share/locale/de/LC_MESSAGES/gretl.mo
 %%NLS%%share/locale/el/LC_MESSAGES/gretl.mo
@@ -573,12 +579,6 @@ libdata/pkgconfig/gretl.pc
 %%NLS%%share/locale/tr/LC_MESSAGES/gretl.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gretl.mo
 %%GUI%%share/mime/packages/gretl.xml
-%%GUI%%share/mime-info/gretl.keys
-%%GUI%%share/mime-info/gretl.mime
-%%GUI%%share/pixmaps/gnome-application-x-gretldata.png
-%%GUI%%share/pixmaps/gnome-application-x-gretlsession.png
-%%GUI%%share/pixmaps/gretl-logo.xpm
-%%GUI%%share/pixmaps/gretl.xpm
 %%GUI%%@dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/scripts/misc
 @dirrm %%DATADIR%%/scripts
@@ -596,5 +596,3 @@ libdata/pkgconfig/gretl.pc
 @dirrm lib/gretl-gtk2
 @dirrm include/gretl
 @dirrmtry share/applications
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true