Attachment #38230 for bug #60568

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




#

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

USE_BZIP2=	yes
USE_X_PREFIX=	yes
WANT_GNOME=	yes
USE_GNOME=	gnometarget gtk20 libxml2
USE_REINPLACE=	yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS=	--enable-static --enable-shared --with-gmake
ALL_TARGET=	# empty
INSTALLS_SHLIB=	yes

MAN1=	gretl.1 gretl-config.1


.if ${HAVE_GNOME:Mlibgnomeui}!=""
PKGNAMESUFFIX=	-gnome
USE_GNOME+=	gnomeprefix gtksourceview libgnomeui
PLIST_SUB+=	GRETLDATADIR="share/gnome/gretl"
.else
CONFIGURE_ARGS+=	--without-gnome --without-gtksourceview
PLIST_SUB+=	GRETLDATADIR="share/gretl"
.endif

post-patch:

Line 1 Link Here

(-)misc/gretl/distinfo (-1 / +1 lines)
1	MD5 (gretl-1.1.4.tar.bz2) = 3009db4052cb8c64e1587c66fe88ad70	1	MD5 (gretl-1.2.0.tar.bz2) = bc8f320ca6f3bc2f08fee43d4aeae091




--- cli/Makefile.in.orig	Wed Oct 22 06:22:31 2003
+++ cli/Makefile.in	Sun Oct 26 10:19:56 2003
@@ -9,12 +9,16 @@
 exec_prefix = @exec_prefix@
 bindir = @bindir@

 ifeq ($(CC),)
   CC = gcc
 endif
@@ -40,7 +44,7 @@
 
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
 

 
 CLI = gretlcli
 LIBTOOL = ../libtool
@@ -50,7 +54,7 @@
 	$(CC) $(CFLAGS) -MM $< > .deps/$*.d 
 
 $(CLI): .deps $(OBJS)
-	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(GRETLLIB) $(READLINE_LIBS) 
+	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(GRETLLIB) $(READLINE_LIBS) $(INTL_LIBS) $(LDFLAGS)
 
 -include gretlcli.d
 
 .deps:
 	mkdir $@




--- gui2/Makefile.in.orig	Wed Nov 26 00:59:06 2003
+++ gui2/Makefile.in	Thu Dec 25 13:25:07 2003
@@ -4,6 +4,7 @@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
+datadir = @datadir@
 CC = @CC@
 CFLAGS = @CFLAGS@
 MAKE = @MAKE@
@@ -47,7 +48,7 @@
 
 ifeq ($(have_gtksourceview),yes)
   langbase := $(shell pkg-config --variable=prefix gtksourceview-1.0)
-  langdir = $(langbase)/share/gtksourceview-1.0/language-specs
+  langdir = $(datadir)/gtksourceview-1.0/language-specs
   query_install_lang = install-lang
 endif
 
@@ -56,7 +57,7 @@
     GTKSOURCEVIEW_CFLAGS = -I$(topsrc)/gui2
     GTKSOURCEVIEW_LIBS = -L./gtksourceview -lgtksourceview-lite
     MY_SOURCEVIEW_LIB = gtksourceview/libgtksourceview-lite.a
-    langdir = $(prefix)/share/gretl/gtksourceview
+    langdir = $(datadir)/gretl/gtksourceview
     query_install_lang = install-lang
   endif
 endif
@@ -66,14 +67,13 @@
 	../lib/libgretl-1.0.la
   GUI_CFLAGS = $(GNOME_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(GTK_EXTRA_CFLAGS)
   query_install_gnome = install-gnome
-  GNOMEDEF = -DGNOME_DISABLE_DEPRECATED -DDATADIR=\"$(gnome_prefix)/share\"

+  localedir = $(prefix)/share/locale
   NLSDEF = -DLOCALEDIR=\"$(localedir)\"
 endif
 ifeq ($(have_gtksourceview),yes)
   langbase := $(shell pkg-config --variable=prefix gtksourceview-1.0)
-  langdir = $(langbase)/share/gtksourceview-1.0/language-specs
+  langdir = $(datadir)/gtksourceview-1.0/language-specs
   query_install_lang = install-lang
 endif
 
@@ -87,7 +87,7 @@
 
 # Directories
 bindir	= $(prefix)/bin

 tooldir = $(topsrc)/tools
 libsrc = $(topsrc)/lib/src
 clisrc = $(topsrc)/cli
@@ -126,10 +126,10 @@
 	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
 
 $(GTKEXTRA_LITE): 
-	make -C gtkextra-lite
+	$(MAKE) -C gtkextra-lite
 
 gtksourceview/libgtksourceview-lite.a:
-	make -C gtksourceview
+	$(MAKE) -C gtksourceview
 
 .deps:
 	mkdir $@
@@ -144,7 +144,7 @@
 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
 
 install-data: installdirs




--- gui2/ssheet.c.orig	Thu Nov  6 23:46:45 2003
+++ gui2/ssheet.c	Thu Dec 25 17:33:04 2003
@@ -822,13 +822,13 @@
 {   
     GdkModifierType mods; 
     gint ret = FALSE;
+    GdkEventButton *bevent = (GdkEventButton *) event;
 
     if (event->type != GDK_BUTTON_PRESS) {
 	return FALSE;
     }
 
     gdk_window_get_pointer(view->window, NULL, NULL, &mods);
-    GdkEventButton *bevent = (GdkEventButton *) event;
 
     if (mods & GDK_BUTTON3_MASK) {
 	gtk_menu_popup (GTK_MENU(sheet->popup), NULL, NULL, NULL, NULL,




--- lib/Makefile.in.orig	Thu Dec 11 23:27:53 2003
+++ lib/Makefile.in	Thu Dec 25 13:19:07 2003
@@ -18,6 +18,11 @@
 
 have_gtk = @have_gtk@

 
 INSTALLDIRS = $(libdir) $(includedir) $(aclocaldir)
 
@@ -48,8 +53,8 @@
 
 # hard-coded -L/usr/local/lib is a bodge!!
 
-LIBS = $(LAPACK_LIBS) -lm -ldl -L/usr/local/lib -lz $(XML_LIBS) \
-	$(GLIB_LIBS) $(GMP_LIBS)
+LIBS = $(LAPACK_LIBS) -lm -lz $(XML_LIBS) \
+	$(GLIB_LIBS) $(GMP_LIBS) $(INTL_LIBS)
 
 #### End of system configuration section. ####
 
@@ -78,7 +83,7 @@
 
 LIBTOOL = ../libtool
 
 override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(XML_CFLAGS) $(GLIB_CFLAGS) \
-	$(GMP_CFLAGS) -DHAVE_CONFIG_H
+	$(GMP_CFLAGS) -DHAVE_CONFIG_H $(CPPFLAGS)
 
 COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
 
@@ -88,7 +93,7 @@
 
 $(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \
-	-rpath $(prefix)/lib $(LIBS) -version-info 0:14:0
+	-rpath $(prefix)/lib $(LIBS) -version-info 0:14:0 $(LDFLAGS)
 
 -include $(LOBJS:.lo=.d)
 
 .deps:
 	mkdir $@




--- plugin/Makefile.in.orig	Sun Oct 19 23:15:51 2003
+++ plugin/Makefile.in	Sun Oct 26 10:24:36 2003
@@ -8,6 +8,10 @@
 MAKE = @MAKE@
 INSTALL = @INSTALL@
 LN = @LN_S@
 
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+INTL_LIBS = @LTLIBINTL@
+
 have_gtk = @have_gtk@
 have_gmp = @have_gmp@
 
@@ -35,8 +39,8 @@
 override CFLAGS += -I.. -DHAVE_CONFIG_H
 
 LIBTOOL = ../libtool

 
 GRETLINC = -I$(topsrc)/lib/src
 GRETLLIB = ../lib/libgretl-1.0.la
@@ -136,11 +140,11 @@
   GTK_CFLAGS += -DGTK_DISABLE_DEPRECATED
   GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell pkg-config --cflags glib-2.0)
 else
-  GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell glib-config --cflags)
+  GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell $(GLIB_CONFIG) --cflags)
 endif  
 
 SRCS = excel_import.c gnumeric_import.c gretl_matrix.c import_common.c \
@@ -129,11 +133,11 @@
 .PHONY: 
 
 install: $(GRETLLIB) $(PLUGINS) installdirs




include/gretl/estimate.h
include/gretl/f2c.h
include/gretl/generate.h
include/gretl/genstack.h
include/gretl/graphing.h
include/gretl/gretl_cmdlist.h
include/gretl/gretl_commands.h
include/gretl/gretl_errors.h
include/gretl/gretl_matrix.h
include/gretl/gretl_matrix_private.h
include/gretl/gretl_utils.h
include/gretl/gretl_win32.h
include/gretl/interact.h

include/gretl/monte_carlo.h
include/gretl/nls.h
include/gretl/nonparam.h
include/gretl/plugins.h
include/gretl/printout.h
include/gretl/pvalues.h
include/gretl/qr_estimate.h

include/gretl/texprint.h
include/gretl/var.h
include/gretl/version.h
lib/gretl-gtk2/excel_import.so
lib/gretl-gtk2/gnumeric_import.so
lib/gretl-gtk2/johansen.so
lib/gretl-gtk2/lad.so
lib/gretl-gtk2/leverage.so
lib/gretl-gtk2/mp_ols.so
lib/gretl-gtk2/panel_data.so
lib/gretl-gtk2/pca.so
lib/gretl-gtk2/progress_bar.so
lib/gretl-gtk2/range-mean.so
lib/gretl-gtk2/stats_tables.so
lib/gretl-gtk2/sur.so
lib/gretl-gtk2/tramo-x12a.so
lib/libgretl-1.0.a
lib/libgretl-1.0.so
lib/libgretl-1.0.so.0
libdata/pkgconfig/gretl.pc
%%GNOME:%%share/gnome/applications/gretl.desktop
%%GRETLDATADIR%%/COPYING
%%GRETLDATADIR%%/data/arma.gdt
%%GRETLDATADIR%%/data/data10-1.gdt
%%GRETLDATADIR%%/data/data10-2.gdt
%%GRETLDATADIR%%/data/data10-3.gdt
%%GRETLDATADIR%%/data/data10-4.gdt
%%GRETLDATADIR%%/data/data10-5.gdt
%%GRETLDATADIR%%/data/data10-6.gdt
%%GRETLDATADIR%%/data/data10-7.gdt
%%GRETLDATADIR%%/data/data10-8.gdt
%%GRETLDATADIR%%/data/data11-1.gdt
%%GRETLDATADIR%%/data/data12-1.gdt
%%GRETLDATADIR%%/data/data13-1.gdt
%%GRETLDATADIR%%/data/data2-1.gdt
%%GRETLDATADIR%%/data/data2-2.gdt
%%GRETLDATADIR%%/data/data2-3.gdt
%%GRETLDATADIR%%/data/data3-1.gdt
%%GRETLDATADIR%%/data/data3-10.gdt
%%GRETLDATADIR%%/data/data3-11.gdt
%%GRETLDATADIR%%/data/data3-12.gdt
%%GRETLDATADIR%%/data/data3-13.gdt
%%GRETLDATADIR%%/data/data3-14.gdt
%%GRETLDATADIR%%/data/data3-15.gdt
%%GRETLDATADIR%%/data/data3-2.gdt
%%GRETLDATADIR%%/data/data3-3.gdt
%%GRETLDATADIR%%/data/data3-4.gdt
%%GRETLDATADIR%%/data/data3-5.gdt
%%GRETLDATADIR%%/data/data3-6.gdt
%%GRETLDATADIR%%/data/data3-7.gdt
%%GRETLDATADIR%%/data/data3-8.gdt
%%GRETLDATADIR%%/data/data3-9.gdt
%%GRETLDATADIR%%/data/data4-1.gdt
%%GRETLDATADIR%%/data/data4-10.gdt
%%GRETLDATADIR%%/data/data4-11.gdt
%%GRETLDATADIR%%/data/data4-12.gdt
%%GRETLDATADIR%%/data/data4-13.gdt
%%GRETLDATADIR%%/data/data4-14.gdt
%%GRETLDATADIR%%/data/data4-15.gdt
%%GRETLDATADIR%%/data/data4-16.gdt
%%GRETLDATADIR%%/data/data4-17.gdt
%%GRETLDATADIR%%/data/data4-2.gdt
%%GRETLDATADIR%%/data/data4-3.gdt
%%GRETLDATADIR%%/data/data4-3a.gdt
%%GRETLDATADIR%%/data/data4-4.gdt
%%GRETLDATADIR%%/data/data4-5.gdt
%%GRETLDATADIR%%/data/data4-6.gdt
%%GRETLDATADIR%%/data/data4-7.gdt
%%GRETLDATADIR%%/data/data4-8.gdt
%%GRETLDATADIR%%/data/data4-9.gdt
%%GRETLDATADIR%%/data/data6-1.gdt
%%GRETLDATADIR%%/data/data6-2.gdt
%%GRETLDATADIR%%/data/data6-3.gdt
%%GRETLDATADIR%%/data/data6-4.gdt
%%GRETLDATADIR%%/data/data6-5.gdt
%%GRETLDATADIR%%/data/data6-6.gdt
%%GRETLDATADIR%%/data/data7-1.gdt
%%GRETLDATADIR%%/data/data7-10.gdt
%%GRETLDATADIR%%/data/data7-11.gdt
%%GRETLDATADIR%%/data/data7-12.gdt
%%GRETLDATADIR%%/data/data7-13.gdt
%%GRETLDATADIR%%/data/data7-14.gdt
%%GRETLDATADIR%%/data/data7-15.gdt
%%GRETLDATADIR%%/data/data7-16.gdt
%%GRETLDATADIR%%/data/data7-17.gdt
%%GRETLDATADIR%%/data/data7-18.gdt
%%GRETLDATADIR%%/data/data7-19.gdt
%%GRETLDATADIR%%/data/data7-2.gdt
%%GRETLDATADIR%%/data/data7-20.gdt
%%GRETLDATADIR%%/data/data7-21.gdt
%%GRETLDATADIR%%/data/data7-22.gdt
%%GRETLDATADIR%%/data/data7-23.gdt
%%GRETLDATADIR%%/data/data7-24.gdt
%%GRETLDATADIR%%/data/data7-26.gdt
%%GRETLDATADIR%%/data/data7-3.gdt
%%GRETLDATADIR%%/data/data7-4.gdt
%%GRETLDATADIR%%/data/data7-5.gdt
%%GRETLDATADIR%%/data/data7-6.gdt
%%GRETLDATADIR%%/data/data7-7.gdt
%%GRETLDATADIR%%/data/data7-8.gdt
%%GRETLDATADIR%%/data/data7-9.gdt
%%GRETLDATADIR%%/data/data8-1.gdt
%%GRETLDATADIR%%/data/data8-2.gdt
%%GRETLDATADIR%%/data/data8-3.gdt
%%GRETLDATADIR%%/data/data9-1.gdt
%%GRETLDATADIR%%/data/data9-10.gdt
%%GRETLDATADIR%%/data/data9-11.gdt
%%GRETLDATADIR%%/data/data9-12.gdt
%%GRETLDATADIR%%/data/data9-13.gdt
%%GRETLDATADIR%%/data/data9-2.gdt
%%GRETLDATADIR%%/data/data9-3.gdt
%%GRETLDATADIR%%/data/data9-4.gdt
%%GRETLDATADIR%%/data/data9-5.gdt
%%GRETLDATADIR%%/data/data9-6.gdt
%%GRETLDATADIR%%/data/data9-7.gdt
%%GRETLDATADIR%%/data/data9-8.gdt
%%GRETLDATADIR%%/data/data9-9.gdt
%%GRETLDATADIR%%/data/descriptions
%%GRETLDATADIR%%/data/ects_nls.gdt
%%GRETLDATADIR%%/data/greene/greene10_3.gdt
%%GRETLDATADIR%%/data/greene/greene11_3.gdt
%%GRETLDATADIR%%/data/greene/greene12_1.gdt
%%GRETLDATADIR%%/data/greene/greene13_1.gdt
%%GRETLDATADIR%%/data/greene/greene14_1.gdt
%%GRETLDATADIR%%/data/greene/greene18_1.gdt
%%GRETLDATADIR%%/data/greene/greene18_2.gdt
%%GRETLDATADIR%%/data/greene/greene19_1.gdt
%%GRETLDATADIR%%/data/greene/greene5_1.gdt
%%GRETLDATADIR%%/data/greene/greene7_8.gdt
%%GRETLDATADIR%%/data/greene/greene8_3.gdt
%%GRETLDATADIR%%/data/greene/greene9_1.gdt
%%GRETLDATADIR%%/data/greene/wg_descriptions
%%GRETLDATADIR%%/data/gretldata.dtd
%%GRETLDATADIR%%/data/hamilton.gdt
%%GRETLDATADIR%%/data/leverage.gdt
%%GRETLDATADIR%%/data/longley.gdt
%%GRETLDATADIR%%/data/sw_ch12.gdt
%%GRETLDATADIR%%/data/sw_ch14.gdt
%%GRETLDATADIR%%/db/bcih.bin
%%GRETLDATADIR%%/db/bcih.idx
%%GRETLDATADIR%%/gretl-logo.xpm
%%GRETLDATADIR%%/gretl.hlp
%%GRETLDATADIR%%/gretl.stamp
%%GRETLDATADIR%%/gretlcli.hlp
%%GRETLDATADIR%%/scripts/arma.inp
%%GRETLDATADIR%%/scripts/ects_nls.inp
%%GRETLDATADIR%%/scripts/greene11_3.inp
%%GRETLDATADIR%%/scripts/greene12_1.inp
%%GRETLDATADIR%%/scripts/greene14_1.inp
%%GRETLDATADIR%%/scripts/greene14_2.inp
%%GRETLDATADIR%%/scripts/greene18_6.inp
%%GRETLDATADIR%%/scripts/greene19_1.inp
%%GRETLDATADIR%%/scripts/greene7_8.inp
%%GRETLDATADIR%%/scripts/greene8_3.inp
%%GRETLDATADIR%%/scripts/greene9_1.inp
%%GRETLDATADIR%%/scripts/greene9_3.inp
%%GRETLDATADIR%%/scripts/leverage.inp
%%GRETLDATADIR%%/scripts/longley.inp
%%GRETLDATADIR%%/scripts/ps10-1.inp
%%GRETLDATADIR%%/scripts/ps10-10.inp
%%GRETLDATADIR%%/scripts/ps10-11.inp
%%GRETLDATADIR%%/scripts/ps10-2.inp
%%GRETLDATADIR%%/scripts/ps10-3.inp
%%GRETLDATADIR%%/scripts/ps10-4.inp
%%GRETLDATADIR%%/scripts/ps10-5a.inp
%%GRETLDATADIR%%/scripts/ps10-5b.inp
%%GRETLDATADIR%%/scripts/ps10-6.inp
%%GRETLDATADIR%%/scripts/ps10-7.inp
%%GRETLDATADIR%%/scripts/ps10-8.inp
%%GRETLDATADIR%%/scripts/ps10-9.inp
%%GRETLDATADIR%%/scripts/ps11-1.inp
%%GRETLDATADIR%%/scripts/ps11-2.inp
%%GRETLDATADIR%%/scripts/ps11-3.inp
%%GRETLDATADIR%%/scripts/ps12-1.inp
%%GRETLDATADIR%%/scripts/ps13-1.inp
%%GRETLDATADIR%%/scripts/ps2-1.inp
%%GRETLDATADIR%%/scripts/ps2-2.inp
%%GRETLDATADIR%%/scripts/ps2-3.inp
%%GRETLDATADIR%%/scripts/ps3-1.inp
%%GRETLDATADIR%%/scripts/ps3-2.inp
%%GRETLDATADIR%%/scripts/ps3-3.inp
%%GRETLDATADIR%%/scripts/ps3-4.inp
%%GRETLDATADIR%%/scripts/ps3-5.inp
%%GRETLDATADIR%%/scripts/ps3-6.inp
%%GRETLDATADIR%%/scripts/ps4-1.inp
%%GRETLDATADIR%%/scripts/ps4-2.inp
%%GRETLDATADIR%%/scripts/ps4-3.inp
%%GRETLDATADIR%%/scripts/ps4-4.inp
%%GRETLDATADIR%%/scripts/ps4-5.inp
%%GRETLDATADIR%%/scripts/ps5-1.inp
%%GRETLDATADIR%%/scripts/ps5-2.inp
%%GRETLDATADIR%%/scripts/ps5-3.inp
%%GRETLDATADIR%%/scripts/ps5-4.inp
%%GRETLDATADIR%%/scripts/ps5-5.inp
%%GRETLDATADIR%%/scripts/ps6-1.inp
%%GRETLDATADIR%%/scripts/ps6-10.inp
%%GRETLDATADIR%%/scripts/ps6-11.inp
%%GRETLDATADIR%%/scripts/ps6-12.inp
%%GRETLDATADIR%%/scripts/ps6-2.inp
%%GRETLDATADIR%%/scripts/ps6-3.inp
%%GRETLDATADIR%%/scripts/ps6-4.inp
%%GRETLDATADIR%%/scripts/ps6-5.inp
%%GRETLDATADIR%%/scripts/ps6-6.inp
%%GRETLDATADIR%%/scripts/ps6-7.inp
%%GRETLDATADIR%%/scripts/ps6-8.inp
%%GRETLDATADIR%%/scripts/ps6-9.inp
%%GRETLDATADIR%%/scripts/ps7-1.inp
%%GRETLDATADIR%%/scripts/ps7-2.inp
%%GRETLDATADIR%%/scripts/ps7-3.inp
%%GRETLDATADIR%%/scripts/ps7-4.inp
%%GRETLDATADIR%%/scripts/ps7-5.inp
%%GRETLDATADIR%%/scripts/ps7-6.inp
%%GRETLDATADIR%%/scripts/ps7-7.inp
%%GRETLDATADIR%%/scripts/ps8-1.inp
%%GRETLDATADIR%%/scripts/ps8-2.inp
%%GRETLDATADIR%%/scripts/ps8-3.inp
%%GRETLDATADIR%%/scripts/ps8-4.inp
%%GRETLDATADIR%%/scripts/ps8-5.inp
%%GRETLDATADIR%%/scripts/ps8-6.inp
%%GRETLDATADIR%%/scripts/ps8-7.inp
%%GRETLDATADIR%%/scripts/ps8-8.inp
%%GRETLDATADIR%%/scripts/ps9-1.inp
%%GRETLDATADIR%%/scripts/ps9-10.inp
%%GRETLDATADIR%%/scripts/ps9-2.inp
%%GRETLDATADIR%%/scripts/ps9-3.inp
%%GRETLDATADIR%%/scripts/ps9-4.inp
%%GRETLDATADIR%%/scripts/ps9-5.inp
%%GRETLDATADIR%%/scripts/ps9-6.inp
%%GRETLDATADIR%%/scripts/ps9-7.inp
%%GRETLDATADIR%%/scripts/ps9-8.inp
%%GRETLDATADIR%%/scripts/ps9-9.inp
%%GRETLDATADIR%%/scripts/ps_descriptions
%%GRETLDATADIR%%/scripts/pscoin.inp
%%GRETLDATADIR%%/scripts/sw_ch12.inp
%%GRETLDATADIR%%/scripts/sw_ch14.inp
%%GRETLDATADIR%%/scripts/testinp
%%GRETLDATADIR%%/scripts/wg_ps_descriptions
%%GNOME:%%share/gnome/gtksourceview-1.0/language-specs/gnuplot.lang
%%GNOME:%%share/gnome/gtksourceview-1.0/language-specs/gretl.lang
%%GNOME:%%share/gnome/help/gretl/C/chapters/appendices.xml
%%GNOME:%%share/gnome/help/gretl/C/chapters/biblio.xml
%%GNOME:%%share/gnome/help/gretl/C/chapters/cli.xml

%%GNOME:%%share/gnome/help/gretl/C/gretl.xml
%%GNOME:%%share/gnome/mime-info/gretl.keys
%%GNOME:%%share/gnome/mime-info/gretl.mime
%%GNOME:%%@exec scrollkeeper-install -q %D/share/gnome/omf/gretl/gretl-C.omf 2>/dev/null || true
%%GNOME:%%share/gnome/omf/gretl/gretl-C.omf
%%GNOME:%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gretl/gretl-C.omf 2>/dev/null || true
%%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:%%@dirrm share/gnome/help/gretl/C/chapters
%%GNOME:%%@dirrm share/gnome/help/gretl/C
%%GNOME:%%@dirrm share/gnome/help/gretl
@dirrm %%GRETLDATADIR%%/scripts
@dirrm %%GRETLDATADIR%%/db
@dirrm %%GRETLDATADIR%%/data/greene
@dirrm %%GRETLDATADIR%%/data
@dirrm %%GRETLDATADIR%%
@dirrm lib/gretl-gtk2
@dirrm include/gretl
%%GNOME:%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gretl
%%GNOME:%%@dirrm etc/gconf/gconf.xml.defaults/apps/gretl

Return to bug 60568

Lines 7-13 Link Here

(-)misc/gretl/Makefile (-4 / +7 lines)
7	#	7	#
8		8
9	PORTNAME= gretl	9	PORTNAME= gretl
10	PORTVERSION= 1.1.4	10	PORTVERSION= 1.2.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}
Lines 23-35 Link Here
23	USE_BZIP2= yes	23	USE_BZIP2= yes
24	USE_X_PREFIX= yes	24	USE_X_PREFIX= yes
25	WANT_GNOME= yes	25	WANT_GNOME= yes
26	USE_GNOME= gnomeprefix gnometarget gtksourceview libxml2	26	USE_GNOME= gnometarget gtk20 libxml2
27	USE_REINPLACE= yes	27	USE_REINPLACE= yes
28	USE_GMAKE= yes	28	USE_GMAKE= yes
29	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
30	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	30	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
31	LDFLAGS="-L${LOCALBASE}/lib"	31	LDFLAGS="-L${LOCALBASE}/lib"
32	CONFIGURE_ARGS= --enable-static --enable-shared --with-gmake	32	CONFIGURE_ARGS= --enable-static --enable-shared --with-gmake
		33	ALL_TARGET= # empty
33	INSTALLS_SHLIB= yes	34	INSTALLS_SHLIB= yes
34		35
35	MAN1= gretl.1 gretl-config.1	36	MAN1= gretl.1 gretl-config.1
Lines 42-50 Link Here
42		43
43	.if ${HAVE_GNOME:Mlibgnomeui}!=""	44	.if ${HAVE_GNOME:Mlibgnomeui}!=""
44	PKGNAMESUFFIX= -gnome	45	PKGNAMESUFFIX= -gnome
45	USE_GNOME+= libgnomeprintui libgnomeui	46	USE_GNOME+= gnomeprefix gtksourceview libgnomeui
		47	PLIST_SUB+= GRETLDATADIR="share/gnome/gretl"
46	.else	48	.else
47	CONFIGURE_ARGS+= --without-gnome	49	CONFIGURE_ARGS+= --without-gnome --without-gtksourceview
		50	PLIST_SUB+= GRETLDATADIR="share/gretl"
48	.endif	51	.endif
49		52
50	post-patch:	53	post-patch:

Lines 1-5 Link Here

(-)misc/gretl/files/patch-cli::Makefile.in (-10 / +10 lines)
1	--- cli/Makefile.in.orig Sun Jun 29 04:06:18 2003	1	--- cli/Makefile.in.orig Wed Oct 22 06:22:31 2003
2	+++ cli/Makefile.in Fri Jul 25 20:49:23 2003	2	+++ cli/Makefile.in Sun Oct 26 10:19:56 2003
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	@@ -39,7 +43,7 @@	21	@@ -40,7 +44,7 @@
22		22
23	DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H	23	DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
24		24
Lines 27-38 Link Here
27		27
28	CLI = gretlcli	28	CLI = gretlcli
29	LIBTOOL = ../libtool	29	LIBTOOL = ../libtool
30	@@ -49,7 +53,7 @@	30	@@ -50,7 +54,7 @@
31	$(CC) -MM -MG -I$(libsrc) $(DEFS) $< >$*.d 2>/dev/null	31	$(CC) $(CFLAGS) -MM $< > .deps/$*.d
32		32
33	$(CLI): $(OBJS)	33	$(CLI): .deps $(OBJS)
34	- ../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(READLINE_LIBS)	34	- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(GRETLLIB) $(READLINE_LIBS)
35	+ ../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(READLINE_LIBS) $(INTL_LIBS) $(LDFLAGS)	35	+ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(GRETLLIB) $(READLINE_LIBS) $(INTL_LIBS) $(LDFLAGS)
36
37	-include gretlcli.d
38		36
		37	.deps:
		38	mkdir $@

Lines 1-15 Link Here

(-)misc/gretl/files/patch-gui2::Makefile.in (-15 / +31 lines)
1	--- gui2/Makefile.in.orig Thu Sep 25 22:54:01 2003	1	--- gui2/Makefile.in.orig Wed Nov 26 00:59:06 2003
2	+++ gui2/Makefile.in Sun Oct 5 20:46:18 2003	2	+++ gui2/Makefile.in Thu Dec 25 13:25:07 2003
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@
6	libdir = @libdir@	6	libdir = @libdir@
7	+datadir= @datadir@	7	+datadir = @datadir@
8	CC = @CC@	8	CC = @CC@
9	CFLAGS = @CFLAGS@	9	CFLAGS = @CFLAGS@
10	MAKE = @MAKE@	10	MAKE = @MAKE@
11	@@ -47,19 +48,18 @@	11	@@ -47,7 +48,7 @@
12	LIBS = $(GNOME_LIBS) $(GTKSOURCEVIEW_LIBS) $(GTK_EXTRA_LIB) ../lib/libgretl-1.0.la	12
		13	ifeq ($(have_gtksourceview),yes)
		14	langbase := $(shell pkg-config --variable=prefix gtksourceview-1.0)
		15	- langdir = $(langbase)/share/gtksourceview-1.0/language-specs
		16	+ langdir = $(datadir)/gtksourceview-1.0/language-specs
		17	query_install_lang = install-lang
		18	endif
		19
		20	@@ -56,7 +57,7 @@
		21	GTKSOURCEVIEW_CFLAGS = -I$(topsrc)/gui2
		22	GTKSOURCEVIEW_LIBS = -L./gtksourceview -lgtksourceview-lite
		23	MY_SOURCEVIEW_LIB = gtksourceview/libgtksourceview-lite.a
		24	- langdir = $(prefix)/share/gretl/gtksourceview
		25	+ langdir = $(datadir)/gretl/gtksourceview
		26	query_install_lang = install-lang
		27	endif
		28	endif
		29	@@ -66,14 +67,13 @@
		30	../lib/libgretl-1.0.la
13	GUI_CFLAGS = $(GNOME_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(GTK_EXTRA_CFLAGS)	31	GUI_CFLAGS = $(GNOME_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(GTK_EXTRA_CFLAGS)
14	query_install_gnome = install-gnome	32	query_install_gnome = install-gnome
15	- GNOMEDEF = -DGNOME_DISABLE_DEPRECATED -DDATADIR=\"$(gnome_prefix)/share\"	33	- GNOMEDEF = -DGNOME_DISABLE_DEPRECATED -DDATADIR=\"$(gnome_prefix)/share\"
Lines 24-37 Link Here
24	+ localedir = $(prefix)/share/locale	42	+ localedir = $(prefix)/share/locale
25	NLSDEF = -DLOCALEDIR=\"$(localedir)\"	43	NLSDEF = -DLOCALEDIR=\"$(localedir)\"
26	endif	44	endif
27	ifeq ($(have_gtksourceview),yes)
28	langbase := $(shell pkg-config --variable=prefix gtksourceview-1.0)
29	- langdir = $(langbase)/share/gtksourceview-1.0/language-specs
30	+ langdir = $(datadir)/gtksourceview-1.0/language-specs
31	query_install_lang = install-lang
32	endif
33		45
34	@@ -72,7 +72,7 @@	46	@@ -87,7 +87,7 @@
35		47
36	# Directories	48	# Directories
37	bindir = $(prefix)/bin	49	bindir = $(prefix)/bin
Lines 40-55 Link Here
40	tooldir = $(topsrc)/tools	52	tooldir = $(topsrc)/tools
41	libsrc = $(topsrc)/lib/src	53	libsrc = $(topsrc)/lib/src
42	clisrc = $(topsrc)/cli	54	clisrc = $(topsrc)/cli
43	@@ -110,7 +110,7 @@	55	@@ -126,10 +126,10 @@
44	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<	56	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
45		57
46	$(GTKEXTRA_LITE):	58	$(GTKEXTRA_LITE):
47	- make -C gtkextra-lite	59	- make -C gtkextra-lite
48	+ $(MAKE) -C gtkextra-lite	60	+ $(MAKE) -C gtkextra-lite
49		61
50	-include $(OBJS:.o=.d)	62	gtksourceview/libgtksourceview-lite.a:
		63	- make -C gtksourceview
		64	+ $(MAKE) -C gtksourceview
51		65
52	@@ -122,7 +122,7 @@	66	.deps:
		67	mkdir $@
		68	@@ -144,7 +144,7 @@
53	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)	69	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
54		70
55	install-data: installdirs	71	install-data: installdirs

Line 0 Link Here

(-)misc/gretl/files/patch-gui2::ssheet.c (+17 lines)
	1	--- gui2/ssheet.c.orig Thu Nov 6 23:46:45 2003
	2	+++ gui2/ssheet.c Thu Dec 25 17:33:04 2003
	3	@@ -822,13 +822,13 @@
	4	{
	5	GdkModifierType mods;
	6	gint ret = FALSE;
	7	+ GdkEventButton bevent = (GdkEventButton ) event;
	8
	9	if (event->type != GDK_BUTTON_PRESS) {
	10	return FALSE;
	11	}
	12
	13	gdk_window_get_pointer(view->window, NULL, NULL, &mods);
	14	- GdkEventButton bevent = (GdkEventButton ) event;
	15
	16	if (mods & GDK_BUTTON3_MASK) {
	17	gtk_menu_popup (GTK_MENU(sheet->popup), NULL, NULL, NULL, NULL,

Lines 1-5 Link Here

(-)misc/gretl/files/patch-lib::Makefile.in (-16 / +18 lines)
1	--- lib/Makefile.in.orig Tue Sep 9 21:46:20 2003	1	--- lib/Makefile.in.orig Thu Dec 11 23:27:53 2003
2	+++ lib/Makefile.in Wed Sep 10 14:28:33 2003	2	+++ lib/Makefile.in Thu Dec 25 13:19:07 2003
3	@@ -18,6 +18,11 @@	3	@@ -18,6 +18,11 @@
4		4
5	have_gtk = @have_gtk@	5	have_gtk = @have_gtk@
Lines 21-50 Link Here
21		21
22	INSTALLDIRS = $(libdir) $(includedir) $(aclocaldir)	22	INSTALLDIRS = $(libdir) $(includedir) $(aclocaldir)
23		23
24	@@ -48,7 +53,7 @@	24	@@ -48,8 +53,8 @@
25		25
26	# hard-coded -L/usr/local/lib is a bodge!!	26	# hard-coded -L/usr/local/lib is a bodge!!
27		27
28	-LIBS = $(LAPACK_LIBS) -lm -ldl -L/usr/local/lib -lz $(XML_LIBS) $(GLIB_LIBS) $(GMP_LIBS)	28	-LIBS = $(LAPACK_LIBS) -lm -ldl -L/usr/local/lib -lz $(XML_LIBS) \
29	+LIBS = $(LAPACK_LIBS) -lm -lz $(XML_LIBS) $(GLIB_LIBS) $(GMP_LIBS) $(INTL_LIBS)	29	- $(GLIB_LIBS) $(GMP_LIBS)
		30	+LIBS = $(LAPACK_LIBS) -lm -lz $(XML_LIBS) \
		31	+ $(GLIB_LIBS) $(GMP_LIBS) $(INTL_LIBS)
30		32
31	#### End of system configuration section. ####	33	#### End of system configuration section. ####
32		34
33	@@ -76,7 +81,7 @@	35	@@ -78,7 +83,7 @@
34
35	LIBTOOL = ../libtool	36	LIBTOOL = ../libtool
36		37
37	-override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(XML_CFLAGS) $(GLIB_CFLAGS) $(GMP_CFLAGS) -DHAVE_CONFIG_H	38	override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(XML_CFLAGS) $(GLIB_CFLAGS) \
38	+override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(XML_CFLAGS) $(GLIB_CFLAGS) $(GMP_CFLAGS) -DHAVE_CONFIG_H $(CPPFLAGS)	39	- $(GMP_CFLAGS) -DHAVE_CONFIG_H
		40	+ $(GMP_CFLAGS) -DHAVE_CONFIG_H $(CPPFLAGS)
39		41
40	COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)	42	COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)
41		43
42	@@ -86,7 +91,7 @@	44	@@ -88,7 +93,7 @@
43		45
44	$(LIBGRETL): $(LOBJS) $(AUX_LOBJ)	46	$(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
45	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \	47	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \
46	- -rpath $(prefix)/lib $(LIBS) -version-info 0:11:0	48	- -rpath $(prefix)/lib $(LIBS) -version-info 0:14:0
47	+ -rpath $(prefix)/lib $(LIBS) -version-info 0:11:0 $(LDFLAGS)	49	+ -rpath $(prefix)/lib $(LIBS) -version-info 0:14:0 $(LDFLAGS)
48
49	-include $(LOBJS:.lo=.d)
50		50
		51	.deps:
		52	mkdir $@

Lines 1-17 Link Here

(-)misc/gretl/files/patch-plugin::Makefile.in (-17 / +8 lines)
1	--- plugin/Makefile.in.orig Tue Apr 22 00:29:01 2003	1	--- plugin/Makefile.in.orig Sun Oct 19 23:15:51 2003
2	+++ plugin/Makefile.in Sun May 4 03:14:38 2003	2	+++ plugin/Makefile.in Sun Oct 26 10:24:36 2003
3	@@ -7,6 +7,10 @@	3	@@ -8,6 +8,10 @@
4	MAKE = @MAKE@
5	INSTALL = @INSTALL@	4	INSTALL = @INSTALL@
6	LN = @LN_S@	5	LN = @LN_S@
7	+	6
8	+CPPFLAGS = @CPPFLAGS@	7	+CPPFLAGS = @CPPFLAGS@
9	+LDFLAGS = @LDFLAGS@	8	+LDFLAGS = @LDFLAGS@
10	+INTL_LIBS = @LTLIBINTL@	9	+INTL_LIBS = @LTLIBINTL@
11		10	+
12	have_gtk = @have_gtk@	11	have_gtk = @have_gtk@
13	have_gmp = @have_gmp@	12	have_gmp = @have_gmp@
14	@@ -38,8 +42,8 @@	13
		14	@@ -35,8 +39,8 @@
15	override CFLAGS += -I.. -DHAVE_CONFIG_H	15	override CFLAGS += -I.. -DHAVE_CONFIG_H
16		16
17	LIBTOOL = ../libtool	17	LIBTOOL = ../libtool
Lines 22-37 Link Here
22		22
23	GRETLINC = -I$(topsrc)/lib/src	23	GRETLINC = -I$(topsrc)/lib/src
24	GRETLLIB = ../lib/libgretl-1.0.la	24	GRETLLIB = ../lib/libgretl-1.0.la
25	@@ -48,7 +52,7 @@	25	@@ -136,11 +140,11 @@
26	GTK_CFLAGS += -DGTK_DISABLE_DEPRECATED
27	GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell pkg-config --cflags glib-2.0)
28	else
29	- GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell glib-config --cflags)
30	+ GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell $(GLIB_CONFIG) --cflags)
31	endif
32
33	SRCS = excel_import.c gnumeric_import.c gretl_matrix.c import_common.c \
34	@@ -129,11 +133,11 @@
35	.PHONY:	26	.PHONY:
36		27
37	install: $(GRETLLIB) $(PLUGINS) installdirs	28	install: $(GRETLLIB) $(PLUGINS) installdirs

Lines 14-24 Link Here

(-)misc/gretl/pkg-plist (-234 / +242 lines)
14	include/gretl/estimate.h	14	include/gretl/estimate.h
15	include/gretl/f2c.h	15	include/gretl/f2c.h
16	include/gretl/generate.h	16	include/gretl/generate.h
		17	include/gretl/genstack.h
17	include/gretl/graphing.h	18	include/gretl/graphing.h
18	include/gretl/gretl_cmdlist.h
19	include/gretl/gretl_commands.h	19	include/gretl/gretl_commands.h
20	include/gretl/gretl_errors.h	20	include/gretl/gretl_errors.h
21	include/gretl/gretl_matrix.h	21	include/gretl/gretl_matrix.h
		22	include/gretl/gretl_matrix_private.h
22	include/gretl/gretl_utils.h	23	include/gretl/gretl_utils.h
23	include/gretl/gretl_win32.h	24	include/gretl/gretl_win32.h
24	include/gretl/interact.h	25	include/gretl/interact.h
Lines 29-34 Link Here
29	include/gretl/monte_carlo.h	30	include/gretl/monte_carlo.h
30	include/gretl/nls.h	31	include/gretl/nls.h
31	include/gretl/nonparam.h	32	include/gretl/nonparam.h
		33	include/gretl/plugins.h
32	include/gretl/printout.h	34	include/gretl/printout.h
33	include/gretl/pvalues.h	35	include/gretl/pvalues.h
34	include/gretl/qr_estimate.h	36	include/gretl/qr_estimate.h
Lines 39-276 Link Here
39	include/gretl/texprint.h	41	include/gretl/texprint.h
40	include/gretl/var.h	42	include/gretl/var.h
41	include/gretl/version.h	43	include/gretl/version.h
42	lib/gretl/excel_import.so	44	lib/gretl-gtk2/excel_import.so
43	lib/gretl/gnumeric_import.so	45	lib/gretl-gtk2/gnumeric_import.so
44	lib/gretl/johansen.so	46	lib/gretl-gtk2/johansen.so
45	lib/gretl/lad.so	47	lib/gretl-gtk2/lad.so
46	lib/gretl/leverage.so	48	lib/gretl-gtk2/leverage.so
47	lib/gretl/mp_ols.so	49	lib/gretl-gtk2/mp_ols.so
48	lib/gretl/panel_data.so	50	lib/gretl-gtk2/panel_data.so
49	lib/gretl/pca.so	51	lib/gretl-gtk2/pca.so
50	lib/gretl/progress_bar.so	52	lib/gretl-gtk2/progress_bar.so
51	lib/gretl/range-mean.so	53	lib/gretl-gtk2/range-mean.so
52	lib/gretl/stats_tables.so	54	lib/gretl-gtk2/stats_tables.so
53	lib/gretl/sur.so	55	lib/gretl-gtk2/sur.so
54	lib/gretl/tramo-x12a.so	56	lib/gretl-gtk2/tramo-x12a.so