diff options
author | adamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059> | 2002-11-05 17:53:34 +0800 |
---|---|---|
committer | adamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059> | 2002-11-05 17:53:34 +0800 |
commit | 67a16cbf1029357fe2fc7b1b07e6d87334120c20 (patch) | |
tree | e9f598808e814f47e176563cdfd3c133a9684298 /x11/libgnome/files | |
parent | d47a40039b35338dad49e3616b933a66f087e9f5 (diff) | |
download | marcuscom-ports-67a16cbf1029357fe2fc7b1b07e6d87334120c20.tar marcuscom-ports-67a16cbf1029357fe2fc7b1b07e6d87334120c20.tar.gz marcuscom-ports-67a16cbf1029357fe2fc7b1b07e6d87334120c20.tar.bz2 marcuscom-ports-67a16cbf1029357fe2fc7b1b07e6d87334120c20.tar.lz marcuscom-ports-67a16cbf1029357fe2fc7b1b07e6d87334120c20.tar.xz marcuscom-ports-67a16cbf1029357fe2fc7b1b07e6d87334120c20.tar.zst marcuscom-ports-67a16cbf1029357fe2fc7b1b07e6d87334120c20.zip |
Update to 2.1.1.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@107 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/libgnome/files')
-rw-r--r-- | x11/libgnome/files/patch-configure | 16 | ||||
-rw-r--r-- | x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in | 16 | ||||
-rw-r--r-- | x11/libgnome/files/patch-libgnome::Makefile.in | 21 |
3 files changed, 23 insertions, 30 deletions
diff --git a/x11/libgnome/files/patch-configure b/x11/libgnome/files/patch-configure index c444fc7c7..c7384c11e 100644 --- a/x11/libgnome/files/patch-configure +++ b/x11/libgnome/files/patch-configure @@ -1,19 +1,11 @@ --- configure.orig Mon May 13 13:03:40 2002 +++ configure Sun May 26 03:43:23 2002 -@@ -7186,6 +7186,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -7471,7 +7472,7 @@ - LIBGNOME_AGE=0 +@@ -8336,7 +8336,7 @@ + case $host in - *-linux-gnu | *-irix6*) + *-linux-gnu | *-irix6* | *-freebsd*) - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define HAVE_MAN_WHEREIS 1 - EOF + _ACEOF diff --git a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in index d2267d824..d8569e65c 100644 --- a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in +++ b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in @@ -1,11 +1,15 @@ ---- help-converters/gnome-vfs-module/Makefile.in.orig Wed Aug 7 01:46:48 2002 -+++ help-converters/gnome-vfs-module/Makefile.in Wed Aug 7 01:49:21 2002 -@@ -138,12 +138,12 @@ +--- help-converters/gnome-vfs-module/Makefile.in.orig Tue Nov 5 00:53:20 2002 ++++ help-converters/gnome-vfs-module/Makefile.in Tue Nov 5 00:56:05 2002 +@@ -138,15 +138,15 @@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ --INCLUDES = -I$(top_srcdir) $(HELP_VFS_MODULE_CFLAGS) -DSERVERDIR=\"$(libexecdir)\" -+INCLUDES = -DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" -DX11BASE="\"$(X11BASE)\"" -I$(top_srcdir) $(HELP_VFS_MODULE_CFLAGS) -DSERVERDIR=\"$(libexecdir)\" +-INCLUDES = \ +- -I$(top_srcdir) \ ++INCLUDES = -DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" \ ++ -DX11BASE="\"$(X11BASE)\"" -I$(top_srcdir) \ + $(HELP_VFS_MODULE_CFLAGS) \ + -DSERVERDIR=\"$(libexecdir)\" modules_LTLIBRARIES = libvfs-help.la @@ -14,4 +18,4 @@ +module_flags = -export_dynamic -avoid-version -module modulesdir = $(libdir)/gnome-vfs-2.0/modules - libvfs_help_la_SOURCES = help-method.c help-method.h + libvfs_help_la_SOURCES = \ diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in index 68d1ba1f3..21a31faff 100644 --- a/x11/libgnome/files/patch-libgnome::Makefile.in +++ b/x11/libgnome/files/patch-libgnome::Makefile.in @@ -1,14 +1,11 @@ - -$FreeBSD: ports/x11/libgnome/files/patch-libgnome::Makefile.in,v 1.3 2002/04/26 10:34:49 sobomax Exp $ - ---- libgnome/Makefile.in.orig Fri Apr 26 13:14:03 2002 -+++ libgnome/Makefile.in Fri Apr 26 13:14:03 2002 -@@ -149,7 +149,7 @@ - +--- libgnome/Makefile.in.orig Tue Nov 5 00:56:43 2002 ++++ libgnome/Makefile.in Tue Nov 5 00:58:40 2002 +@@ -149,6 +149,8 @@ libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome --INCLUDES = -I.. -I$(srcdir)/.. $(WARN_CFLAGS) $(LIBGNOME_CFLAGS) -DG_DISABLE_DEPRECATED -DLIBGNOME_PREFIX=\""$(prefix)"\" -DLIBGNOME_LIBDIR=\""$(libdir)"\" -DLIBGNOME_DATADIR=\""$(datadir)"\" -DLIBGNOME_BINDIR=\""$(bindir)"\" -DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\" -DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\" -DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\" -DVERSION=\""$(VERSION)"\" -DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\" -DG_LOG_DOMAIN=\"Gnome\" -+INCLUDES = -DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" -DX11BASE="\"$(X11BASE)\"" -I.. -I$(srcdir)/.. $(WARN_CFLAGS) $(LIBGNOME_CFLAGS) -DG_DISABLE_DEPRECATED -DLIBGNOME_PREFIX=\""$(prefix)"\" -DLIBGNOME_LIBDIR=\""$(libdir)"\" -DLIBGNOME_DATADIR=\""$(datadir)"\" -DLIBGNOME_BINDIR=\""$(bindir)"\" -DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\" -DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\" -DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\" -DVERSION=\""$(VERSION)"\" -DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\" -DG_LOG_DOMAIN=\"Gnome\" - - - libgnome_2_la_SOURCES = libgnometypebuiltins.h libgnometypebuiltins.c gnome-config.c gnome-sound.c gnome-triggers.c gnome-triggersP.h gnome-program.c gnome-help.c gnome-exec.c gnome-gconf.c gnome-gconfP.h gnome-i18n.c gnome-i18nP.h gnome-url.c gnome-util.c gnome-score.c gnome-init.c + INCLUDES = \ ++ -DPREFIX="\"$(PREFIX)"\" -DLOCALBASE="\"$(LOCALBASE)\"" \ ++ -DX11BASE="\"$(X11BASE)"\" \ + -I.. \ + -I$(srcdir)/.. \ + $(WARN_CFLAGS) \ |