Attachment #71533 for bug #104175

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




#

PORTNAME=	gretl
PORTVERSION=	1.6.0
PORTREVISION=	1
CATEGORIES=	misc
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

USE_GETTEXT=	yes
USE_GMAKE=	yes
USE_LDCONFIG=	yes
USE_AUTOTOOLS=	libtool:15
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DGNUPLOT_PNG" \
		LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS=	--enable-static --enable-shared --with-gmake

USE_GNOME+=	gnomeprefix gtksourceview libgnomeui
GCONF_SCHEMAS=	gretl.schemas
DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
PLIST_SUB+=	GNOMEUI=""
.else
CONFIGURE_ARGS+=	--without-gnome --without-gtksourceview
PLIST_SUB+=	GNOMEUI="@comment "
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)misc/gretl/distinfo (-3 / +3 lines)
1	MD5 (gretl-1.5.1.tar.bz2) = 20be30f96c7738fef368ddf5ff888f83	1	MD5 (gretl-1.6.0.tar.bz2) = bf043ac5403403479eebe68fc2e7db5a
2	SHA256 (gretl-1.5.1.tar.bz2) = b46b6edf6759ceef5b12429e2f2138a2a6844984d91b91e957ec424d0d7f61be	2	SHA256 (gretl-1.6.0.tar.bz2) = 3a1207ff82e57d1db863a0a73e36758c5606fec23e07bc2e0a39a08043fe5216
3	SIZE (gretl-1.5.1.tar.bz2) = 4470429	3	SIZE (gretl-1.6.0.tar.bz2) = 3609530

Lines 1-5 Link Here

(-)misc/gretl/files/patch-cli::Makefile.in (-5 / +8 lines)
1	--- cli/Makefile.in.orig Fri Sep 10 22:16:11 2004	1	--- cli/Makefile.in.orig Sat Sep 11 01:19:35 2004
2	+++ cli/Makefile.in Sun Jan 15 14:18:39 2006	2	+++ cli/Makefile.in Sun Oct 8 02:07:02 2006
3	@@ -9,12 +9,16 @@	3	@@ -9,12 +9,16 @@
4	exec_prefix = @exec_prefix@	4	exec_prefix = @exec_prefix@
5	bindir = @bindir@	5	bindir = @bindir@
Lines 18-24 Link Here
18	ifeq ($(CC),)	18	ifeq ($(CC),)
19	CC = gcc	19	CC = gcc
20	endif	20	endif
21	@@ -40,7 +44,7 @@	21	@@ -40,17 +44,17 @@
22		22
23	DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H	23	DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
24		24
Lines 26-33 Link Here
26	+override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(READLINE_CFLAGS) $(DEFS) $(CPPFLAGS)	26	+override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(READLINE_CFLAGS) $(DEFS) $(CPPFLAGS)
27		27
28	CLI = gretlcli	28	CLI = gretlcli
29	LIBTOOL = ../libtool	29	-LIBTOOL = ../libtool
30	@@ -50,7 +54,7 @@	30	+LIBTOOL = @LIBTOOL@
		31
		32	%.o: %.c
		33	$(CC) -c $(CFLAGS) $<
31	$(CC) $(CFLAGS) -MM $< > .deps/$*.d	34	$(CC) $(CFLAGS) -MM $< > .deps/$*.d
32		35
33	$(CLI): .deps $(OBJS)	36	$(CLI): .deps $(OBJS)




--- 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 @@
 exec_prefix = @exec_prefix@
 bindir = @bindir@

 CC = @CC@
 CFLAGS = @CFLAGS@
 MAKE = @MAKE@
@@ -50,7 +51,7 @@
 
 ifeq ($(have_gtksourceview),yes)
   langbase := $(shell pkg-config --variable=prefix gtksourceview-1.0)

   query_install_lang = install-lang
 endif
 
@@ -59,7 +60,7 @@
     GTKSOURCEVIEW_CFLAGS = -I$(topsrc)/gui2
     GTKSOURCEVIEW_LIBS = -L./gtksourceview -lgtksourceview-lite
     MY_SOURCEVIEW_LIB = gtksourceview/libgtksourceview-lite.a

     query_install_lang = install-lang
   endif
 endif
@@ -69,14 +70,14 @@
 	../lib/libgretl-1.0.la
   GUI_CFLAGS = $(GNOME_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(GTK_EXTRA_CFLAGS)
   query_install_gnome = install-gnome

   NLSDEF = -DLOCALEDIR=\"$(localedir)\"
 endif
 
@@ -88,7 +89,7 @@
 
 # Directories
 bindir	= $(prefix)/bin

 tooldir = $(topsrc)/tools
 libsrc = $(topsrc)/lib/src
 clisrc = $(topsrc)/cli
@@ -97,7 +98,7 @@
 #### End of system configuration section. ####
 
 SHELL = /bin/sh
-LIBTOOL = ../libtool
+LIBTOOL = @LIBTOOL@
 PROG  = gretl_x11
 
 vpath %.c $(topsrc)/gui2
@@ -156,23 +157,23 @@
 	$(CC) $(CFLAGS) -MM $< > .deps/$*.d 
 
 $(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)
 
 gretl.lang: mklang
 	./mklang > $@

 
 .deps:
 	mkdir $@
@@ -187,7 +188,7 @@
 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
 
 install-data: installdirs

Lines 1-5 Link Here

(-)misc/gretl/files/patch-lib::Makefile.in (-5 / +9 lines)
1	--- lib/Makefile.in.orig Thu Dec 8 00:25:48 2005	1	--- lib/Makefile.in.orig Tue May 23 18:27:51 2006
2	+++ lib/Makefile.in Sun Jan 15 14:54:18 2006	2	+++ lib/Makefile.in Sun Oct 8 02:07:54 2006
3	@@ -22,6 +22,11 @@	3	@@ -22,6 +22,11 @@
4		4
5	have_gtk = @have_gtk@	5	have_gtk = @have_gtk@
Lines 32-39 Link Here
32		32
33	#### End of system configuration section. ####	33	#### End of system configuration section. ####
34		34
35	@@ -186,7 +191,7 @@	35	@@ -187,10 +192,10 @@
36	LIBTOOL = ../libtool	36	LOBJS = $(SRCS:.c=.lo)
		37	AUX_LOBJ = $(CEPHES_SRC:.c=.lo) $(MINPACK_SRC:.c=.lo)
		38
		39	-LIBTOOL = ../libtool
		40	+LIBTOOL = @LIBTOOL@
37		41
38	override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(XML_CFLAGS) $(GLIB_CFLAGS) \	42	override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(XML_CFLAGS) $(GLIB_CFLAGS) \
39	- $(GMP_CFLAGS) -DHAVE_CONFIG_H	43	- $(GMP_CFLAGS) -DHAVE_CONFIG_H
Lines 41-47 Link Here
41		45
42	COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)	46	COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)
43		47
44	@@ -195,7 +200,7 @@	48	@@ -199,7 +204,7 @@
45	$(CC) $(CFLAGS) -MM -MT $.lo $< > .deps/$.d	49	$(CC) $(CFLAGS) -MM -MT $.lo $< > .deps/$.d
46		50
47	$(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)	51	$(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)




--- lib/src/printout.c.orig	Fri Sep  8 02:15:00 2006
+++ lib/src/printout.c	Sun Oct  8 01:52:29 2006
@@ -400,11 +400,11 @@
 void print_xtab (const Xtab *tab, gretlopt opt, PRN *prn)
 {
     int i, j, r, c;
-    r = tab->rows;
-    c = tab->cols;
     double x, y;
     int n5 = 0;
     double pearson = 0.0;
+    r = tab->rows;
+    c = tab->cols;
 
     pputc(prn, '\n');
     pprintf(prn, _("Cross-tabulation of %s (rows) against %s (columns)"),




--- plugin/Makefile.in.orig	Tue Sep 12 22:53:16 2006
+++ plugin/Makefile.in	Sun Oct  8 02:08:19 2006
@@ -8,6 +8,10 @@
 INSTALL = @INSTALL@
 LN = @LN_S@

 build_gui = @build_gui@
 have_gtk = @have_gtk@
 have_gmp = @have_gmp@
@@ -45,7 +49,7 @@
 
 override CFLAGS += -I.. -I$(topsrc)/gui2 -DHAVE_CONFIG_H
 
-LIBTOOL = ../libtool
+LIBTOOL = @LIBTOOL@
 COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
 LINK = $(LIBTOOL) --mode=link $(CC) -module -avoid-version -rpath $(plugindir)
 
@@ -163,7 +167,7 @@
 URCDATA = $(topsrc)/plugin/data/urcdata.gz
 
 override CFLAGS += $(GRETLINC) $(GTK_CFLAGS) $(GMP_CFLAGS) $(MPFR_CFLAGS) \
-	$(XML_CFLAGS) $(GRETL_LIBOLE2_CFLAGS) $(ZIP_CFLAGS) $(AUDIO_CFLAGS) -I. $(GMPDEF)
+	$(XML_CFLAGS) $(GRETL_LIBOLE2_CFLAGS) $(ZIP_CFLAGS) $(AUDIO_CFLAGS) -I. $(GMPDEF) $(CPPFLAGS)
 
 %.lo: %.c
 	$(COMPILE) $< 
@@ -266,12 +270,12 @@
 .PHONY: 
 
 install: $(GRETLLIB) $(PLUGINS) $(URCDATA) installdirs 




--- share/Makefile.in.orig	Wed Aug 30 10:23:29 2006
+++ share/Makefile.in	Sun Oct  8 02:56:33 2006
@@ -1,15 +1,16 @@
 topsrc = @top_srcdir@
 

+gretldir = $(datadir)/gretl
 tooldir = $(topsrc)/tools
 sharesrc = $(topsrc)/share
 pdfdir = ../doc/tex
 
-INSTALL_DATA = cp -fp
+INSTALL_DATA = @INSTALL_DATA@
 
 EN_GUI_HLP = $(sharesrc)/gretlgui.hlp
 EN_CMD_HLP = $(sharesrc)/gretlcmd.hlp
@@ -41,17 +42,17 @@
 all: $(AUTO_HELPFILES)
 
 $(AUTO_HELPFILES): 

-	make -C ../doc/commands help-all
+	$(MAKE) -C ../doc/commands help-all
 
 install: installdirs install_datafiles install_scripts install_functions \
 	install_help install_fonts
 	$(INSTALL_DATA) $(sharesrc)/gretl.stamp $(gretldir)/gretl.stamp
-	make -C bcih install
+	$(MAKE) -C bcih install
 
 install-strip: install
 
@@ -77,12 +78,12 @@
 	$(INSTALL_DATA) $(sharesrc)/functions/gretlfunc.dtd $(gretldir)/functions 
 
 install_man: gretl.1
-	$(tooldir)/mkinstalldirs $(prefix)/share/man/man1

+	$(tooldir)/mkinstalldirs $(prefix)/man/man1
+	$(INSTALL_DATA) $(topsrc)/gretl.1 $(prefix)/man/man1
 
 install_help: $(AUTO_HELPFILES)
 	$(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
@@ -95,8 +96,8 @@
 	$(INSTALL_DATA) $(IT_CLI_HLP) $(gretldir)/gretlcli.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 \
-	if test -f $$f ; then $(INSTALL_DATA) $$f $(gretldir)/doc ; fi ; done
+#	for f in $(pdfdir)/gretl-ref.pdf $(pdfdir)/gretl-guide.pdf ; do \
+#	if test -f $$f ; then $(INSTALL_DATA) $$f $(gretldir)/doc ; fi ; done
 
 install_fonts:
 	for f in $(sharesrc)/fonts/*.ttf ; do \




--- tools/ltmain.sh.orig	Mon Feb 10 02:23:55 2003
+++ tools/ltmain.sh	Mon Apr 14 12:23:06 2003
@@ -967,6 +967,7 @@
 	;;
 
       -avoid-version)
+	build_old_libs=no
 	avoid_version=yes
 	continue
 	;;
@@ -4280,10 +4281,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"

Lines 22-27 Link Here

(-)misc/gretl/pkg-plist (-5 / +73 lines)
22	include/gretl/gretl_list.h	22	include/gretl/gretl_list.h
23	include/gretl/gretl_matrix.h	23	include/gretl/gretl_matrix.h
24	include/gretl/gretl_model.h	24	include/gretl/gretl_model.h
		25	include/gretl/gretl_panel.h
25	include/gretl/gretl_paths.h	26	include/gretl/gretl_paths.h
26	include/gretl/gretl_prn.h	27	include/gretl/gretl_prn.h
27	include/gretl/gretl_restrict.h	28	include/gretl/gretl_restrict.h
Lines 55-88 Link Here
55	include/gretl/usermat.h	56	include/gretl/usermat.h
56	include/gretl/var.h	57	include/gretl/var.h
57	include/gretl/varprint.h	58	include/gretl/varprint.h
		59	lib/gretl-gtk2/arma.a
		60	lib/gretl-gtk2/arma.la
58	lib/gretl-gtk2/arma.so	61	lib/gretl-gtk2/arma.so
		62	lib/gretl-gtk2/arma_x12.a
		63	lib/gretl-gtk2/arma_x12.la
59	lib/gretl-gtk2/arma_x12.so	64	lib/gretl-gtk2/arma_x12.so
60	lib/gretl-gtk2/data/urcdata.gz	65	lib/gretl-gtk2/data/urcdata.gz
		66	lib/gretl-gtk2/eviews_import.a
		67	lib/gretl-gtk2/eviews_import.la
61	lib/gretl-gtk2/eviews_import.so	68	lib/gretl-gtk2/eviews_import.so
		69	lib/gretl-gtk2/excel_import.a
		70	lib/gretl-gtk2/excel_import.la
62	lib/gretl-gtk2/excel_import.so	71	lib/gretl-gtk2/excel_import.so
		72	lib/gretl-gtk2/fractals.a
		73	lib/gretl-gtk2/fractals.la
63	lib/gretl-gtk2/fractals.so	74	lib/gretl-gtk2/fractals.so
		75	lib/gretl-gtk2/garch.a
		76	lib/gretl-gtk2/garch.la
64	lib/gretl-gtk2/garch.so	77	lib/gretl-gtk2/garch.so
		78	lib/gretl-gtk2/gnumeric_import.a
		79	lib/gretl-gtk2/gnumeric_import.la
65	lib/gretl-gtk2/gnumeric_import.so	80	lib/gretl-gtk2/gnumeric_import.so
		81	lib/gretl-gtk2/gretlzip.a
		82	lib/gretl-gtk2/gretlzip.la
		83	lib/gretl-gtk2/gretlzip.so
		84	lib/gretl-gtk2/jmulti_import.a
		85	lib/gretl-gtk2/jmulti_import.la
		86	lib/gretl-gtk2/jmulti_import.so
		87	lib/gretl-gtk2/johansen.a
		88	lib/gretl-gtk2/johansen.la
66	lib/gretl-gtk2/johansen.so	89	lib/gretl-gtk2/johansen.so
		90	lib/gretl-gtk2/kernel.a
		91	lib/gretl-gtk2/kernel.la
67	lib/gretl-gtk2/kernel.so	92	lib/gretl-gtk2/kernel.so
		93	lib/gretl-gtk2/lad.a
		94	lib/gretl-gtk2/lad.la
68	lib/gretl-gtk2/lad.so	95	lib/gretl-gtk2/lad.so
		96	lib/gretl-gtk2/leverage.a
		97	lib/gretl-gtk2/leverage.la
69	lib/gretl-gtk2/leverage.so	98	lib/gretl-gtk2/leverage.so
		99	lib/gretl-gtk2/mailer.a
		100	lib/gretl-gtk2/mailer.la
70	lib/gretl-gtk2/mailer.so	101	lib/gretl-gtk2/mailer.so
		102	lib/gretl-gtk2/mp_ols.a
		103	lib/gretl-gtk2/mp_ols.la
71	lib/gretl-gtk2/mp_ols.so	104	lib/gretl-gtk2/mp_ols.so
		105	lib/gretl-gtk2/nistcheck.a
		106	lib/gretl-gtk2/nistcheck.la
72	lib/gretl-gtk2/nistcheck.so	107	lib/gretl-gtk2/nistcheck.so
73	lib/gretl-gtk2/panel_data.so	108	lib/gretl-gtk2/pca.a
		109	lib/gretl-gtk2/pca.la
74	lib/gretl-gtk2/pca.so	110	lib/gretl-gtk2/pca.so
		111	lib/gretl-gtk2/poisson.a
		112	lib/gretl-gtk2/poisson.la
75	lib/gretl-gtk2/poisson.so	113	lib/gretl-gtk2/poisson.so
		114	lib/gretl-gtk2/progress_bar.a
		115	lib/gretl-gtk2/progress_bar.la
76	lib/gretl-gtk2/progress_bar.so	116	lib/gretl-gtk2/progress_bar.so
		117	lib/gretl-gtk2/range-mean.a
		118	lib/gretl-gtk2/range-mean.la
77	lib/gretl-gtk2/range-mean.so	119	lib/gretl-gtk2/range-mean.so
		120	lib/gretl-gtk2/stata_import.a
		121	lib/gretl-gtk2/stata_import.la
78	lib/gretl-gtk2/stata_import.so	122	lib/gretl-gtk2/stata_import.so
		123	lib/gretl-gtk2/stats_tables.a
		124	lib/gretl-gtk2/stats_tables.la
79	lib/gretl-gtk2/stats_tables.so	125	lib/gretl-gtk2/stats_tables.so
		126	lib/gretl-gtk2/sysest.a
		127	lib/gretl-gtk2/sysest.la
80	lib/gretl-gtk2/sysest.so	128	lib/gretl-gtk2/sysest.so
		129	lib/gretl-gtk2/tobit.a
		130	lib/gretl-gtk2/tobit.la
81	lib/gretl-gtk2/tobit.so	131	lib/gretl-gtk2/tobit.so
		132	lib/gretl-gtk2/tramo-x12a.a
		133	lib/gretl-gtk2/tramo-x12a.la
82	lib/gretl-gtk2/tramo-x12a.so	134	lib/gretl-gtk2/tramo-x12a.so
		135	lib/gretl-gtk2/urcdist.a
		136	lib/gretl-gtk2/urcdist.la
83	lib/gretl-gtk2/urcdist.so	137	lib/gretl-gtk2/urcdist.so
		138	lib/gretl-gtk2/vif.a
		139	lib/gretl-gtk2/vif.la
84	lib/gretl-gtk2/vif.so	140	lib/gretl-gtk2/vif.so
85	lib/libgretl-1.0.a	141	lib/libgretl-1.0.a
		142	lib/libgretl-1.0.la
86	lib/libgretl-1.0.so	143	lib/libgretl-1.0.so
87	lib/libgretl-1.0.so.0	144	lib/libgretl-1.0.so.0
88	libdata/pkgconfig/gretl.pc	145	libdata/pkgconfig/gretl.pc
Lines 208-213 Link Here
208	%%DATADIR%%/data/misc/djclose.gdt	265	%%DATADIR%%/data/misc/djclose.gdt
209	%%DATADIR%%/data/misc/ects_nls.gdt	266	%%DATADIR%%/data/misc/ects_nls.gdt
210	%%DATADIR%%/data/misc/hamilton.gdt	267	%%DATADIR%%/data/misc/hamilton.gdt
		268	%%DATADIR%%/data/misc/hendry_jae.gdt
211	%%DATADIR%%/data/misc/jgm-data.gdt	269	%%DATADIR%%/data/misc/jgm-data.gdt
212	%%DATADIR%%/data/misc/klein.gdt	270	%%DATADIR%%/data/misc/klein.gdt
213	%%DATADIR%%/data/misc/kmenta.gdt	271	%%DATADIR%%/data/misc/kmenta.gdt
Lines 216-221 Link Here
216	%%DATADIR%%/data/misc/mccullagh.gdt	274	%%DATADIR%%/data/misc/mccullagh.gdt
217	%%DATADIR%%/data/misc/mrw.gdt	275	%%DATADIR%%/data/misc/mrw.gdt
218	%%DATADIR%%/data/misc/np.gdt	276	%%DATADIR%%/data/misc/np.gdt
		277	%%DATADIR%%/data/misc/nysewk.gdt
		278	%%DATADIR%%/data/misc/penngrow.gdt
219	%%DATADIR%%/data/misc/poisson.gdt	279	%%DATADIR%%/data/misc/poisson.gdt
220	%%DATADIR%%/data/misc/sw_ch12.gdt	280	%%DATADIR%%/data/misc/sw_ch12.gdt
221	%%DATADIR%%/data/misc/sw_ch14.gdt	281	%%DATADIR%%/data/misc/sw_ch14.gdt
Lines 232-239 Link Here
232	%%DATADIR%%/data/nist/Wampler5.dat	292	%%DATADIR%%/data/nist/Wampler5.dat
233	%%DATADIR%%/db/fedstl.bin	293	%%DATADIR%%/db/fedstl.bin
234	%%DATADIR%%/db/fedstl.idx	294	%%DATADIR%%/db/fedstl.idx
235	%%DATADIR%%/doc/gretl-guide.pdf	295	%%DATADIR%%/fonts/luxisr.ttf
236	%%DATADIR%%/doc/gretl-ref.pdf	296	%%DATADIR%%/functions/gretlfunc.dtd
		297	%%NOGNOME:%%%%DATADIR%%/gtksourceview/gnuplot.lang
		298	%%NOGNOME:%%%%DATADIR%%/gtksourceview/gretl.lang
237	%%DATADIR%%/gretl-logo.xpm	299	%%DATADIR%%/gretl-logo.xpm
238	%%DATADIR%%/gretl.stamp	300	%%DATADIR%%/gretl.stamp
239	%%DATADIR%%/gretlcli.hlp	301	%%DATADIR%%/gretlcli.hlp
Lines 273-278 Link Here
273	%%DATADIR%%/helpfigs/syssigma1.png	335	%%DATADIR%%/helpfigs/syssigma1.png
274	%%DATADIR%%/helpfigs/syssigma2.png	336	%%DATADIR%%/helpfigs/syssigma2.png
275	%%DATADIR%%/helpfigs/vif.png	337	%%DATADIR%%/helpfigs/vif.png
		338	%%DATADIR%%/helpfigs/wlsr2.png
276	%%DATADIR%%/scripts/greene11_3.inp	339	%%DATADIR%%/scripts/greene11_3.inp
277	%%DATADIR%%/scripts/greene12_1.inp	340	%%DATADIR%%/scripts/greene12_1.inp
278	%%DATADIR%%/scripts/greene14_1.inp	341	%%DATADIR%%/scripts/greene14_1.inp
Lines 288-301 Link Here
288	%%DATADIR%%/scripts/misc/arma.inp	351	%%DATADIR%%/scripts/misc/arma.inp
289	%%DATADIR%%/scripts/misc/armaloop.inp	352	%%DATADIR%%/scripts/misc/armaloop.inp
290	%%DATADIR%%/scripts/misc/bjg.inp	353	%%DATADIR%%/scripts/misc/bjg.inp
		354	%%DATADIR%%/scripts/misc/denmark.inp
291	%%DATADIR%%/scripts/misc/ects_nls.inp	355	%%DATADIR%%/scripts/misc/ects_nls.inp
292	%%DATADIR%%/scripts/misc/garch.inp	356	%%DATADIR%%/scripts/misc/garch.inp
		357	%%DATADIR%%/scripts/misc/hamilton.inp
293	%%DATADIR%%/scripts/misc/jgm-1996.inp	358	%%DATADIR%%/scripts/misc/jgm-1996.inp
294	%%DATADIR%%/scripts/misc/klein.inp	359	%%DATADIR%%/scripts/misc/klein.inp
295	%%DATADIR%%/scripts/misc/kmenta.inp	360	%%DATADIR%%/scripts/misc/kmenta.inp
296	%%DATADIR%%/scripts/misc/leverage.inp	361	%%DATADIR%%/scripts/misc/leverage.inp
297	%%DATADIR%%/scripts/misc/longley.inp	362	%%DATADIR%%/scripts/misc/longley.inp
298	%%DATADIR%%/scripts/misc/mrw.inp	363	%%DATADIR%%/scripts/misc/mrw.inp
		364	%%DATADIR%%/scripts/misc/penngrow.inp
299	%%DATADIR%%/scripts/misc/perron97.inp	365	%%DATADIR%%/scripts/misc/perron97.inp
300	%%DATADIR%%/scripts/misc/ps_descriptions	366	%%DATADIR%%/scripts/misc/ps_descriptions
301	%%DATADIR%%/scripts/misc/pscoin.inp	367	%%DATADIR%%/scripts/misc/pscoin.inp
Lines 398-411 Link Here
398	@dirrm %%DATADIR%%/scripts/misc	464	@dirrm %%DATADIR%%/scripts/misc
399	@dirrm %%DATADIR%%/scripts	465	@dirrm %%DATADIR%%/scripts
400	@dirrm %%DATADIR%%/helpfigs	466	@dirrm %%DATADIR%%/helpfigs
401	@dirrm %%DATADIR%%/doc	467	%%NOGNOME:%%@dirrm %%DATADIR%%/gtksourceview
		468	@dirrm %%DATADIR%%/functions
		469	@dirrm %%DATADIR%%/fonts
402	@dirrm %%DATADIR%%/db	470	@dirrm %%DATADIR%%/db
403	@dirrm %%DATADIR%%/data/nist	471	@dirrm %%DATADIR%%/data/nist
404	@dirrm %%DATADIR%%/data/misc	472	@dirrm %%DATADIR%%/data/misc
405	@dirrm %%DATADIR%%/data/greene	473	@dirrm %%DATADIR%%/data/greene
406	@dirrm %%DATADIR%%/data	474	@dirrm %%DATADIR%%/data
407	@dirrm %%DATADIR%%	475	@dirrm %%DATADIR%%
408	%%GNOMEUI%%@dirrmtry share/gnome	476	%%GNOME:%%@dirrmtry share/gnome
409	@dirrm lib/gretl-gtk2/data	477	@dirrm lib/gretl-gtk2/data
410	@dirrm lib/gretl-gtk2	478	@dirrm lib/gretl-gtk2
411	@dirrm include/gretl	479	@dirrm include/gretl

Return to bug 104175

Lines 7-14 Link Here

(-)misc/gretl/Makefile (-5 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= gretl	9	PORTNAME= gretl
10	PORTVERSION= 1.5.1	10	PORTVERSION= 1.6.0
11	PORTREVISION= 1
12	CATEGORIES= misc	11	CATEGORIES= misc
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
14	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 28-34 Link Here
28	USE_GETTEXT= yes	27	USE_GETTEXT= yes
29	USE_GMAKE= yes	28	USE_GMAKE= yes
30	USE_LDCONFIG= yes	29	USE_LDCONFIG= yes
31	GNU_CONFIGURE= yes	30	USE_AUTOTOOLS= libtool:15
32	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DGNUPLOT_PNG" \	31	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DGNUPLOT_PNG" \
33	LDFLAGS="-L${LOCALBASE}/lib"	32	LDFLAGS="-L${LOCALBASE}/lib"
34	CONFIGURE_ARGS= --enable-static --enable-shared --with-gmake	33	CONFIGURE_ARGS= --enable-static --enable-shared --with-gmake
Lines 51-60 Link Here
51	USE_GNOME+= gnomeprefix gtksourceview libgnomeui	50	USE_GNOME+= gnomeprefix gtksourceview libgnomeui
52	GCONF_SCHEMAS= gretl.schemas	51	GCONF_SCHEMAS= gretl.schemas
53	DATADIR= ${PREFIX}/share/gnome/${PORTNAME}	52	DATADIR= ${PREFIX}/share/gnome/${PORTNAME}
54	PLIST_SUB+= GNOMEUI=""
55	.else	53	.else
56	CONFIGURE_ARGS+= --without-gnome --without-gtksourceview	54	CONFIGURE_ARGS+= --without-gnome --without-gtksourceview
57	PLIST_SUB+= GNOMEUI="@comment "
58	.endif	55	.endif
59		56
60	.include <bsd.port.post.mk>	57	.include <bsd.port.post.mk>

Lines 1-5 Link Here

(-)misc/gretl/files/patch-gui2::Makefile.in (-13 / +22 lines)
1	--- gui2/Makefile.in.orig Mon Nov 21 23:02:28 2005	1	--- gui2/Makefile.in.orig Thu Jul 27 04:51:05 2006
2	+++ gui2/Makefile.in Sun Jan 15 14:51:18 2006	2	+++ gui2/Makefile.in Sun Oct 8 02:07:29 2006
3	@@ -4,6 +4,7 @@	3	@@ -4,6 +4,7 @@
4	exec_prefix = @exec_prefix@	4	exec_prefix = @exec_prefix@
5	bindir = @bindir@	5	bindir = @bindir@
Lines 8-14 Link Here
8	CC = @CC@	8	CC = @CC@
9	CFLAGS = @CFLAGS@	9	CFLAGS = @CFLAGS@
10	MAKE = @MAKE@	10	MAKE = @MAKE@
11	@@ -47,7 +48,7 @@	11	@@ -50,7 +51,7 @@
12		12
13	ifeq ($(have_gtksourceview),yes)	13	ifeq ($(have_gtksourceview),yes)
14	langbase := $(shell pkg-config --variable=prefix gtksourceview-1.0)	14	langbase := $(shell pkg-config --variable=prefix gtksourceview-1.0)
Lines 17-23 Link Here
17	query_install_lang = install-lang	17	query_install_lang = install-lang
18	endif	18	endif
19		19
20	@@ -56,7 +57,7 @@	20	@@ -59,7 +60,7 @@
21	GTKSOURCEVIEW_CFLAGS = -I$(topsrc)/gui2	21	GTKSOURCEVIEW_CFLAGS = -I$(topsrc)/gui2
22	GTKSOURCEVIEW_LIBS = -L./gtksourceview -lgtksourceview-lite	22	GTKSOURCEVIEW_LIBS = -L./gtksourceview -lgtksourceview-lite
23	MY_SOURCEVIEW_LIB = gtksourceview/libgtksourceview-lite.a	23	MY_SOURCEVIEW_LIB = gtksourceview/libgtksourceview-lite.a
Lines 26-32 Link Here
26	query_install_lang = install-lang	26	query_install_lang = install-lang
27	endif	27	endif
28	endif	28	endif
29	@@ -66,14 +67,14 @@	29	@@ -69,14 +70,14 @@
30	../lib/libgretl-1.0.la	30	../lib/libgretl-1.0.la
31	GUI_CFLAGS = $(GNOME_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(GTK_EXTRA_CFLAGS)	31	GUI_CFLAGS = $(GNOME_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(GTK_EXTRA_CFLAGS)
32	query_install_gnome = install-gnome	32	query_install_gnome = install-gnome
Lines 43-49 Link Here
43	NLSDEF = -DLOCALEDIR=\"$(localedir)\"	43	NLSDEF = -DLOCALEDIR=\"$(localedir)\"
44	endif	44	endif
45		45
46	@@ -85,7 +86,7 @@	46	@@ -88,7 +89,7 @@
47		47
48	# Directories	48	# Directories
49	bindir = $(prefix)/bin	49	bindir = $(prefix)/bin
Lines 52-71 Link Here
52	tooldir = $(topsrc)/tools	52	tooldir = $(topsrc)/tools
53	libsrc = $(topsrc)/lib/src	53	libsrc = $(topsrc)/lib/src
54	clisrc = $(topsrc)/cli	54	clisrc = $(topsrc)/cli
55	@@ -149,23 +150,23 @@	55	@@ -97,7 +98,7 @@
		56	#### End of system configuration section. ####
		57
		58	SHELL = /bin/sh
		59	-LIBTOOL = ../libtool
		60	+LIBTOOL = @LIBTOOL@
		61	PROG = gretl_x11
		62
		63	vpath %.c $(topsrc)/gui2
		64	@@ -156,23 +157,23 @@
56	$(CC) $(CFLAGS) -MM $< > .deps/$*.d	65	$(CC) $(CFLAGS) -MM $< > .deps/$*.d
57		66
58	$(PROG): .deps $(OBJS) $(HACK_OBJ) $(GTKEXTRA_LITE) $(MY_SOURCEVIEW_LIB)	67	$(PROG): .deps $(OBJS) $(HACK_OBJ) $(GTKEXTRA_LITE) $(MY_SOURCEVIEW_LIB)
59	- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB)	68	- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
60	+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB)	69	+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
61		70
62	$(HACK_OBJ): $(HACK_SRC) $(HACK_HDR)	71	$(HACK_OBJ): $(HACK_SRC) $(HACK_HDR)
63	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<	72	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
64		73
65	mklang: mklang.c	74	mklang: mklang.c
66	$(CC) -c -I.. -I$(libsrc) $<	75	$(CC) -c -I.. -I$(libsrc) $(XML_CFLAGS) $<
67	- $(LIBTOOL) --mode=link $(CC) -o $@ mklang.o ../lib/libgretl-1.0.la	76	- $(LIBTOOL) --mode=link $(CC) -o $@ mklang.o ../lib/libgretl-1.0.la $(XML_LIBS)
68	+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ mklang.o ../lib/libgretl-1.0.la	77	+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ mklang.o ../lib/libgretl-1.0.la $(XML_LIBS)
69		78
70	gretl.lang: mklang	79	gretl.lang: mklang
71	./mklang > $@	80	./mklang > $@
Lines 80-86 Link Here
80		89
81	.deps:	90	.deps:
82	mkdir $@	91	mkdir $@
83	@@ -180,7 +181,7 @@	92	@@ -187,7 +188,7 @@
84	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)	93	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
85		94
86	install-data: installdirs	95	install-data: installdirs

Line 0 Link Here

(-)misc/gretl/files/patch-lib__src__printout.c (+16 lines)
	1	--- lib/src/printout.c.orig Fri Sep 8 02:15:00 2006
	2	+++ lib/src/printout.c Sun Oct 8 01:52:29 2006
	3	@@ -400,11 +400,11 @@
	4	void print_xtab (const Xtab tab, gretlopt opt, PRN prn)
	5	{
	6	int i, j, r, c;
	7	- r = tab->rows;
	8	- c = tab->cols;
	9	double x, y;
	10	int n5 = 0;
	11	double pearson = 0.0;
	12	+ r = tab->rows;
	13	+ c = tab->cols;
	14
	15	pputc(prn, '\n');
	16	pprintf(prn, _("Cross-tabulation of %s (rows) against %s (columns)"),

Lines 1-5 Link Here

(-)misc/gretl/files/patch-plugin::Makefile.in (-7 / +16 lines)
1	--- plugin/Makefile.in.orig Sun May 22 12:11:20 2005	1	--- plugin/Makefile.in.orig Tue Sep 12 22:53:16 2006
2	+++ plugin/Makefile.in Wed Jul 6 02:05:05 2005	2	+++ plugin/Makefile.in Sun Oct 8 02:08:19 2006
3	@@ -8,6 +8,10 @@	3	@@ -8,6 +8,10 @@
4	INSTALL = @INSTALL@	4	INSTALL = @INSTALL@
5	LN = @LN_S@	5	LN = @LN_S@
Lines 11-26 Link Here
11	build_gui = @build_gui@	11	build_gui = @build_gui@
12	have_gtk = @have_gtk@	12	have_gtk = @have_gtk@
13	have_gmp = @have_gmp@	13	have_gmp = @have_gmp@
14	@@ -145,7 +149,7 @@	14	@@ -45,7 +49,7 @@
		15
		16	override CFLAGS += -I.. -I$(topsrc)/gui2 -DHAVE_CONFIG_H
		17
		18	-LIBTOOL = ../libtool
		19	+LIBTOOL = @LIBTOOL@
		20	COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)
		21	LINK = $(LIBTOOL) --mode=link $(CC) -module -avoid-version -rpath $(plugindir)
		22
		23	@@ -163,7 +167,7 @@
15	URCDATA = $(topsrc)/plugin/data/urcdata.gz	24	URCDATA = $(topsrc)/plugin/data/urcdata.gz
16		25
17	override CFLAGS += $(GRETLINC) $(GTK_CFLAGS) $(GMP_CFLAGS) $(XML_CFLAGS) \	26	override CFLAGS += $(GRETLINC) $(GTK_CFLAGS) $(GMP_CFLAGS) $(MPFR_CFLAGS) \
18	- $(LIBOLE2_CFLAGS) $(AUDIO_CFLAGS) -I. $(GMPDEF)	27	- $(XML_CFLAGS) $(GRETL_LIBOLE2_CFLAGS) $(ZIP_CFLAGS) $(AUDIO_CFLAGS) -I. $(GMPDEF)
19	+ $(LIBOLE2_CFLAGS) $(AUDIO_CFLAGS) -I. $(GMPDEF) $(CPPFLAGS)	28	+ $(XML_CFLAGS) $(GRETL_LIBOLE2_CFLAGS) $(ZIP_CFLAGS) $(AUDIO_CFLAGS) -I. $(GMPDEF) $(CPPFLAGS)
20		29
21	%.lo: %.c	30	%.lo: %.c
22	$(COMPILE) $<	31	$(COMPILE) $<
23	@@ -239,12 +243,12 @@	32	@@ -266,12 +270,12 @@
24	.PHONY:	33	.PHONY:
25		34
26	install: $(GRETLLIB) $(PLUGINS) $(URCDATA) installdirs	35	install: $(GRETLLIB) $(PLUGINS) $(URCDATA) installdirs

Lines 1-5 Link Here

(-)misc/gretl/files/patch-share::Makefile.in (-11 / +27 lines)
1	--- share/Makefile.in.orig Thu Feb 2 03:39:37 2006	1	--- share/Makefile.in.orig Wed Aug 30 10:23:29 2006
2	+++ share/Makefile.in Tue Jun 13 22:39:26 2006	2	+++ share/Makefile.in Sun Oct 8 02:56:33 2006
3	@@ -1,15 +1,16 @@	3	@@ -1,15 +1,16 @@
4	topsrc = @top_srcdir@	4	topsrc = @top_srcdir@
5		5
Lines 12-25 Link Here
12	+gretldir = $(datadir)/gretl	12	+gretldir = $(datadir)/gretl
13	tooldir = $(topsrc)/tools	13	tooldir = $(topsrc)/tools
14	sharesrc = $(topsrc)/share	14	sharesrc = $(topsrc)/share
15	pdfdir = $(topsrc)/doc/tex	15	pdfdir = ../doc/tex
16		16
17	-INSTALL_DATA = cp -fp	17	-INSTALL_DATA = cp -fp
18	+INSTALL_DATA = @INSTALL_DATA@	18	+INSTALL_DATA = @INSTALL_DATA@
19		19
20	ifeq ($(build_docs),yes)	20	EN_GUI_HLP = $(sharesrc)/gretlgui.hlp
21	AUTO_HELPFILES = \	21	EN_CMD_HLP = $(sharesrc)/gretlcmd.hlp
22	@@ -46,17 +47,17 @@	22	@@ -41,17 +42,17 @@
23	all: $(AUTO_HELPFILES)	23	all: $(AUTO_HELPFILES)
24		24
25	$(AUTO_HELPFILES):	25	$(AUTO_HELPFILES):
Lines 32-47 Link Here
32	- make -C ../doc/commands help-all	32	- make -C ../doc/commands help-all
33	+ $(MAKE) -C ../doc/commands help-all	33	+ $(MAKE) -C ../doc/commands help-all
34		34
35	install: installdirs install_datafiles install_scripts install_help \	35	install: installdirs install_datafiles install_scripts install_functions \
36	$(INSTALL_GUI_SCRIPT_HELP) $(INSTALL_HELP_FIGS)	36	install_help install_fonts
37	$(INSTALL_DATA) $(sharesrc)/gretl.stamp $(gretldir)/gretl.stamp	37	$(INSTALL_DATA) $(sharesrc)/gretl.stamp $(gretldir)/gretl.stamp
38	- make -C bcih install	38	- make -C bcih install
39	+ $(MAKE) -C bcih install	39	+ $(MAKE) -C bcih install
40		40
41	install-strip: install	41	install-strip: install
42		42
43	@@ -79,8 +80,8 @@	43	@@ -77,12 +78,12 @@
44	$(INSTALL_DATA) $$f $(gretldir)/scripts/misc ; done	44	$(INSTALL_DATA) $(sharesrc)/functions/gretlfunc.dtd $(gretldir)/functions
45		45
46	install_man: gretl.1	46	install_man: gretl.1
47	- $(tooldir)/mkinstalldirs $(prefix)/share/man/man1	47	- $(tooldir)/mkinstalldirs $(prefix)/share/man/man1
Lines 49-53 Link Here
49	+ $(tooldir)/mkinstalldirs $(prefix)/man/man1	49	+ $(tooldir)/mkinstalldirs $(prefix)/man/man1
50	+ $(INSTALL_DATA) $(topsrc)/gretl.1 $(prefix)/man/man1	50	+ $(INSTALL_DATA) $(topsrc)/gretl.1 $(prefix)/man/man1
51		51
52	install_helpfigs:	52	install_help: $(AUTO_HELPFILES)
		53	$(tooldir)/mkinstalldirs $(gretldir)
		54	- $(tooldir)/mkinstalldirs $(gretldir)/doc
		55	+# $(tooldir)/mkinstalldirs $(gretldir)/doc
53	$(tooldir)/mkinstalldirs $(gretldir)/helpfigs	56	$(tooldir)/mkinstalldirs $(gretldir)/helpfigs
		57	$(INSTALL_DATA) $(EN_GUI_HLP) $(gretldir)/gretlgui.hlp
		58	$(INSTALL_DATA) $(EN_CMD_HLP) $(gretldir)/gretlcmd.hlp
		59	@@ -95,8 +96,8 @@
		60	$(INSTALL_DATA) $(IT_CLI_HLP) $(gretldir)/gretlcli.hlp.it
		61	for f in $(sharesrc)/texfigs/*.png ; do \
		62	$(INSTALL_DATA) $$f $(gretldir)/helpfigs ; done
		63	- for f in $(pdfdir)/gretl-ref.pdf $(pdfdir)/gretl-guide.pdf ; do \
		64	- if test -f $$f ; then $(INSTALL_DATA) $$f $(gretldir)/doc ; fi ; done
		65	+# for f in $(pdfdir)/gretl-ref.pdf $(pdfdir)/gretl-guide.pdf ; do \
		66	+# if test -f $$f ; then $(INSTALL_DATA) $$f $(gretldir)/doc ; fi ; done
		67
		68	install_fonts:
		69	for f in $(sharesrc)/fonts/*.ttf ; do \

Lines 1-23 Link Here

(-)misc/gretl/files/patch-tools::ltmain.sh (-23 lines)
1	--- tools/ltmain.sh.orig Mon Feb 10 02:23:55 2003
2	+++ tools/ltmain.sh Mon Apr 14 12:23:06 2003
3	@@ -967,6 +967,7 @@
4	;;
5
6	-avoid-version)
7	+ build_old_libs=no
8	avoid_version=yes
9	continue
10	;;
11	@@ -4280,10 +4281,12 @@
12	fi
13
14	# Install the pseudo-library for information purposes.
15	+ if /usr/bin/false; then
16	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
17	instname="$dir/$name"i
18	$show "$install_prog $instname $destdir/$name"
19	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
20	+ fi
21
22	# Maybe install the static library, too.
23	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"