- Update to 1.8.7

PR:		143813
Submitted by:	Ports Fury

7 files changed, 56 insertions, 53 deletions

diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 6d36af6ff74f..1815eac169b2 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	1.8.6
-PORTREVISION=	1
+PORTVERSION=	1.8.7
 CATEGORIES=	math finance
 MASTER_SITES=	SF
 
@@ -32,7 +31,7 @@ CONFIGURE_ARGS=	--enable-static --enable-shared --with-gmake --without-gnome
 ALL_TARGET=	# empty
 USE_LDCONFIG=	yes
 
-MAN1=		gretl.1 gretl-config.1
+MAN1=		gretl.1
 
 USE_FORTRAN=	yes
 CONFIGURE_ENV+=	LAPACK_LIBS="${BLAS} ${LAPACK} -l${FORTRANRUNTIME}"
@@ -76,6 +75,10 @@ post-install:
 .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
@@ -87,5 +90,6 @@ post-install:
 .for file in gretl-logo.xpm gretl.xpm
 	${INSTALL_DATA} ${WRKSRC}/pixmaps/${file} ${PREFIX}/share/pixmaps
 .endfor
+	@-update-mime-database ${PREFIX}/share/mime
 
 .include <bsd.port.post.mk>
diff --git a/math/gretl/distinfo b/math/gretl/distinfo
index d5638efd680c..31588ffc02db 100644
--- a/math/gretl/distinfo
+++ b/math/gretl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gretl-1.8.6.tar.bz2) = 5d5666ead0d45a7a33acfa4695ddab09
-SHA256 (gretl-1.8.6.tar.bz2) = bdfbce0c3a8b136a4a06e67da916d57f6155b1b9d4658db7595fe1fb3c6d89d2
-SIZE (gretl-1.8.6.tar.bz2) = 6982571
+MD5 (gretl-1.8.7.tar.bz2) = f011cd534669901d63a39b618fa3bd42
+SHA256 (gretl-1.8.7.tar.bz2) = 4564e6e27ae7b855a4c5a166d9f56c16e57d380fa3bac627076157d5d4448e69
+SIZE (gretl-1.8.7.tar.bz2) = 7011559
diff --git a/math/gretl/files/patch-cli::Makefile.in b/math/gretl/files/patch-cli::Makefile.in
index 4249edb16e7c..0bcb9824e1dd 100644
--- a/math/gretl/files/patch-cli::Makefile.in
+++ b/math/gretl/files/patch-cli::Makefile.in
@@ -1,8 +1,8 @@
---- cli/Makefile.in.orig	2009-08-17 22:00:41.000000000 +0900
-+++ cli/Makefile.in	2009-10-29 22:57:08.000000000 +0900
-@@ -16,6 +16,10 @@
- READLINE_LIBS = @READLINE_LIBS@
- READLINE_CFLAGS = @READLINE_CFLAGS@
+--- cli/Makefile.in.orig	2009-12-31 01:24:50.000000000 +0900
++++ cli/Makefile.in	2010-02-02 03:05:49.000000000 +0900
+@@ -18,6 +18,10 @@
+ 
+ quiet_build = @quiet_build@
  
 +CPPFLAGS = @CPPFLAGS@
 +LDFLAGS = @LDFLAGS@
@@ -11,7 +11,7 @@
  ifeq ($(CC),)
    CC = gcc
  endif
-@@ -41,10 +45,10 @@
+@@ -52,10 +56,10 @@
  
  DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
  
@@ -23,13 +23,13 @@
 +LIBTOOL = @LIBTOOL@
  
  %.o: %.c
- 	$(CC) -c $(CFLAGS) $<
-@@ -52,7 +56,7 @@
- 
+ 	$(CCECHO)
+@@ -65,7 +69,7 @@
  $(CLI): .deps $(OBJS)
- 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(OBJS) $(GRETLLIB) \
+ 	$(LDECHO)
+ 	$(AMP)$(LIBTOOL) --mode=link $(CCV) -o $@ $(LDFLAGS) $(OBJS) $(GRETLLIB) \
 -	$(READLINE_LIBS)
 +	$(READLINE_LIBS) $(INTL_LIBS)
  
  .deps:
- 	mkdir $@
+ 	$(AMP)mkdir $@
diff --git a/math/gretl/files/patch-gui2::Makefile.in b/math/gretl/files/patch-gui2::Makefile.in
index e7736ff7393b..811333ada1e9 100644
--- a/math/gretl/files/patch-gui2::Makefile.in
+++ b/math/gretl/files/patch-gui2::Makefile.in
@@ -1,6 +1,6 @@
---- gui2/Makefile.in.orig	2009-09-17 03:48:17.000000000 +0900
-+++ gui2/Makefile.in	2009-10-29 22:59:23.000000000 +0900
-@@ -98,7 +98,7 @@
+--- gui2/Makefile.in.orig	2009-12-31 01:25:11.000000000 +0900
++++ gui2/Makefile.in	2010-02-02 03:07:35.000000000 +0900
+@@ -117,7 +117,7 @@
  #### End of system configuration section. ####
  
  SHELL = /bin/sh
@@ -9,16 +9,14 @@
  PROG  = gretl_x11
  
  vpath %.c $(topsrc)/gui2
-@@ -167,7 +167,7 @@
- 	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
+@@ -192,13 +192,13 @@
+ 	$(AMP)$(CC) -c -I.. -I$(libsrc) $(XML_CFLAGS) $<
  
- mklang: mklang.o
--	$(LIBTOOL) --mode=link $(CC) -o $@ $< ../lib/libgretl-1.0.la $(XML_LIBS)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $< ../lib/libgretl-1.0.la $(LDFLAGS) $(XML_LIBS)
+ mklang: mklang.o 
+-	$(AMP)$(LIBTOOL) --mode=link $(CCV) -o $@ $< ../lib/libgretl-1.0.la $(XML_LIBS)
++	$(AMP)$(LIBTOOL) --mode=link $(CCV) -o $@ $< ../lib/libgretl-1.0.la $(LDFLAGS) $(XML_LIBS)
  
- mklang.o: mklang.c $(topsrc)/lib/src/options.c $(topsrc)/lib/src/genlex.c $(topsrc)/lib/src/gretl_commands.c
- 	$(CC) -c -I.. -I$(libsrc) $(XML_CFLAGS) $<
-@@ -176,7 +176,7 @@
+ $(GRETL_LANG): $(MKLANG)
  	./mklang $(LANGOPT) > $@
  
  $(GTKSOURCEVIEW_LITE):
@@ -26,8 +24,8 @@
 +	$(MAKE) -C gtksourceview
  
  .deps:
- 	mkdir $@
-@@ -191,7 +191,7 @@
+ 	$(AMP)mkdir $@
+@@ -213,7 +213,7 @@
  	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(DESTDIR)$(bindir)/$(PROG)
  
  install-data: installdirs
diff --git a/math/gretl/files/patch-lib::Makefile.in b/math/gretl/files/patch-lib::Makefile.in
index 2324f9dfd1c3..b96b6985645c 100644
--- a/math/gretl/files/patch-lib::Makefile.in
+++ b/math/gretl/files/patch-lib::Makefile.in
@@ -1,6 +1,6 @@
---- lib/Makefile.in.orig	2009-11-26 06:07:31.000000000 +0900
-+++ lib/Makefile.in	2009-12-04 04:04:23.000000000 +0900
-@@ -33,6 +33,10 @@
+--- lib/Makefile.in.orig	2009-12-31 01:22:21.000000000 +0900
++++ lib/Makefile.in	2010-02-02 03:11:21.000000000 +0900
+@@ -34,6 +34,10 @@
    RPATH = $(DARWIN_RPATH)
  endif
  
@@ -11,18 +11,16 @@
  ifeq ($(INSTALL_PROGRAM),)
    INSTALL_PROGRAM = $(INSTALL) -m 755
  endif
-@@ -47,7 +51,7 @@
+@@ -56,14 +60,14 @@
+ # Installation directories
  libdir = $(prefix)/lib
  includedir = $(prefix)/include/gretl
- aclocaldir = $(prefix)/share/aclocal
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  
- INSTALLDIRS = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(aclocaldir)
+ INSTALLDIRS = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(pkgconfigdir)
  
-@@ -60,8 +64,8 @@
-   INSTALL_CFG = install-cfg-old
- endif
+ LIBGRETL = libgretl-1.0.la 
  
 -LIBS = $(LAPACK_LIBS) -lm -ldl -lz $(XML_LIBS) \
 -	$(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS)
@@ -31,7 +29,7 @@
  
  #### End of system configuration section. ####
  
-@@ -230,10 +234,10 @@
+@@ -232,10 +236,10 @@
  LOBJS = $(SRCS:.c=.lo)
  AUX_LOBJ = $(CEPHES_SRC:.c=.lo) $(MINPACK_SRC:.c=.lo)
  
@@ -42,14 +40,14 @@
 -	$(GMP_CFLAGS) $(FFTW_CFLAGS) $(RLIB_CFLAGS) -DHAVE_CONFIG_H
 +	$(GMP_CFLAGS) $(FFTW_CFLAGS) $(RLIB_CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H
  
- COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
+ COMPILE = $(LIBTOOL) --mode=compile $(CCV) -c $(CFLAGS) 
  
-@@ -242,7 +246,7 @@
- 	$(CC) $(CFLAGS) -MM -MT $*.lo $< > .deps/$*.d
+@@ -246,7 +250,7 @@
  
  $(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
--	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LOBJS) $(AUX_LOBJ) \
+ 	$(LDECHO)
+-	$(AMP)$(LIBTOOL) --mode=link $(CCV) -o $@ $(LOBJS) $(AUX_LOBJ) \
++	$(AMP)$(LIBTOOL) --mode=link $(CCV) $(LDFLAGS) -o $@ $(LOBJS) $(AUX_LOBJ) \
  	-rpath $(RPATH) $(LIBS) -version-info $(CURRENT):$(REVISION):$(AGE)
  
  .deps:
diff --git a/math/gretl/files/patch-plugin::Makefile.in b/math/gretl/files/patch-plugin::Makefile.in
index 56252cb48e43..67d491f46094 100644
--- a/math/gretl/files/patch-plugin::Makefile.in
+++ b/math/gretl/files/patch-plugin::Makefile.in
@@ -1,5 +1,5 @@
---- plugin/Makefile.in.orig	2008-05-27 01:47:52.000000000 +0900
-+++ plugin/Makefile.in	2008-06-18 13:56:53.000000000 +0900
+--- plugin/Makefile.in.orig	2009-12-31 01:24:19.000000000 +0900
++++ plugin/Makefile.in	2010-02-02 03:12:37.000000000 +0900
 @@ -11,6 +11,10 @@
  INSTALL = @INSTALL@
  LN = @LN_S@
@@ -11,16 +11,16 @@
  build_gui = @build_gui@
  have_gmp = @have_gmp@
  build_mailer = @build_mailer@
-@@ -45,7 +49,7 @@
+@@ -46,7 +50,7 @@
  
  override CFLAGS += -I.. -I$(topsrc)/gui2 -DHAVE_CONFIG_H
  
 -LIBTOOL = ../libtool
 +LIBTOOL = @LIBTOOL@
- COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
- LINK = $(LIBTOOL) --mode=link $(CC) -module -avoid-version -rpath $(plugindir)
+ COMPILE = $(LIBTOOL) --mode=compile $(CCV) -c $(CFLAGS) 
  
-@@ -175,7 +179,7 @@
+ ifeq ($(quiet_build),yes)
+@@ -193,7 +197,7 @@
  
  override CFLAGS += $(GRETLINC) $(GTK_CFLAGS) $(GMP_CFLAGS) $(MPFR_CFLAGS) \
  	$(XML_CFLAGS) $(GRETL_LIBOLE2_CFLAGS) $(ZIP_CFLAGS) $(AUDIO_CFLAGS) \
@@ -28,8 +28,8 @@
 +	$(ODBC_CFLAGS) -I. $(GMPDEF) $(CPPFLAGS)
  
  %.lo: %.c
- 	$(COMPILE) $< 
-@@ -296,13 +300,13 @@
+ 	$(CCECHO)
+@@ -324,13 +328,13 @@
  .PHONY: 
  
  install: $(GRETLLIB) $(PLUGINS) $(URCDATA) $(DWDATA) installdirs 
diff --git a/math/gretl/pkg-plist b/math/gretl/pkg-plist
index 6cda6e38aac3..9bc8bc72cb31 100644
--- a/math/gretl/pkg-plist
+++ b/math/gretl/pkg-plist
@@ -545,6 +545,7 @@ 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
+share/mime/packages/gretl.xml
 share/mime-info/gretl.keys
 share/mime-info/gretl.mime
 share/pixmaps/gnome-application-x-gretldata.png
@@ -569,3 +570,5 @@ share/pixmaps/gretl.xpm
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @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