Attachment 25074 Details for Bug 42739 – file.diff

[patch] file.diff

file.diff (text/plain), 13.73 KB, created by tkato on 2002-09-13 16:42:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-09-13 16:42:44 UTC

Size: 13.73 KB

patch

obsolete

>diff -urN /usr/ports/misc/gretl/Makefile misc/gretl/Makefile
>--- /usr/ports/misc/gretl/Makefile	Tue Sep 10 20:20:16 2002
>+++ misc/gretl/Makefile	Thu Sep 12 21:06:31 2002
>@@ -7,7 +7,7 @@
> #
> 
> PORTNAME=	gretl
>-PORTVERSION=	0.998a
>+PORTVERSION=	0.999
> CATEGORIES=	misc
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -16,30 +16,31 @@
> 
> BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
> LIB_DEPENDS=	gnomeole2.0:${PORTSDIR}/devel/libole2 \
>-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
>-		xml.5:${PORTSDIR}/textproc/libxml \
>+		gmp.6:${PORTSDIR}/math/libgmp4 \
>+		xml2.5:${PORTSDIR}/textproc/libxml2 \
> 		gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra
> RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
> 
>-USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> USE_GNOMENG=	yes
>+USE_GNOME=	gdkpixbuf
> WANT_GNOME=	yes
>+USE_REINPLACE=	yes
> USE_GMAKE=	yes
> USE_LIBTOOL=	yes
> CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
> 		LDFLAGS="-L${LOCALBASE}/lib"
>-CONFIGURE_ARGS=	--with-gmake --without-gmp
>+CONFIGURE_ARGS=	--with-gmake --without-gtk2
> INSTALLS_SHLIB=	yes
> 
> MAN1=	gretl.1 gretl-config.1
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${HAVE_GNOME:Mgtk12}!=""
>-USE_GNOME+=	gtk12
>-PKGNAMESUFFIX=	gtk
>+.if ${HAVE_GNOME:Mgnomeprint}!= ""
>+USE_GNOME+=	gnomeprint gnomeprefix
>+PKGNAMESUFFIX=  -gnome
> .else
> CONFIGURE_ARGS+=	--without-gnome
> .endif
>diff -urN /usr/ports/misc/gretl/distinfo misc/gretl/distinfo
>--- /usr/ports/misc/gretl/distinfo	Tue Sep 10 20:20:16 2002
>+++ misc/gretl/distinfo	Wed Aug 28 00:22:56 2002
>@@ -1 +1 @@
>-MD5 (gretl-0.998a.tar.gz) = 97a5e3803ed0ee58188c46e0f0a777b8
>+MD5 (gretl-0.999.tar.gz) = e38c01044e3e2a6025d9a66c357ce8fb
>diff -urN /usr/ports/misc/gretl/files/patch-gnome::Makefile.in misc/gretl/files/patch-gnome::Makefile.in
>--- /usr/ports/misc/gretl/files/patch-gnome::Makefile.in	Thu Jan  1 09:00:00 1970
>+++ misc/gretl/files/patch-gnome::Makefile.in	Wed Aug 28 03:11:50 2002
>@@ -0,0 +1,15 @@
>+--- gnome/Makefile.in.orig	Sun Aug 25 03:07:17 2002
>++++ gnome/Makefile.in	Wed Aug 28 03:10:35 2002
>+@@ -18,9 +18,9 @@
>+   install_help = install-help-1
>+ endif
>+ 
>+-desktopdir = $(gnome_prefix)/share/applications
>+-mimedir = $(gnome_prefix)/share/mime-info
>+-gpixmaps = $(gnome_prefix)/share/pixmaps
>++desktopdir = $(gnome_prefix)/share/gnome/applications
>++mimedir = $(gnome_prefix)/share/gnome/mime-info
>++gpixmaps = $(gnome_prefix)/share/gnome/pixmaps
>+ ghelpdir = $(gnome_prefix)/share/gnome/help/gretl
>+ 
>+ install: install-images install-misc install-help-dirs $(install_help)
>diff -urN /usr/ports/misc/gretl/files/patch-gui::Makefile.in misc/gretl/files/patch-gui::Makefile.in
>--- /usr/ports/misc/gretl/files/patch-gui::Makefile.in	Tue Sep 10 20:20:16 2002
>+++ misc/gretl/files/patch-gui::Makefile.in	Wed Aug 28 00:40:26 2002
>@@ -1,17 +1,6 @@
>---- 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
>-+  mimedir = $(gnome_prefix)/share/gnome/mime-info
>-+  gpixmaps = $(gnome_prefix)/share/gnome/pixmaps
>-   ghelpdir = $(gnome_prefix)/share/gnome/help/gretl
>-   query_install_gnome = install-gnome
>- else
>-@@ -54,7 +54,7 @@
>+--- gui/Makefile.in.orig	Mon Aug 26 02:32:00 2002
>++++ gui/Makefile.in	Wed Aug 28 00:40:11 2002
>+@@ -57,7 +57,7 @@
>  endif
>  ifeq ($(USE_NLS),yes)
>    datadir = @datadir@
>@@ -20,7 +9,7 @@
>    DEFS = -DLOCALEDIR=\"$(localedir)\"
>  endif
>  
>-@@ -63,7 +63,7 @@
>+@@ -66,7 +66,7 @@
>  
>  # Directories
>  bindir	= $(prefix)/bin
>@@ -29,12 +18,12 @@
>  tooldir = $(topsrc)/tools
>  libsrc = $(topsrc)/lib/src
>  clisrc = $(topsrc)/cli
>-@@ -94,7 +94,7 @@
>+@@ -100,7 +100,7 @@
>  	$(LIBTOOL) $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
>  
>  install-data: installdirs
> -	$(INSTALL_PROGRAM) $(topsrc)/gretl_sh $(bindir)/gretl
> +	$(INSTALL_SCRIPT) $(topsrc)/gretl_sh $(bindir)/gretl
>- 	$(INSTALL_DATA) gretl-logo.xpm $(gretldir)
>+ 	$(INSTALL_DATA) ../pixmaps/gretl-logo.xpm $(gretldir)
>  	$(INSTALL_DATA) $(topsrc)/COPYING $(gretldir)
>  
>diff -urN /usr/ports/misc/gretl/files/patch-lib::Makefile.in misc/gretl/files/patch-lib::Makefile.in
>--- /usr/ports/misc/gretl/files/patch-lib::Makefile.in	Tue Sep 10 20:20:16 2002
>+++ misc/gretl/files/patch-lib::Makefile.in	Wed Aug 28 00:42:31 2002
>@@ -1,8 +1,8 @@
>---- 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@
>+--- lib/Makefile.in.orig	Mon Aug 26 02:31:58 2002
>++++ lib/Makefile.in	Wed Aug 28 00:42:18 2002
>+@@ -12,8 +12,8 @@
>  XML_LIBS = @XML_LIBS@
>+ have_gtk = @have_gtk@
>  
> -ifeq ($(INSTALL_PROGRAM),)
> -  INSTALL_PROGRAM = $(INSTALL) -m 755
>@@ -11,16 +11,25 @@
>  endif
>  ifeq ($(INSTALL_DATA),)
>    INSTALL_DATA = $(INSTALL) -m 644
>-@@ -28,7 +28,7 @@
>- 
>- # General compile options and libs:
>- LIBGRETL = libgretl.la
>+@@ -26,7 +26,7 @@
>+ libdir = $(prefix)/lib
>+ includedir = $(prefix)/include/gretl
>+ aclocaldir = $(prefix)/share/aclocal
>+-pkgconfigdir = $(libdir)/pkgconfig
>++pkgconfigdir = $(prefix)/libdata/pkgconfig
>+ 
>+ INSTALLDIRS = $(libdir) $(includedir) $(aclocaldir)
>+ 
>+@@ -40,7 +40,7 @@
>+   LIBGRETL = libgretl.la
>+   INSTALL_CFG = install-cfg-old
>+ endif
> -LIBS = -lm -ldl -L/usr/local/lib -lz $(XML_LIBS)
> +LIBS = -lm -lz $(XML_LIBS)
>  
>  #### End of system configuration section. ####
>  
>-@@ -65,15 +65,15 @@
>+@@ -77,17 +77,17 @@
>  .PHONY: 
>  
>  install: $(LIBGRETL) install-data
>@@ -31,11 +40,13 @@
> -	$(LIBTOOL) $(INSTALL_PROGRAM) -s $< $(libdir)/$<
> +	$(LIBTOOL) $(INSTALL_DATA) -s $< $(libdir)/$<
>  
>- install-data: installdirs
>+ install-data: installdirs $(INSTALL_CFG)
>  	$(INSTALL_DATA) $(srcdir)/*.h $(includedir)
>  	$(INSTALL_DATA) ../gretl.m4 $(aclocaldir)
>+ 
>+ install-cfg-old: ../gretl-config
> -	$(INSTALL_PROGRAM) ../gretl-config $(bindir)
> +	$(INSTALL_SCRIPT) ../gretl-config $(bindir)
>  
>- installdirs:
>- 	$(topsrc)/tools/mkinstalldirs $(libdir) $(includedir) $(aclocaldir)
>+ install-cfg-new: ../gretl2.pc
>+ 	$(INSTALL_DATA) ../gretl2.pc $(pkgconfigdir)
>diff -urN /usr/ports/misc/gretl/files/patch-plugin::Makefile.in misc/gretl/files/patch-plugin::Makefile.in
>--- /usr/ports/misc/gretl/files/patch-plugin::Makefile.in	Tue Sep 10 20:20:16 2002
>+++ misc/gretl/files/patch-plugin::Makefile.in	Wed Aug 28 02:41:15 2002
>@@ -1,5 +1,5 @@
>---- plugin/Makefile.in.orig	Thu Jul 11 00:20:39 2002
>-+++ plugin/Makefile.in	Sat Jul 27 08:43:08 2002
>+--- plugin/Makefile.in.orig	Mon Aug 26 02:32:01 2002
>++++ plugin/Makefile.in	Wed Aug 28 00:45:07 2002
> @@ -2,6 +2,7 @@
>  
>  prefix = @prefix@
>@@ -8,25 +8,25 @@
>  CC = @CC@
>  CFLAGS = @CFLAGS@
>  MAKE = @MAKE@
>-@@ -25,7 +26,7 @@
>+@@ -26,7 +27,7 @@
>  endif
>  
>  # Installation directory
> -share = $(prefix)/share/gretl
> +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
>+ override CFLAGS += -I.. -DHAVE_CONFIG_H
>+ 
>+@@ -48,7 +49,7 @@
>+   PROGRESS_PLUGIN = progress_bar.so
>+   GNUMERIC_PLUGIN = gnumeric_import.so
>+   EXCEL_PLUGIN = excel_import.so
>+-  GRETL_LIBOLE2_CFLAGS := -I. $(shell glib-config --cflags)
>++  GRETL_LIBOLE2_CFLAGS := -I. $(shell $(GLIB_CONFIG) --cflags)
>+ endif  
>  
>- all: $(PLUGINS)
>-@@ -98,15 +99,15 @@
>+ PLUGINS = stats_tables.so panel_data.so des_import.so \
>+@@ -139,15 +140,15 @@
>  .PHONY: 
>  
>  install: $(PLUGINS) installdirs
>@@ -46,4 +46,4 @@
> +	$(topsrc)/tools/mkinstalldirs $(gretldir)/plugins
>  
>  clean:
>- 	rm -f *.o *.lo $(PLUGINS) core 
>+ 	rm -f *.o *.lo *.so core 
>diff -urN /usr/ports/misc/gretl/files/patch-share::Makefile.in misc/gretl/files/patch-share::Makefile.in
>--- /usr/ports/misc/gretl/files/patch-share::Makefile.in	Tue May 21 11:37:33 2002
>+++ misc/gretl/files/patch-share::Makefile.in	Wed Aug 28 00:48:18 2002
>@@ -1,10 +1,11 @@
>---- share/Makefile.in.orig	Thu Mar 28 07:10:47 2002
>-+++ share/Makefile.in	Wed May  1 06:56:53 2002
>-@@ -1,10 +1,11 @@
>+--- share/Makefile.in.orig	Tue Aug 20 05:22:47 2002
>++++ share/Makefile.in	Wed Aug 28 00:48:06 2002
>+@@ -1,11 +1,12 @@
>  topsrc = ..
>  
>  prefix = @prefix@
> +libdir = @libdir@
>+ have_gtk = @have_gtk@
>  
> -gretldir = $(prefix)/share/gretl
> +gretldir = $(libdir)/gretl
>@@ -12,5 +13,5 @@
> -INSTALL_DATA = cp -fp
> +INSTALL_DATA = @INSTALL_DATA@
>  
>- .PHONY :
>- 
>+ ifeq ($(have_gtk),2.0)
>+    ES_GUI_HLP = gretl.hlp.es.utf8
>diff -urN /usr/ports/misc/gretl/pkg-plist misc/gretl/pkg-plist
>--- /usr/ports/misc/gretl/pkg-plist	Tue Sep 10 20:20:16 2002
>+++ misc/gretl/pkg-plist	Thu Sep 12 21:33:09 2002
>@@ -13,6 +13,7 @@
> include/gretl/estimate.h
> include/gretl/generate.h
> include/gretl/graphing.h
>+include/gretl/gretl_utils.h
> include/gretl/interact.h
> include/gretl/internal.h
> include/gretl/libgretl.h
>@@ -24,7 +25,6 @@
> include/gretl/strutils.h
> include/gretl/subsample.h
> include/gretl/texprint.h
>-include/gretl/utils.h
> include/gretl/var.h
> include/gretl/version.h
> include/gretl/win32.h
>@@ -138,9 +138,11 @@
> lib/gretl/db/bcih.idx
> lib/gretl/gretl-logo.xpm
> lib/gretl/gretl.hlp
>+lib/gretl/gretl.hlp.es
> lib/gretl/gretl.stamp
> lib/gretl/gretlcli.hlp
> lib/gretl/gretlcli.hlp.es
>+lib/gretl/plugins/des_import.so
> lib/gretl/plugins/excel_import.so
> lib/gretl/plugins/gnumeric_import.so
> lib/gretl/plugins/mp_ols.so
>@@ -231,26 +233,25 @@
> lib/gretl/scripts/wg_ps_descriptions
> lib/libgretl.a
> lib/libgretl.so
>-lib/libgretl.so.15
>+lib/libgretl.so.16
> 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/applications/gretl.desktop
>+%%GNOME:%%share/gnome/help/gretl/C/a3425.html
>+%%GNOME:%%share/gnome/help/gretl/C/a3529.html
>+%%GNOME:%%share/gnome/help/gretl/C/a3556.html
>+%%GNOME:%%share/gnome/help/gretl/C/a3590.html
>+%%GNOME:%%share/gnome/help/gretl/C/b3720.html
>+%%GNOME:%%share/gnome/help/gretl/C/c1071.html
>+%%GNOME:%%share/gnome/help/gretl/C/c1314.html
> %%GNOME:%%share/gnome/help/gretl/C/c137.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/c3305.html
>+%%GNOME:%%share/gnome/help/gretl/C/c3348.html
>+%%GNOME:%%share/gnome/help/gretl/C/c485.html
>+%%GNOME:%%share/gnome/help/gretl/C/c588.html
>+%%GNOME:%%share/gnome/help/gretl/C/c775.html
>+%%GNOME:%%share/gnome/help/gretl/C/c925.html
>+%%GNOME:%%share/gnome/help/gretl/C/c985.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
>@@ -284,31 +285,36 @@
> %%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/x1027.html
>+%%GNOME:%%share/gnome/help/gretl/C/x1060.html
>+%%GNOME:%%share/gnome/help/gretl/C/x1173.html
>+%%GNOME:%%share/gnome/help/gretl/C/x1238.html
>+%%GNOME:%%share/gnome/help/gretl/C/x1354.html
>+%%GNOME:%%share/gnome/help/gretl/C/x197.html
>+%%GNOME:%%share/gnome/help/gretl/C/x219.html
>+%%GNOME:%%share/gnome/help/gretl/C/x3178.html
>+%%GNOME:%%share/gnome/help/gretl/C/x3314.html
>+%%GNOME:%%share/gnome/help/gretl/C/x3395.html
>+%%GNOME:%%share/gnome/help/gretl/C/x3438.html
>+%%GNOME:%%share/gnome/help/gretl/C/x3506.html
>+%%GNOME:%%share/gnome/help/gretl/C/x445.html
>+%%GNOME:%%share/gnome/help/gretl/C/x541.html
>+%%GNOME:%%share/gnome/help/gretl/C/x596.html
>+%%GNOME:%%share/gnome/help/gretl/C/x630.html
>+%%GNOME:%%share/gnome/help/gretl/C/x657.html
> %%GNOME:%%share/gnome/help/gretl/C/x69.html
>-%%GNOME:%%share/gnome/help/gretl/C/x741.html
>+%%GNOME:%%share/gnome/help/gretl/C/x743.html
>+%%GNOME:%%share/gnome/help/gretl/C/x827.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/help/gretl/C/x865.html
>+%%GNOME:%%share/gnome/help/gretl/C/x895.html
>+%%GNOME:%%share/gnome/help/gretl/C/x909.html
>+%%GNOME:%%share/gnome/help/gretl/C/x961.html
> %%GNOME:%%share/gnome/mime-info/gretl.keys
> %%GNOME:%%share/gnome/mime-info/gretl.mime
> %%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretldata.png
> %%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretlsession.png
>-%%GNOME:%%share/gnome/pixmaps/gretl-gnome-logo.xpm
>+%%GNOME:%%share/gnome/pixmaps/gretl-logo.xpm
> %%GNOME:%%share/gnome/pixmaps/gretl.png
> @dirrm lib/gretl/scripts
> @dirrm lib/gretl/plugins

Actions: View | Diff

Attachments on bug 42739: 25074