Attachment #26656 for bug #45459

View | Details | Raw Unified | Return to bug 45459
Collapse All | Expand All




#

PORTNAME=	gretl
PORTVERSION=	1.0
CATEGORIES=	misc
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	ports@FreeBSD.org

BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
		gnuplot:${PORTSDIR}/math/gnuplot
LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4 \
		xml2.5:${PORTSDIR}/textproc/libxml2 \
		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot

USE_X_PREFIX=	yes
USE_GNOMENG=	yes
USE_GNOME=	gdkpixbuf
WANT_GNOME=	yes
USE_REINPLACE=	yes
USE_GMAKE=	yes
USE_GNOMENG=	yes
GNU_CONFIGURE=	yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS=	--enable-static --enable-shared --with-gmake
INSTALLS_SHLIB=	yes

MAN1=	gretl.1 gretl-config.1

.if defined(WITHOUT_GNOME2)

.if ${HAVE_GNOME:Mgnomeprint}!= ""
USE_GNOME+=	gnomeprint gnomeprefix
PKGNAMESUFFIX=  -gnome
.else
CONFIGURE_ARGS+=	--without-gnome
PLIST_SUB+=	GNOME2:="@comment " DATADIR="share"
.else
LIB_DEPENDS+=	gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
USE_GNOME=	gnomeprefix
PLIST_SUB+=	GNOME2:="" DATADIR="share/gnome"
.endif

pre-configure:
	@cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/autoconf
		 s|/share/gretl/|/lib/gretl/|g' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|SIGCLD|SIGCHLD|g' ${WRKSRC}/gui/gretl.c

.include <bsd.port.mk>

Line 1 Link Here

(-)misc/gretl/distinfo (-1 / +1 lines)
1	MD5 (gretl-0.999.tar.gz) = e38c01044e3e2a6025d9a66c357ce8fb	1	MD5 (gretl-1.0.tar.gz) = 5f175f7134953836139c9f803c936847

Lines 1-7 Link Here

(-)misc/gretl/files/patch-Makefile.in (-3 / +3 lines)
1	--- Makefile.in.orig Tue Mar 12 02:54:07 2002	1	--- Makefile.in.orig Thu Sep 12 00:35:22 2002
2	+++ Makefile.in Thu May 2 01:42:34 2002	2	+++ Makefile.in Mon Oct 21 10:02:37 2002
3	@@ -22,8 +22,9 @@	3	@@ -22,8 +22,9 @@
4	CC = gcc	4	GUIDIR = gui
5	endif	5	endif
6		6
7	-INSTALL_PROGRAM = ${INSTALL} -m 755	7	-INSTALL_PROGRAM = ${INSTALL} -m 755




--- aclocal.m4.dist	Thu Oct 10 11:39:35 2002
+++ aclocal.m4	Mon Oct 21 09:34:35 2002
@@ -11,7 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# gettext.m4 serial 13 (gettext-0.11.1)
+# gettext.m4 serial 17 (gettext-0.11.5)
 dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -46,7 +46,9 @@
 dnl    $(top_builddir)/intl/libintl.a will be created.
 dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
 dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
 dnl INTLDIR is used to find the intl libraries.  If empty,
 dnl    the value `$(top_builddir)/intl/' is used.
 dnl
@@ -73,9 +75,9 @@
   ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
     [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
 ])])])])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], ,
+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
     [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])
+])])])])
   define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
   define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
 
@@ -88,6 +90,21 @@
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
 
+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+  dnl Ideally we would do this search only after the
+  dnl      if test "$USE_NLS" = "yes"; then
+  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl the configure script would need to contain the same shell code
+  dnl again, outside any 'if'. There are two solutions:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+  dnl documented, we avoid it.
+  ifelse(gt_included_intl, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
   AC_MSG_CHECKING([whether NLS is requested])
   dnl Default is enabled NLS
   AC_ARG_ENABLE(nls,
@@ -123,13 +140,20 @@
         dnl to fall back to GNU NLS library.
 
         dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-ngettext], 2, 1))
+        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
         define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
         define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
 
         AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
          [AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;],
             [bindtextdomain ("", "");
 return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
@@ -154,30 +178,42 @@
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
             AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias ();],
               [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
               gt_cv_func_gnugettext_libintl=yes,
               gt_cv_func_gnugettext_libintl=no)
             dnl Now see whether libintl exists and depends on libiconv.
             if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias ();],
                 [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
                [LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
                 gt_cv_func_gnugettext_libintl=yes
@@ -465,7 +501,7 @@
         ;;
       esac
     done],
-   [# Capture the value of obsolete $ALL_LINGUAS because we need it to compute
+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
     # from automake.
     eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
@@ -494,6 +530,10 @@
   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
   AC_REQUIRE([AC_FUNC_MMAP])dnl
   AC_REQUIRE([jm_GLIBC21])dnl
+  AC_REQUIRE([gt_INTDIV0])dnl
+  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
 
   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h])
@@ -503,7 +543,9 @@
 
   AM_ICONV
   AM_LANGINFO_CODESET
-  AM_LC_MESSAGES
+  if test $ac_cv_header_locale_h = yes; then
+    AM_LC_MESSAGES
+  fi
 
   dnl intl/plural.c is generated from intl/plural.y. It requires bison,
   dnl because plural.y uses bison specific features. It requires at least
@@ -1322,7 +1364,7 @@
 AC_LIB_PROG_LD_GNU
 ])
 
-# iconv.m4 serial AM3 (gettext-0.11)
+# iconv.m4 serial AM4 (gettext-0.11.3)
 dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -1332,11 +1374,8 @@
 
 dnl From Bruno Haible.
 
-AC_DEFUN([AM_ICONV_LINK],
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
 [
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-
   dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
@@ -1344,6 +1383,16 @@
   dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
   dnl accordingly.
   AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
 
   dnl Add $INCICONV to CPPFLAGS before performing the following checks,
   dnl because if the user has installed libiconv and not disabled its use
@@ -1393,7 +1442,7 @@
 
 AC_DEFUN([AM_ICONV],
 [
-  AC_REQUIRE([AM_ICONV_LINK])
+  AM_ICONV_LINK
   if test "$am_cv_func_iconv" = yes; then
     AC_MSG_CHECKING([for iconv declaration])
     AC_CACHE_VAL(am_cv_proto_iconv, [




--- cli/Makefile.in.orig	Tue Nov 12 04:28:19 2002
+++ cli/Makefile.in	Mon Nov 18 20:00:01 2002
@@ -15,6 +15,10 @@
 RL_OBJ = @RL_OBJ@
 USE_NLS = @USE_NLS@
 
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+INTL_LIBS = @LTLIBINTL@
+
 ifeq ($(CC),)
   CC = gcc
 endif
@@ -25,15 +29,14 @@
   LN = ln -sf
 endif
 ifeq ($(USE_NLS),yes)
-  datadir = @datadir@
-  localedir = $(datadir)/locale
+  localedir = $(prefix)/share/locale
   DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
 endif
 
 GRETLLIB = ../lib/libgretl-1.0.la
 
 # General compile options and libs:
-LIBS = $(CLI_LIBS)
+LIBS = $(CLI_LIBS) $(INTL_LIBS)
 
 # Directories
 tooldir = $(topsrc)/tools
@@ -41,14 +44,14 @@
 
 #### End of system configuration section. ####
 
-override CFLAGS += -I. -I.. -I$(libsrc) $(DEFS)
+override CFLAGS += -I. -I.. -I$(libsrc) $(DEFS) $(CPPFLAGS)
 
 CLI = gretlcli
 LIBTOOL = $(topsrc)/libtool
 
 $(CLI): gretlcli.o $(RL_OBJ)
 	../libtool --mode=link $(CC) -o $@ $< \
-	$(RL_OBJ) $(GRETLLIB) $(CLI_LIBS) 
+	$(RL_OBJ) $(GRETLLIB) $(CLI_LIBS) $(LDFLAGS)
 
 .PHONY :
 

Lines 1-10 Link Here

(-)misc/gretl/files/patch-configure (-10 lines)
1	--- configure.orig Sun Apr 21 23:11:36 2002
2	+++ configure Wed May 1 06:58:01 2002
3	@@ -6114,6 +6114,7 @@
4
5	# This can be used to rebuild libtool when needed
6	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
7	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
8
9	# Always use our own libtool.
10	LIBTOOL='$(SHELL) $(top_builddir)/libtool'

Line 0 Link Here

(-)misc/gretl/files/patch-doc::manual.xml (+11 lines)
	1	--- doc/manual.xml.orig Fri Nov 8 01:30:56 2002
	2	+++ doc/manual.xml Mon Nov 18 20:26:15 2002
	3	@@ -1,6 +1,6 @@
	4	<?xml version="1.0"?>
	5	-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
	6	-"/usr/share/sgml/docbook-xml-4.2/docbookx.dtd" [
	7	+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
	8	+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
	9
	10	<!ENTITY version "1.0">
	11	<!ENTITY latex "LaTeX">




--- 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
 
 INSTALL = @INSTALL@
-gnome_prefix = @gnome_prefix@
+datadir = @datadir@
 have_gnome = @have_gnome@
 
-sysconfdir = $(gnome_prefix)/etc
+sysconfdir = @sysconfdir@
 
 GCONFTOOL = @GCONFTOOL@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
@@ -24,11 +24,11 @@
   install_help = install-help-1
 endif
 
-desktopdir = $(gnome_prefix)/share/applications
-mimedir = $(gnome_prefix)/share/mime-info
-gpixmaps = $(gnome_prefix)/share/pixmaps
-ghelpdir = $(gnome_prefix)/share/gnome/help/gretl
-schemadir = $(gnome_prefix)/etc/gconf/schemas
+desktopdir = $(datadir)/applications
+mimedir = $(datadir)/mime-info
+gpixmaps = $(datadir)/pixmaps
+ghelpdir = $(datadir)/help/gretl
+schemadir = $(sysconfdir)/gconf/schemas
 
 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
-	make -C $(omfdir) install
+	$(MAKE) -C $(omfdir) install
 
 install-help-1:
 	$(INSTALL_DATA) topic.dat $(ghelpdir)/C




--- gui2/Makefile.in.orig	Tue Nov 12 04:28:20 2002
+++ gui2/Makefile.in	Mon Nov 18 20:02:19 2002
@@ -4,6 +4,7 @@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
+datadir= @datadir@
 CC = @CC@
 CFLAGS = @CFLAGS@
 MAKE = @MAKE@
@@ -42,14 +43,13 @@
   LIBS = $(GNOME_LIBS) $(GTK_EXTRA_LIB) ../lib/libgretl-1.0.la
   GUI_CFLAGS = $(GNOME_CFLAGS) $(GTK_EXTRA_CFLAGS)
   query_install_gnome = install-gnome
-  GNOMEDEF = -DGNOME_DISABLE_DEPRECATED -DDATADIR=\"$(gnome_prefix)/share\"
+  GNOMEDEF = -DGNOME_DISABLE_DEPRECATED -DDATADIR=\"$(datadir)\"
 else
   LIBS = $(GTK_LIBS) $(GTK_EXTRA_LIB) ../lib/libgretl-1.0.la
   GUI_CFLAGS = $(GTK_CFLAGS) $(GTK_EXTRA_CFLAGS)
 endif
 ifeq ($(USE_NLS),yes)
-  datadir = @datadir@
-  localedir = $(datadir)/locale
+  localedir = $(prefix)/share/locale
   NLSDEF = -DLOCALEDIR=\"$(localedir)\"
 endif
 
@@ -60,7 +60,7 @@
 
 # Directories
 bindir	= $(prefix)/bin
-gretldir = $(prefix)/share/gretl
+gretldir = $(datadir)/gretl
 tooldir = $(topsrc)/tools
 libsrc = $(topsrc)/lib/src
 clisrc = $(topsrc)/cli
@@ -92,7 +92,7 @@
 	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
 
 $(GTKEXTRA_LITE): 
-	make -C gtkextra-lite
+	$(MAKE) -C gtkextra-lite
 
 .PHONY:
 
@@ -103,7 +103,7 @@
 	$(LIBTOOL) $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
 
 install-data: installdirs
-	$(INSTALL_PROGRAM) $(topsrc)/gretl_sh $(bindir)/gretl
+	$(INSTALL_SCRIPT) $(topsrc)/gretl_sh $(bindir)/gretl
 	$(INSTALL_DATA) ../pixmaps/gretl-logo.xpm $(gretldir)
 	$(INSTALL_DATA) $(topsrc)/COPYING $(gretldir)
 




--- gui2/gretl.c.orig	Tue Oct  8 02:10:30 2002
+++ gui2/gretl.c	Mon Oct 21 08:48:34 2002
@@ -1560,7 +1560,7 @@
 {
     pid_t pid;
 
-    signal(SIGCLD, SIG_IGN);
+    signal(SIGCHLD, SIG_IGN);
 
     pid = fork();
     if (pid == -1) {
@@ -1649,7 +1649,7 @@
 	return;
     }
 
-    signal(SIGCLD, SIG_IGN); 
+    signal(SIGCHLD, SIG_IGN); 
     pid = fork();
 
     if (pid == -1) {




--- gui2/omf-install/Makefile.in.orig	Sun Aug 25 03:09:19 2002
+++ gui2/omf-install/Makefile.in	Mon Oct 21 07:48:35 2002
@@ -1,9 +1,9 @@
 
 INSTALL = @INSTALL@
-gnome_prefix = @gnome_prefix@
+datadir = @datadir@
 
-docdir = $(gnome_prefix)/share/gnome/help/gretl/C
-omfdir = $(gnome_prefix)/share/omf/gretl
+docdir = $(datadir)/help/gretl/C
+omfdir = $(datadir)/omf/gretl
 
 gretl-C.omf: gretl-C.omf.in
 	  scrollkeeper-preinstall $(docdir)/`awk 'BEGIN {RS = ">" } \
@@ -12,5 +12,5 @@
 
 install: gretl-C.omf
 	../../tools/mkinstalldirs $(omfdir)
-	$(INSTALL) -m 644 $< $(omfdir)
-	scrollkeeper-update -p $(gnome_prefix)/var/scrollkeeper
+	$(INSTALL_DATA) $< $(omfdir)
+	scrollkeeper-update -p /var/log/scrollkeeper




--- gui/Makefile.in.orig	Mon Aug 26 02:32:00 2002
+++ gui/Makefile.in	Wed Aug 28 00:40:11 2002
@@ -57,7 +57,7 @@
 endif
 ifeq ($(USE_NLS),yes)
   datadir = @datadir@
-  localedir = $(datadir)/locale
+  localedir = $(prefix)/share/locale
   DEFS = -DLOCALEDIR=\"$(localedir)\"
 endif
 
@@ -66,7 +66,7 @@
 
 # Directories
 bindir	= $(prefix)/bin
-gretldir = $(prefix)/share/gretl
+gretldir = $(libdir)/gretl
 tooldir = $(topsrc)/tools
 libsrc = $(topsrc)/lib/src
 clisrc = $(topsrc)/cli
@@ -100,7 +100,7 @@
 	$(LIBTOOL) $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
 
 install-data: installdirs
-	$(INSTALL_PROGRAM) $(topsrc)/gretl_sh $(bindir)/gretl
+	$(INSTALL_SCRIPT) $(topsrc)/gretl_sh $(bindir)/gretl
 	$(INSTALL_DATA) ../pixmaps/gretl-logo.xpm $(gretldir)
 	$(INSTALL_DATA) $(topsrc)/COPYING $(gretldir)
 




--- lib/Makefile.in.orig	Wed Nov 13 03:50:52 2002
+++ lib/Makefile.in	Mon Nov 18 20:04:11 2002
@@ -14,6 +14,11 @@
 GLIB_LIBS = @GLIB_LIBS@
 have_gtk = @have_gtk@
 
+datadir = @datadir@
+CPPFLAGS = @CPPFLAGS@ -DDATADIR=\"$(datadir)\"
+LDFLAGS = @LDFLAGS@
+INTL_LIBS = @LTLIBINTL@
+
 ifeq ($(INSTALL_PROGRAM),)
   INSTALL_PROGRAM = $(INSTALL) -m 755
 endif
@@ -28,7 +33,7 @@
   INSTALL_DATA = $(INSTALL) -m 644
@@ -26,7 +26,7 @@
 libdir = $(prefix)/lib
 includedir = $(prefix)/include/gretl
 aclocaldir = $(prefix)/share/aclocal

 
 INSTALLDIRS = $(libdir) $(includedir) $(aclocaldir)
 
@@ -42,7 +47,7 @@
   LIBGRETL = libgretl.la
   INSTALL_CFG = install-cfg-old
 endif
 
-LIBS = -lm -ldl -L/usr/local/lib -lz $(XML_LIBS) $(GLIB_LIBS)
+LIBS = -lm -lz $(XML_LIBS) $(GLIB_LIBS) $(INTL_LIBS)
 
 #### End of system configuration section. ####
 
@@ -73,14 +78,14 @@
 
 override CFLAGS += -I. -I./src -I.. $(XML_CFLAGS) $(GLIB_CFLAGS) -DHAVE_CONFIG_H
 
-COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)
+COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS)
 
 .c.o:        
 	$(COMPILE) $<
 
 $(LIBGRETL): $(OBJS) $(LOBJS) $(CEPHES_OBJ) $(CEPHES_OBJ)
 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(CEPHES_LOBJ) \
-	-rpath $(prefix)/lib $(LIBS) -version-info 0:0:0
+	-rpath $(prefix)/lib $(LIBS) -version-info 0:0:0 $(LDFLAGS)
 
 .PHONY: 
 	$(INSTALL_DATA) $(srcdir)/*.h $(includedir)
 	$(INSTALL_DATA) ../gretl.m4 $(aclocaldir)
 
 install-cfg-old: ../gretl-config
-	$(INSTALL_PROGRAM) ../gretl-config $(bindir)
+	$(INSTALL_SCRIPT) ../gretl-config $(bindir)
 
 install-cfg-new: ../gretl2.pc
 	$(INSTALL_DATA) ../gretl2.pc $(pkgconfigdir)




--- lib/src/gretl_utils.c.orig	Mon Sep 30 06:13:40 2002
+++ lib/src/gretl_utils.c	Mon Oct 21 08:31:52 2002
@@ -1373,8 +1373,8 @@
 	if (home != NULL) {
 	    strcpy(ppaths->gretldir, home);
 	} else {
-	    strcpy(ppaths->gretldir, GRETL_PREFIX);
-	    strcat(ppaths->gretldir, "/share/gretl/");
+	    strcpy(ppaths->gretldir, DATADIR);
+	    strcat(ppaths->gretldir, "/gretl/");
 	} 
 	if (gui) {
 	    sprintf(ppaths->binbase, "%sdb/", ppaths->gretldir);




--- plugin/Makefile.in.orig	Fri Oct 11 03:03:46 2002
+++ plugin/Makefile.in	Mon Oct 21 10:23:25 2002
@@ -8,6 +8,10 @@
 INSTALL = @INSTALL@
 LN = @LN_S@
 
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+INTL_LIBS = @LTLIBINTL@
+
 have_gtk = @have_gtk@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -31,8 +35,8 @@
-share = $(prefix)/share/gretl
+gretldir = $(libdir)/gretl
 
 override CFLAGS += -I.. -DHAVE_CONFIG_H
 
 LIBTOOL = $(topsrc)/libtool
-COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
-LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -shared
+COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS)
+LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -shared $(LDFLAGS)
 
 GRETLINC = -I$(topsrc)/lib/src
 GRETLLIB = ../lib/libgretl.la
@@ -47,7 +51,7 @@
   PROGRESS_PLUGIN = progress_bar.so
   GNUMERIC_PLUGIN = gnumeric_import.so
   EXCEL_PLUGIN = excel_import.so

+  GRETL_LIBOLE2_CFLAGS := -I. $(shell $(GLIB_CONFIG) --cflags)
 endif  
 
 PLUGINS = stats_tables.so panel_data.so des_import.so range-mean.so lad.so \
@@ -156,11 +160,11 @@
 .PHONY: 
 
 install: $(PLUGINS) installdirs
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
-	$(PLUGINS) $(share)/plugins
+	$(LIBTOOL) --mode=install $(INSTALL_DATA) \
 	$(PLUGINS) $(plugindir)
 
 install-strip: $(PLUGINS) installdirs
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \
-	$(PLUGINS) $(share)/plugins
+	$(LIBTOOL) --mode=install $(INSTALL_DATA) -s \
 	$(PLUGINS) $(plugindir)
 
 installdirs:
-	$(topsrc)/tools/mkinstalldirs $(share)/plugins
+	$(topsrc)/tools/mkinstalldirs $(gretldir)/plugins
 
 clean:
 	rm -f *.o *.lo *.so core 

Line 0 Link Here

(-)misc/gretl/files/patch-po::Makefile.in.in (+11 lines)
	1	--- po/Makefile.in.in.orig Fri May 24 05:03:49 2002
	2	+++ po/Makefile.in.in Mon Oct 21 08:10:04 2002
	3	@@ -21,7 +21,7 @@
	4	prefix = @prefix@
	5	exec_prefix = @exec_prefix@
	6	datadir = @datadir@
	7	-localedir = $(datadir)/locale
	8	+localedir = $(prefix)/share/locale
	9	gettextsrcdir = $(datadir)/gettext/po
	10
	11	INSTALL = @INSTALL@




--- share/Makefile.in.orig	Mon Sep 30 03:49:42 2002
+++ share/Makefile.in	Mon Oct 21 07:31:57 2002
@@ -1,11 +1,12 @@
 topsrc = ..
 
 prefix = @prefix@
+datadir = @datadir@
 have_gtk = @have_gtk@
 
-gretldir = $(prefix)/share/gretl
+gretldir = $(datadir)/gretl
 tooldir = $(topsrc)/tools
-INSTALL_DATA = cp -fp
+INSTALL_DATA = @INSTALL_DATA@




--- tools/ltmain.sh.orig	Mon May 20 06:43:59 2002
+++ tools/ltmain.sh	Mon Oct 21 10:45:46 2002
@@ -956,6 +956,7 @@
 	;;
 
       -avoid-version)
+	build_old_libs=no
 	avoid_version=yes
 	continue
 	;;
@@ -1043,14 +1044,14 @@
 	    # These systems don't actually have a C library (as such)
 	    test "X$arg" = "X-lc" && continue
 	    ;;
-	  *-*-openbsd*)
+	  *-*-openbsd* | *-*-freebsd*)
 	    # Do not include libc due to us having libc/libc_r.
 	    test "X$arg" = "X-lc" && continue
 	    ;;
 	  esac
 	 elif test "X$arg" = "X-lc_r"; then
 	  case $host in
-	  *-*-openbsd*)
+	  *-*-openbsd* | *-*-freebsd*)
 	    # Do not include libc_r directly, use -pthread flag.
 	    continue
 	    ;;
@@ -2441,7 +2442,7 @@
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
 	    ;;
-	  *-*-openbsd*)
+	  *-*-openbsd* | *-*-freebsd*)
 	    # Do not include libc due to us having libc/libc_r.
 	    ;;
 	  *)
@@ -4210,10 +4211,12 @@
 	fi
 
 	# Install the pseudo-library for information purposes.
+	if /usr/bin/false; then
 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 	instname="$dir/$name"i
 	$show "$install_prog $instname $destdir/$name"
 	$run eval "$install_prog $instname $destdir/$name" || exit $?
+	fi
 
 	# Maybe install the static library, too.
 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"




bin/gretl
bin/gretl-config
bin/gretl_x11
bin/gretlcli
%%GNOME2:%%etc/gconf/gconf.xml.defaults/apps/gretl/%gconf.xml
%%GNOME2:%%etc/gconf/gconf.xml.defaults/schemas/apps/gretl/%gconf.xml
%%GNOME2:%%etc/gconf/schemas/gretl.schemas
include/gretl/calendar.h
include/gretl/cmdlist.h
include/gretl/commands.h

include/gretl/internal.h
include/gretl/libgretl.h
include/gretl/libprob.h
include/gretl/modelprint.h
include/gretl/monte_carlo.h
include/gretl/nonparam.h
include/gretl/printout.h

include/gretl/var.h
include/gretl/version.h
include/gretl/win32.h
lib/gretl/excel_import-2.so
lib/gretl/gnumeric_import-2.so
lib/gretl/lad.so
lib/gretl/mp_ols.so
lib/gretl/panel_data.so
lib/gretl/progress_bar-2.so
lib/gretl/range-mean.so
lib/gretl/stats_tables.so
lib/libgretl-1.0.a
lib/libgretl-1.0.so
lib/libgretl-1.0.so.0
libdata/pkgconfig/gretl.pc
%%GNOME2:%%%%DATADIR%%/applications/gretl.desktop
%%DATADIR%%/gretl/COPYING
%%DATADIR%%/gretl/data/data10-1.gdt
%%DATADIR%%/gretl/data/data10-2.gdt
%%DATADIR%%/gretl/data/data10-3.gdt
%%DATADIR%%/gretl/data/data10-4.gdt
%%DATADIR%%/gretl/data/data10-5.gdt
%%DATADIR%%/gretl/data/data10-6.gdt
%%DATADIR%%/gretl/data/data10-7.gdt
%%DATADIR%%/gretl/data/data10-8.gdt
%%DATADIR%%/gretl/data/data11-1.gdt
%%DATADIR%%/gretl/data/data12-1.gdt
%%DATADIR%%/gretl/data/data13-1.gdt
%%DATADIR%%/gretl/data/data2-1.gdt
%%DATADIR%%/gretl/data/data2-2.gdt
%%DATADIR%%/gretl/data/data2-3.gdt
%%DATADIR%%/gretl/data/data3-1.gdt
%%DATADIR%%/gretl/data/data3-10.gdt
%%DATADIR%%/gretl/data/data3-11.gdt
%%DATADIR%%/gretl/data/data3-12.gdt
%%DATADIR%%/gretl/data/data3-13.gdt
%%DATADIR%%/gretl/data/data3-14.gdt
%%DATADIR%%/gretl/data/data3-15.gdt
%%DATADIR%%/gretl/data/data3-2.gdt
%%DATADIR%%/gretl/data/data3-3.gdt
%%DATADIR%%/gretl/data/data3-4.gdt
%%DATADIR%%/gretl/data/data3-5.gdt
%%DATADIR%%/gretl/data/data3-6.gdt
%%DATADIR%%/gretl/data/data3-7.gdt
%%DATADIR%%/gretl/data/data3-8.gdt
%%DATADIR%%/gretl/data/data3-9.gdt
%%DATADIR%%/gretl/data/data4-1.gdt
%%DATADIR%%/gretl/data/data4-10.gdt
%%DATADIR%%/gretl/data/data4-11.gdt
%%DATADIR%%/gretl/data/data4-12.gdt
%%DATADIR%%/gretl/data/data4-13.gdt
%%DATADIR%%/gretl/data/data4-14.gdt
%%DATADIR%%/gretl/data/data4-15.gdt
%%DATADIR%%/gretl/data/data4-16.gdt
%%DATADIR%%/gretl/data/data4-17.gdt
%%DATADIR%%/gretl/data/data4-2.gdt
%%DATADIR%%/gretl/data/data4-3.gdt
%%DATADIR%%/gretl/data/data4-3a.gdt
%%DATADIR%%/gretl/data/data4-4.gdt
%%DATADIR%%/gretl/data/data4-5.gdt
%%DATADIR%%/gretl/data/data4-6.gdt
%%DATADIR%%/gretl/data/data4-7.gdt
%%DATADIR%%/gretl/data/data4-8.gdt
%%DATADIR%%/gretl/data/data4-9.gdt
%%DATADIR%%/gretl/data/data6-1.gdt
%%DATADIR%%/gretl/data/data6-2.gdt
%%DATADIR%%/gretl/data/data6-3.gdt
%%DATADIR%%/gretl/data/data6-4.gdt
%%DATADIR%%/gretl/data/data6-5.gdt
%%DATADIR%%/gretl/data/data6-6.gdt
%%DATADIR%%/gretl/data/data7-1.gdt
%%DATADIR%%/gretl/data/data7-10.gdt
%%DATADIR%%/gretl/data/data7-11.gdt
%%DATADIR%%/gretl/data/data7-12.gdt
%%DATADIR%%/gretl/data/data7-13.gdt
%%DATADIR%%/gretl/data/data7-14.gdt
%%DATADIR%%/gretl/data/data7-15.gdt
%%DATADIR%%/gretl/data/data7-16.gdt
%%DATADIR%%/gretl/data/data7-17.gdt
%%DATADIR%%/gretl/data/data7-18.gdt
%%DATADIR%%/gretl/data/data7-19.gdt
%%DATADIR%%/gretl/data/data7-2.gdt
%%DATADIR%%/gretl/data/data7-20.gdt
%%DATADIR%%/gretl/data/data7-21.gdt
%%DATADIR%%/gretl/data/data7-22.gdt
%%DATADIR%%/gretl/data/data7-23.gdt
%%DATADIR%%/gretl/data/data7-24.gdt
%%DATADIR%%/gretl/data/data7-26.gdt
%%DATADIR%%/gretl/data/data7-3.gdt
%%DATADIR%%/gretl/data/data7-4.gdt
%%DATADIR%%/gretl/data/data7-5.gdt
%%DATADIR%%/gretl/data/data7-6.gdt
%%DATADIR%%/gretl/data/data7-7.gdt
%%DATADIR%%/gretl/data/data7-8.gdt
%%DATADIR%%/gretl/data/data7-9.gdt
%%DATADIR%%/gretl/data/data8-1.gdt
%%DATADIR%%/gretl/data/data8-2.gdt
%%DATADIR%%/gretl/data/data8-3.gdt
%%DATADIR%%/gretl/data/data9-1.gdt
%%DATADIR%%/gretl/data/data9-10.gdt
%%DATADIR%%/gretl/data/data9-11.gdt
%%DATADIR%%/gretl/data/data9-12.gdt
%%DATADIR%%/gretl/data/data9-13.gdt
%%DATADIR%%/gretl/data/data9-2.gdt
%%DATADIR%%/gretl/data/data9-3.gdt
%%DATADIR%%/gretl/data/data9-4.gdt
%%DATADIR%%/gretl/data/data9-5.gdt
%%DATADIR%%/gretl/data/data9-6.gdt
%%DATADIR%%/gretl/data/data9-7.gdt
%%DATADIR%%/gretl/data/data9-8.gdt
%%DATADIR%%/gretl/data/data9-9.gdt
%%DATADIR%%/gretl/data/descriptions
%%DATADIR%%/gretl/data/greene/greene10_3.gdt
%%DATADIR%%/gretl/data/greene/greene11_3.gdt
%%DATADIR%%/gretl/data/greene/greene12_1.gdt
%%DATADIR%%/gretl/data/greene/greene18_1.gdt
%%DATADIR%%/gretl/data/greene/greene18_2.gdt
%%DATADIR%%/gretl/data/greene/greene19_1.gdt
%%DATADIR%%/gretl/data/greene/greene7_8.gdt
%%DATADIR%%/gretl/data/greene/greene8_3.gdt
%%DATADIR%%/gretl/data/greene/greene9_1.gdt
%%DATADIR%%/gretl/data/greene/wg_descriptions
%%DATADIR%%/gretl/data/longley.gdt
%%DATADIR%%/gretl/db/README
%%DATADIR%%/gretl/db/bcih.bin
%%DATADIR%%/gretl/db/bcih.idx
%%DATADIR%%/gretl/gretl-logo.xpm
%%DATADIR%%/gretl/gretl.hlp
%%DATADIR%%/gretl/gretl.hlp.es
%%DATADIR%%/gretl/gretl.stamp
%%DATADIR%%/gretl/gretlcli.hlp
%%DATADIR%%/gretl/gretlcli.hlp.es
%%DATADIR%%/gretl/scripts/greene11_3.inp
%%DATADIR%%/gretl/scripts/greene12_1.inp
%%DATADIR%%/gretl/scripts/greene18_6.inp
%%DATADIR%%/gretl/scripts/greene19_1.inp
%%DATADIR%%/gretl/scripts/greene7_8.inp
%%DATADIR%%/gretl/scripts/greene8_3.inp
%%DATADIR%%/gretl/scripts/greene9_1.inp
%%DATADIR%%/gretl/scripts/ps10-1.inp
%%DATADIR%%/gretl/scripts/ps10-10.inp
%%DATADIR%%/gretl/scripts/ps10-11.inp
%%DATADIR%%/gretl/scripts/ps10-2.inp
%%DATADIR%%/gretl/scripts/ps10-3.inp
%%DATADIR%%/gretl/scripts/ps10-4.inp
%%DATADIR%%/gretl/scripts/ps10-5a.inp
%%DATADIR%%/gretl/scripts/ps10-5b.inp
%%DATADIR%%/gretl/scripts/ps10-6.inp
%%DATADIR%%/gretl/scripts/ps10-7.inp
%%DATADIR%%/gretl/scripts/ps10-8.inp
%%DATADIR%%/gretl/scripts/ps10-9.inp
%%DATADIR%%/gretl/scripts/ps11-1.inp
%%DATADIR%%/gretl/scripts/ps11-2.inp
%%DATADIR%%/gretl/scripts/ps11-3.inp
%%DATADIR%%/gretl/scripts/ps12-1.inp
%%DATADIR%%/gretl/scripts/ps13-1.inp
%%DATADIR%%/gretl/scripts/ps2-1.inp
%%DATADIR%%/gretl/scripts/ps2-2.inp
%%DATADIR%%/gretl/scripts/ps2-3.inp
%%DATADIR%%/gretl/scripts/ps3-1.inp
%%DATADIR%%/gretl/scripts/ps3-2.inp
%%DATADIR%%/gretl/scripts/ps3-3.inp
%%DATADIR%%/gretl/scripts/ps3-4.inp
%%DATADIR%%/gretl/scripts/ps3-5.inp
%%DATADIR%%/gretl/scripts/ps3-6.inp
%%DATADIR%%/gretl/scripts/ps4-1.inp
%%DATADIR%%/gretl/scripts/ps4-2.inp
%%DATADIR%%/gretl/scripts/ps4-3.inp
%%DATADIR%%/gretl/scripts/ps4-4.inp
%%DATADIR%%/gretl/scripts/ps4-5.inp
%%DATADIR%%/gretl/scripts/ps5-1.inp
%%DATADIR%%/gretl/scripts/ps5-2.inp
%%DATADIR%%/gretl/scripts/ps5-3.inp
%%DATADIR%%/gretl/scripts/ps5-4.inp
%%DATADIR%%/gretl/scripts/ps5-5.inp
%%DATADIR%%/gretl/scripts/ps6-1.inp
%%DATADIR%%/gretl/scripts/ps6-10.inp
%%DATADIR%%/gretl/scripts/ps6-11.inp
%%DATADIR%%/gretl/scripts/ps6-12.inp
%%DATADIR%%/gretl/scripts/ps6-2.inp
%%DATADIR%%/gretl/scripts/ps6-3.inp
%%DATADIR%%/gretl/scripts/ps6-4.inp
%%DATADIR%%/gretl/scripts/ps6-5.inp
%%DATADIR%%/gretl/scripts/ps6-6.inp
%%DATADIR%%/gretl/scripts/ps6-7.inp
%%DATADIR%%/gretl/scripts/ps6-8.inp
%%DATADIR%%/gretl/scripts/ps6-9.inp
%%DATADIR%%/gretl/scripts/ps7-1.inp
%%DATADIR%%/gretl/scripts/ps7-2.inp
%%DATADIR%%/gretl/scripts/ps7-3.inp
%%DATADIR%%/gretl/scripts/ps7-4.inp
%%DATADIR%%/gretl/scripts/ps7-5.inp
%%DATADIR%%/gretl/scripts/ps7-6.inp
%%DATADIR%%/gretl/scripts/ps7-7.inp
%%DATADIR%%/gretl/scripts/ps8-1.inp
%%DATADIR%%/gretl/scripts/ps8-2.inp
%%DATADIR%%/gretl/scripts/ps8-3.inp
%%DATADIR%%/gretl/scripts/ps8-4.inp
%%DATADIR%%/gretl/scripts/ps8-5.inp
%%DATADIR%%/gretl/scripts/ps8-6.inp
%%DATADIR%%/gretl/scripts/ps8-7.inp
%%DATADIR%%/gretl/scripts/ps8-8.inp
%%DATADIR%%/gretl/scripts/ps9-1.inp
%%DATADIR%%/gretl/scripts/ps9-10.inp
%%DATADIR%%/gretl/scripts/ps9-2.inp
%%DATADIR%%/gretl/scripts/ps9-3.inp
%%DATADIR%%/gretl/scripts/ps9-4.inp
%%DATADIR%%/gretl/scripts/ps9-5.inp
%%DATADIR%%/gretl/scripts/ps9-6.inp
%%DATADIR%%/gretl/scripts/ps9-7.inp
%%DATADIR%%/gretl/scripts/ps9-8.inp
%%DATADIR%%/gretl/scripts/ps9-9.inp
%%DATADIR%%/gretl/scripts/ps_descriptions
%%DATADIR%%/gretl/scripts/testinp
%%DATADIR%%/gretl/scripts/wg_ps_descriptions
%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/appendices.xml
%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/biblio.xml
%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/cli.xml
%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/cmdref.xml
%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/datafiles.xml
%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/graphs.xml
%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/intro.xml
%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/looping.xml
%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/modes.xml
%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/native.xml
%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/optarg.xml
%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/panel.xml
%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/starting.xml
%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/trouble.xml
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/adf1.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/adf2.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/autocorr.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/caution.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/chisqu.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/corc.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/cumulate.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/datafiles.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/greeneC.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/gretl-logo.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/important.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/ldx.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/ldy.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/linreg.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/mainwin.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/menubar.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/modelwin.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/nonlin.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/note.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/plot_control.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/resid.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/scriptwin.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/selector.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/session.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/tip.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/tipbak.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/toolbar.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/uhatsq.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/warning.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/yhat.png
%%GNOME2:%%%%DATADIR%%/help/gretl/C/gretl.xml
%%GNOME2:%%%%DATADIR%%/mime-info/gretl.keys
%%GNOME2:%%%%DATADIR%%/mime-info/gretl.mime
%%GNOME2:%%%%DATADIR%%/omf/gretl/gretl-C.omf
%%GNOME2:%%%%DATADIR%%/pixmaps/gnome-application-x-gretldata.png
%%GNOME2:%%%%DATADIR%%/pixmaps/gnome-application-x-gretlsession.png
%%GNOME2:%%%%DATADIR%%/pixmaps/gretl-logo.xpm
%%GNOME2:%%%%DATADIR%%/pixmaps/gretl.png
share/locale/es/LC_MESSAGES/gretl.mo
share/locale/fr/LC_MESSAGES/gretl.mo
%%GNOME2:%%@dirrm %%DATADIR%%/omf/gretl
%%GNOME2:%%@dirrm %%DATADIR%%/help/gretl/C/figures
%%GNOME2:%%@dirrm %%DATADIR%%/help/gretl/C/chapters
%%GNOME2:%%@dirrm %%DATADIR%%/help/gretl/C
%%GNOME2:%%@dirrm %%DATADIR%%/help/gretl
@dirrm %%DATADIR%%/gretl/scripts
@dirrm %%DATADIR%%/gretl/db
@dirrm %%DATADIR%%/gretl/data/greene
@dirrm %%DATADIR%%/gretl/data
@dirrm %%DATADIR%%/gretl
%%GNOME:%%share/gnome/help/gretl/C/x827.html
%%GNOME:%%share/gnome/help/gretl/C/x84.html
%%GNOME:%%share/gnome/help/gretl/C/x865.html
%%GNOME:%%share/gnome/help/gretl/C/x895.html
%%GNOME:%%share/gnome/help/gretl/C/x909.html
%%GNOME:%%share/gnome/help/gretl/C/x961.html
%%GNOME:%%share/gnome/mime-info/gretl.keys
%%GNOME:%%share/gnome/mime-info/gretl.mime
%%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
%%GNOME:%%share/gnome/pixmaps/gretl.png
@dirrm lib/gretl/scripts
@dirrm lib/gretl/plugins
@dirrm lib/gretl/db
@dirrm lib/gretl/data/greene
@dirrm lib/gretl/data
@dirrm lib/gretl
@dirrm include/gretl
%%GNOME2:%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gretl
%%GNOME2:%%@dirrm etc/gconf/gconf.xml.defaults/apps/gretl

Return to bug 45459

Lines 7-53 Link Here

(-)misc/gretl/Makefile (-24 / +20 lines)
7	#	7	#
8		8
9	PORTNAME= gretl	9	PORTNAME= gretl
10	PORTVERSION= 0.999	10	PORTVERSION= 1.0
11	CATEGORIES= misc	11	CATEGORIES= misc
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
16		16
17	BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot	17	BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf \
18	LIB_DEPENDS= gnomeole2.0:${PORTSDIR}/devel/libole2 \	18	gnuplot:${PORTSDIR}/math/gnuplot
19	gmp.6:${PORTSDIR}/math/libgmp4 \	19	LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 \
20	xml2.5:${PORTSDIR}/textproc/libxml2 \	20	xml2.5:${PORTSDIR}/textproc/libxml2 \
21	gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra	21	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
22	RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot	22	BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
23		23
24	USE_X_PREFIX= yes	24	USE_X_PREFIX= yes
25	USE_GNOMENG= yes
26	USE_GNOME= gdkpixbuf
27	WANT_GNOME= yes
28	USE_REINPLACE= yes
29	USE_GMAKE= yes	25	USE_GMAKE= yes
30	USE_LIBTOOL= yes	26	USE_GNOMENG= yes
31	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}	27	GNU_CONFIGURE= yes
		28	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
32	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	29	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
33	LDFLAGS="-L${LOCALBASE}/lib"	30	LDFLAGS="-L${LOCALBASE}/lib"
34	CONFIGURE_ARGS= --with-gmake --without-gtk2	31	CONFIGURE_ARGS= --enable-static --enable-shared --with-gmake
35	INSTALLS_SHLIB= yes	32	INSTALLS_SHLIB= yes
36		33
37	MAN1= gretl.1 gretl-config.1	34	MAN1= gretl.1 gretl-config.1
38		35
39	.include <bsd.port.pre.mk>	36	.if defined(WITHOUT_GNOME2)
40
41	.if ${HAVE_GNOME:Mgnomeprint}!= ""
42	USE_GNOME+= gnomeprint gnomeprefix
43	PKGNAMESUFFIX= -gnome
44	.else
45	CONFIGURE_ARGS+= --without-gnome	37	CONFIGURE_ARGS+= --without-gnome
		38	PLIST_SUB+= GNOME2:="@comment " DATADIR="share"
		39	.else
		40	LIB_DEPENDS+= gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
		41	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
		42	USE_GNOME= gnomeprefix
		43	PLIST_SUB+= GNOME2:="" DATADIR="share/gnome"
46	.endif	44	.endif
47		45
48	pre-patch:	46	pre-configure:
49	@${REINPLACE_CMD} -e 's\|`glib-config\|`\$$GLIB_CONFIG\|g ; \	47	@cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/autoconf
50	s\|/share/gretl/\|/lib/gretl/\|g' ${WRKSRC}/configure
51	@${REINPLACE_CMD} -e 's\|SIGCLD\|SIGCHLD\|g' ${WRKSRC}/gui/gretl.c
52		48
53	.include <bsd.port.post.mk>	49	.include <bsd.port.mk>

Line 0 Link Here

(-)misc/gretl/files/patch-aclocal.m4 (+207 lines)
		1	--- aclocal.m4.dist Thu Oct 10 11:39:35 2002
		2	+++ aclocal.m4 Mon Oct 21 09:34:35 2002
		3	@@ -11,7 +11,7 @@
		4	# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
		5	# PARTICULAR PURPOSE.
		6
		7	-# gettext.m4 serial 13 (gettext-0.11.1)
		8	+# gettext.m4 serial 17 (gettext-0.11.5)
		9	dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
		10	dnl This file is free software, distributed under the terms of the GNU
		11	dnl General Public License. As a special exception to the GNU General
		12	@@ -46,7 +46,9 @@
		13	dnl $(top_builddir)/intl/libintl.a will be created.
		14	dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
		15	dnl implementations (in libc or libintl) without the ngettext() function
		16	-dnl will be ignored.
		17	+dnl will be ignored. If NEEDSYMBOL is specified and is
		18	+dnl 'need-formatstring-macros', then GNU gettext implementations that don't
		19	+dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
		20	dnl INTLDIR is used to find the intl libraries. If empty,
		21	dnl the value `$(top_builddir)/intl/' is used.
		22	dnl
		23	@@ -73,9 +75,9 @@
		24	ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
		25	[errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
		26	])])])])])
		27	- ifelse([$2], [], , [ifelse([$2], [need-ngettext], ,
		28	+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
		29	[errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
		30	-])])])
		31	+])])])])
		32	define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
		33	define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
		34
		35	@@ -88,6 +90,21 @@
		36	AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
		37	AC_REQUIRE([AC_LIB_RPATH])
		38
		39	+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
		40	+ dnl Ideally we would do this search only after the
		41	+ dnl if test "$USE_NLS" = "yes"; then
		42	+ dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
		43	+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
		44	+ dnl the configure script would need to contain the same shell code
		45	+ dnl again, outside any 'if'. There are two solutions:
		46	+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
		47	+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
		48	+ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
		49	+ dnl documented, we avoid it.
		50	+ ifelse(gt_included_intl, yes, , [
		51	+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
		52	+ ])
		53	+
		54	AC_MSG_CHECKING([whether NLS is requested])
		55	dnl Default is enabled NLS
		56	AC_ARG_ENABLE(nls,
		57	@@ -123,13 +140,20 @@
		58	dnl to fall back to GNU NLS library.
		59
		60	dnl Add a version number to the cache macros.
		61	- define([gt_api_version], ifelse([$2], [need-ngettext], 2, 1))
		62	+ define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
		63	define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
		64	define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
65
66	AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
67	[AC_TRY_LINK([#include <libintl.h>
68	-extern int _nl_msg_cat_cntr;
69	+]ifelse([$2], [need-formatstring-macros],
70	+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
71	+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
72	+#endif
73	+changequote(,)dnl
74	+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
75	+changequote([,])dnl
76	+], [])[extern int _nl_msg_cat_cntr;
77	extern int *_nl_domain_bindings;],
78	[bindtextdomain ("", "");
79	return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
80	@@ -154,30 +178,42 @@
81	LIBS="$LIBS $LIBINTL"
82	dnl Now see whether libintl exists and does not depend on libiconv.
83	AC_TRY_LINK([#include <libintl.h>
84	-extern int _nl_msg_cat_cntr;
85	-extern int *_nl_domain_bindings;
86	+]ifelse([$2], [need-formatstring-macros],
87	+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
88	+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
89	+#endif
90	+changequote(,)dnl
91	+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
92	+changequote([,])dnl
93	+], [])[extern int _nl_msg_cat_cntr;
94	extern
95	#ifdef __cplusplus
96	"C"
97	#endif
98	const char *_nl_expand_alias ();],
99	[bindtextdomain ("", "");
100	-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + _nl_domain_bindings + _nl_expand_alias (0)],
101	+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
102	gt_cv_func_gnugettext_libintl=yes,
103	gt_cv_func_gnugettext_libintl=no)
104	dnl Now see whether libintl exists and depends on libiconv.
105	if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
106	LIBS="$LIBS $LIBICONV"
107	AC_TRY_LINK([#include <libintl.h>
108	-extern int _nl_msg_cat_cntr;
109	-extern int *_nl_domain_bindings;
110	+]ifelse([$2], [need-formatstring-macros],
111	+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
112	+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
113	+#endif
114	+changequote(,)dnl
115	+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
116	+changequote([,])dnl
117	+], [])[extern int _nl_msg_cat_cntr;
118	extern
119	#ifdef __cplusplus
120	"C"
121	#endif
122	const char *_nl_expand_alias ();],
123	[bindtextdomain ("", "");
124	-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + _nl_domain_bindings + _nl_expand_alias (0)],
125	+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
126	[LIBINTL="$LIBINTL $LIBICONV"
127	LTLIBINTL="$LTLIBINTL $LTLIBICONV"
128	gt_cv_func_gnugettext_libintl=yes
129	@@ -465,7 +501,7 @@
130	;;
131	esac
132	done],
133	- [# Capture the value of obsolete $ALL_LINGUAS because we need it to compute
134	+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
135	# POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
136	# from automake.
137	eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
138	@@ -494,6 +530,10 @@
139	AC_REQUIRE([AC_FUNC_ALLOCA])dnl
140	AC_REQUIRE([AC_FUNC_MMAP])dnl
141	AC_REQUIRE([jm_GLIBC21])dnl
142	+ AC_REQUIRE([gt_INTDIV0])dnl
143	+ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
144	+ AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
145	+ AC_REQUIRE([gt_INTTYPES_PRI])dnl
146
147	AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
148	stdlib.h string.h unistd.h sys/param.h])
149	@@ -503,7 +543,9 @@
150
151	AM_ICONV
152	AM_LANGINFO_CODESET
153	- AM_LC_MESSAGES
154	+ if test $ac_cv_header_locale_h = yes; then
155	+ AM_LC_MESSAGES
156	+ fi
157
158	dnl intl/plural.c is generated from intl/plural.y. It requires bison,
159	dnl because plural.y uses bison specific features. It requires at least
160	@@ -1322,7 +1364,7 @@
161	AC_LIB_PROG_LD_GNU
162	])
163
164	-# iconv.m4 serial AM3 (gettext-0.11)
165	+# iconv.m4 serial AM4 (gettext-0.11.3)
166	dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
167	dnl This file is free software, distributed under the terms of the GNU
168	dnl General Public License. As a special exception to the GNU General
169	@@ -1332,11 +1374,8 @@
170
171	dnl From Bruno Haible.
172
173	-AC_DEFUN([AM_ICONV_LINK],
174	+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
175	[
176	- dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
177	- dnl those with the standalone portable GNU libiconv installed).
178	-
179	dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
180	AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
181	AC_REQUIRE([AC_LIB_RPATH])
182	@@ -1344,6 +1383,16 @@
183	dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
184	dnl accordingly.
185	AC_LIB_LINKFLAGS_BODY([iconv])
186	+])
187	+
188	+AC_DEFUN([AM_ICONV_LINK],
189	+[
190	+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
191	+ dnl those with the standalone portable GNU libiconv installed).
192	+
193	+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
194	+ dnl accordingly.
195	+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
196
197	dnl Add $INCICONV to CPPFLAGS before performing the following checks,
198	dnl because if the user has installed libiconv and not disabled its use
199	@@ -1393,7 +1442,7 @@
200
201	AC_DEFUN([AM_ICONV],
202	[
203	- AC_REQUIRE([AM_ICONV_LINK])
204	+ AM_ICONV_LINK
205	if test "$am_cv_func_iconv" = yes; then
206	AC_MSG_CHECKING([for iconv declaration])
207	AC_CACHE_VAL(am_cv_proto_iconv, [

Line 0 Link Here

(-)misc/gretl/files/patch-cli::Makefile.in (+48 lines)
	1	--- cli/Makefile.in.orig Tue Nov 12 04:28:19 2002
	2	+++ cli/Makefile.in Mon Nov 18 20:00:01 2002
	3	@@ -15,6 +15,10 @@
	4	RL_OBJ = @RL_OBJ@
	5	USE_NLS = @USE_NLS@
	6
	7	+CPPFLAGS = @CPPFLAGS@
	8	+LDFLAGS = @LDFLAGS@
	9	+INTL_LIBS = @LTLIBINTL@
	10	+
	11	ifeq ($(CC),)
	12	CC = gcc
	13	endif
	14	@@ -25,15 +29,14 @@
	15	LN = ln -sf
	16	endif
	17	ifeq ($(USE_NLS),yes)
	18	- datadir = @datadir@
	19	- localedir = $(datadir)/locale
	20	+ localedir = $(prefix)/share/locale
	21	DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
	22	endif
	23
	24	GRETLLIB = ../lib/libgretl-1.0.la
	25
	26	# General compile options and libs:
	27	-LIBS = $(CLI_LIBS)
	28	+LIBS = $(CLI_LIBS) $(INTL_LIBS)
	29
	30	# Directories
	31	tooldir = $(topsrc)/tools
	32	@@ -41,14 +44,14 @@
	33
	34	#### End of system configuration section. ####
	35
	36	-override CFLAGS += -I. -I.. -I$(libsrc) $(DEFS)
	37	+override CFLAGS += -I. -I.. -I$(libsrc) $(DEFS) $(CPPFLAGS)
	38
	39	CLI = gretlcli
	40	LIBTOOL = $(topsrc)/libtool
	41
	42	$(CLI): gretlcli.o $(RL_OBJ)
	43	../libtool --mode=link $(CC) -o $@ $< \
	44	- $(RL_OBJ) $(GRETLLIB) $(CLI_LIBS)
	45	+ $(RL_OBJ) $(GRETLLIB) $(CLI_LIBS) $(LDFLAGS)
	46
	47	.PHONY :
	48

Lines 1-15 Link Here

(-)misc/gretl/files/patch-gnome::Makefile.in (-8 / +34 lines)
1	--- gnome/Makefile.in.orig Sun Aug 25 03:07:17 2002	1	--- gnome/Makefile.in.orig Tue Aug 27 03:11:56 2002
2	+++ gnome/Makefile.in Wed Aug 28 03:10:35 2002	2	+++ gnome/Makefile.in Mon Oct 21 08:27:48 2002
3	@@ -18,9 +18,9 @@	3	@@ -2,10 +2,10 @@
		4	docdir = ../doc
		5
		6	INSTALL = @INSTALL@
		7	-gnome_prefix = @gnome_prefix@
		8	+datadir = @datadir@
		9	have_gnome = @have_gnome@
		10
		11	-sysconfdir = $(gnome_prefix)/etc
		12	+sysconfdir = @sysconfdir@
		13
		14	GCONFTOOL = @GCONFTOOL@
		15	GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
		16	@@ -24,11 +24,11 @@
4	install_help = install-help-1	17	install_help = install-help-1
5	endif	18	endif
6		19
7	-desktopdir = $(gnome_prefix)/share/applications	20	-desktopdir = $(gnome_prefix)/share/applications
8	-mimedir = $(gnome_prefix)/share/mime-info	21	-mimedir = $(gnome_prefix)/share/mime-info
9	-gpixmaps = $(gnome_prefix)/share/pixmaps	22	-gpixmaps = $(gnome_prefix)/share/pixmaps
10	+desktopdir = $(gnome_prefix)/share/gnome/applications	23	-ghelpdir = $(gnome_prefix)/share/gnome/help/gretl
11	+mimedir = $(gnome_prefix)/share/gnome/mime-info	24	-schemadir = $(gnome_prefix)/etc/gconf/schemas
12	+gpixmaps = $(gnome_prefix)/share/gnome/pixmaps	25	+desktopdir = $(datadir)/applications
13	ghelpdir = $(gnome_prefix)/share/gnome/help/gretl	26	+mimedir = $(datadir)/mime-info
		27	+gpixmaps = $(datadir)/pixmaps
		28	+ghelpdir = $(datadir)/help/gretl
		29	+schemadir = $(sysconfdir)/gconf/schemas
		30
		31	install: install-images install-misc install-help-dirs $(install_help) $(install_schemas)
		32
		33	@@ -58,7 +58,7 @@
		34	cat $$f \| sed s+fileref=\"figures/[^\"]*+\&.png+g > \
		35	$(ghelpdir)/C/chapters/`basename $$f` ; done
		36	$(INSTALL_DATA) $(docdir)/figures/*.png $(ghelpdir)/C/figures
		37	- make -C $(omfdir) install
		38	+ $(MAKE) -C $(omfdir) install
14		39
15	install: install-images install-misc install-help-dirs $(install_help)	40	install-help-1:
		41	$(INSTALL_DATA) topic.dat $(ghelpdir)/C

Line 0 Link Here

(-)misc/gretl/files/patch-gui2::Makefile.in (+54 lines)
	1	--- gui2/Makefile.in.orig Tue Nov 12 04:28:20 2002
	2	+++ gui2/Makefile.in Mon Nov 18 20:02:19 2002
	3	@@ -4,6 +4,7 @@
	4	exec_prefix = @exec_prefix@
	5	bindir = @bindir@
	6	libdir = @libdir@
	7	+datadir= @datadir@
	8	CC = @CC@
	9	CFLAGS = @CFLAGS@
	10	MAKE = @MAKE@
	11	@@ -42,14 +43,13 @@
	12	LIBS = $(GNOME_LIBS) $(GTK_EXTRA_LIB) ../lib/libgretl-1.0.la
	13	GUI_CFLAGS = $(GNOME_CFLAGS) $(GTK_EXTRA_CFLAGS)
	14	query_install_gnome = install-gnome
	15	- GNOMEDEF = -DGNOME_DISABLE_DEPRECATED -DDATADIR=\"$(gnome_prefix)/share\"
	16	+ GNOMEDEF = -DGNOME_DISABLE_DEPRECATED -DDATADIR=\"$(datadir)\"
	17	else
	18	LIBS = $(GTK_LIBS) $(GTK_EXTRA_LIB) ../lib/libgretl-1.0.la
	19	GUI_CFLAGS = $(GTK_CFLAGS) $(GTK_EXTRA_CFLAGS)
	20	endif
	21	ifeq ($(USE_NLS),yes)
	22	- datadir = @datadir@
	23	- localedir = $(datadir)/locale
	24	+ localedir = $(prefix)/share/locale
	25	NLSDEF = -DLOCALEDIR=\"$(localedir)\"
	26	endif
	27
	28	@@ -60,7 +60,7 @@
	29
	30	# Directories
	31	bindir = $(prefix)/bin
	32	-gretldir = $(prefix)/share/gretl
	33	+gretldir = $(datadir)/gretl
	34	tooldir = $(topsrc)/tools
	35	libsrc = $(topsrc)/lib/src
	36	clisrc = $(topsrc)/cli
	37	@@ -92,7 +92,7 @@
	38	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
	39
	40	$(GTKEXTRA_LITE):
	41	- make -C gtkextra-lite
	42	+ $(MAKE) -C gtkextra-lite
	43
	44	.PHONY:
	45
	46	@@ -103,7 +103,7 @@
	47	$(LIBTOOL) $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
	48
	49	install-data: installdirs
	50	- $(INSTALL_PROGRAM) $(topsrc)/gretl_sh $(bindir)/gretl
	51	+ $(INSTALL_SCRIPT) $(topsrc)/gretl_sh $(bindir)/gretl
	52	$(INSTALL_DATA) ../pixmaps/gretl-logo.xpm $(gretldir)
	53	$(INSTALL_DATA) $(topsrc)/COPYING $(gretldir)
	54

Line 0 Link Here

(-)misc/gretl/files/patch-gui2::gretl.c (+20 lines)
	1	--- gui2/gretl.c.orig Tue Oct 8 02:10:30 2002
	2	+++ gui2/gretl.c Mon Oct 21 08:48:34 2002
	3	@@ -1560,7 +1560,7 @@
	4	{
	5	pid_t pid;
	6
	7	- signal(SIGCLD, SIG_IGN);
	8	+ signal(SIGCHLD, SIG_IGN);
	9
	10	pid = fork();
	11	if (pid == -1) {
	12	@@ -1649,7 +1649,7 @@
	13	return;
	14	}
	15
	16	- signal(SIGCLD, SIG_IGN);
	17	+ signal(SIGCHLD, SIG_IGN);
	18	pid = fork();
	19
	20	if (pid == -1) {

Line 0 Link Here

(-)misc/gretl/files/patch-gui2::omf-install::Makefile.in (+23 lines)
	1	--- gui2/omf-install/Makefile.in.orig Sun Aug 25 03:09:19 2002
	2	+++ gui2/omf-install/Makefile.in Mon Oct 21 07:48:35 2002
	3	@@ -1,9 +1,9 @@
	4
	5	INSTALL = @INSTALL@
	6	-gnome_prefix = @gnome_prefix@
	7	+datadir = @datadir@
	8
	9	-docdir = $(gnome_prefix)/share/gnome/help/gretl/C
	10	-omfdir = $(gnome_prefix)/share/omf/gretl
	11	+docdir = $(datadir)/help/gretl/C
	12	+omfdir = $(datadir)/omf/gretl
	13
	14	gretl-C.omf: gretl-C.omf.in
	15	scrollkeeper-preinstall $(docdir)/`awk 'BEGIN {RS = ">" } \
	16	@@ -12,5 +12,5 @@
	17
	18	install: gretl-C.omf
	19	../../tools/mkinstalldirs $(omfdir)
	20	- $(INSTALL) -m 644 $< $(omfdir)
	21	- scrollkeeper-update -p $(gnome_prefix)/var/scrollkeeper
	22	+ $(INSTALL_DATA) $< $(omfdir)
	23	+ scrollkeeper-update -p /var/log/scrollkeeper

Lines 1-29 Link Here

(-)misc/gretl/files/patch-gui::Makefile.in (-29 lines)
1	--- gui/Makefile.in.orig Mon Aug 26 02:32:00 2002
2	+++ gui/Makefile.in Wed Aug 28 00:40:11 2002
3	@@ -57,7 +57,7 @@
4	endif
5	ifeq ($(USE_NLS),yes)
6	datadir = @datadir@
7	- localedir = $(datadir)/locale
8	+ localedir = $(prefix)/share/locale
9	DEFS = -DLOCALEDIR=\"$(localedir)\"
10	endif
11
12	@@ -66,7 +66,7 @@
13
14	# Directories
15	bindir = $(prefix)/bin
16	-gretldir = $(prefix)/share/gretl
17	+gretldir = $(libdir)/gretl
18	tooldir = $(topsrc)/tools
19	libsrc = $(topsrc)/lib/src
20	clisrc = $(topsrc)/cli
21	@@ -100,7 +100,7 @@
22	$(LIBTOOL) $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
23
24	install-data: installdirs
25	- $(INSTALL_PROGRAM) $(topsrc)/gretl_sh $(bindir)/gretl
26	+ $(INSTALL_SCRIPT) $(topsrc)/gretl_sh $(bindir)/gretl
27	$(INSTALL_DATA) ../pixmaps/gretl-logo.xpm $(gretldir)
28	$(INSTALL_DATA) $(topsrc)/COPYING $(gretldir)
29

Lines 1-17 Link Here

(-)misc/gretl/files/patch-lib::Makefile.in (-34 / +31 lines)
1	--- lib/Makefile.in.orig Mon Aug 26 02:31:58 2002	1	--- lib/Makefile.in.orig Wed Nov 13 03:50:52 2002
2	+++ lib/Makefile.in Wed Aug 28 00:42:18 2002	2	+++ lib/Makefile.in Mon Nov 18 20:04:11 2002
3	@@ -12,8 +12,8 @@	3	@@ -14,6 +14,11 @@
4	XML_LIBS = @XML_LIBS@	4	GLIB_LIBS = @GLIB_LIBS@
5	have_gtk = @have_gtk@	5	have_gtk = @have_gtk@
6		6
7	-ifeq ($(INSTALL_PROGRAM),)	7	+datadir = @datadir@
8	- INSTALL_PROGRAM = $(INSTALL) -m 755	8	+CPPFLAGS = @CPPFLAGS@ -DDATADIR=\"$(datadir)\"
9	+ifeq ($(INSTALL_SCRIPT),)	9	+LDFLAGS = @LDFLAGS@
10	+ INSTALL_SCRIPT = $(INSTALL) -m 755	10	+INTL_LIBS = @LTLIBINTL@
		11	+
		12	ifeq ($(INSTALL_PROGRAM),)
		13	INSTALL_PROGRAM = $(INSTALL) -m 755
11	endif	14	endif
12	ifeq ($(INSTALL_DATA),)	15	@@ -28,7 +33,7 @@
13	INSTALL_DATA = $(INSTALL) -m 644
14	@@ -26,7 +26,7 @@
15	libdir = $(prefix)/lib	16	libdir = $(prefix)/lib
16	includedir = $(prefix)/include/gretl	17	includedir = $(prefix)/include/gretl
17	aclocaldir = $(prefix)/share/aclocal	18	aclocaldir = $(prefix)/share/aclocal
Lines 20-52 Link Here
20		21
21	INSTALLDIRS = $(libdir) $(includedir) $(aclocaldir)	22	INSTALLDIRS = $(libdir) $(includedir) $(aclocaldir)
22		23
23	@@ -40,7 +40,7 @@	24	@@ -42,7 +47,7 @@
24	LIBGRETL = libgretl.la
25	INSTALL_CFG = install-cfg-old	25	INSTALL_CFG = install-cfg-old
26	endif	26	endif
27	-LIBS = -lm -ldl -L/usr/local/lib -lz $(XML_LIBS)	27
28	+LIBS = -lm -lz $(XML_LIBS)	28	-LIBS = -lm -ldl -L/usr/local/lib -lz $(XML_LIBS) $(GLIB_LIBS)
		29	+LIBS = -lm -lz $(XML_LIBS) $(GLIB_LIBS) $(INTL_LIBS)
29		30
30	#### End of system configuration section. ####	31	#### End of system configuration section. ####
31		32
32	@@ -77,17 +77,17 @@	33	@@ -73,14 +78,14 @@
33	.PHONY:	34
		35	override CFLAGS += -I. -I./src -I.. $(XML_CFLAGS) $(GLIB_CFLAGS) -DHAVE_CONFIG_H
		36
		37	-COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)
		38	+COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS)
34		39
35	install: $(LIBGRETL) install-data	40	.c.o:
36	- $(LIBTOOL) $(INSTALL_PROGRAM) $< $(libdir)/$<	41	$(COMPILE) $<
37	+ $(LIBTOOL) $(INSTALL_DATA) $< $(libdir)/$<	42
38		43	$(LIBGRETL): $(OBJS) $(LOBJS) $(CEPHES_OBJ) $(CEPHES_OBJ)
39	install-strip: $(LIBGRETL) install-data	44	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(CEPHES_LOBJ) \
40	- $(LIBTOOL) $(INSTALL_PROGRAM) -s $< $(libdir)/$<	45	- -rpath $(prefix)/lib $(LIBS) -version-info 0:0:0
41	+ $(LIBTOOL) $(INSTALL_DATA) -s $< $(libdir)/$<	46	+ -rpath $(prefix)/lib $(LIBS) -version-info 0:0:0 $(LDFLAGS)
42		47
43	install-data: installdirs $(INSTALL_CFG)	48	.PHONY:
44	$(INSTALL_DATA) $(srcdir)/*.h $(includedir)
45	$(INSTALL_DATA) ../gretl.m4 $(aclocaldir)
46
47	install-cfg-old: ../gretl-config
48	- $(INSTALL_PROGRAM) ../gretl-config $(bindir)
49	+ $(INSTALL_SCRIPT) ../gretl-config $(bindir)
50		49
51	install-cfg-new: ../gretl2.pc
52	$(INSTALL_DATA) ../gretl2.pc $(pkgconfigdir)

Line 0 Link Here

(-)misc/gretl/files/patch-lib::src::gretl_utils.c (+13 lines)
	1	--- lib/src/gretl_utils.c.orig Mon Sep 30 06:13:40 2002
	2	+++ lib/src/gretl_utils.c Mon Oct 21 08:31:52 2002
	3	@@ -1373,8 +1373,8 @@
	4	if (home != NULL) {
	5	strcpy(ppaths->gretldir, home);
	6	} else {
	7	- strcpy(ppaths->gretldir, GRETL_PREFIX);
	8	- strcat(ppaths->gretldir, "/share/gretl/");
	9	+ strcpy(ppaths->gretldir, DATADIR);
	10	+ strcat(ppaths->gretldir, "/gretl/");
	11	}
	12	if (gui) {
	13	sprintf(ppaths->binbase, "%sdb/", ppaths->gretldir);

Lines 1-23 Link Here

(-)misc/gretl/files/patch-plugin::Makefile.in (-29 / +27 lines)
1	--- plugin/Makefile.in.orig Mon Aug 26 02:32:01 2002	1	--- plugin/Makefile.in.orig Fri Oct 11 03:03:46 2002
2	+++ plugin/Makefile.in Wed Aug 28 00:45:07 2002	2	+++ plugin/Makefile.in Mon Oct 21 10:23:25 2002
3	@@ -2,6 +2,7 @@	3	@@ -8,6 +8,10 @@
4		4	INSTALL = @INSTALL@
5	prefix = @prefix@	5	LN = @LN_S@
6	exec_prefix = @exec_prefix@	6
7	+libdir = @libdir@	7	+CPPFLAGS = @CPPFLAGS@
8	CC = @CC@	8	+LDFLAGS = @LDFLAGS@
9	CFLAGS = @CFLAGS@	9	+INTL_LIBS = @LTLIBINTL@
10	MAKE = @MAKE@	10	+
11	@@ -26,7 +27,7 @@	11	have_gtk = @have_gtk@
12	endif	12	GTK_CFLAGS = @GTK_CFLAGS@
13		13	GTK_LIBS = @GTK_LIBS@
14	# Installation directory	14	@@ -31,8 +35,8 @@
15	-share = $(prefix)/share/gretl
16	+gretldir = $(libdir)/gretl
17
18	override CFLAGS += -I.. -DHAVE_CONFIG_H	15	override CFLAGS += -I.. -DHAVE_CONFIG_H
19		16
20	@@ -48,7 +49,7 @@	17	LIBTOOL = $(topsrc)/libtool
		18	-COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)
		19	-LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -shared
		20	+COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS)
		21	+LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -shared $(LDFLAGS)
		22
		23	GRETLINC = -I$(topsrc)/lib/src
		24	GRETLLIB = ../lib/libgretl.la
		25	@@ -47,7 +51,7 @@
21	PROGRESS_PLUGIN = progress_bar.so	26	PROGRESS_PLUGIN = progress_bar.so
22	GNUMERIC_PLUGIN = gnumeric_import.so	27	GNUMERIC_PLUGIN = gnumeric_import.so
23	EXCEL_PLUGIN = excel_import.so	28	EXCEL_PLUGIN = excel_import.so
Lines 25-49 Link Here
25	+ GRETL_LIBOLE2_CFLAGS := -I. $(shell $(GLIB_CONFIG) --cflags)	30	+ GRETL_LIBOLE2_CFLAGS := -I. $(shell $(GLIB_CONFIG) --cflags)
26	endif	31	endif
27		32
28	PLUGINS = stats_tables.so panel_data.so des_import.so \	33	PLUGINS = stats_tables.so panel_data.so des_import.so range-mean.so lad.so \
29	@@ -139,15 +140,15 @@	34	@@ -156,11 +160,11 @@
30	.PHONY:	35	.PHONY:
31		36
32	install: $(PLUGINS) installdirs	37	install: $(PLUGINS) installdirs
33	- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \	38	- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
34	- $(PLUGINS) $(share)/plugins
35	+ $(LIBTOOL) --mode=install $(INSTALL_DATA) \	39	+ $(LIBTOOL) --mode=install $(INSTALL_DATA) \
36	+ $(PLUGINS) $(gretldir)/plugins	40	$(PLUGINS) $(plugindir)
37		41
38	install-strip: $(PLUGINS) installdirs	42	install-strip: $(PLUGINS) installdirs
39	- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \	43	- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \
40	- $(PLUGINS) $(share)/plugins
41	+ $(LIBTOOL) --mode=install $(INSTALL_DATA) -s \	44	+ $(LIBTOOL) --mode=install $(INSTALL_DATA) -s \
42	+ $(PLUGINS) $(gretldir)/plugins	45	$(PLUGINS) $(plugindir)
43		46
44	installdirs:	47	installdirs:
45	- $(topsrc)/tools/mkinstalldirs $(share)/plugins
46	+ $(topsrc)/tools/mkinstalldirs $(gretldir)/plugins
47
48	clean:
49	rm -f .o .lo *.so core

Lines 1-14 Link Here

(-)misc/gretl/files/patch-share::Makefile.in (-4 / +4 lines)
1	--- share/Makefile.in.orig Tue Aug 20 05:22:47 2002	1	--- share/Makefile.in.orig Mon Sep 30 03:49:42 2002
2	+++ share/Makefile.in Wed Aug 28 00:48:06 2002	2	+++ share/Makefile.in Mon Oct 21 07:31:57 2002
3	@@ -1,11 +1,12 @@	3	@@ -1,11 +1,12 @@
4	topsrc = ..	4	topsrc = ..
5		5
6	prefix = @prefix@	6	prefix = @prefix@
7	+libdir = @libdir@	7	+datadir = @datadir@
8	have_gtk = @have_gtk@	8	have_gtk = @have_gtk@
9		9
10	-gretldir = $(prefix)/share/gretl	10	-gretldir = $(prefix)/share/gretl
11	+gretldir = $(libdir)/gretl	11	+gretldir = $(datadir)/gretl
12	tooldir = $(topsrc)/tools	12	tooldir = $(topsrc)/tools
13	-INSTALL_DATA = cp -fp	13	-INSTALL_DATA = cp -fp
14	+INSTALL_DATA = @INSTALL_DATA@	14	+INSTALL_DATA = @INSTALL_DATA@

Line 0 Link Here

(-)misc/gretl/files/patch-tools::ltmain.sh (+49 lines)
	1	--- tools/ltmain.sh.orig Mon May 20 06:43:59 2002
	2	+++ tools/ltmain.sh Mon Oct 21 10:45:46 2002
	3	@@ -956,6 +956,7 @@
	4	;;
	5
	6	-avoid-version)
	7	+ build_old_libs=no
	8	avoid_version=yes
	9	continue
	10	;;
	11	@@ -1043,14 +1044,14 @@
	12	# These systems don't actually have a C library (as such)
	13	test "X$arg" = "X-lc" && continue
	14	;;
	15	- --openbsd*)
	16	+ --openbsd* \| --freebsd*)
	17	# Do not include libc due to us having libc/libc_r.
	18	test "X$arg" = "X-lc" && continue
	19	;;
	20	esac
	21	elif test "X$arg" = "X-lc_r"; then
	22	case $host in
	23	- --openbsd*)
	24	+ --openbsd* \| --freebsd*)
	25	# Do not include libc_r directly, use -pthread flag.
	26	continue
	27	;;
	28	@@ -2441,7 +2442,7 @@
	29	--netbsd*)
	30	# Don't link with libc until the a.out ld.so is fixed.
	31	;;
	32	- --openbsd*)
	33	+ --openbsd* \| --freebsd*)
	34	# Do not include libc due to us having libc/libc_r.
	35	;;
	36	*)
	37	@@ -4210,10 +4211,12 @@
	38	fi
	39
	40	# Install the pseudo-library for information purposes.
	41	+ if /usr/bin/false; then
	42	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
	43	instname="$dir/$name"i
	44	$show "$install_prog $instname $destdir/$name"
	45	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
	46	+ fi
	47
	48	# Maybe install the static library, too.
	49	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"