sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

upgrade to 1.0.8

Browse source 
PR:		51864
Submitted by:	Ports Fury
This commit is contained in:
Ying-Chieh Liao 2003-05-12 07:48:37 +00:00
parent 98c8c4109a
commit e3dce69135
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=80784
20 changed files with 176 additions and 580 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
math/gretl/Makefile
View file

@ -7,7 +7,7 @@
# #
PORTNAME= gretl PORTNAME= gretl
PORTVERSION= 1.0.7 PORTVERSION= 1.0.8
CATEGORIES= misc CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME} MASTER_SITE_SUBDIR= ${PORTNAME}
@ -38,7 +38,7 @@ MAN1= gretl.1 gretl-config.1
.if ${HAVE_GNOME:Mlibgnomeui}!="" .if ${HAVE_GNOME:Mlibgnomeui}!=""
PKGNAMESUFFIX= -gnome PKGNAMESUFFIX= -gnome
USE_GNOME+= gnomeprefix libgnomeprintui USE_GNOME+= gnomeprefix libgnomeprintui libgnomeui
PLIST_SUB+= GRETLDATADIR="share/gnome" PLIST_SUB+= GRETLDATADIR="share/gnome"
.else .else
CONFIGURE_ARGS+= --without-gnome CONFIGURE_ARGS+= --without-gnome

2
math/gretl/distinfo
View file

@ -1 +1 @@
MD5 (gretl-1.0.7.tar.bz2) = ab7be0659523ea851ec1a3bad837eeee MD5 (gretl-1.0.8.tar.bz2) = de3023ee1c2e0f2e769c63ad7c0f99da

207
math/gretl/files/patch-aclocal.m4
View file

@ -1,207 +0,0 @@
--- 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, [

57
math/gretl/files/patch-cli::Makefile.in
View file

@ -1,8 +1,17 @@
--- cli/Makefile.in.orig Wed Apr 9 03:57:13 2003 --- cli/Makefile.in.orig Mon Apr 28 21:44:49 2003
+++ cli/Makefile.in Mon Apr 14 16:59:22 2003 +++ cli/Makefile.in Sun May 4 03:10:33 2003
@@ -15,6 +15,10 @@ @@ -9,7 +9,7 @@
RL_OBJ = @RL_OBJ@ exec_prefix = @exec_prefix@
USE_NLS = @USE_NLS@ bindir = @bindir@
datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = $(prefix)/share/locale
have_readline = @have_readline@
READLINE_LIBS = @READLINE_LIBS@
@@ -17,6 +17,10 @@
GMP_CFLAGS = @GMP_CFLAGS@
+CPPFLAGS = @CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@
@ -11,41 +20,21 @@
ifeq ($(CC),) ifeq ($(CC),)
CC = gcc CC = gcc
endif endif
@@ -25,15 +29,14 @@ @@ -41,7 +45,7 @@
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 DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
# General compile options and libs: -override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(GMP_CFLAGS) $(READLINE_CFLAGS) $(DEFS)
-LIBS = $(CLI_LIBS) +override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(GMP_CFLAGS) $(READLINE_CFLAGS) $(DEFS) $(CPPFLAGS)
+LIBS = $(CLI_LIBS) $(INTL_LIBS)
# Directories
tooldir = $(topsrc)/tools
@@ -45,7 +48,7 @@
SRCS = gretlcli.c common.c complete.c
OBJS = gretlcli.o $(RL_OBJ)
-override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(DEFS)
+override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(DEFS) $(CPPFLAGS)
CLI = gretlcli CLI = gretlcli
LIBTOOL = ../libtool LIBTOOL = ../libtool
@@ -55,9 +58,7 @@ @@ -51,7 +55,7 @@
$(CC) -MM -MG -I.. -I$(topsrc) -I$(libsrc) $(DEFS) $< >$*.d 2>/dev/null $(CC) -MM -MG -I$(libsrc) $(DEFS) $< >$*.d 2>/dev/null
$(CLI): $(OBJS) $(CLI): $(OBJS)
- ../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(CLI_LIBS) - ../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(READLINE_LIBS)
- + ../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(READLINE_LIBS) $(INTL_LIBS) $(LDFLAGS)
--include gretlcli.d
+ ../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(CLI_LIBS) $(LDFLAGS)
.PHONY : -include gretlcli.d

11
math/gretl/files/patch-doc::manual.xml
View file

@ -1,11 +0,0 @@
--- doc/manual.xml.orig Wed Feb 5 02:02:07 2003
+++ doc/manual.xml Mon Apr 14 12:30:41 2003
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"/usr/share/sgml/docbook-xml-4.2/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
<!ENTITY version "1.0.3">
<!ENTITY latex "LaTeX">

8
math/gretl/files/patch-lib::Makefile.in
View file

@ -1,5 +1,5 @@
--- lib/Makefile.in.orig Wed Apr 9 03:57:16 2003 --- lib/Makefile.in.orig Mon Apr 21 23:24:57 2003
+++ lib/Makefile.in Mon Apr 14 17:50:12 2003 +++ lib/Makefile.in Sun May 4 03:12:41 2003
@@ -16,6 +16,11 @@ @@ -16,6 +16,11 @@
GMP_LIBS = @GMP_LIBS@ GMP_LIBS = @GMP_LIBS@
have_gtk = @have_gtk@ have_gtk = @have_gtk@
@ -43,8 +43,8 @@
$(LIBGRETL): $(OBJS) $(LOBJS) $(CEPHES_OBJ) $(CEPHES_LOBJ) $(LIBGRETL): $(OBJS) $(LOBJS) $(CEPHES_OBJ) $(CEPHES_LOBJ)
$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(CEPHES_LOBJ) \ $(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(CEPHES_LOBJ) \
- -rpath $(prefix)/lib $(LIBS) -version-info 0:6:0 - -rpath $(prefix)/lib $(LIBS) -version-info 0:7:0
+ -rpath $(prefix)/lib $(LIBS) -version-info 0:6:0 $(LDFLAGS) + -rpath $(prefix)/lib $(LIBS) -version-info 0:7:0 $(LDFLAGS)
-include $(OBJS:.o=.d) -include $(OBJS:.o=.d)

29
math/gretl/files/patch-plugin::Makefile.in
View file

@ -1,17 +1,17 @@
--- plugin/Makefile.in.orig Wed Apr 9 08:46:09 2003 --- plugin/Makefile.in.orig Tue Apr 22 00:29:01 2003
+++ plugin/Makefile.in Mon Apr 14 12:45:07 2003 +++ plugin/Makefile.in Sun May 4 03:14:38 2003
@@ -8,6 +8,10 @@ @@ -7,6 +7,10 @@
MAKE = @MAKE@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
LN = @LN_S@ LN = @LN_S@
+
+CPPFLAGS = @CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@
+INTL_LIBS = @LTLIBINTL@ +INTL_LIBS = @LTLIBINTL@
+
have_gtk = @have_gtk@ have_gtk = @have_gtk@
GTK_CFLAGS = @GTK_CFLAGS@ have_gmp = @have_gmp@
GTK_LIBS = @GTK_LIBS@ @@ -38,8 +42,8 @@
@@ -36,8 +40,8 @@
override CFLAGS += -I.. -DHAVE_CONFIG_H override CFLAGS += -I.. -DHAVE_CONFIG_H
LIBTOOL = ../libtool LIBTOOL = ../libtool
@ -22,7 +22,7 @@
GRETLINC = -I$(topsrc)/lib/src GRETLINC = -I$(topsrc)/lib/src
GRETLLIB = ../lib/libgretl-1.0.la GRETLLIB = ../lib/libgretl-1.0.la
@@ -46,7 +50,7 @@ @@ -48,7 +52,7 @@
GTK_CFLAGS += -DGTK_DISABLE_DEPRECATED GTK_CFLAGS += -DGTK_DISABLE_DEPRECATED
GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell pkg-config --cflags glib-2.0) GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell pkg-config --cflags glib-2.0)
else else
@ -31,22 +31,17 @@
endif endif
SRCS = excel_import.c gnumeric_import.c gretl_matrix.c import_common.c \ SRCS = excel_import.c gnumeric_import.c gretl_matrix.c import_common.c \
@@ -130,15 +134,15 @@ @@ -129,11 +133,11 @@
.PHONY: .PHONY:
install: $(PLUGINS) installdirs install: $(GRETLLIB) $(PLUGINS) installdirs
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
+ $(LIBTOOL) --mode=install $(INSTALL_DATA) \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) \
$(PLUGINS) $(plugindir) $(PLUGINS) $(plugindir)
install-strip: $(PLUGINS) installdirs install-strip: $(GRETLLIB) $(PLUGINS) installdirs
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \
+ $(LIBTOOL) --mode=install $(INSTALL_DATA) -s \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) -s \
$(PLUGINS) $(plugindir) $(PLUGINS) $(plugindir)
install-lapack: $(GRETLLIB) $(LAPACK_PLUGINS) installdirs
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
+ $(LIBTOOL) --mode=install $(INSTALL_DATA) \
$(LAPACK_PLUGINS) $(plugindir)
installdirs: installdirs:

25
math/gretl/files/patch-plugin::tramo-x12a.c Normal file
View file

@ -0,0 +1,25 @@
--- plugin/tramo-x12a.c.orig Tue Feb 18 05:20:25 2003
+++ plugin/tramo-x12a.c Sun May 4 03:27:36 2003
@@ -187,7 +187,7 @@
else strcpy(seats, "seats");
}
-static void truncate (char *str, int n)
+static void truncate_ (char *str, int n)
{
int len = strlen(str);
@@ -361,11 +361,11 @@
/* formulate name of new variable to add */
strcpy(varname, pdinfo->varname[0]);
if (opt == TRAMO_SEATS) {
- truncate(varname, 5);
+ truncate_(varname, 5);
strcat(varname, "_");
strncat(varname, tramo_series_strings[code], 2);
} else {
- truncate(varname, 4);
+ truncate_(varname, 4);
strcat(varname, "_");
strcat(varname, x12a_series_strings[code]);
}

26
math/gretl/files/patch-share::bcih::Makefile.in
View file

@ -1,17 +1,21 @@
--- share/bcih/Makefile.in.orig Wed Apr 9 03:57:19 2003 --- share/bcih/Makefile.in.orig Sat Apr 26 04:32:37 2003
+++ share/bcih/Makefile.in Mon Apr 14 16:07:21 2003 +++ share/bcih/Makefile.in Sun May 4 03:16:24 2003
@@ -2,11 +2,12 @@ @@ -4,7 +4,10 @@
INSTALL_DATA = cp -fp
CC = @CC@
prefix = @prefix@ prefix = @prefix@
+datadir = @datadir@
VPATH = $(topsrc)/share/bcih
-gretldir = $(prefix)/share/gretl -gretldir = $(prefix)/share/gretl
-INSTALL_DATA = cp -fp +datadir = @datadir@
+gretldir = $(datadir)/gretl +gretldir = $(datadir)/gretl
+INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DATA = @INSTALL_DATA@
+
VPATH = $(topsrc)/share/bcih
mkbin: mkbin.c bcih.bin: mkbin bcih.dat
$(CC) -o $@ $< @@ -21,4 +24,4 @@
rm -f mkbin bcih.bin
distclean: clean
- rm -f Makefile
\ No newline at end of file
+ rm -f Makefile

9
math/gretl/pkg-plist
View file

@ -5,16 +5,16 @@ bin/gretlcli
%%GNOME:%%etc/gconf/gconf.xml.defaults/schemas/apps/gretl/%gconf.xml %%GNOME:%%etc/gconf/gconf.xml.defaults/schemas/apps/gretl/%gconf.xml
%%GNOME:%%etc/gconf/schemas/gretl.schemas %%GNOME:%%etc/gconf/schemas/gretl.schemas
include/gretl/calendar.h include/gretl/calendar.h
include/gretl/cmdlist.h
include/gretl/commands.h
include/gretl/compare.h include/gretl/compare.h
include/gretl/dataio.h include/gretl/dataio.h
include/gretl/describe.h include/gretl/describe.h
include/gretl/discrete.h include/gretl/discrete.h
include/gretl/errors.h
include/gretl/estimate.h include/gretl/estimate.h
include/gretl/generate.h include/gretl/generate.h
include/gretl/graphing.h include/gretl/graphing.h
include/gretl/gretl_cmdlist.h
include/gretl/gretl_commands.h
include/gretl/gretl_errors.h
include/gretl/gretl_utils.h include/gretl/gretl_utils.h
include/gretl/gretl_win32.h include/gretl/gretl_win32.h
include/gretl/interact.h include/gretl/interact.h
@ -37,12 +37,14 @@ lib/gretl/excel_import.so
lib/gretl/gnumeric_import.so lib/gretl/gnumeric_import.so
lib/gretl/johansen.so lib/gretl/johansen.so
lib/gretl/lad.so lib/gretl/lad.so
lib/gretl/leverage.so
lib/gretl/mp_ols.so lib/gretl/mp_ols.so
lib/gretl/panel_data.so lib/gretl/panel_data.so
lib/gretl/progress_bar.so lib/gretl/progress_bar.so
lib/gretl/range-mean.so lib/gretl/range-mean.so
lib/gretl/stats_tables.so lib/gretl/stats_tables.so
lib/gretl/sur.so lib/gretl/sur.so
lib/gretl/tramo-x12a.so
lib/libgretl-1.0.a lib/libgretl-1.0.a
lib/libgretl-1.0.so lib/libgretl-1.0.so
lib/libgretl-1.0.so.0 lib/libgretl-1.0.so.0
@ -157,6 +159,7 @@ libdata/pkgconfig/gretl.pc
%%GRETLDATADIR%%/gretl/data/greene/wg_descriptions %%GRETLDATADIR%%/gretl/data/greene/wg_descriptions
%%GRETLDATADIR%%/gretl/data/gretldata.dtd %%GRETLDATADIR%%/gretl/data/gretldata.dtd
%%GRETLDATADIR%%/gretl/data/hamilton.gdt %%GRETLDATADIR%%/gretl/data/hamilton.gdt
%%GRETLDATADIR%%/gretl/data/leverage.gdt
%%GRETLDATADIR%%/gretl/data/longley.gdt %%GRETLDATADIR%%/gretl/data/longley.gdt
%%GRETLDATADIR%%/gretl/db/bcih.bin %%GRETLDATADIR%%/gretl/db/bcih.bin
%%GRETLDATADIR%%/gretl/db/bcih.idx %%GRETLDATADIR%%/gretl/db/bcih.idx

4
misc/gretl/Makefile
View file

@ -7,7 +7,7 @@
# #
PORTNAME= gretl PORTNAME= gretl
PORTVERSION= 1.0.7 PORTVERSION= 1.0.8
CATEGORIES= misc CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME} MASTER_SITE_SUBDIR= ${PORTNAME}
@ -38,7 +38,7 @@ MAN1= gretl.1 gretl-config.1
.if ${HAVE_GNOME:Mlibgnomeui}!="" .if ${HAVE_GNOME:Mlibgnomeui}!=""
PKGNAMESUFFIX= -gnome PKGNAMESUFFIX= -gnome
USE_GNOME+= gnomeprefix libgnomeprintui USE_GNOME+= gnomeprefix libgnomeprintui libgnomeui
PLIST_SUB+= GRETLDATADIR="share/gnome" PLIST_SUB+= GRETLDATADIR="share/gnome"
.else .else
CONFIGURE_ARGS+= --without-gnome CONFIGURE_ARGS+= --without-gnome

2
misc/gretl/distinfo
View file

@ -1 +1 @@
MD5 (gretl-1.0.7.tar.bz2) = ab7be0659523ea851ec1a3bad837eeee MD5 (gretl-1.0.8.tar.bz2) = de3023ee1c2e0f2e769c63ad7c0f99da

207
misc/gretl/files/patch-aclocal.m4
View file

@ -1,207 +0,0 @@
--- 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, [

57
misc/gretl/files/patch-cli::Makefile.in
View file

@ -1,8 +1,17 @@
--- cli/Makefile.in.orig Wed Apr 9 03:57:13 2003 --- cli/Makefile.in.orig Mon Apr 28 21:44:49 2003
+++ cli/Makefile.in Mon Apr 14 16:59:22 2003 +++ cli/Makefile.in Sun May 4 03:10:33 2003
@@ -15,6 +15,10 @@ @@ -9,7 +9,7 @@
RL_OBJ = @RL_OBJ@ exec_prefix = @exec_prefix@
USE_NLS = @USE_NLS@ bindir = @bindir@
datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = $(prefix)/share/locale
have_readline = @have_readline@
READLINE_LIBS = @READLINE_LIBS@
@@ -17,6 +17,10 @@
GMP_CFLAGS = @GMP_CFLAGS@
+CPPFLAGS = @CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@
@ -11,41 +20,21 @@
ifeq ($(CC),) ifeq ($(CC),)
CC = gcc CC = gcc
endif endif
@@ -25,15 +29,14 @@ @@ -41,7 +45,7 @@
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 DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
# General compile options and libs: -override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(GMP_CFLAGS) $(READLINE_CFLAGS) $(DEFS)
-LIBS = $(CLI_LIBS) +override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(GMP_CFLAGS) $(READLINE_CFLAGS) $(DEFS) $(CPPFLAGS)
+LIBS = $(CLI_LIBS) $(INTL_LIBS)
# Directories
tooldir = $(topsrc)/tools
@@ -45,7 +48,7 @@
SRCS = gretlcli.c common.c complete.c
OBJS = gretlcli.o $(RL_OBJ)
-override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(DEFS)
+override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(DEFS) $(CPPFLAGS)
CLI = gretlcli CLI = gretlcli
LIBTOOL = ../libtool LIBTOOL = ../libtool
@@ -55,9 +58,7 @@ @@ -51,7 +55,7 @@
$(CC) -MM -MG -I.. -I$(topsrc) -I$(libsrc) $(DEFS) $< >$*.d 2>/dev/null $(CC) -MM -MG -I$(libsrc) $(DEFS) $< >$*.d 2>/dev/null
$(CLI): $(OBJS) $(CLI): $(OBJS)
- ../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(CLI_LIBS) - ../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(READLINE_LIBS)
- + ../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(READLINE_LIBS) $(INTL_LIBS) $(LDFLAGS)
--include gretlcli.d
+ ../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(CLI_LIBS) $(LDFLAGS)
.PHONY : -include gretlcli.d

11
misc/gretl/files/patch-doc::manual.xml
View file

@ -1,11 +0,0 @@
--- doc/manual.xml.orig Wed Feb 5 02:02:07 2003
+++ doc/manual.xml Mon Apr 14 12:30:41 2003
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"/usr/share/sgml/docbook-xml-4.2/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
<!ENTITY version "1.0.3">
<!ENTITY latex "LaTeX">

8
misc/gretl/files/patch-lib::Makefile.in
View file

@ -1,5 +1,5 @@
--- lib/Makefile.in.orig Wed Apr 9 03:57:16 2003 --- lib/Makefile.in.orig Mon Apr 21 23:24:57 2003
+++ lib/Makefile.in Mon Apr 14 17:50:12 2003 +++ lib/Makefile.in Sun May 4 03:12:41 2003
@@ -16,6 +16,11 @@ @@ -16,6 +16,11 @@
GMP_LIBS = @GMP_LIBS@ GMP_LIBS = @GMP_LIBS@
have_gtk = @have_gtk@ have_gtk = @have_gtk@
@ -43,8 +43,8 @@
$(LIBGRETL): $(OBJS) $(LOBJS) $(CEPHES_OBJ) $(CEPHES_LOBJ) $(LIBGRETL): $(OBJS) $(LOBJS) $(CEPHES_OBJ) $(CEPHES_LOBJ)
$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(CEPHES_LOBJ) \ $(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(CEPHES_LOBJ) \
- -rpath $(prefix)/lib $(LIBS) -version-info 0:6:0 - -rpath $(prefix)/lib $(LIBS) -version-info 0:7:0
+ -rpath $(prefix)/lib $(LIBS) -version-info 0:6:0 $(LDFLAGS) + -rpath $(prefix)/lib $(LIBS) -version-info 0:7:0 $(LDFLAGS)
-include $(OBJS:.o=.d) -include $(OBJS:.o=.d)

29
misc/gretl/files/patch-plugin::Makefile.in
View file

@ -1,17 +1,17 @@
--- plugin/Makefile.in.orig Wed Apr 9 08:46:09 2003 --- plugin/Makefile.in.orig Tue Apr 22 00:29:01 2003
+++ plugin/Makefile.in Mon Apr 14 12:45:07 2003 +++ plugin/Makefile.in Sun May 4 03:14:38 2003
@@ -8,6 +8,10 @@ @@ -7,6 +7,10 @@
MAKE = @MAKE@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
LN = @LN_S@ LN = @LN_S@
+
+CPPFLAGS = @CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@
+INTL_LIBS = @LTLIBINTL@ +INTL_LIBS = @LTLIBINTL@
+
have_gtk = @have_gtk@ have_gtk = @have_gtk@
GTK_CFLAGS = @GTK_CFLAGS@ have_gmp = @have_gmp@
GTK_LIBS = @GTK_LIBS@ @@ -38,8 +42,8 @@
@@ -36,8 +40,8 @@
override CFLAGS += -I.. -DHAVE_CONFIG_H override CFLAGS += -I.. -DHAVE_CONFIG_H
LIBTOOL = ../libtool LIBTOOL = ../libtool
@ -22,7 +22,7 @@
GRETLINC = -I$(topsrc)/lib/src GRETLINC = -I$(topsrc)/lib/src
GRETLLIB = ../lib/libgretl-1.0.la GRETLLIB = ../lib/libgretl-1.0.la
@@ -46,7 +50,7 @@ @@ -48,7 +52,7 @@
GTK_CFLAGS += -DGTK_DISABLE_DEPRECATED GTK_CFLAGS += -DGTK_DISABLE_DEPRECATED
GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell pkg-config --cflags glib-2.0) GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell pkg-config --cflags glib-2.0)
else else
@ -31,22 +31,17 @@
endif endif
SRCS = excel_import.c gnumeric_import.c gretl_matrix.c import_common.c \ SRCS = excel_import.c gnumeric_import.c gretl_matrix.c import_common.c \
@@ -130,15 +134,15 @@ @@ -129,11 +133,11 @@
.PHONY: .PHONY:
install: $(PLUGINS) installdirs install: $(GRETLLIB) $(PLUGINS) installdirs
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
+ $(LIBTOOL) --mode=install $(INSTALL_DATA) \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) \
$(PLUGINS) $(plugindir) $(PLUGINS) $(plugindir)
install-strip: $(PLUGINS) installdirs install-strip: $(GRETLLIB) $(PLUGINS) installdirs
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \
+ $(LIBTOOL) --mode=install $(INSTALL_DATA) -s \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) -s \
$(PLUGINS) $(plugindir) $(PLUGINS) $(plugindir)
install-lapack: $(GRETLLIB) $(LAPACK_PLUGINS) installdirs
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
+ $(LIBTOOL) --mode=install $(INSTALL_DATA) \
$(LAPACK_PLUGINS) $(plugindir)
installdirs: installdirs:

25
misc/gretl/files/patch-plugin::tramo-x12a.c Normal file
View file

@ -0,0 +1,25 @@
--- plugin/tramo-x12a.c.orig Tue Feb 18 05:20:25 2003
+++ plugin/tramo-x12a.c Sun May 4 03:27:36 2003
@@ -187,7 +187,7 @@
else strcpy(seats, "seats");
}
-static void truncate (char *str, int n)
+static void truncate_ (char *str, int n)
{
int len = strlen(str);
@@ -361,11 +361,11 @@
/* formulate name of new variable to add */
strcpy(varname, pdinfo->varname[0]);
if (opt == TRAMO_SEATS) {
- truncate(varname, 5);
+ truncate_(varname, 5);
strcat(varname, "_");
strncat(varname, tramo_series_strings[code], 2);
} else {
- truncate(varname, 4);
+ truncate_(varname, 4);
strcat(varname, "_");
strcat(varname, x12a_series_strings[code]);
}

26
misc/gretl/files/patch-share::bcih::Makefile.in
View file

@ -1,17 +1,21 @@
--- share/bcih/Makefile.in.orig Wed Apr 9 03:57:19 2003 --- share/bcih/Makefile.in.orig Sat Apr 26 04:32:37 2003
+++ share/bcih/Makefile.in Mon Apr 14 16:07:21 2003 +++ share/bcih/Makefile.in Sun May 4 03:16:24 2003
@@ -2,11 +2,12 @@ @@ -4,7 +4,10 @@
INSTALL_DATA = cp -fp
CC = @CC@
prefix = @prefix@ prefix = @prefix@
+datadir = @datadir@
VPATH = $(topsrc)/share/bcih
-gretldir = $(prefix)/share/gretl -gretldir = $(prefix)/share/gretl
-INSTALL_DATA = cp -fp +datadir = @datadir@
+gretldir = $(datadir)/gretl +gretldir = $(datadir)/gretl
+INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DATA = @INSTALL_DATA@
+
VPATH = $(topsrc)/share/bcih
mkbin: mkbin.c bcih.bin: mkbin bcih.dat
$(CC) -o $@ $< @@ -21,4 +24,4 @@
rm -f mkbin bcih.bin
distclean: clean
- rm -f Makefile
\ No newline at end of file
+ rm -f Makefile

9
misc/gretl/pkg-plist
View file

@ -5,16 +5,16 @@ bin/gretlcli
%%GNOME:%%etc/gconf/gconf.xml.defaults/schemas/apps/gretl/%gconf.xml %%GNOME:%%etc/gconf/gconf.xml.defaults/schemas/apps/gretl/%gconf.xml
%%GNOME:%%etc/gconf/schemas/gretl.schemas %%GNOME:%%etc/gconf/schemas/gretl.schemas
include/gretl/calendar.h include/gretl/calendar.h
include/gretl/cmdlist.h
include/gretl/commands.h
include/gretl/compare.h include/gretl/compare.h
include/gretl/dataio.h include/gretl/dataio.h
include/gretl/describe.h include/gretl/describe.h
include/gretl/discrete.h include/gretl/discrete.h
include/gretl/errors.h
include/gretl/estimate.h include/gretl/estimate.h
include/gretl/generate.h include/gretl/generate.h
include/gretl/graphing.h include/gretl/graphing.h
include/gretl/gretl_cmdlist.h
include/gretl/gretl_commands.h
include/gretl/gretl_errors.h
include/gretl/gretl_utils.h include/gretl/gretl_utils.h
include/gretl/gretl_win32.h include/gretl/gretl_win32.h
include/gretl/interact.h include/gretl/interact.h
@ -37,12 +37,14 @@ lib/gretl/excel_import.so
lib/gretl/gnumeric_import.so lib/gretl/gnumeric_import.so
lib/gretl/johansen.so lib/gretl/johansen.so
lib/gretl/lad.so lib/gretl/lad.so
lib/gretl/leverage.so
lib/gretl/mp_ols.so lib/gretl/mp_ols.so
lib/gretl/panel_data.so lib/gretl/panel_data.so
lib/gretl/progress_bar.so lib/gretl/progress_bar.so
lib/gretl/range-mean.so lib/gretl/range-mean.so
lib/gretl/stats_tables.so lib/gretl/stats_tables.so
lib/gretl/sur.so lib/gretl/sur.so
lib/gretl/tramo-x12a.so
lib/libgretl-1.0.a lib/libgretl-1.0.a
lib/libgretl-1.0.so lib/libgretl-1.0.so
lib/libgretl-1.0.so.0 lib/libgretl-1.0.so.0
@ -157,6 +159,7 @@ libdata/pkgconfig/gretl.pc
%%GRETLDATADIR%%/gretl/data/greene/wg_descriptions %%GRETLDATADIR%%/gretl/data/greene/wg_descriptions
%%GRETLDATADIR%%/gretl/data/gretldata.dtd %%GRETLDATADIR%%/gretl/data/gretldata.dtd
%%GRETLDATADIR%%/gretl/data/hamilton.gdt %%GRETLDATADIR%%/gretl/data/hamilton.gdt
%%GRETLDATADIR%%/gretl/data/leverage.gdt
%%GRETLDATADIR%%/gretl/data/longley.gdt %%GRETLDATADIR%%/gretl/data/longley.gdt
%%GRETLDATADIR%%/gretl/db/bcih.bin %%GRETLDATADIR%%/gretl/db/bcih.bin
%%GRETLDATADIR%%/gretl/db/bcih.idx %%GRETLDATADIR%%/gretl/db/bcih.idx