Update to 1.9.3

Approved by:	makc, miwi (mentors, implicit)
Feature safe:	yes

9 files changed, 188 insertions, 174 deletions

diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index c59d4dc7f222..9ae68f97e0ba 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -7,57 +7,86 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	1.9.1
+PORTVERSION=	1.9.3
 CATEGORIES=	math finance
 MASTER_SITES=	SF
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	GNU Regression, Econometrics and Time-series Library
 
-BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
-LIB_DEPENDS=	fftw3.5:${PORTSDIR}/math/fftw3 \
-		mpfr.4:${PORTSDIR}/math/mpfr
-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+LIB_DEPENDS=	fftw3.5:${PORTSDIR}/math/fftw3
 
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
-USE_GNOME=	gnomehier gtk20 gtksourceview2 libxml2
-USE_GETTEXT=	yes
+USE_FORTRAN=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${GCCLIBDIR}"
-CONFIGURE_ARGS=	--enable-static --enable-shared --with-gmake --without-gnome
-ALL_TARGET=	# empty
 USE_LDCONFIG=	yes
+WANT_GNOME=	yes
 
-MAN1=		gretl.1
+ALL_TARGET=	# empty
+CONFIGURE_ARGS =	--enable-static --enable-shared --with-gmake --without-gnome
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
+CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" \
+			LAPACK_LIBS="${LAPACK} ${BLAS}" \
+			LDFLAGS="${LDFLAGS}"
 
-USE_FORTRAN=	yes
-CONFIGURE_ENV+=	LAPACK_LIBS="${BLAS} ${LAPACK} -l${FORTRANRUNTIME}"
-FORTRANRUNTIME=	gfortran
-GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
+MAN1=		gretl.1
+OPTIONS=	ATLAS "Use Atlas for BLAS and LAPACK" off \
+		GUI "Build the graphical user interface and plugins" on \
+		NLS "Build with Natural Language Support" on \
+		ODBC "Build with unixODBC database support" off \
+		R "Build with libR support" off
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "alpha"
-BROKEN=		math/lapack appears to be broken on alpha
-.endif
-
-.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
-WITH_ATLAS=	yes
-.endif
-
 .if defined(WITH_ATLAS)
 LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
 BLAS=		-lf77blas -latlas
 LAPACK=		-lalapack -lcblas
 .else
-LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
-LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas \
+		lapack.4:${PORTSDIR}/math/lapack
 BLAS=		-lblas
 LAPACK=		-llapack
 .endif
 
+.if defined(WITH_GUI)
+CONFIGURE_ARGS+=	--enable-gui=yes
+USE_GNOME=		gnomehier gtksourceview2
+BUILD_DEPENDS+=		gnuplot:${PORTSDIR}/math/gnuplot
+RUN_DEPENDS+=		gnuplot:${PORTSDIR}/math/gnuplot
+PLIST_SUB+=		GUI=""
+.else
+CONFIGURE_ARGS+=	--enable-gui=no
+PLIST_SUB+=		GUI="@comment "
+.endif
+
+.if !defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--enable-nls=yes
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--enable-nls=no
+PLIST_SUB+=		NLS="@comment "
+.endif
+
+.if defined(WITH_ODBC)
+CONFIGURE_ARGS+=	--with-odbc
+LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+PLIST_SUB+=		ODBC=""
+.else
+CONFIGURE_ARGS+=	--without-odbc
+PLIST_SUB+=		ODBC="@comment "
+.endif
+
+.if defined(WITH_R)
+CONFIGURE_ARGS+=	--with-libR
+LIB_DEPENDS+=		R.0:${PORTSDIR}/math/R
+.else
+CONFIGURE_ARGS+=	--without-libR
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|set term png|set term dumb|g' \
 		${WRKSRC}/configure
@@ -66,29 +95,33 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|@gnome_prefix@|@prefix@|g' \
 		${WRKSRC}/gnome/gretl.keys.in
 
-pre-configure:
-	@${DIRNAME} `${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
-
+.if defined(WITH_GUI)
 post-install:
 	@${MKDIR} ${PREFIX}/share/applications
-.for file in gretl.desktop
-	${INSTALL_DATA} ${WRKSRC}/gnome/${file} ${PREFIX}/share/applications
+.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
+.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
+.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
+.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
+.for _file in gretl-logo.xpm gretl.xpm
+	${INSTALL_DATA} ${WRKSRC}/pixmaps/${_file} ${PREFIX}/share/pixmaps
 .endfor
 	@-update-mime-database ${PREFIX}/share/mime
 
+.endif
+
+regression-test test check: build
+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} \
+		${MAKE_ARGS} check)
+
 .include <bsd.port.post.mk>
diff --git a/math/gretl/distinfo b/math/gretl/distinfo
index 6da4bdd119b4..831b9b414f37 100644
--- a/math/gretl/distinfo
+++ b/math/gretl/distinfo
@@ -1,3 +1,2 @@
-MD5 (gretl-1.9.1.tar.bz2) = 1227de74bdc4dde33df33103de3fdf76
-SHA256 (gretl-1.9.1.tar.bz2) = b46916828132cc6955ed20cf4c9816d17cae3f692368a245d56f8e55f3efda39
-SIZE (gretl-1.9.1.tar.bz2) = 7545384
+SHA256 (gretl-1.9.3.tar.bz2) = 0f54d2d59286656524692fb88a123571dfb1fb5696805346d5cb291f041a9913
+SIZE (gretl-1.9.3.tar.bz2) = 7845369
diff --git a/math/gretl/files/patch-cli::Makefile.in b/math/gretl/files/patch-cli::Makefile.in
index 8b4b5949a7d7..61fd4d5948de 100644
--- a/math/gretl/files/patch-cli::Makefile.in
+++ b/math/gretl/files/patch-cli::Makefile.in
@@ -1,6 +1,6 @@
---- cli/Makefile.in.orig	2010-06-16 22:01:23.000000000 +0900
-+++ cli/Makefile.in	2010-07-09 04:31:31.000000000 +0900
-@@ -20,6 +20,10 @@
+--- cli/Makefile.in.orig	2010-08-28 11:10:07.000000000 -0400
++++ cli/Makefile.in	2011-02-02 15:28:13.000000000 -0500
+@@ -21,6 +21,10 @@
  
  quiet_build = @quiet_build@
  
@@ -11,7 +11,7 @@
  ifeq ($(CC),)
    CC = gcc
  endif
-@@ -54,10 +58,10 @@
+@@ -55,10 +59,10 @@
  
  DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
  
@@ -24,10 +24,10 @@
  
  %.o: %.c
  	$(CCECHO)
-@@ -67,7 +71,7 @@
+@@ -68,7 +72,7 @@
  $(CLI): .deps $(OBJS)
  	$(LDECHO)
- 	$(AMP)$(LIBTOOL) --mode=link $(CCV) -o $@ $(LDFLAGS) $(OBJS) \
+ 	$(AMP)$(LIBTOOL) --mode=link $(CCV) $(LDFLAGS) -o $@ $(OBJS) \
 -	$(GRETLLIB) $(READLINE_LIBS)
 +	$(GRETLLIB) $(READLINE_LIBS) $(INTL_LIBS)
  
diff --git a/math/gretl/files/patch-gui2::Makefile.in b/math/gretl/files/patch-gui2::Makefile.in
index f2b546bbe56a..91648096de77 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	2010-06-16 22:03:53.000000000 +0900
-+++ gui2/Makefile.in	2010-07-09 04:32:55.000000000 +0900
-@@ -118,7 +118,7 @@
+--- gui2/Makefile.in.orig	2010-08-28 11:10:12.000000000 -0400
++++ gui2/Makefile.in	2011-02-02 15:50:09.000000000 -0500
+@@ -120,7 +120,7 @@
  #### End of system configuration section. ####
  
  SHELL = /bin/sh
@@ -9,23 +9,7 @@
  PROG  = gretl_x11$(EXEEXT)
  
  vpath %.c $(topsrc)/gui2
-@@ -193,13 +193,13 @@
- 	$(AMP)$(CC) -c -I.. -I$(libsrc) $(XML_CFLAGS) $<
- 
- 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)
- 
- $(GRETL_LANG): $(MKLANG)
- 	./mklang $(LANGOPT) > $@
- 
- $(GTKSOURCEVIEW_LITE):
--	make -C gtksourceview
-+	$(MAKE) -C gtksourceview
- 
- .deps:
- 	$(AMP)mkdir $@
-@@ -214,7 +214,7 @@
+@@ -221,7 +221,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 b96b6985645c..a58f01ed37ba 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-12-31 01:22:21.000000000 +0900
-+++ lib/Makefile.in	2010-02-02 03:11:21.000000000 +0900
-@@ -34,6 +34,10 @@
+--- lib/Makefile.in.orig	2010-11-17 08:55:23.000000000 -0500
++++ lib/Makefile.in	2011-02-02 15:59:26.000000000 -0500
+@@ -38,6 +38,10 @@
    RPATH = $(DARWIN_RPATH)
  endif
  
@@ -11,9 +11,9 @@
  ifeq ($(INSTALL_PROGRAM),)
    INSTALL_PROGRAM = $(INSTALL) -m 755
  endif
-@@ -56,14 +60,14 @@
+@@ -59,14 +63,14 @@
+ 
  # Installation directories
- libdir = $(prefix)/lib
  includedir = $(prefix)/include/gretl
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
@@ -29,7 +29,7 @@
  
  #### End of system configuration section. ####
  
-@@ -232,10 +236,10 @@
+@@ -238,10 +242,10 @@
  LOBJS = $(SRCS:.c=.lo)
  AUX_LOBJ = $(CEPHES_SRC:.c=.lo) $(MINPACK_SRC:.c=.lo)
  
@@ -42,12 +42,3 @@
  
  COMPILE = $(LIBTOOL) --mode=compile $(CCV) -c $(CFLAGS) 
  
-@@ -246,7 +250,7 @@
- 
- $(LIBGRETL): .deps $(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 67d491f46094..cbd2f35e69f1 100644
--- a/math/gretl/files/patch-plugin::Makefile.in
+++ b/math/gretl/files/patch-plugin::Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- plugin/Makefile.in.orig	2010-11-18 09:41:28.000000000 -0500
++++ plugin/Makefile.in	2011-02-02 16:11:27.000000000 -0500
+@@ -12,6 +12,10 @@
  INSTALL = @INSTALL@
  LN = @LN_S@
  
@@ -9,8 +9,8 @@
 +INTL_LIBS = @LTLIBINTL@
 +
  build_gui = @build_gui@
- have_gmp = @have_gmp@
  build_mailer = @build_mailer@
+ have_odbc = @have_odbc@
 @@ -46,7 +50,7 @@
  
  override CFLAGS += -I.. -I$(topsrc)/gui2 -DHAVE_CONFIG_H
@@ -20,16 +20,16 @@
  COMPILE = $(LIBTOOL) --mode=compile $(CCV) -c $(CFLAGS) 
  
  ifeq ($(quiet_build),yes)
-@@ -193,7 +197,7 @@
+@@ -197,7 +201,7 @@
  
  override CFLAGS += $(GRETLINC) $(GTK_CFLAGS) $(GMP_CFLAGS) $(MPFR_CFLAGS) \
  	$(XML_CFLAGS) $(GRETL_LIBOLE2_CFLAGS) $(ZIP_CFLAGS) $(AUDIO_CFLAGS) \
--	$(ODBC_CFLAGS) -I. $(GMPDEF)
-+	$(ODBC_CFLAGS) -I. $(GMPDEF) $(CPPFLAGS)
+-	$(ODBC_CFLAGS) -I. 
++	$(ODBC_CFLAGS) -I. $(CPPFLAGS)
  
  %.lo: %.c
  	$(CCECHO)
-@@ -324,13 +328,13 @@
+@@ -339,13 +343,13 @@
  .PHONY: 
  
  install: $(GRETLLIB) $(PLUGINS) $(URCDATA) $(DWDATA) installdirs 
diff --git a/math/gretl/files/patch-share::Makefile.in b/math/gretl/files/patch-share::Makefile.in
index ce35a948cca7..5d17f50fee8c 100644
--- a/math/gretl/files/patch-share::Makefile.in
+++ b/math/gretl/files/patch-share::Makefile.in
@@ -1,6 +1,6 @@
---- share/Makefile.in.orig	2008-07-30 23:25:31.000000000 +0900
-+++ share/Makefile.in	2008-08-02 02:34:37.000000000 +0900
-@@ -10,7 +10,7 @@
+--- share/Makefile.in.orig	2010-08-23 08:47:12.000000000 -0400
++++ share/Makefile.in	2011-02-05 04:47:43.000000000 -0500
+@@ -13,7 +13,7 @@
  sharesrc = $(topsrc)/share
  pdfdir = ../doc/tex
  
@@ -9,25 +9,8 @@
  
  AUTO_HELPFILES = \
  	gretlgui.hlp \
-@@ -36,14 +36,14 @@
- all: $(query_make_help)
- 
- help:
--	make -C ../doc/commands help-all
-+	$(MAKE) -C ../doc/commands help-all
- 
- .PHONY :
- 
- install: installdirs install_datafiles install_scripts install_functions \
- 	install_fonts install_help
- 	$(INSTALL_DATA) $(sharesrc)/gretl.stamp $(DESTDIR)$(gretldir)/gretl.stamp
--	make -C bcih install
-+	$(MAKE) -C bcih install
- 
- install-strip: install
- 
-@@ -69,20 +69,20 @@
- 	$(INSTALL_DATA) $(sharesrc)/functions/gretlfunc.dtd $(DESTDIR)$(gretldir)/functions 
+@@ -80,22 +80,22 @@
+ 	$(INSTALL_DATA) $(sharesrc)/functions/criteria.gfn $(DESTDIR)$(gretldir)/functions 
  
  install_man: gretl.1
 -	$(tooldir)/mkinstalldirs $(DESTDIR)$(prefix)/share/man/man1
@@ -56,3 +39,12 @@
  
  install_fonts:
  	for f in $(sharesrc)/fonts/*.ttf ; do \
+@@ -112,7 +112,7 @@
+ 	$(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/scripts/misc 
+ 	$(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/db
+ 	$(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/functions
+-	$(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/functions/docs
++#	$(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/functions/docs
+ 	$(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/fonts
+ 
+ clean:
diff --git a/math/gretl/pkg-descr b/math/gretl/pkg-descr
index 22246ee640cf..98d5769c2675 100644
--- a/math/gretl/pkg-descr
+++ b/math/gretl/pkg-descr
@@ -1,9 +1,9 @@
 GNU Regression, Econometrics and Time-series Library
 
 Features
-   - A wide variety of least-squares based estimators (including two-stage
+   - A wide variety of least-squares-based estimators (including two-stage
      least squares).
-   - Easy intuitive interface.
+   - Easy, intuitive interface.
    - Single commands to launch things like augmented Dickey-Fuller test, Chow
      test for structural stability, Vector Autoregression.
    - Reads own format ascii data files, Comma Separated Values files, BOX1
@@ -14,7 +14,7 @@ Features
    - Output models as LaTeX files, in tabular or equation format (not very
      flexible yet).
    - Integrated scripting language: enter commands either via the gui or via
-     script.
+     scripts.
    - Command loop structure for Monte Carlo simulations.
    - GUI controller for fine-tuning Gnuplot graphs.
    - Link to GNU R for further data analysis.
diff --git a/math/gretl/pkg-plist b/math/gretl/pkg-plist
index ed2ca0b6cfd3..18f36c0ecacd 100644
--- a/math/gretl/pkg-plist
+++ b/math/gretl/pkg-plist
@@ -1,5 +1,5 @@
-bin/gretl
-bin/gretl_x11
+%%GUI%%bin/gretl
+%%GUI%%bin/gretl_x11
 bin/gretlcli
 include/gretl/adf_kpss.h
 include/gretl/bhhh_max.h
@@ -19,6 +19,7 @@ include/gretl/genfuncs.h
 include/gretl/genmain.h
 include/gretl/graphing.h
 include/gretl/gretl_bfgs.h
+include/gretl/gretl_bundle.h
 include/gretl/gretl_commands.h
 include/gretl/gretl_data_io.h
 include/gretl/gretl_errors.h
@@ -83,6 +84,9 @@ lib/gretl-gtk2/arma.so
 lib/gretl-gtk2/arma_x12.a
 lib/gretl-gtk2/arma_x12.la
 lib/gretl-gtk2/arma_x12.so
+lib/gretl-gtk2/biprobit.a
+lib/gretl-gtk2/biprobit.la
+lib/gretl-gtk2/biprobit.so
 lib/gretl-gtk2/data/dwdata.gz
 lib/gretl-gtk2/data/urcdata.gz
 lib/gretl-gtk2/duration.a
@@ -91,24 +95,27 @@ lib/gretl-gtk2/duration.so
 lib/gretl-gtk2/eviews_import.a
 lib/gretl-gtk2/eviews_import.la
 lib/gretl-gtk2/eviews_import.so
-lib/gretl-gtk2/excel_import.a
-lib/gretl-gtk2/excel_import.la
-lib/gretl-gtk2/excel_import.so
+%%GUI%%lib/gretl-gtk2/excel_import.a
+%%GUI%%lib/gretl-gtk2/excel_import.la
+%%GUI%%lib/gretl-gtk2/excel_import.so
 lib/gretl-gtk2/fractals.a
 lib/gretl-gtk2/fractals.la
 lib/gretl-gtk2/fractals.so
 lib/gretl-gtk2/garch.a
 lib/gretl-gtk2/garch.la
 lib/gretl-gtk2/garch.so
-lib/gretl-gtk2/gnumeric_import.a
-lib/gretl-gtk2/gnumeric_import.la
-lib/gretl-gtk2/gnumeric_import.so
+%%GUI%%lib/gretl-gtk2/gnumeric_import.a
+%%GUI%%lib/gretl-gtk2/gnumeric_import.la
+%%GUI%%lib/gretl-gtk2/gnumeric_import.so
 lib/gretl-gtk2/gretlzip.a
 lib/gretl-gtk2/gretlzip.la
 lib/gretl-gtk2/gretlzip.so
 lib/gretl-gtk2/heckit.a
 lib/gretl-gtk2/heckit.la
 lib/gretl-gtk2/heckit.so
+lib/gretl-gtk2/interpolate.a
+lib/gretl-gtk2/interpolate.la
+lib/gretl-gtk2/interpolate.so
 lib/gretl-gtk2/interval.a
 lib/gretl-gtk2/interval.la
 lib/gretl-gtk2/interval.so
@@ -121,33 +128,36 @@ lib/gretl-gtk2/johansen.so
 lib/gretl-gtk2/kernel.a
 lib/gretl-gtk2/kernel.la
 lib/gretl-gtk2/kernel.so
-lib/gretl-gtk2/lad.a
-lib/gretl-gtk2/lad.la
-lib/gretl-gtk2/lad.so
-lib/gretl-gtk2/leverage.a
-lib/gretl-gtk2/leverage.la
-lib/gretl-gtk2/leverage.so
-lib/gretl-gtk2/mailer.a
-lib/gretl-gtk2/mailer.la
-lib/gretl-gtk2/mailer.so
+%%GUI%%lib/gretl-gtk2/leverage.a
+%%GUI%%lib/gretl-gtk2/leverage.la
+%%GUI%%lib/gretl-gtk2/leverage.so
+%%GUI%%lib/gretl-gtk2/mailer.a
+%%GUI%%lib/gretl-gtk2/mailer.la
+%%GUI%%lib/gretl-gtk2/mailer.so
 lib/gretl-gtk2/mp_ols.a
 lib/gretl-gtk2/mp_ols.la
 lib/gretl-gtk2/mp_ols.so
 lib/gretl-gtk2/nistcheck.a
 lib/gretl-gtk2/nistcheck.la
 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/pca.a
-lib/gretl-gtk2/pca.la
-lib/gretl-gtk2/pca.so
+%%ODBC%%lib/gretl-gtk2/odbc_import.a
+%%ODBC%%lib/gretl-gtk2/odbc_import.la
+%%ODBC%%lib/gretl-gtk2/odbc_import.so
+%%GUI%%lib/gretl-gtk2/ods_import.a
+%%GUI%%lib/gretl-gtk2/ods_import.la
+%%GUI%%lib/gretl-gtk2/ods_import.so
+lib/gretl-gtk2/panurc.a
+lib/gretl-gtk2/panurc.la
+lib/gretl-gtk2/panurc.so
+%%GUI%%lib/gretl-gtk2/pca.a
+%%GUI%%lib/gretl-gtk2/pca.la
+%%GUI%%lib/gretl-gtk2/pca.so
 lib/gretl-gtk2/poisson.a
 lib/gretl-gtk2/poisson.la
 lib/gretl-gtk2/poisson.so
-lib/gretl-gtk2/progress_bar.a
-lib/gretl-gtk2/progress_bar.la
-lib/gretl-gtk2/progress_bar.so
+%%GUI%%lib/gretl-gtk2/progress_bar.a
+%%GUI%%lib/gretl-gtk2/progress_bar.la
+%%GUI%%lib/gretl-gtk2/progress_bar.so
 lib/gretl-gtk2/quantreg.a
 lib/gretl-gtk2/quantreg.la
 lib/gretl-gtk2/quantreg.so
@@ -172,9 +182,9 @@ lib/gretl-gtk2/sysest.so
 lib/gretl-gtk2/tobit.a
 lib/gretl-gtk2/tobit.la
 lib/gretl-gtk2/tobit.so
-lib/gretl-gtk2/tramo-x12a.a
-lib/gretl-gtk2/tramo-x12a.la
-lib/gretl-gtk2/tramo-x12a.so
+%%GUI%%lib/gretl-gtk2/tramo-x12a.a
+%%GUI%%lib/gretl-gtk2/tramo-x12a.la
+%%GUI%%lib/gretl-gtk2/tramo-x12a.so
 lib/gretl-gtk2/urcdist.a
 lib/gretl-gtk2/urcdist.la
 lib/gretl-gtk2/urcdist.so
@@ -186,8 +196,8 @@ lib/libgretl-1.0.la
 lib/libgretl-1.0.so
 lib/libgretl-1.0.so.0
 libdata/pkgconfig/gretl.pc
-share/applications/gretl.desktop
-%%DATADIR%%/COPYING
+%%GUI%%share/applications/gretl.desktop
+%%GUI%%%%DATADIR%%/COPYING
 %%DATADIR%%/data/data10-1.gdt
 %%DATADIR%%/data/data10-2.gdt
 %%DATADIR%%/data/data10-3.gdt
@@ -292,6 +302,7 @@ share/applications/gretl.desktop
 %%DATADIR%%/data/greene/greene18_2.gdt
 %%DATADIR%%/data/greene/greene19_1.gdt
 %%DATADIR%%/data/greene/greene22_2.gdt
+%%DATADIR%%/data/greene/greene25_1.gdt
 %%DATADIR%%/data/greene/greene5_1.gdt
 %%DATADIR%%/data/greene/greene7_8.gdt
 %%DATADIR%%/data/greene/greene8_3.gdt
@@ -299,6 +310,7 @@ share/applications/gretl.desktop
 %%DATADIR%%/data/greene/wg_descriptions
 %%DATADIR%%/data/gretldata.dtd
 %%DATADIR%%/data/misc/AWM.gdt
+%%DATADIR%%/data/misc/CEL.gdt
 %%DATADIR%%/data/misc/abdata.gdt
 %%DATADIR%%/data/misc/anscombe.gdt
 %%DATADIR%%/data/misc/arma.gdt
@@ -307,6 +319,7 @@ share/applications/gretl.desktop
 %%DATADIR%%/data/misc/banks91.gdt
 %%DATADIR%%/data/misc/bjg.gdt
 %%DATADIR%%/data/misc/broiler.gdt
+%%DATADIR%%/data/misc/chomage.gdt
 %%DATADIR%%/data/misc/credscore.gdt
 %%DATADIR%%/data/misc/denmark.gdt
 %%DATADIR%%/data/misc/descriptions
@@ -366,7 +379,7 @@ share/applications/gretl.desktop
 %%DATADIR%%/genrgui.hlp
 %%DATADIR%%/genrgui.hlp.it
 %%DATADIR%%/genrgui.hlp.pt
-%%DATADIR%%/gretl-logo.xpm
+%%GUI%%%%DATADIR%%/gretl-logo.xpm
 %%DATADIR%%/gretl.stamp
 %%DATADIR%%/gretlcli.hlp
 %%DATADIR%%/gretlcli.hlp.es
@@ -380,6 +393,7 @@ share/applications/gretl.desktop
 %%DATADIR%%/gretlgui.hlp.es
 %%DATADIR%%/gretlgui.hlp.it
 %%DATADIR%%/gretlgui.hlp.pt
+%%DATADIR%%/gretlhelp.refs
 %%DATADIR%%/helpfigs/Gamma.png
 %%DATADIR%%/helpfigs/adf1.png
 %%DATADIR%%/helpfigs/aic.png
@@ -427,6 +441,8 @@ share/applications/gretl.desktop
 %%DATADIR%%/scripts/greene9_3.inp
 %%DATADIR%%/scripts/misc/arbond91.inp
 %%DATADIR%%/scripts/misc/armaloop.inp
+%%DATADIR%%/scripts/misc/bbond98.inp
+%%DATADIR%%/scripts/misc/biprobit.inp
 %%DATADIR%%/scripts/misc/bjg.inp
 %%DATADIR%%/scripts/misc/camtriv.inp
 %%DATADIR%%/scripts/misc/convolve.inp
@@ -535,29 +551,30 @@ share/applications/gretl.desktop
 %%DATADIR%%/scripts/ps_descriptions
 %%DATADIR%%/scripts/testinp
 %%DATADIR%%/scripts/wg_ps_descriptions
-%%DATADIR%%/ui/gretlmain.xml
-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
-share/locale/fr/LC_MESSAGES/gretl.mo
-share/locale/it/LC_MESSAGES/gretl.mo
-share/locale/pl/LC_MESSAGES/gretl.mo
-share/locale/pt/LC_MESSAGES/gretl.mo
-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
-share/pixmaps/gnome-application-x-gretlsession.png
-share/pixmaps/gretl-logo.xpm
-share/pixmaps/gretl.xpm
-@dirrm %%DATADIR%%/ui
+%%GUI%%%%DATADIR%%/ui/gretlmain.xml
+%%GUI%%share/gtksourceview-2.0/language-specs/gnuplot.lang
+%%GUI%%share/gtksourceview-2.0/language-specs/gretl.lang
+%%NLS%%share/locale/cs/LC_MESSAGES/gretl.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gretl.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gretl.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/gretl.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gretl.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gretl.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gretl.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/gretl.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/gretl.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gretl.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/gretl.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/gretl.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/gretl.mo
+%%GUI%%share/mime/packages/gretl.xml
+%%GUI%%share/mime-info/gretl.keys
+%%GUI%%share/mime-info/gretl.mime
+%%GUI%%share/pixmaps/gnome-application-x-gretldata.png
+%%GUI%%share/pixmaps/gnome-application-x-gretlsession.png
+%%GUI%%share/pixmaps/gretl-logo.xpm
+%%GUI%%share/pixmaps/gretl.xpm
+%%GUI%%@dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/scripts/misc
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/helpfigs
@@ -573,8 +590,6 @@ share/pixmaps/gretl.xpm
 @dirrm lib/gretl-gtk2/data
 @dirrm lib/gretl-gtk2
 @dirrm include/gretl
-@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