6 files changed, 116 insertions, 48 deletions

diff --git a/misc/gretl/Makefile b/misc/gretl/Makefile
index 1d6a7bcad599..75d0c8303836 100644
--- a/misc/gretl/Makefile
+++ b/misc/gretl/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	1.2.9
-PORTREVISION=	1
+PORTVERSION=	1.3.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,7 +24,6 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget gtk20 libxml2
-USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -34,7 +32,7 @@ CONFIGURE_ARGS=	--enable-static --enable-shared --with-gmake
 ALL_TARGET=	# empty
 INSTALLS_SHLIB=	yes
 
-MAN1=	gretl.1 gretl-config.1
+MAN1=		gretl.1 gretl-config.1
 
 .include <bsd.port.pre.mk>
 
@@ -45,12 +43,11 @@ BROKEN=		"math/lapack appears to be broken on alpha"
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 PKGNAMESUFFIX=	-gnome
 USE_GNOME+=	gnomeprefix gtksourceview libgnomeui
+INSTALLS_OMF=	yes
+GCONF_SCHEMAS=	gretl.schemas
 DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
 .else
 CONFIGURE_ARGS+=	--without-gnome --without-gtksourceview
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|libpng"|libpng12"|g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/misc/gretl/distinfo b/misc/gretl/distinfo
index c922c3b345cf..6d617ee36394 100644
--- a/misc/gretl/distinfo
+++ b/misc/gretl/distinfo
@@ -1,2 +1,2 @@
-MD5 (gretl-1.2.9.tar.bz2) = bc7a13aaa5b76de4784ecad2c9fd9fd1
-SIZE (gretl-1.2.9.tar.bz2) = 4661152
+MD5 (gretl-1.3.0.tar.bz2) = efd51897e34808b15fdb6109fa36834c
+SIZE (gretl-1.3.0.tar.bz2) = 4146959
diff --git a/misc/gretl/files/patch-gnome::Makefile.in b/misc/gretl/files/patch-gnome::Makefile.in
index 0daf4dce042b..a0f075106313 100644
--- a/misc/gretl/files/patch-gnome::Makefile.in
+++ b/misc/gretl/files/patch-gnome::Makefile.in
@@ -1,7 +1,7 @@
---- gnome/Makefile.in.orig	Tue Aug 27 03:11:56 2002
-+++ gnome/Makefile.in	Mon Oct 21 08:27:48 2002
-@@ -2,10 +2,10 @@
- docdir = ../doc
+--- gnome/Makefile.in.orig	Fri Nov  5 05:16:18 2004
++++ gnome/Makefile.in	Thu Nov 18 20:14:05 2004
+@@ -4,10 +4,10 @@
+ docdir = $(topsrc)/doc
  
  INSTALL = @INSTALL@
 -gnome_prefix = @gnome_prefix@
@@ -13,7 +13,7 @@
  
  GCONFTOOL = @GCONFTOOL@
  GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-@@ -24,11 +24,11 @@
+@@ -26,11 +26,11 @@
    install_help = install-help-1
  endif
  
@@ -30,12 +30,12 @@
  
  install: install-images install-misc install-help-dirs $(install_help) $(install_schemas)
  
-@@ -58,7 +58,7 @@
- 	  cat $$f | sed s+fileref=\"figures/[^\"]*+\&.png+g > \
- 	  $(ghelpdir)/C/chapters/`basename $$f` ; done
- 	$(INSTALL_DATA) $(docdir)/figures/*.png $(ghelpdir)/C/figures
+@@ -73,7 +73,7 @@
+ 	  $(ghelpdir)/it/chapters/`basename $$f` ; done
+ 	$(INSTALL_DATA) $(docdir)/figures/*.png $(ghelpdir)/it/figures
+ 	$(INSTALL_DATA) $(docdir)/figures_it/*.png $(ghelpdir)/it/figures
 -	make -C $(omfdir) install
 +	$(MAKE) -C $(omfdir) install
  
  install-help-1:
- 	$(INSTALL_DATA) topic.dat $(ghelpdir)/C
+ 	-$(INSTALL_DATA) $(topsrc)/gnome/topic.dat $(ghelpdir)/C
diff --git a/misc/gretl/files/patch-lib::Makefile.in b/misc/gretl/files/patch-lib::Makefile.in
index 6843bf0b89ca..32c0d8ddd963 100644
--- a/misc/gretl/files/patch-lib::Makefile.in
+++ b/misc/gretl/files/patch-lib::Makefile.in
@@ -1,5 +1,5 @@
---- lib/Makefile.in.orig	Thu Dec 11 23:27:53 2003
-+++ lib/Makefile.in	Thu Dec 25 13:19:07 2003
+--- lib/Makefile.in.orig	Mon Nov  1 01:05:09 2004
++++ lib/Makefile.in	Thu Nov 18 20:25:22 2004
 @@ -18,6 +18,11 @@
  
  have_gtk = @have_gtk@
@@ -32,7 +32,7 @@
  
  #### End of system configuration section. ####
  
-@@ -78,7 +83,7 @@
+@@ -115,7 +120,7 @@
  LIBTOOL = ../libtool
  
  override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(XML_CFLAGS) $(GLIB_CFLAGS) \
@@ -41,12 +41,12 @@
  
  COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
  
-@@ -88,7 +93,7 @@
+@@ -125,7 +130,7 @@
  
  $(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
  	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \
--	-rpath $(prefix)/lib $(LIBS) -version-info 0:22:0
-+	-rpath $(prefix)/lib $(LIBS) -version-info 0:22:0 $(LDFLAGS)
+-	-rpath $(prefix)/lib $(LIBS) -version-info 0:23:0
++	-rpath $(prefix)/lib $(LIBS) -version-info 0:23:0 $(LDFLAGS)
  
  .deps:
  	mkdir $@
diff --git a/misc/gretl/files/patch-plugin::Makefile.in b/misc/gretl/files/patch-plugin::Makefile.in
index 61055a2418ed..b2043c0e7495 100644
--- a/misc/gretl/files/patch-plugin::Makefile.in
+++ b/misc/gretl/files/patch-plugin::Makefile.in
@@ -1,5 +1,5 @@
---- plugin/Makefile.in.orig	Sun Oct 19 23:15:51 2003
-+++ plugin/Makefile.in	Sun Oct 26 10:24:36 2003
+--- plugin/Makefile.in.orig	Wed Oct 20 00:55:16 2004
++++ plugin/Makefile.in	Thu Nov 18 20:24:54 2004
 @@ -8,6 +8,10 @@
  INSTALL = @INSTALL@
  LN = @LN_S@
@@ -11,24 +11,23 @@
  have_gtk = @have_gtk@
  have_gmp = @have_gmp@
  
-@@ -35,8 +39,8 @@
- override CFLAGS += -I.. -DHAVE_CONFIG_H
+@@ -96,7 +100,7 @@
+ URCDATA = $(topsrc)/plugin/data/urcdata.gz
  
- LIBTOOL = ../libtool
--COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
--LINK = $(LIBTOOL) --mode=link $(CC) -module -avoid-version -rpath $(plugindir)
-+COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS)
-+LINK = $(LIBTOOL) --mode=link $(CC) -module -avoid-version -rpath $(plugindir) $(LDFLAGS)
+ override CFLAGS += $(GRETLINC) $(GTK_CFLAGS) $(GMP_CFLAGS) $(XML_CFLAGS) \
+-	$(LIBOLE2_CFLAGS) $(AUDIO_CFLAGS) -I. $(GMPDEF)
++	$(LIBOLE2_CFLAGS) $(AUDIO_CFLAGS) -I. $(GMPDEF) $(CPPFLAGS)
  
- GRETLINC = -I$(topsrc)/lib/src
- GRETLLIB = ../lib/libgretl-1.0.la
-@@ -136,11 +140,11 @@
+ %.lo: %.c
+ 	$(COMPILE) $< 
+@@ -181,12 +185,12 @@
  .PHONY: 
  
- install: $(GRETLLIB) $(PLUGINS) installdirs
+ install: $(GRETLLIB) $(PLUGINS) $(URCDATA) installdirs 
 -	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
 +	$(LIBTOOL) --mode=install $(INSTALL_DATA) \
  	$(PLUGINS) $(plugindir)
+ 	$(INSTALL_DATA) $(URCDATA) $(plugindir)/data
  
  install-strip: $(GRETLLIB) $(PLUGINS) installdirs
 -	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \
diff --git a/misc/gretl/pkg-plist b/misc/gretl/pkg-plist
index a23bbf0fc357..c3cc32ce3b79 100644
--- a/misc/gretl/pkg-plist
+++ b/misc/gretl/pkg-plist
@@ -1,13 +1,11 @@
 bin/gretl
 bin/gretl_x11
 bin/gretlcli
-%%GNOME:%%@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/%%GNOME:%%etc/gconf/schemas/gretl.schemas > /dev/null || /usr/bin/true
-%%GNOME:%%etc/gconf/schemas/gretl.schemas
-%%GNOME:%%@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/%%GNOME:%%etc/gconf/schemas/gretl.schemas > /dev/null || /usr/bin/true
 include/gretl/bhhh_max.h
 include/gretl/calendar.h
 include/gretl/clapack_double.h
 include/gretl/compare.h
+include/gretl/compat.h
 include/gretl/dataio.h
 include/gretl/dbread.h
 include/gretl/describe.h
@@ -19,6 +17,7 @@ include/gretl/genstack.h
 include/gretl/graphing.h
 include/gretl/gretl_commands.h
 include/gretl/gretl_errors.h
+include/gretl/gretl_func.h
 include/gretl/gretl_list.h
 include/gretl/gretl_matrix.h
 include/gretl/gretl_matrix_private.h
@@ -33,6 +32,7 @@ include/gretl/interact.h
 include/gretl/libgretl.h
 include/gretl/libprob.h
 include/gretl/libset.h
+include/gretl/missing.h
 include/gretl/modelprint.h
 include/gretl/modelspec.h
 include/gretl/monte_carlo.h
@@ -48,10 +48,12 @@ include/gretl/strutils.h
 include/gretl/subsample.h
 include/gretl/system.h
 include/gretl/texprint.h
+include/gretl/transforms.h
 include/gretl/var.h
 include/gretl/version.h
 lib/gretl-gtk2/arma.so
 lib/gretl-gtk2/arma_x12.so
+lib/gretl-gtk2/data/urcdata.gz
 lib/gretl-gtk2/excel_import.so
 lib/gretl-gtk2/garch.so
 lib/gretl-gtk2/gnumeric_import.so
@@ -69,6 +71,8 @@ lib/gretl-gtk2/stats_tables.so
 lib/gretl-gtk2/sysest.so
 lib/gretl-gtk2/tobit.so
 lib/gretl-gtk2/tramo-x12a.so
+lib/gretl-gtk2/urcdist.so
+lib/gretl-gtk2/vif.so
 lib/libgretl-1.0.a
 lib/libgretl-1.0.so
 lib/libgretl-1.0.so.0
@@ -185,15 +189,20 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/data/greene/greene9_1.gdt
 %%DATADIR%%/data/greene/wg_descriptions
 %%DATADIR%%/data/gretldata.dtd
+%%DATADIR%%/data/misc/anscombe.gdt
 %%DATADIR%%/data/misc/arma.gdt
+%%DATADIR%%/data/misc/armaloop.gdt
 %%DATADIR%%/data/misc/b-g.gdt
 %%DATADIR%%/data/misc/descriptions
 %%DATADIR%%/data/misc/djclose.gdt
 %%DATADIR%%/data/misc/ects_nls.gdt
 %%DATADIR%%/data/misc/hamilton.gdt
+%%DATADIR%%/data/misc/jgm-data.gdt
 %%DATADIR%%/data/misc/klein.gdt
 %%DATADIR%%/data/misc/leverage.gdt
 %%DATADIR%%/data/misc/longley.gdt
+%%DATADIR%%/data/misc/mrw.gdt
+%%DATADIR%%/data/misc/np.gdt
 %%DATADIR%%/data/misc/sw_ch12.gdt
 %%DATADIR%%/data/misc/sw_ch14.gdt
 %%DATADIR%%/data/nist/Filip.dat
@@ -207,8 +216,8 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/data/nist/Wampler3.dat
 %%DATADIR%%/data/nist/Wampler4.dat
 %%DATADIR%%/data/nist/Wampler5.dat
-%%DATADIR%%/db/bcih.bin
-%%DATADIR%%/db/bcih.idx
+%%DATADIR%%/db/fedstl.bin
+%%DATADIR%%/db/fedstl.idx
 %%DATADIR%%/gretl-logo.xpm
 %%DATADIR%%/gretl.hlp
 %%DATADIR%%/gretl.stamp
@@ -225,11 +234,14 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/scripts/greene9_1.inp
 %%DATADIR%%/scripts/greene9_3.inp
 %%DATADIR%%/scripts/misc/arma.inp
+%%DATADIR%%/scripts/misc/armaloop.inp
 %%DATADIR%%/scripts/misc/ects_nls.inp
 %%DATADIR%%/scripts/misc/garch.inp
+%%DATADIR%%/scripts/misc/jgm-1996.inp
 %%DATADIR%%/scripts/misc/klein.inp
 %%DATADIR%%/scripts/misc/leverage.inp
 %%DATADIR%%/scripts/misc/longley.inp
+%%DATADIR%%/scripts/misc/mrw.inp
 %%DATADIR%%/scripts/misc/ps_descriptions
 %%DATADIR%%/scripts/misc/pscoin.inp
 %%DATADIR%%/scripts/misc/restrict.inp
@@ -317,17 +329,16 @@ libdata/pkgconfig/gretl.pc
 %%GNOME:%%share/gnome/help/gretl/C/chapters/biblio.xml
 %%GNOME:%%share/gnome/help/gretl/C/chapters/cli.xml
 %%GNOME:%%share/gnome/help/gretl/C/chapters/cmdlist.xml
-%%GNOME:%%share/gnome/help/gretl/C/chapters/cmdlist_standalone_it.xml
 %%GNOME:%%share/gnome/help/gretl/C/chapters/cmdref.xml
-%%GNOME:%%share/gnome/help/gretl/C/chapters/cmdref_standalone.xml
-%%GNOME:%%share/gnome/help/gretl/C/chapters/cmdref_standalone_it.xml
 %%GNOME:%%share/gnome/help/gretl/C/chapters/datafiles.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/functions.xml
 %%GNOME:%%share/gnome/help/gretl/C/chapters/graphs.xml
 %%GNOME:%%share/gnome/help/gretl/C/chapters/intro.xml
 %%GNOME:%%share/gnome/help/gretl/C/chapters/looping.xml
 %%GNOME:%%share/gnome/help/gretl/C/chapters/modes.xml
 %%GNOME:%%share/gnome/help/gretl/C/chapters/native.xml
 %%GNOME:%%share/gnome/help/gretl/C/chapters/nls.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/obs.xml
 %%GNOME:%%share/gnome/help/gretl/C/chapters/optarg.xml
 %%GNOME:%%share/gnome/help/gretl/C/chapters/panel.xml
 %%GNOME:%%share/gnome/help/gretl/C/chapters/sampling.xml
@@ -370,13 +381,70 @@ libdata/pkgconfig/gretl.pc
 %%GNOME:%%share/gnome/help/gretl/C/figures/tip.png
 %%GNOME:%%share/gnome/help/gretl/C/figures/toolbar.png
 %%GNOME:%%share/gnome/help/gretl/C/figures/tworootT.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/vif.png
 %%GNOME:%%share/gnome/help/gretl/C/figures/warning.png
 %%GNOME:%%share/gnome/help/gretl/C/gretl.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/appendices.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/biblio.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/cli.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/cmdlist.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/cmdref.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/datafiles.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/functions.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/graphs.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/intro.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/looping.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/modes.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/native.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/nls.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/optarg.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/panel.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/sampling.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/starting.xml
+%%GNOME:%%share/gnome/help/gretl/it/chapters/trouble.xml
+%%GNOME:%%share/gnome/help/gretl/it/figures/adf1.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/adf2.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/aic.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/arlags.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/autocorr.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/caution.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/corc.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/cumulate.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/datafiles.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/dffit.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/garch_h.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/greeneC.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/gretl-logo.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/hsk.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/important.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/influence.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/lambda.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/ldx.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/ldy.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/logistic1.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/logistic2.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/mainwin.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/menubar.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/model_table.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/modelwin.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/nls_window.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/note.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/nw1.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/nw2.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/plot_control.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/scriptwin.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/selector.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/session.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/simformula.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/tip.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/toolbar.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/tworootT.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/vif.png
+%%GNOME:%%share/gnome/help/gretl/it/figures/warning.png
+%%GNOME:%%share/gnome/help/gretl/it/gretl.xml
 %%GNOME:%%share/gnome/mime-info/gretl.keys
 %%GNOME:%%share/gnome/mime-info/gretl.mime
-%%GNOME:%%@exec scrollkeeper-install -q %D/share/gnome/omf/gretl/gretl-C.omf 2>/dev/null || true
 %%GNOME:%%share/gnome/omf/gretl/gretl-C.omf
-%%GNOME:%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gretl/gretl-C.omf 2>/dev/null || true
 %%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretldata.png
 %%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretlsession.png
 %%GNOME:%%share/gnome/pixmaps/gretl-logo.xpm
@@ -387,6 +455,9 @@ share/locale/it/LC_MESSAGES/gretl.mo
 share/locale/ja/LC_MESSAGES/gretl.mo
 share/locale/pl/LC_MESSAGES/gretl.mo
 %%GNOME:%%@dirrm share/gnome/omf/gretl
+%%GNOME:%%@dirrm share/gnome/help/gretl/it/figures
+%%GNOME:%%@dirrm share/gnome/help/gretl/it/chapters
+%%GNOME:%%@dirrm share/gnome/help/gretl/it
 %%GNOME:%%@dirrm share/gnome/help/gretl/C/figures
 %%GNOME:%%@dirrm share/gnome/help/gretl/C/chapters
 %%GNOME:%%@dirrm share/gnome/help/gretl/C
@@ -399,5 +470,6 @@ share/locale/pl/LC_MESSAGES/gretl.mo
 @dirrm %%DATADIR%%/data/greene
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
+@dirrm lib/gretl-gtk2/data
 @dirrm lib/gretl-gtk2
 @dirrm include/gretl