diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-04-01 22:49:19 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-04-01 22:49:19 +0800 |
| commit | b056da02371b67a21cc4132e9d4d99b868b606d6 (patch) | |
| tree | 35fd7e14fc0040b6c72e4ec7ffd2a28963535c67 /x11/libgnome/files | |
| parent | 35e6da54022cfe004d2d666482432240ca528fec (diff) | |
| download | marcuscom-ports-b056da02371b67a21cc4132e9d4d99b868b606d6.tar marcuscom-ports-b056da02371b67a21cc4132e9d4d99b868b606d6.tar.gz marcuscom-ports-b056da02371b67a21cc4132e9d4d99b868b606d6.tar.bz2 marcuscom-ports-b056da02371b67a21cc4132e9d4d99b868b606d6.tar.lz marcuscom-ports-b056da02371b67a21cc4132e9d4d99b868b606d6.tar.xz marcuscom-ports-b056da02371b67a21cc4132e9d4d99b868b606d6.tar.zst marcuscom-ports-b056da02371b67a21cc4132e9d4d99b868b606d6.zip | |
Update to 2.30.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13951 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/libgnome/files')
| -rw-r--r-- | x11/libgnome/files/patch-libgnome::Makefile.in | 11 | ||||
| -rw-r--r-- | x11/libgnome/files/patch-libgnome_gnome-util.c | 19 | ||||
| -rw-r--r-- | x11/libgnome/files/patch-libgnome_libgnome-2.0.pc.in | 9 | ||||
| -rw-r--r-- | x11/libgnome/files/pkg-deinstall.in | 20 |
4 files changed, 59 insertions, 0 deletions
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in new file mode 100644 index 000000000..efac650ba --- /dev/null +++ b/x11/libgnome/files/patch-libgnome::Makefile.in @@ -0,0 +1,11 @@ +--- libgnome/Makefile.in.orig Tue May 29 22:16:13 2007 ++++ libgnome/Makefile.in Tue May 29 22:16:58 2007 +@@ -280,6 +280,8 @@ + LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ + libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome + INCLUDES = \ ++ -DPREFIX=\""$(PREFIX)"\" \ ++ -DLOCALBASE=\""$(LOCALBASE)"\" \ + -I.. \ + -I$(srcdir)/.. \ + $(WARN_CFLAGS) \ diff --git a/x11/libgnome/files/patch-libgnome_gnome-util.c b/x11/libgnome/files/patch-libgnome_gnome-util.c new file mode 100644 index 000000000..1a7e49a84 --- /dev/null +++ b/x11/libgnome/files/patch-libgnome_gnome-util.c @@ -0,0 +1,19 @@ +--- libgnome/gnome-util.c.orig Mon Jul 10 15:25:22 2006 ++++ libgnome/gnome-util.c Mon Jul 10 15:25:55 2006 +@@ -79,11 +79,11 @@ + const char shells [][14] = { + /* Note that on some systems shells can also + * be installed in /usr/bin */ +- "/bin/bash", "/usr/bin/bash", +- "/bin/zsh", "/usr/bin/zsh", +- "/bin/tcsh", "/usr/bin/tcsh", +- "/bin/ksh", "/usr/bin/ksh", +- "/bin/csh", "/bin/sh" ++ LOCALBASE "/bin/bash", ++ LOCALBASE "/bin/zsh", ++ LOCALBASE "/bin/ksh", ++ 0 ++ + }; + + if (geteuid () == getuid () && diff --git a/x11/libgnome/files/patch-libgnome_libgnome-2.0.pc.in b/x11/libgnome/files/patch-libgnome_libgnome-2.0.pc.in new file mode 100644 index 000000000..8d376a4b8 --- /dev/null +++ b/x11/libgnome/files/patch-libgnome_libgnome-2.0.pc.in @@ -0,0 +1,9 @@ +--- libgnome/libgnome-2.0.pc.in.orig Mon Apr 18 16:54:21 2005 ++++ libgnome/libgnome-2.0.pc.in Mon Apr 18 16:54:41 2005 +@@ -8,5 +8,5 @@ + Description: libgnome + Requires: glib-2.0 ORBit-2.0 libbonobo-2.0 gconf-2.0 gnome-vfs-2.0 + Version: @VERSION@ +-Libs: -L${libdir} -lgnome-2 -lpopt ++Libs: -L${libdir} -L%%LOCALBASE%%/lib -lgnome-2 -lpopt + Cflags: -I${includedir}/libgnome-2.0 diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in new file mode 100644 index 000000000..77ebb6e94 --- /dev/null +++ b/x11/libgnome/files/pkg-deinstall.in @@ -0,0 +1,20 @@ +#!/bin/sh +# +# $FreeBSD: ports/x11/libgnome/files/pkg-deinstall.in,v 1.10 2009/11/28 20:06:15 marcus Exp $ +# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.23 2009/09/26 13:42:02 marcus Exp $ +# +# Restore gconf keys of gnomevfs2. + +if [ "$2" != "POST-DEINSTALL" ]; then + exit 0 +fi + +SCHEMAS=%%LOCALBASE%%/etc/gconf/schemas/desktop_default_applications.schemas + +if [ -f ${SCHEMAS} ]; then + env GCONF_CONFIG_SOURCE=xml::%%LOCALBASE%%/etc/gconf/gconf.xml.defaults \ + %%LOCALBASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \ + > /dev/null || /usr/bin/true +fi + +exit 0 |