Date: Wed, 12 Mar 2008 03:00:20 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/121619: Update port: math/gretl to 1.7.3 Message-ID: <20080312030020.70523614.tkato432@yahoo.com> Resent-Message-ID: <200803111810.m2BIA2Vf048682@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 121619
>Category: ports
>Synopsis: Update port: math/gretl to 1.7.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 11 18:10:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 6.3-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Update to version 1.7.3
Remove file:
files/patch-gui2::omf-install::Makefile.in
files/patch-lib__src__gretl_matrix.c
files/patch-plugin__oprobit.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/math/gretl/Makefile math/gretl/Makefile
--- /usr/ports/math/gretl/Makefile 2008-01-21 17:31:44.000000000 +0900
+++ math/gretl/Makefile 2008-03-01 23:08:38.000000000 +0900
@@ -7,7 +7,7 @@
#
PORTNAME= gretl
-PORTVERSION= 1.7.1
+PORTVERSION= 1.7.3
CATEGORIES= math finance
MASTER_SITES= SF
@@ -26,7 +26,7 @@
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15 autoconf:261
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DGNUPLOT_PNG" \
- LDFLAGS="-L${LOCALBASE}/lib ${GCCLIBDIR}"
+ LDFLAGS="-L${LOCALBASE}/lib -lgnuregex ${GCCLIBDIR}"
CONFIGURE_ARGS= --enable-static --enable-shared --with-gmake
ALL_TARGET= # empty
USE_LDCONFIG= yes
@@ -47,7 +47,6 @@
.if ${HAVE_GNOME:Mlibgnomeui}!=""
PKGNAMESUFFIX= -gnome
USE_GNOME+= gnomeprefix gtksourceview libgnomeui
-GCONF_SCHEMAS= gretl.schemas
.else
CONFIGURE_ARGS+= --without-gnome --without-gtksourceview
.endif
@@ -67,6 +66,16 @@
LAPACK= -llapack
.endif
+.if ${OSVERSION} > 502010
+GNU_REGEX_H= gnu/regex.h
+.else
+GNU_REGEX_H= gnuregex.h
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|<regex.h>|<${GNU_REGEX_H}>|g' \
+ ${WRKSRC}/gui2/gtksourceview/gtksourceregex.c
+
pre-configure:
@${DIRNAME} `${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
diff -urN /usr/ports/math/gretl/distinfo math/gretl/distinfo
--- /usr/ports/math/gretl/distinfo 2008-01-21 17:31:44.000000000 +0900
+++ math/gretl/distinfo 2008-03-01 23:08:38.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (gretl-1.7.1.tar.bz2) = 85e0890eaf912ef105b6c58978eec1c3
-SHA256 (gretl-1.7.1.tar.bz2) = 3a9ac36536941a1ac958a154c27e2b4be825e711e52334bb94f4fa0325ce7fec
-SIZE (gretl-1.7.1.tar.bz2) = 4748191
+MD5 (gretl-1.7.3.tar.bz2) = e77031517c23fcd5f261a2f88c45fae3
+SHA256 (gretl-1.7.3.tar.bz2) = 1dceb787f23098fabf2d00c64e79f22cf7563a94161471a72c1d00ef41d82627
+SIZE (gretl-1.7.3.tar.bz2) = 4808500
diff -urN /usr/ports/math/gretl/files/patch-gui2::Makefile.in math/gretl/files/patch-gui2::Makefile.in
--- /usr/ports/math/gretl/files/patch-gui2::Makefile.in 2006-10-09 09:41:43.000000000 +0900
+++ math/gretl/files/patch-gui2::Makefile.in 2008-03-01 23:08:38.000000000 +0900
@@ -1,6 +1,6 @@
---- gui2/Makefile.in.orig Thu Jul 27 04:51:05 2006
-+++ gui2/Makefile.in Sun Oct 8 02:07:29 2006
-@@ -4,6 +4,7 @@
+--- gui2/Makefile.in.orig 2008-02-07 10:22:01.000000000 +0900
++++ gui2/Makefile.in 2008-02-29 03:05:18.000000000 +0900
+@@ -5,6 +5,7 @@
exec_prefix = @exec_prefix@
bindir = @bindir@
libdir = @libdir@
@@ -8,7 +8,7 @@
CC = @CC@
CFLAGS = @CFLAGS@
MAKE = @MAKE@
-@@ -50,7 +51,7 @@
+@@ -49,7 +50,7 @@
ifeq ($(have_gtksourceview),yes)
langbase := $(shell pkg-config --variable=prefix gtksourceview-1.0)
@@ -17,7 +17,7 @@
query_install_lang = install-lang
endif
-@@ -59,7 +60,7 @@
+@@ -58,7 +59,7 @@
GTKSOURCEVIEW_CFLAGS = -I$(topsrc)/gui2
GTKSOURCEVIEW_LIBS = -L./gtksourceview -lgtksourceview-lite
MY_SOURCEVIEW_LIB = gtksourceview/libgtksourceview-lite.a
@@ -26,7 +26,7 @@
query_install_lang = install-lang
endif
endif
-@@ -69,14 +70,14 @@
+@@ -68,14 +69,14 @@
../lib/libgretl-1.0.la
GUI_CFLAGS = $(GNOME_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(GTK_EXTRA_CFLAGS)
query_install_gnome = install-gnome
@@ -43,7 +43,7 @@
NLSDEF = -DLOCALEDIR=\"$(localedir)\"
endif
-@@ -88,7 +89,7 @@
+@@ -87,7 +88,7 @@
# Directories
bindir = $(prefix)/bin
@@ -52,7 +52,7 @@
tooldir = $(topsrc)/tools
libsrc = $(topsrc)/lib/src
clisrc = $(topsrc)/cli
-@@ -97,7 +98,7 @@
+@@ -96,7 +97,7 @@
#### End of system configuration section. ####
SHELL = /bin/sh
@@ -61,22 +61,23 @@
PROG = gretl_x11
vpath %.c $(topsrc)/gui2
-@@ -156,23 +157,23 @@
+@@ -155,13 +156,13 @@
$(CC) $(CFLAGS) -MM $< > .deps/$*.d
- $(PROG): .deps $(OBJS) $(HACK_OBJ) $(GTKEXTRA_LITE) $(MY_SOURCEVIEW_LIB)
+ $(PROG): .deps $(OBJS) $(HACK_OBJ) $(GTKEXTRA_LITE) $(MY_SOURCEVIEW_LIB)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
$(HACK_OBJ): $(HACK_SRC) $(HACK_HDR)
$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
- mklang: mklang.c
- $(CC) -c -I.. -I$(libsrc) $(XML_CFLAGS) $<
-- $(LIBTOOL) --mode=link $(CC) -o $@ mklang.o ../lib/libgretl-1.0.la $(XML_LIBS)
-+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ mklang.o ../lib/libgretl-1.0.la $(XML_LIBS)
+ mklang: mklang.o
+- $(LIBTOOL) --mode=link $(CC) -o $@ $< ../lib/libgretl-1.0.la $(XML_LIBS)
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $< ../lib/libgretl-1.0.la $(XML_LIBS)
- gretl.lang: mklang
+ mklang.o: mklang.c $(topsrc)/lib/src/options.c $(topsrc)/lib/src/genlex.c
+ $(CC) -c -I.. -I$(libsrc) $(XML_CFLAGS) $<
+@@ -170,10 +171,10 @@
./mklang > $@
$(GTKEXTRA_LITE):
@@ -89,7 +90,7 @@
.deps:
mkdir $@
-@@ -187,7 +188,7 @@
+@@ -188,7 +189,7 @@
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
install-data: installdirs
diff -urN /usr/ports/math/gretl/files/patch-gui2::omf-install::Makefile.in math/gretl/files/patch-gui2::omf-install::Makefile.in
--- /usr/ports/math/gretl/files/patch-gui2::omf-install::Makefile.in 2007-10-25 13:49:22.000000000 +0900
+++ math/gretl/files/patch-gui2::omf-install::Makefile.in 1970-01-01 09:00:00.000000000 +0900
@@ -1,29 +0,0 @@
---- gui2/omf-install/Makefile.in.orig Wed Apr 9 01:11:18 2003
-+++ gui2/omf-install/Makefile.in Mon Apr 14 17:37:41 2003
-@@ -1,13 +1,14 @@
--topsrc = $top_srcdir@
-+topsrc = @top_srcdir@
- tooldir = $(topsrc)/tools
-
- INSTALL = @INSTALL@
--gnome_prefix = @gnome_prefix@
-+INSTALL_DATA = @INSTALL_DATA@
-+datadir = @datadir@
-
- VPATH = $(topsrc)/gui2/omf-install
-
--docdir = $(gnome_prefix)/share/gnome/help/gretl/C
--omfdir = $(gnome_prefix)/share/omf/gretl
-+docdir = $(gnome_prefix)/share/gnome/help/gretl/C
-+omfdir = $(datadir)/omf/gretl
-
- gretl-C.omf: gretl-C.omf.in
- scrollkeeper-preinstall $(docdir)/`awk 'BEGIN {RS = ">" } \
-@@ -16,5 +17,5 @@
-
- install: gretl-C.omf
- $(tooldir)/mkinstalldirs $(omfdir)
-- $(INSTALL) -m 644 $< $(omfdir)
-- scrollkeeper-update -p $(gnome_prefix)/var/scrollkeeper
-+ $(INSTALL_DATA) $< $(omfdir)
-+ scrollkeeper-update -p /var/db/scrollkeeper
diff -urN /usr/ports/math/gretl/files/patch-lib__src__gretl_matrix.c math/gretl/files/patch-lib__src__gretl_matrix.c
--- /usr/ports/math/gretl/files/patch-lib__src__gretl_matrix.c 2007-04-18 04:21:31.000000000 +0900
+++ math/gretl/files/patch-lib__src__gretl_matrix.c 1970-01-01 09:00:00.000000000 +0900
@@ -1,17 +0,0 @@
---- lib/src/gretl_matrix.c.orig Wed Mar 14 09:25:57 2007
-+++ lib/src/gretl_matrix.c Sat Apr 14 03:50:51 2007
-@@ -432,12 +432,13 @@
- {
- int reverse = (start > end);
- int i, k, n = 1 + (reverse ? (start-end) : (end-start));
-+ gretl_matrix *v;
-
- if (n == 0) {
- return NULL;
- }
-
-- gretl_matrix *v = gretl_vector_alloc(n);
-+ v = gretl_vector_alloc(n);
-
- if (v == NULL) {
- return v;
diff -urN /usr/ports/math/gretl/files/patch-plugin__oprobit.c math/gretl/files/patch-plugin__oprobit.c
--- /usr/ports/math/gretl/files/patch-plugin__oprobit.c 2007-04-18 04:21:31.000000000 +0900
+++ math/gretl/files/patch-plugin__oprobit.c 1970-01-01 09:00:00.000000000 +0900
@@ -1,19 +0,0 @@
---- plugin/oprobit.c.orig Fri Feb 16 06:47:19 2007
-+++ plugin/oprobit.c Sat Apr 14 03:58:23 2007
-@@ -665,6 +665,7 @@
- gretl_matrix *V = NULL;
- double *theta = NULL;
- int err;
-+ op_container *OC;
-
- /* BFGS apparatus */
- int maxit = 1000;
-@@ -679,7 +680,7 @@
- opt &= ~OPT_R;
- }
-
-- op_container *OC = op_container_new(ci, Z, pmod, opt);
-+ OC = op_container_new(ci, Z, pmod, opt);
- if (OC == NULL) {
- return E_ALLOC;
- }
diff -urN /usr/ports/math/gretl/files/patch-share::Makefile.in math/gretl/files/patch-share::Makefile.in
--- /usr/ports/math/gretl/files/patch-share::Makefile.in 2007-04-18 04:21:31.000000000 +0900
+++ math/gretl/files/patch-share::Makefile.in 2008-03-01 23:08:38.000000000 +0900
@@ -1,5 +1,5 @@
---- share/Makefile.in.orig Fri Mar 9 11:04:53 2007
-+++ share/Makefile.in Sat Apr 14 02:54:05 2007
+--- share/Makefile.in.orig 2008-02-26 11:46:06.000000000 +0900
++++ share/Makefile.in 2008-02-29 03:15:31.000000000 +0900
@@ -2,15 +2,16 @@
datarootdir = @datarootdir@
@@ -19,7 +19,7 @@
EN_GUI_HLP = $(sharesrc)/gretlgui.hlp
EN_CMD_HLP = $(sharesrc)/gretlcmd.hlp
-@@ -45,14 +46,14 @@
+@@ -55,14 +56,14 @@
all: $(query_make_help)
help:
@@ -36,7 +36,7 @@
install-strip: install
-@@ -78,12 +79,12 @@
+@@ -88,12 +89,12 @@
$(INSTALL_DATA) $(sharesrc)/functions/gretlfunc.dtd $(gretldir)/functions
install_man: gretl.1
@@ -45,15 +45,15 @@
+ $(tooldir)/mkinstalldirs $(prefix)/man/man1
+ $(INSTALL_DATA) $(topsrc)/gretl.1 $(prefix)/man/man1
- install_help: $(AUTO_HELPFILES)
+ install_help: $(query_make_help)
$(tooldir)/mkinstalldirs $(gretldir)
- $(tooldir)/mkinstalldirs $(gretldir)/doc
+# $(tooldir)/mkinstalldirs $(gretldir)/doc
$(tooldir)/mkinstalldirs $(gretldir)/helpfigs
$(INSTALL_DATA) $(EN_GUI_HLP) $(gretldir)/gretlgui.hlp
$(INSTALL_DATA) $(EN_CMD_HLP) $(gretldir)/gretlcmd.hlp
-@@ -96,8 +97,8 @@
- $(INSTALL_DATA) $(IT_CLI_HLP) $(gretldir)/gretlcli.hlp.it
+@@ -110,8 +111,8 @@
+ $(INSTALL_DATA) $(IT_GUI_GENHLP) $(gretldir)/genrgui.hlp.it
for f in $(sharesrc)/texfigs/*.png ; do \
$(INSTALL_DATA) $$f $(gretldir)/helpfigs ; done
- for f in $(pdfdir)/gretl-ref.pdf $(pdfdir)/gretl-guide.pdf ; do \
diff -urN /usr/ports/math/gretl/pkg-plist math/gretl/pkg-plist
--- /usr/ports/math/gretl/pkg-plist 2008-01-21 17:31:45.000000000 +0900
+++ math/gretl/pkg-plist 2008-03-01 23:08:38.000000000 +0900
@@ -52,6 +52,7 @@
include/gretl/plotspec.h
include/gretl/plugins.h
include/gretl/printout.h
+include/gretl/printscan.h
include/gretl/pvalues.h
include/gretl/qr_estimate.h
include/gretl/random.h
@@ -283,6 +284,7 @@
%%DATADIR%%/data/misc/australia.gdt
%%DATADIR%%/data/misc/b-g.gdt
%%DATADIR%%/data/misc/bjg.gdt
+%%DATADIR%%/data/misc/broiler.gdt
%%DATADIR%%/data/misc/denmark.gdt
%%DATADIR%%/data/misc/descriptions
%%DATADIR%%/data/misc/djclose.gdt
@@ -325,8 +327,10 @@
%%DATADIR%%/fonts/Vera.ttf
%%DATADIR%%/fonts/luxisr.ttf
%%DATADIR%%/functions/gretlfunc.dtd
-%%NOGNOME:%%%%DATADIR%%/gtksourceview/gnuplot.lang
-%%NOGNOME:%%%%DATADIR%%/gtksourceview/gretl.lang
+%%DATADIR%%/genrcli.hlp
+%%DATADIR%%/genrcli.hlp.it
+%%DATADIR%%/genrgui.hlp
+%%DATADIR%%/genrgui.hlp.it
%%DATADIR%%/gretl-logo.xpm
%%DATADIR%%/gretl.stamp
%%DATADIR%%/gretlcli.hlp
@@ -338,6 +342,8 @@
%%DATADIR%%/gretlgui.hlp
%%DATADIR%%/gretlgui.hlp.es
%%DATADIR%%/gretlgui.hlp.it
+%%NOGNOME:%%%%DATADIR%%/gtksourceview/gnuplot.lang
+%%NOGNOME:%%%%DATADIR%%/gtksourceview/gretl.lang
%%DATADIR%%/helpfigs/adf1.png
%%DATADIR%%/helpfigs/aic.png
%%DATADIR%%/helpfigs/arlags.png
@@ -485,12 +491,6 @@
%%DATADIR%%/scripts/wg_ps_descriptions
%%GNOME:%%share/gtksourceview-1.0/language-specs/gnuplot.lang
%%GNOME:%%share/gtksourceview-1.0/language-specs/gretl.lang
-%%GNOME:%%share/mime-info/gretl.keys
-%%GNOME:%%share/mime-info/gretl.mime
-%%GNOME:%%share/pixmaps/gnome-application-x-gretldata.png
-%%GNOME:%%share/pixmaps/gnome-application-x-gretlsession.png
-%%GNOME:%%share/pixmaps/gretl-logo.xpm
-%%GNOME:%%share/pixmaps/gretl.xpm
share/locale/de/LC_MESSAGES/gretl.mo
share/locale/es/LC_MESSAGES/gretl.mo
share/locale/eu/LC_MESSAGES/gretl.mo
@@ -502,6 +502,12 @@
share/locale/pt_BR/LC_MESSAGES/gretl.mo
share/locale/rw/LC_MESSAGES/gretl.mo
share/locale/tr/LC_MESSAGES/gretl.mo
+%%GNOME:%%share/mime-info/gretl.keys
+%%GNOME:%%share/mime-info/gretl.mime
+%%GNOME:%%share/pixmaps/gnome-application-x-gretldata.png
+%%GNOME:%%share/pixmaps/gnome-application-x-gretlsession.png
+%%GNOME:%%share/pixmaps/gretl-logo.xpm
+%%GNOME:%%share/pixmaps/gretl.xpm
@dirrm %%DATADIR%%/scripts/misc
@dirrm %%DATADIR%%/scripts
@dirrm %%DATADIR%%/helpfigs
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080312030020.70523614.tkato432>