- Update to 1.8.1

PR:		136479
Submitted by:	Ports Fury

5 files changed, 51 insertions, 42 deletions

diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index d5031c7e8c19..e41f77664d22 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -7,13 +7,12 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	1.8.0
-PORTREVISION=	1
+PORTVERSION=	1.8.1
 CATEGORIES=	math finance
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Gnu Regression, Econometrics and Time-series Library
+COMMENT=	GNU Regression, Econometrics and Time-series Library
 
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 LIB_DEPENDS=	fftw3.5:${PORTSDIR}/math/fftw3 \
@@ -22,13 +21,13 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 USE_BZIP2=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gtk20 libxml2
+USE_GNOME=	gnomehier gtk20 gtksourceview2 libxml2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lgnuregex ${GCCLIBDIR}"
-CONFIGURE_ARGS=	--enable-static --enable-shared --with-gmake
+		LDFLAGS="-L${LOCALBASE}/lib ${GCCLIBDIR}"
+CONFIGURE_ARGS=	--enable-static --enable-shared --with-gmake --without-gnome
 ALL_TARGET=	# empty
 USE_LDCONFIG=	yes
 
@@ -45,13 +44,6 @@ GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
 BROKEN=		math/lapack appears to be broken on alpha
 .endif
 
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-PKGNAMESUFFIX=	-gnome
-USE_GNOME+=	gnomehier gtksourceview2 libgnomeui
-.else
-CONFIGURE_ARGS+=	--without-gnome --without-gtksourceview
-.endif
-
 .if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
 WITH_ATLAS=	yes
 .endif
@@ -70,10 +62,27 @@ LAPACK=		-llapack
 post-patch:
 	@${REINPLACE_CMD} -e 's|set term png|set term dumb|g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|<regex.h>|<gnu/regex.h>|g' \
-		${WRKSRC}/gui2/gtksourceview/gtksourceregex.c
+	@${REINPLACE_CMD} -e 's|@gnome_prefix@|@prefix@|g' \
+		${WRKSRC}/gnome/gretl.keys.in
 
 pre-configure:
 	@${DIRNAME} `${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 
+post-install:
+	@${MKDIR} ${PREFIX}/share/applications
+.for file in gretl.desktop
+	${INSTALL_DATA} ${WRKSRC}/gnome/${file} ${PREFIX}/share/applications
+.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
+
 .include <bsd.port.post.mk>
diff --git a/math/gretl/distinfo b/math/gretl/distinfo
index 9c28b71f84c8..70902b8fa73e 100644
--- a/math/gretl/distinfo
+++ b/math/gretl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gretl-1.8.0.tar.bz2) = 21d0065cefb08585fe95d05e7b977312
-SHA256 (gretl-1.8.0.tar.bz2) = a5759591f8a456adde25438894367e3809e31e39c53fcb1eea46f934ee06cd71
-SIZE (gretl-1.8.0.tar.bz2) = 6286262
+MD5 (gretl-1.8.1.tar.bz2) = fe80920504b7f4e4e6995fba44cbb6da
+SHA256 (gretl-1.8.1.tar.bz2) = 62d6b648ceca2a9b89e384b28943da78155873266307c28b7e15e7af5289b426
+SIZE (gretl-1.8.1.tar.bz2) = 6777140
diff --git a/math/gretl/files/patch-lib::Makefile.in b/math/gretl/files/patch-lib::Makefile.in
index ec3a4552aa81..f7d9a73615ea 100644
--- a/math/gretl/files/patch-lib::Makefile.in
+++ b/math/gretl/files/patch-lib::Makefile.in
@@ -1,5 +1,5 @@
---- lib/Makefile.in.orig	2008-05-25 10:40:28.000000000 +0900
-+++ lib/Makefile.in	2008-06-18 16:15:55.000000000 +0900
+--- lib/Makefile.in.orig	2009-05-06 23:33:33.000000000 +0900
++++ lib/Makefile.in	2009-07-08 01:12:18.000000000 +0900
 @@ -25,6 +25,10 @@
  
  have_gtk = @have_gtk@
@@ -20,18 +20,18 @@
  
  INSTALLDIRS = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(aclocaldir)
  
-@@ -55,8 +59,8 @@
- 
- # hard-coded -L/usr/local/lib is a bodge!!
+@@ -53,8 +57,8 @@
+   INSTALL_CFG = install-cfg-old
+ endif
  
--LIBS = $(LAPACK_LIBS) -lm -ldl -L/usr/local/lib -lz $(XML_LIBS) \
+-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)
  
  #### End of system configuration section. ####
  
-@@ -215,10 +219,10 @@
+@@ -219,10 +223,10 @@
  LOBJS = $(SRCS:.c=.lo)
  AUX_LOBJ = $(CEPHES_SRC:.c=.lo) $(MINPACK_SRC:.c=.lo)
  
@@ -44,7 +44,7 @@
  
  COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
  
-@@ -227,7 +231,7 @@
+@@ -231,7 +235,7 @@
  	$(CC) $(CFLAGS) -MM -MT $*.lo $< > .deps/$*.d
  
  $(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
diff --git a/math/gretl/pkg-descr b/math/gretl/pkg-descr
index b0fbe9f62440..22246ee640cf 100644
--- a/math/gretl/pkg-descr
+++ b/math/gretl/pkg-descr
@@ -1,4 +1,4 @@
-Gnu Regression, Econometrics and Time-series Library
+GNU Regression, Econometrics and Time-series Library
 
 Features
    - A wide variety of least-squares based estimators (including two-stage
diff --git a/math/gretl/pkg-plist b/math/gretl/pkg-plist
index e53b8dda3263..e128778d0a27 100644
--- a/math/gretl/pkg-plist
+++ b/math/gretl/pkg-plist
@@ -36,6 +36,7 @@ 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
 include/gretl/gretl_win32.h
 include/gretl/gretl_www.h
@@ -179,7 +180,7 @@ lib/libgretl-1.0.la
 lib/libgretl-1.0.so
 lib/libgretl-1.0.so.0
 libdata/pkgconfig/gretl.pc
-%%GNOME:%%share/applications/gretl.desktop
+share/applications/gretl.desktop
 %%DATADIR%%/COPYING
 %%DATADIR%%/data/data10-1.gdt
 %%DATADIR%%/data/data10-2.gdt
@@ -297,6 +298,7 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/data/misc/arma.gdt
 %%DATADIR%%/data/misc/australia.gdt
 %%DATADIR%%/data/misc/b-g.gdt
+%%DATADIR%%/data/misc/banks91.gdt
 %%DATADIR%%/data/misc/bjg.gdt
 %%DATADIR%%/data/misc/broiler.gdt
 %%DATADIR%%/data/misc/credscore.gdt
@@ -319,6 +321,7 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/data/misc/mccullagh.gdt
 %%DATADIR%%/data/misc/mroz87.gdt
 %%DATADIR%%/data/misc/mrw.gdt
+%%DATADIR%%/data/misc/murder_rates.gdt
 %%DATADIR%%/data/misc/np.gdt
 %%DATADIR%%/data/misc/nysewk.gdt
 %%DATADIR%%/data/misc/ooballot.gdt
@@ -346,7 +349,6 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/fonts/FreeSans.ttf
 %%DATADIR%%/fonts/Vera.ttf
 %%DATADIR%%/fonts/VeraMono.ttf
-%%DATADIR%%/fonts/luxisr.ttf
 %%DATADIR%%/functions/gretlfunc.dtd
 %%DATADIR%%/genrcli.hlp
 %%DATADIR%%/genrcli.hlp.it
@@ -368,9 +370,6 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/gretlgui.hlp.es
 %%DATADIR%%/gretlgui.hlp.it
 %%DATADIR%%/gretlgui.hlp.pt
-%%NOGNOME:%%%%DATADIR%%/gtksourceview/R.lang
-%%NOGNOME:%%%%DATADIR%%/gtksourceview/gnuplot.lang
-%%NOGNOME:%%%%DATADIR%%/gtksourceview/gretl.lang
 %%DATADIR%%/helpfigs/Gamma.png
 %%DATADIR%%/helpfigs/adf1.png
 %%DATADIR%%/helpfigs/aic.png
@@ -424,6 +423,7 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/scripts/misc/credscore.inp
 %%DATADIR%%/scripts/misc/denmark.inp
 %%DATADIR%%/scripts/misc/ects_nls.inp
+%%DATADIR%%/scripts/misc/frontier.inp
 %%DATADIR%%/scripts/misc/garch.inp
 %%DATADIR%%/scripts/misc/hall_cbapm.inp
 %%DATADIR%%/scripts/misc/hamilton.inp
@@ -436,6 +436,7 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/scripts/misc/longley.inp
 %%DATADIR%%/scripts/misc/mrw.inp
 %%DATADIR%%/scripts/misc/mrw_qr.inp
+%%DATADIR%%/scripts/misc/murder_rates.inp
 %%DATADIR%%/scripts/misc/ooballot.inp
 %%DATADIR%%/scripts/misc/oprobit.inp
 %%DATADIR%%/scripts/misc/penngrow.inp
@@ -525,8 +526,9 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/scripts/testinp
 %%DATADIR%%/scripts/wg_ps_descriptions
 %%DATADIR%%/ui/gretlmain.xml
-%%GNOME:%%share/gtksourceview-2.0/language-specs/gnuplot.lang
-%%GNOME:%%share/gtksourceview-2.0/language-specs/gretl.lang
+share/gtksourceview-2.0/language-specs/gnuplot.lang
+share/gtksourceview-2.0/language-specs/gretl.lang
+share/locale/cs/LC_MESSAGES/gretl.mo
 share/locale/de/LC_MESSAGES/gretl.mo
 share/locale/es/LC_MESSAGES/gretl.mo
 share/locale/eu/LC_MESSAGES/gretl.mo
@@ -538,17 +540,16 @@ share/locale/pt_BR/LC_MESSAGES/gretl.mo
 share/locale/ru/LC_MESSAGES/gretl.mo
 share/locale/tr/LC_MESSAGES/gretl.mo
 share/locale/zh_TW/LC_MESSAGES/gretl.mo
-%%GNOME:%%share/mime-info/gretl.keys
-%%GNOME:%%share/mime-info/gretl.mime
-%%GNOME:%%share/pixmaps/gnome-application-x-gretldata.png
-%%GNOME:%%share/pixmaps/gnome-application-x-gretlsession.png
-%%GNOME:%%share/pixmaps/gretl-logo.xpm
-%%GNOME:%%share/pixmaps/gretl.xpm
+share/mime-info/gretl.keys
+share/mime-info/gretl.mime
+share/pixmaps/gnome-application-x-gretldata.png
+share/pixmaps/gnome-application-x-gretlsession.png
+share/pixmaps/gretl-logo.xpm
+share/pixmaps/gretl.xpm
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/scripts/misc
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/helpfigs
-%%NOGNOME:%%@dirrm %%DATADIR%%/gtksourceview
 @dirrm %%DATADIR%%/functions
 @dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/db
@@ -557,7 +558,6 @@ share/locale/zh_TW/LC_MESSAGES/gretl.mo
 @dirrm %%DATADIR%%/data/greene
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
-%%GNOME:%%@dirrmtry share/gnome
 @dirrm lib/gretl-gtk2/data
 @dirrm lib/gretl-gtk2
 @dirrm include/gretl