Attachment #24042 for bug #41173

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

Lines 7-13 Link Here

(-)misc/gretl/Makefile (-2 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= gretl	9	PORTNAME= gretl
10	PORTVERSION= 0.994	10	PORTVERSION= 0.998a
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 30-36 Link Here
30	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}	30	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
31	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	31	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
32	LDFLAGS="-L${LOCALBASE}/lib"	32	LDFLAGS="-L${LOCALBASE}/lib"
33	CONFIGURE_ARGS= --with-gmake	33	CONFIGURE_ARGS= --with-gmake --without-gmp
34	INSTALLS_SHLIB= yes	34	INSTALLS_SHLIB= yes
35		35
36	MAN1= gretl.1 gretl-config.1	36	MAN1= gretl.1 gretl-config.1

Line 1 Link Here

(-)misc/gretl/distinfo (-1 / +1 lines)
1	MD5 (gretl-0.994.tar.gz) = a4f69d758c52b9f60c74c85e50f0cdd9	1	MD5 (gretl-0.998a.tar.gz) = 97a5e3803ed0ee58188c46e0f0a777b8




--- gui/Makefile.in.orig	Thu Jul 11 00:20:39 2002
+++ gui/Makefile.in	Sat Jul 27 09:04:18 2002
@@ -44,8 +44,8 @@
   LIBS = $(GNOME_LIBS) $(GTK_EXTRA_LIBS) ../lib/libgretl.la
   GUI_CFLAGS = $(GNOME_CFLAGS) $(GTK_EXTRA_CFLAGS)
   desktopdir = $(gnome_prefix)/share/gnome/apps/Applications
-  mimedir = $(gnome_prefix)/share/mime-info
-  gpixmaps = $(gnome_prefix)/share/pixmaps

   ghelpdir = $(gnome_prefix)/share/gnome/help/gretl
   query_install_gnome = install-gnome
 else
@@ -54,7 +54,7 @@
 endif
 ifeq ($(USE_NLS),yes)
   datadir = @datadir@
-  localedir = $(datadir)/locale
+  localedir = $(prefix)/share/locale
   DEFS = -DLOCALEDIR=\"$(localedir)\"
 endif
 
@@ -63,7 +63,7 @@
 override LIBS += $(PIXBUF_LIBS)
 
 # Directories
 bindir	= $(prefix)/bin
-gretldir = $(prefix)/share/gretl
+gretldir = $(libdir)/gretl
 tooldir = $(topsrc)/tools
 libsrc = $(topsrc)/lib/src
 clisrc = $(topsrc)/cli
@@ -94,7 +94,7 @@
 	$(LIBTOOL) $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
 
 install-data: installdirs




--- lib/Makefile.in.orig	Thu Jul 11 00:20:39 2002
+++ lib/Makefile.in	Sat Jul 27 08:40:14 2002
@@ -11,8 +11,8 @@
 XML_CFLAGS = @XML_CFLAGS@
 XML_LIBS = @XML_LIBS@

 endif
 ifeq ($(INSTALL_DATA),)
   INSTALL_DATA = $(INSTALL) -m 644
@@ -28,7 +28,7 @@
 
 # General compile options and libs:
 LIBGRETL = libgretl.la

 
 #### End of system configuration section. ####
 
@@ -65,15 +65,15 @@
 .PHONY: 
 
 install: $(LIBGRETL) install-data

 
 install-data: installdirs
 	$(INSTALL_DATA) $(srcdir)/*.h $(includedir)
 	$(INSTALL_DATA) ../gretl.m4 $(aclocaldir)
-	$(INSTALL_PROGRAM) ../gretl-config $(bindir)
+	$(INSTALL_SCRIPT) ../gretl-config $(bindir)
 
 installdirs:
 	$(topsrc)/tools/mkinstalldirs $(libdir) $(includedir) $(aclocaldir)




--- plugin/Makefile.in.orig	Thu Jul 11 00:20:39 2002
+++ plugin/Makefile.in	Sat Jul 27 08:43:08 2002
@@ -2,6 +2,7 @@
 
 prefix = @prefix@

 CC = @CC@
 CFLAGS = @CFLAGS@
 MAKE = @MAKE@
@@ -25,7 +26,7 @@
 endif
 
 # Installation directory

+gretldir = $(libdir)/gretl
 
 LIBTOOL = $(topsrc)/libtool
 COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
@@ -45,7 +46,7 @@
   query-ms-ole.lo=ms-ole.lo
   vpath %.c libole2
   vpath %.h libole2
-  LIBOLE2_CFLAGS = -I. `glib-config --cflags`
+  LIBOLE2_CFLAGS = -I. `$(GLIB_CONFIG) --cflags`
 endif
+GTKLIB = `$(GTK_CONFIG) --libs`
 
 all: $(PLUGINS)
@@ -98,15 +99,15 @@
@@ -85,15 +86,15 @@
 .PHONY: 
 
 install: $(PLUGINS) installdirs




--- plugin/workbook.c.orig	Fri May 31 22:22:42 2002
+++ plugin/workbook.c	Sat Jul 27 08:45:00 2002
@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <glib.h>
+#include <wchar.h>
 #include "biff.h"
 #include "importer.h"
 
 #ifdef G_OS_WIN32
 # include "../winconfig.h"




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

lib/gretl/gretl.hlp
lib/gretl/gretl.stamp
lib/gretl/gretlcli.hlp
lib/gretl/gretlcli.hlp.es
lib/gretl/plugins/excel_import.so
lib/gretl/plugins/gnumeric_import.so
lib/gretl/plugins/mp_ols.so
lib/gretl/plugins/panel_data.so
lib/gretl/plugins/progress_bar.so
lib/gretl/plugins/stats_tables.so

lib/gretl/scripts/wg_ps_descriptions
lib/libgretl.a
lib/libgretl.so
lib/libgretl.so.15
share/aclocal/gretl.m4
%%GNOME:%%share/gnome/apps/Applications/gretl.desktop
%%GNOME:%%share/gnome/help/gretl/C/a3408.html
%%GNOME:%%share/gnome/help/gretl/C/a3512.html
%%GNOME:%%share/gnome/help/gretl/C/a3539.html
%%GNOME:%%share/gnome/help/gretl/C/a3573.html
%%GNOME:%%share/gnome/help/gretl/C/b3703.html
%%GNOME:%%share/gnome/help/gretl/C/c1067.html
%%GNOME:%%share/gnome/help/gretl/C/c1310.html
%%GNOME:%%share/gnome/help/gretl/C/c137.html
%%GNOME:%%share/gnome/help/gretl/C/c208.html
%%GNOME:%%share/gnome/help/gretl/C/c21.html
%%GNOME:%%share/gnome/help/gretl/C/c217.html
%%GNOME:%%share/gnome/help/gretl/C/c3294.html
%%GNOME:%%share/gnome/help/gretl/C/c3333.html
%%GNOME:%%share/gnome/help/gretl/C/c443.html
%%GNOME:%%share/gnome/help/gretl/C/c586.html
%%GNOME:%%share/gnome/help/gretl/C/c773.html
%%GNOME:%%share/gnome/help/gretl/C/c921.html
%%GNOME:%%share/gnome/help/gretl/C/c981.html
%%GNOME:%%share/gnome/help/gretl/C/docbook.css
%%GNOME:%%share/gnome/help/gretl/C/figures/adf1.png
%%GNOME:%%share/gnome/help/gretl/C/figures/adf2.png

%%GNOME:%%share/gnome/help/gretl/C/figures/plot_control.png
%%GNOME:%%share/gnome/help/gretl/C/figures/resid.png
%%GNOME:%%share/gnome/help/gretl/C/figures/scriptwin.png
%%GNOME:%%share/gnome/help/gretl/C/figures/selector.png
%%GNOME:%%share/gnome/help/gretl/C/figures/session.png
%%GNOME:%%share/gnome/help/gretl/C/figures/tip.png
%%GNOME:%%share/gnome/help/gretl/C/figures/tipbak.png

%%GNOME:%%share/gnome/help/gretl/C/figures/yhat.png
%%GNOME:%%share/gnome/help/gretl/C/index.html
%%GNOME:%%share/gnome/help/gretl/C/topic.dat
%%GNOME:%%share/gnome/help/gretl/C/x1023.html
%%GNOME:%%share/gnome/help/gretl/C/x1056.html
%%GNOME:%%share/gnome/help/gretl/C/x1169.html
%%GNOME:%%share/gnome/help/gretl/C/x1234.html
%%GNOME:%%share/gnome/help/gretl/C/x1350.html
%%GNOME:%%share/gnome/help/gretl/C/x3167.html
%%GNOME:%%share/gnome/help/gretl/C/x3421.html
%%GNOME:%%share/gnome/help/gretl/C/x3489.html
%%GNOME:%%share/gnome/help/gretl/C/x499.html
%%GNOME:%%share/gnome/help/gretl/C/x546.html
%%GNOME:%%share/gnome/help/gretl/C/x594.html
%%GNOME:%%share/gnome/help/gretl/C/x628.html
%%GNOME:%%share/gnome/help/gretl/C/x655.html
%%GNOME:%%share/gnome/help/gretl/C/x69.html
%%GNOME:%%share/gnome/help/gretl/C/x741.html
%%GNOME:%%share/gnome/help/gretl/C/x84.html
%%GNOME:%%share/gnome/help/gretl/C/x861.html
%%GNOME:%%share/gnome/help/gretl/C/x891.html
%%GNOME:%%share/gnome/help/gretl/C/x905.html
%%GNOME:%%share/gnome/help/gretl/C/x957.html
%%GNOME:%%share/gnome/mime-info/gretl.keys
%%GNOME:%%share/gnome/mime-info/gretl.mime
%%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretldata.png

Return to bug 41173

Lines 16-21 Link Here

(-)misc/gretl/pkg-plist (-34 / +39 lines)
16	include/gretl/interact.h	16	include/gretl/interact.h
17	include/gretl/internal.h	17	include/gretl/internal.h
18	include/gretl/libgretl.h	18	include/gretl/libgretl.h
		19	include/gretl/libprob.h
19	include/gretl/monte_carlo.h	20	include/gretl/monte_carlo.h
20	include/gretl/nonparam.h	21	include/gretl/nonparam.h
21	include/gretl/printout.h	22	include/gretl/printout.h
Lines 139-146 Link Here
139	lib/gretl/gretl.hlp	140	lib/gretl/gretl.hlp
140	lib/gretl/gretl.stamp	141	lib/gretl/gretl.stamp
141	lib/gretl/gretlcli.hlp	142	lib/gretl/gretlcli.hlp
		143	lib/gretl/gretlcli.hlp.es
142	lib/gretl/plugins/excel_import.so	144	lib/gretl/plugins/excel_import.so
143	lib/gretl/plugins/gnumeric_import.so	145	lib/gretl/plugins/gnumeric_import.so
		146	lib/gretl/plugins/mp_ols.so
144	lib/gretl/plugins/panel_data.so	147	lib/gretl/plugins/panel_data.so
145	lib/gretl/plugins/progress_bar.so	148	lib/gretl/plugins/progress_bar.so
146	lib/gretl/plugins/stats_tables.so	149	lib/gretl/plugins/stats_tables.so
Lines 228-252 Link Here
228	lib/gretl/scripts/wg_ps_descriptions	231	lib/gretl/scripts/wg_ps_descriptions
229	lib/libgretl.a	232	lib/libgretl.a
230	lib/libgretl.so	233	lib/libgretl.so
231	lib/libgretl.so.12	234	lib/libgretl.so.15
		235	share/aclocal/gretl.m4
232	%%GNOME:%%share/gnome/apps/Applications/gretl.desktop	236	%%GNOME:%%share/gnome/apps/Applications/gretl.desktop
233	%%GNOME:%%share/gnome/help/gretl/C/a3374.html	237	%%GNOME:%%share/gnome/help/gretl/C/a3408.html
234	%%GNOME:%%share/gnome/help/gretl/C/a3476.html	238	%%GNOME:%%share/gnome/help/gretl/C/a3512.html
235	%%GNOME:%%share/gnome/help/gretl/C/a3503.html	239	%%GNOME:%%share/gnome/help/gretl/C/a3539.html
236	%%GNOME:%%share/gnome/help/gretl/C/a3537.html	240	%%GNOME:%%share/gnome/help/gretl/C/a3573.html
237	%%GNOME:%%share/gnome/help/gretl/C/b3661.html	241	%%GNOME:%%share/gnome/help/gretl/C/b3703.html
238	%%GNOME:%%share/gnome/help/gretl/C/c1058.html	242	%%GNOME:%%share/gnome/help/gretl/C/c1067.html
239	%%GNOME:%%share/gnome/help/gretl/C/c1299.html	243	%%GNOME:%%share/gnome/help/gretl/C/c1310.html
240	%%GNOME:%%share/gnome/help/gretl/C/c137.html	244	%%GNOME:%%share/gnome/help/gretl/C/c137.html
241	%%GNOME:%%share/gnome/help/gretl/C/c208.html
242	%%GNOME:%%share/gnome/help/gretl/C/c21.html	245	%%GNOME:%%share/gnome/help/gretl/C/c21.html
243	%%GNOME:%%share/gnome/help/gretl/C/c3260.html	246	%%GNOME:%%share/gnome/help/gretl/C/c217.html
244	%%GNOME:%%share/gnome/help/gretl/C/c3299.html	247	%%GNOME:%%share/gnome/help/gretl/C/c3294.html
245	%%GNOME:%%share/gnome/help/gretl/C/c434.html	248	%%GNOME:%%share/gnome/help/gretl/C/c3333.html
246	%%GNOME:%%share/gnome/help/gretl/C/c577.html	249	%%GNOME:%%share/gnome/help/gretl/C/c443.html
247	%%GNOME:%%share/gnome/help/gretl/C/c764.html	250	%%GNOME:%%share/gnome/help/gretl/C/c586.html
248	%%GNOME:%%share/gnome/help/gretl/C/c912.html	251	%%GNOME:%%share/gnome/help/gretl/C/c773.html
249	%%GNOME:%%share/gnome/help/gretl/C/c972.html	252	%%GNOME:%%share/gnome/help/gretl/C/c921.html
		253	%%GNOME:%%share/gnome/help/gretl/C/c981.html
250	%%GNOME:%%share/gnome/help/gretl/C/docbook.css	254	%%GNOME:%%share/gnome/help/gretl/C/docbook.css
251	%%GNOME:%%share/gnome/help/gretl/C/figures/adf1.png	255	%%GNOME:%%share/gnome/help/gretl/C/figures/adf1.png
252	%%GNOME:%%share/gnome/help/gretl/C/figures/adf2.png	256	%%GNOME:%%share/gnome/help/gretl/C/figures/adf2.png
Lines 270-275 Link Here
270	%%GNOME:%%share/gnome/help/gretl/C/figures/plot_control.png	274	%%GNOME:%%share/gnome/help/gretl/C/figures/plot_control.png
271	%%GNOME:%%share/gnome/help/gretl/C/figures/resid.png	275	%%GNOME:%%share/gnome/help/gretl/C/figures/resid.png
272	%%GNOME:%%share/gnome/help/gretl/C/figures/scriptwin.png	276	%%GNOME:%%share/gnome/help/gretl/C/figures/scriptwin.png
		277	%%GNOME:%%share/gnome/help/gretl/C/figures/selector.png
273	%%GNOME:%%share/gnome/help/gretl/C/figures/session.png	278	%%GNOME:%%share/gnome/help/gretl/C/figures/session.png
274	%%GNOME:%%share/gnome/help/gretl/C/figures/tip.png	279	%%GNOME:%%share/gnome/help/gretl/C/figures/tip.png
275	%%GNOME:%%share/gnome/help/gretl/C/figures/tipbak.png	280	%%GNOME:%%share/gnome/help/gretl/C/figures/tipbak.png
Lines 279-304 Link Here
279	%%GNOME:%%share/gnome/help/gretl/C/figures/yhat.png	284	%%GNOME:%%share/gnome/help/gretl/C/figures/yhat.png
280	%%GNOME:%%share/gnome/help/gretl/C/index.html	285	%%GNOME:%%share/gnome/help/gretl/C/index.html
281	%%GNOME:%%share/gnome/help/gretl/C/topic.dat	286	%%GNOME:%%share/gnome/help/gretl/C/topic.dat
282	%%GNOME:%%share/gnome/help/gretl/C/x1014.html	287	%%GNOME:%%share/gnome/help/gretl/C/x1023.html
283	%%GNOME:%%share/gnome/help/gretl/C/x1047.html	288	%%GNOME:%%share/gnome/help/gretl/C/x1056.html
284	%%GNOME:%%share/gnome/help/gretl/C/x1158.html	289	%%GNOME:%%share/gnome/help/gretl/C/x1169.html
285	%%GNOME:%%share/gnome/help/gretl/C/x1223.html	290	%%GNOME:%%share/gnome/help/gretl/C/x1234.html
286	%%GNOME:%%share/gnome/help/gretl/C/x1339.html	291	%%GNOME:%%share/gnome/help/gretl/C/x1350.html
287	%%GNOME:%%share/gnome/help/gretl/C/x3138.html	292	%%GNOME:%%share/gnome/help/gretl/C/x3167.html
288	%%GNOME:%%share/gnome/help/gretl/C/x3387.html	293	%%GNOME:%%share/gnome/help/gretl/C/x3421.html
289	%%GNOME:%%share/gnome/help/gretl/C/x3455.html	294	%%GNOME:%%share/gnome/help/gretl/C/x3489.html
290	%%GNOME:%%share/gnome/help/gretl/C/x490.html	295	%%GNOME:%%share/gnome/help/gretl/C/x499.html
291	%%GNOME:%%share/gnome/help/gretl/C/x537.html	296	%%GNOME:%%share/gnome/help/gretl/C/x546.html
292	%%GNOME:%%share/gnome/help/gretl/C/x585.html	297	%%GNOME:%%share/gnome/help/gretl/C/x594.html
293	%%GNOME:%%share/gnome/help/gretl/C/x619.html	298	%%GNOME:%%share/gnome/help/gretl/C/x628.html
294	%%GNOME:%%share/gnome/help/gretl/C/x646.html	299	%%GNOME:%%share/gnome/help/gretl/C/x655.html
295	%%GNOME:%%share/gnome/help/gretl/C/x69.html	300	%%GNOME:%%share/gnome/help/gretl/C/x69.html
296	%%GNOME:%%share/gnome/help/gretl/C/x732.html	301	%%GNOME:%%share/gnome/help/gretl/C/x741.html
297	%%GNOME:%%share/gnome/help/gretl/C/x84.html	302	%%GNOME:%%share/gnome/help/gretl/C/x84.html
298	%%GNOME:%%share/gnome/help/gretl/C/x852.html	303	%%GNOME:%%share/gnome/help/gretl/C/x861.html
299	%%GNOME:%%share/gnome/help/gretl/C/x882.html	304	%%GNOME:%%share/gnome/help/gretl/C/x891.html
300	%%GNOME:%%share/gnome/help/gretl/C/x896.html	305	%%GNOME:%%share/gnome/help/gretl/C/x905.html
301	%%GNOME:%%share/gnome/help/gretl/C/x948.html	306	%%GNOME:%%share/gnome/help/gretl/C/x957.html
302	%%GNOME:%%share/gnome/mime-info/gretl.keys	307	%%GNOME:%%share/gnome/mime-info/gretl.keys
303	%%GNOME:%%share/gnome/mime-info/gretl.mime	308	%%GNOME:%%share/gnome/mime-info/gretl.mime
304	%%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretldata.png	309	%%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretldata.png

Lines 1-8 Link Here

(-)misc/gretl/files/patch-gui::Makefile.in (-13 / +15 lines)
1	--- gui/Makefile.in.orig Mon Apr 22 01:43:31 2002	1	--- gui/Makefile.in.orig Thu Jul 11 00:20:39 2002
2	+++ gui/Makefile.in Thu May 2 01:49:12 2002	2	+++ gui/Makefile.in Sat Jul 27 09:04:18 2002
3	@@ -41,21 +41,20 @@	3	@@ -44,8 +44,8 @@
4	LIBS = `gnome-config --libs gnomeui print` `gtkextra-config --libs` ../lib/libgretl.la	4	LIBS = $(GNOME_LIBS) $(GTK_EXTRA_LIBS) ../lib/libgretl.la
5	GUI_CFLAGS = `gnome-config --cflags gnomeui print` `gtkextra-config --cflags`	5	GUI_CFLAGS = $(GNOME_CFLAGS) $(GTK_EXTRA_CFLAGS)
6	desktopdir = $(gnome_prefix)/share/gnome/apps/Applications	6	desktopdir = $(gnome_prefix)/share/gnome/apps/Applications
7	- mimedir = $(gnome_prefix)/share/mime-info	7	- mimedir = $(gnome_prefix)/share/mime-info
8	- gpixmaps = $(gnome_prefix)/share/pixmaps	8	- gpixmaps = $(gnome_prefix)/share/pixmaps
Lines 11-33 Link Here
11	ghelpdir = $(gnome_prefix)/share/gnome/help/gretl	11	ghelpdir = $(gnome_prefix)/share/gnome/help/gretl
12	query_install_gnome = install-gnome	12	query_install_gnome = install-gnome
13	else	13	else
14	- LIBS = `gtk-config --libs` `gtkextra-config --libs` ../lib/libgretl.la	14	@@ -54,7 +54,7 @@
15	- GUI_CFLAGS = `gtk-config --cflags` `gtkextra-config --cflags`	15	endif
16	+ LIBS = `$(GTK_CONFIG) --libs` `gtkextra-config --libs` ../lib/libgretl.la	16	ifeq ($(USE_NLS),yes)
17	+ GUI_CFLAGS = `$(GTK_CONFIG) --cflags` `gtkextra-config --cflags`	17	datadir = @datadir@
		18	- localedir = $(datadir)/locale
		19	+ localedir = $(prefix)/share/locale
		20	DEFS = -DLOCALEDIR=\"$(localedir)\"
18	endif	21	endif
19		22
20	override CFLAGS += $(PIXBUF_CFLAGS)	23	@@ -63,7 +63,7 @@
21	override LIBS += $(PIXBUF_LIBS)
22		24
23	# Directories	25	# Directories
24	-bindir = $(prefix)/bin	26	bindir = $(prefix)/bin
25	-gretldir = $(prefix)/share/gretl	27	-gretldir = $(prefix)/share/gretl
26	+gretldir = $(libdir)/gretl	28	+gretldir = $(libdir)/gretl
27	tooldir = $(topsrc)/tools	29	tooldir = $(topsrc)/tools
28	libsrc = $(topsrc)/lib/src	30	libsrc = $(topsrc)/lib/src
29	clisrc = $(topsrc)/cli	31	clisrc = $(topsrc)/cli
30	@@ -90,7 +89,7 @@	32	@@ -94,7 +94,7 @@
31	$(LIBTOOL) $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)	33	$(LIBTOOL) $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
32		34
33	install-data: installdirs	35	install-data: installdirs

Lines 1-5 Link Here

(-)misc/gretl/files/patch-lib::Makefile.in (-5 / +6 lines)
1	--- lib/Makefile.in.orig Mon Apr 22 01:43:31 2002	1	--- lib/Makefile.in.orig Thu Jul 11 00:20:39 2002
2	+++ lib/Makefile.in Wed May 1 23:59:51 2002	2	+++ lib/Makefile.in Sat Jul 27 08:40:14 2002
3	@@ -11,8 +11,8 @@	3	@@ -11,8 +11,8 @@
4	XML_CFLAGS = @XML_CFLAGS@	4	XML_CFLAGS = @XML_CFLAGS@
5	XML_LIBS = @XML_LIBS@	5	XML_LIBS = @XML_LIBS@
Lines 11-17 Link Here
11	endif	11	endif
12	ifeq ($(INSTALL_DATA),)	12	ifeq ($(INSTALL_DATA),)
13	INSTALL_DATA = $(INSTALL) -m 644	13	INSTALL_DATA = $(INSTALL) -m 644
14	@@ -27,7 +27,7 @@	14	@@ -28,7 +28,7 @@
15		15
16	# General compile options and libs:	16	# General compile options and libs:
17	LIBGRETL = libgretl.la	17	LIBGRETL = libgretl.la
Lines 20-26 Link Here
20		20
21	#### End of system configuration section. ####	21	#### End of system configuration section. ####
22		22
23	@@ -61,14 +61,14 @@	23	@@ -65,15 +65,15 @@
24	.PHONY:	24	.PHONY:
25		25
26	install: $(LIBGRETL) install-data	26	install: $(LIBGRETL) install-data
Lines 33-40 Link Here
33		33
34	install-data: installdirs	34	install-data: installdirs
35	$(INSTALL_DATA) $(srcdir)/*.h $(includedir)	35	$(INSTALL_DATA) $(srcdir)/*.h $(includedir)
		36	$(INSTALL_DATA) ../gretl.m4 $(aclocaldir)
36	- $(INSTALL_PROGRAM) ../gretl-config $(bindir)	37	- $(INSTALL_PROGRAM) ../gretl-config $(bindir)
37	+ $(INSTALL_SCRIPT) ../gretl-config $(bindir)	38	+ $(INSTALL_SCRIPT) ../gretl-config $(bindir)
38		39
39	installdirs:	40	installdirs:
40	$(topsrc)/tools/mkinstalldirs $(libdir) $(includedir)	41	$(topsrc)/tools/mkinstalldirs $(libdir) $(includedir) $(aclocaldir)

Lines 1-5 Link Here

(-)misc/gretl/files/patch-plugin::Makefile.in (-15 / +13 lines)
1	--- plugin/Makefile.in.orig Thu Mar 28 07:05:24 2002	1	--- plugin/Makefile.in.orig Thu Jul 11 00:20:39 2002
2	+++ plugin/Makefile.in Thu May 2 01:46:10 2002	2	+++ plugin/Makefile.in Sat Jul 27 08:43:08 2002
3	@@ -2,6 +2,7 @@	3	@@ -2,6 +2,7 @@
4		4
5	prefix = @prefix@	5	prefix = @prefix@
Lines 8-14 Link Here
8	CC = @CC@	8	CC = @CC@
9	CFLAGS = @CFLAGS@	9	CFLAGS = @CFLAGS@
10	MAKE = @MAKE@	10	MAKE = @MAKE@
11	@@ -21,7 +22,7 @@	11	@@ -25,7 +26,7 @@
12	endif	12	endif
13		13
14	# Installation directory	14	# Installation directory
Lines 16-34 Link Here
16	+gretldir = $(libdir)/gretl	16	+gretldir = $(libdir)/gretl
17		17
18	LIBTOOL = $(topsrc)/libtool	18	LIBTOOL = $(topsrc)/libtool
19	COMPILE = $(LIBTOOL) --mode=compile $(CC) -c -fPIC -DPIC $(CFLAGS)	19	COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)
20	@@ -29,8 +30,8 @@	20	@@ -45,7 +46,7 @@
21		21	query-ms-ole.lo=ms-ole.lo
22	GRETLINC = -I$(topsrc)/lib/src	22	vpath %.c libole2
23	GRETLLIB = ../lib/libgretl.la	23	vpath %.h libole2
24	-GTKINC = `gtk-config --cflags`	24	- LIBOLE2_CFLAGS = -I. `glib-config --cflags`
25	-GTKLIB = `gtk-config --libs`	25	+ LIBOLE2_CFLAGS = -I. `$(GLIB_CONFIG) --cflags`
26	+GTKINC = `$(GTK_CONFIG) --cflags`	26	endif
27	+GTKLIB = `$(GTK_CONFIG) --libs`
28		27
29	PLUGINS = stats_tables.so panel_data.so progress_bar.so \	28	all: $(PLUGINS)
30	gnumeric_import.so excel_import.so	29	@@ -98,15 +99,15 @@
31	@@ -85,15 +86,15 @@
32	.PHONY:	30	.PHONY:
33		31
34	install: $(PLUGINS) installdirs	32	install: $(PLUGINS) installdirs

Lines 1-10 Link Here

(-)misc/gretl/files/patch-plugin::workbook.c (-6 / +6 lines)
1	--- plugin/workbook.c.orig Thu Apr 11 05:33:44 2002	1	--- plugin/workbook.c.orig Fri May 31 22:22:42 2002
2	+++ plugin/workbook.c Thu May 2 01:27:51 2002	2	+++ plugin/workbook.c Sat Jul 27 08:45:00 2002
3	@@ -2,6 +2,7 @@	3	@@ -24,6 +24,7 @@
4
5	#include <stdio.h>	4	#include <stdio.h>
		5	#include <stdlib.h>
6	#include <glib.h>	6	#include <glib.h>
7	+#include <wchar.h>	7	+#include <wchar.h>
8	#include "biff.h"
9	#include "importer.h"
10		8
		9	#ifdef G_OS_WIN32
		10	# include "../winconfig.h"