5 files changed, 28 insertions, 20 deletions

diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 359c436a775f..ed2a78390d76 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	1.8.1
+PORTVERSION=	1.8.2
 CATEGORIES=	math finance
 MASTER_SITES=	SF
 
@@ -62,6 +62,8 @@ LAPACK=		-llapack
 post-patch:
 	@${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
 
diff --git a/math/gretl/distinfo b/math/gretl/distinfo
index 70902b8fa73e..8bc4c3286a88 100644
--- a/math/gretl/distinfo
+++ b/math/gretl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gretl-1.8.1.tar.bz2) = fe80920504b7f4e4e6995fba44cbb6da
-SHA256 (gretl-1.8.1.tar.bz2) = 62d6b648ceca2a9b89e384b28943da78155873266307c28b7e15e7af5289b426
-SIZE (gretl-1.8.1.tar.bz2) = 6777140
+MD5 (gretl-1.8.2.tar.bz2) = cc4469d46972fa2abe0041e64c939358
+SHA256 (gretl-1.8.2.tar.bz2) = 5ab5c4bb191b13723016d3ecbb4c4b29728a6d62eeebabf014c8e1e4dbed2e10
+SIZE (gretl-1.8.2.tar.bz2) = 6845908
diff --git a/math/gretl/files/patch-cli::Makefile.in b/math/gretl/files/patch-cli::Makefile.in
index 1a3143da96e4..d6560ee9865a 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	2008-03-24 21:46:11.000000000 +0900
-+++ cli/Makefile.in	2008-06-18 16:22:11.000000000 +0900
+--- cli/Makefile.in.orig	2009-07-06 13:26:32.000000000 +0900
++++ cli/Makefile.in	2009-08-07 00:40:58.000000000 +0900
 @@ -16,6 +16,10 @@
  READLINE_LIBS = @READLINE_LIBS@
  READLINE_CFLAGS = @READLINE_CFLAGS@
@@ -11,7 +11,7 @@
  ifeq ($(CC),)
    CC = gcc
  endif
-@@ -41,17 +45,17 @@
+@@ -41,18 +45,18 @@
  
  DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
  
@@ -27,8 +27,10 @@
  	$(CC) $(CFLAGS) -MM $< > .deps/$*.d 
  
  $(CLI): .deps $(OBJS)
--	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(GRETLLIB) $(READLINE_LIBS) 
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(GRETLLIB) $(READLINE_LIBS) $(INTL_LIBS)
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(GRETLLIB) \
+-	$(READLINE_LIBS)
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(GRETLLIB) \
++	$(READLINE_LIBS) $(INTL_LIBS)
  
  .deps:
  	mkdir $@
diff --git a/math/gretl/files/patch-lib::Makefile.in b/math/gretl/files/patch-lib::Makefile.in
index f7d9a73615ea..161a40e2d7d0 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-05-06 23:33:33.000000000 +0900
-+++ lib/Makefile.in	2009-07-08 01:12:18.000000000 +0900
-@@ -25,6 +25,10 @@
+--- 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 @@
  
  have_gtk = @have_gtk@
  
@@ -11,7 +11,7 @@
  ifeq ($(INSTALL_PROGRAM),)
    INSTALL_PROGRAM = $(INSTALL) -m 755
  endif
-@@ -39,7 +43,7 @@
+@@ -41,7 +45,7 @@
  libdir = $(prefix)/lib
  includedir = $(prefix)/include/gretl
  aclocaldir = $(prefix)/share/aclocal
@@ -20,18 +20,18 @@
  
  INSTALLDIRS = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(aclocaldir)
  
-@@ -53,8 +57,8 @@
+@@ -54,8 +58,8 @@
    INSTALL_CFG = install-cfg-old
  endif
  
 -LIBS = $(LAPACK_LIBS) -lm -ldl -lz $(XML_LIBS) \
--	$(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS)
+-	$(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS) $(RLIB_LIBS)
 +LIBS = $(LAPACK_LIBS) -lm -lz $(XML_LIBS) \
-+	$(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS) $(INTL_LIBS)
++	$(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS) $(RLIB_LIBS) $(INTL_LIBS)
  
  #### End of system configuration section. ####
  
-@@ -219,10 +223,10 @@
+@@ -224,10 +228,10 @@
  LOBJS = $(SRCS:.c=.lo)
  AUX_LOBJ = $(CEPHES_SRC:.c=.lo) $(MINPACK_SRC:.c=.lo)
  
@@ -39,12 +39,12 @@
 +LIBTOOL = @LIBTOOL@
  
  override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(XML_CFLAGS) $(GLIB_CFLAGS) \
--	$(GMP_CFLAGS) $(FFTW_CFLAGS) -DHAVE_CONFIG_H
-+	$(GMP_CFLAGS) $(FFTW_CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H
+-	$(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) 
  
-@@ -231,7 +235,7 @@
+@@ -236,7 +240,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 e128778d0a27..fada10ca6427 100644
--- a/math/gretl/pkg-plist
+++ b/math/gretl/pkg-plist
@@ -15,6 +15,7 @@ include/gretl/dbread.h
 include/gretl/describe.h
 include/gretl/discrete.h
 include/gretl/estimate.h
+include/gretl/flow_control.h
 include/gretl/forecast.h
 include/gretl/genfuncs.h
 include/gretl/genmain.h
@@ -71,6 +72,9 @@ include/gretl/usermat.h
 include/gretl/var.h
 include/gretl/varprint.h
 include/gretl/vartest.h
+lib/gretl-gtk2/anova.a
+lib/gretl-gtk2/anova.la
+lib/gretl-gtk2/anova.so
 lib/gretl-gtk2/arbond.a
 lib/gretl-gtk2/arbond.la
 lib/gretl-gtk2/arbond.so