6 files changed, 30 insertions, 38 deletions

diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 89f575339668..9cd065fd979e 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	1.8.2
-PORTREVISION=	1
+PORTVERSION=	1.8.5
 CATEGORIES=	math finance
 MASTER_SITES=	SF
 
diff --git a/math/gretl/distinfo b/math/gretl/distinfo
index 8bc4c3286a88..4137715b3d99 100644
--- a/math/gretl/distinfo
+++ b/math/gretl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gretl-1.8.2.tar.bz2) = cc4469d46972fa2abe0041e64c939358
-SHA256 (gretl-1.8.2.tar.bz2) = 5ab5c4bb191b13723016d3ecbb4c4b29728a6d62eeebabf014c8e1e4dbed2e10
-SIZE (gretl-1.8.2.tar.bz2) = 6845908
+MD5 (gretl-1.8.5.tar.bz2) = 2e2c7f21538ac7a4ec9fcaa0b55df8f3
+SHA256 (gretl-1.8.5.tar.bz2) = d2dc50eb9d23715ffd421e15558263776347e3f848d0f065f4754c8fa9801017
+SIZE (gretl-1.8.5.tar.bz2) = 6965280
diff --git a/math/gretl/files/patch-cli::Makefile.in b/math/gretl/files/patch-cli::Makefile.in
index d6560ee9865a..4249edb16e7c 100644
--- a/math/gretl/files/patch-cli::Makefile.in
+++ b/math/gretl/files/patch-cli::Makefile.in
@@ -1,5 +1,5 @@
---- cli/Makefile.in.orig	2009-07-06 13:26:32.000000000 +0900
-+++ cli/Makefile.in	2009-08-07 00:40:58.000000000 +0900
+--- 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@
@@ -11,7 +11,7 @@
  ifeq ($(CC),)
    CC = gcc
  endif
-@@ -41,18 +45,18 @@
+@@ -41,10 +45,10 @@
  
  DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
  
@@ -24,12 +24,11 @@
  
  %.o: %.c
  	$(CC) -c $(CFLAGS) $<
- 	$(CC) $(CFLAGS) -MM $< > .deps/$*.d 
+@@ -52,7 +56,7 @@
  
  $(CLI): .deps $(OBJS)
--	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(GRETLLIB) \
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(OBJS) $(GRETLLIB) \
 -	$(READLINE_LIBS)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(GRETLLIB) \
 +	$(READLINE_LIBS) $(INTL_LIBS)
  
  .deps:
diff --git a/math/gretl/files/patch-gui2::Makefile.in b/math/gretl/files/patch-gui2::Makefile.in
index 494267a58c17..e7736ff7393b 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	2008-12-12 03:44:33.000000000 +0900
-+++ gui2/Makefile.in	2009-02-05 23:24:20.000000000 +0900
-@@ -106,7 +106,7 @@
+--- 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 @@
  #### End of system configuration section. ####
  
  SHELL = /bin/sh
@@ -9,23 +9,16 @@
  PROG  = gretl_x11
  
  vpath %.c $(topsrc)/gui2
-@@ -164,13 +164,13 @@
- 	$(CC) $(CFLAGS) -MM $< > .deps/$*.d 
- 
- $(PROG): .deps $(OBJS) $(HACK_OBJ) $(GTKSOURCEVIEW_LITE) 
--	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
- 
- $(HACK_OBJ): $(HACK_SRC) $(HACK_HDR)
+@@ -167,7 +167,7 @@
  	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
  
  mklang: mklang.o
 -	$(LIBTOOL) --mode=link $(CC) -o $@ $< ../lib/libgretl-1.0.la $(XML_LIBS)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $< ../lib/libgretl-1.0.la $(XML_LIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $< ../lib/libgretl-1.0.la $(LDFLAGS) $(XML_LIBS)
  
- mklang.o: mklang.c $(topsrc)/lib/src/options.c $(topsrc)/lib/src/genlex.c
+ 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) $<
-@@ -179,7 +179,7 @@
+@@ -176,7 +176,7 @@
  	./mklang $(LANGOPT) > $@
  
  $(GTKSOURCEVIEW_LITE):
@@ -34,7 +27,7 @@
  
  .deps:
  	mkdir $@
-@@ -194,7 +194,7 @@
+@@ -191,7 +191,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 161a40e2d7d0..33c8c9d453a8 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-07-06 13:24:20.000000000 +0900
-+++ lib/Makefile.in	2009-08-07 00:39:12.000000000 +0900
-@@ -27,6 +27,10 @@
+--- lib/Makefile.in.orig	2009-07-09 10:21:49.000000000 +0900
++++ lib/Makefile.in	2009-10-29 23:01:13.000000000 +0900
+@@ -26,6 +26,10 @@
  
  have_gtk = @have_gtk@
  
@@ -11,7 +11,7 @@
  ifeq ($(INSTALL_PROGRAM),)
    INSTALL_PROGRAM = $(INSTALL) -m 755
  endif
-@@ -41,7 +45,7 @@
+@@ -40,7 +44,7 @@
  libdir = $(prefix)/lib
  includedir = $(prefix)/include/gretl
  aclocaldir = $(prefix)/share/aclocal
@@ -20,18 +20,18 @@
  
  INSTALLDIRS = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(aclocaldir)
  
-@@ -54,8 +58,8 @@
+@@ -53,8 +57,8 @@
    INSTALL_CFG = install-cfg-old
  endif
  
 -LIBS = $(LAPACK_LIBS) -lm -ldl -lz $(XML_LIBS) \
--	$(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS) $(RLIB_LIBS)
+-	$(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS)
 +LIBS = $(LAPACK_LIBS) -lm -lz $(XML_LIBS) \
-+	$(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS) $(RLIB_LIBS) $(INTL_LIBS)
++	$(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS) $(INTL_LIBS)
  
  #### End of system configuration section. ####
  
-@@ -224,10 +228,10 @@
+@@ -223,10 +227,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) 
  
-@@ -236,7 +240,7 @@
+@@ -235,7 +239,7 @@
  	$(CC) $(CFLAGS) -MM -MT $*.lo $< > .deps/$*.d
  
  $(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
diff --git a/math/gretl/pkg-plist b/math/gretl/pkg-plist
index fada10ca6427..6cda6e38aac3 100644
--- a/math/gretl/pkg-plist
+++ b/math/gretl/pkg-plist
@@ -137,9 +137,6 @@ lib/gretl-gtk2/nistcheck.so
 lib/gretl-gtk2/ods_import.a
 lib/gretl-gtk2/ods_import.la
 lib/gretl-gtk2/ods_import.so
-lib/gretl-gtk2/oprobit.a
-lib/gretl-gtk2/oprobit.la
-lib/gretl-gtk2/oprobit.so
 lib/gretl-gtk2/pca.a
 lib/gretl-gtk2/pca.la
 lib/gretl-gtk2/pca.so
@@ -155,6 +152,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/sas_import.a
+lib/gretl-gtk2/sas_import.la
+lib/gretl-gtk2/sas_import.so
 lib/gretl-gtk2/spss_import.a
 lib/gretl-gtk2/spss_import.la
 lib/gretl-gtk2/spss_import.so
@@ -312,6 +312,7 @@ share/applications/gretl.desktop
 %%DATADIR%%/data/misc/ects_nls.gdt
 %%DATADIR%%/data/misc/engel.gdt
 %%DATADIR%%/data/misc/galton.gdt
+%%DATADIR%%/data/misc/gear.gdt
 %%DATADIR%%/data/misc/hall.gdt
 %%DATADIR%%/data/misc/hamilton.gdt
 %%DATADIR%%/data/misc/hendry_jae.gdt