diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-12-25 03:44:27 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-12-25 03:44:27 +0800 |
| commit | 72bfd921afb407ed021ca31390d3b0762ae31ae1 (patch) | |
| tree | 1e6ce6e969617b5b4b93baa3593c4fa644146ef4 /devel/gnomevfs2 | |
| parent | 82792921749a46c40b168bf0eebb462148661bf4 (diff) | |
| download | marcuscom-ports-72bfd921afb407ed021ca31390d3b0762ae31ae1.tar marcuscom-ports-72bfd921afb407ed021ca31390d3b0762ae31ae1.tar.gz marcuscom-ports-72bfd921afb407ed021ca31390d3b0762ae31ae1.tar.bz2 marcuscom-ports-72bfd921afb407ed021ca31390d3b0762ae31ae1.tar.lz marcuscom-ports-72bfd921afb407ed021ca31390d3b0762ae31ae1.tar.xz marcuscom-ports-72bfd921afb407ed021ca31390d3b0762ae31ae1.tar.zst marcuscom-ports-72bfd921afb407ed021ca31390d3b0762ae31ae1.zip | |
Add pkg-install.in to restore libgnome's keys if libgnome's .schemas file
exits. I think this is the best explain why:
mezz: Because, when you install libgnome and it depends on gnomevfs2, so
libgnome will always overwrite gnomevfs2's key. If you reinstall or
upgrade gnomevfs2 alone and it will overwrite libgnome's key, so I
figure we add pkg-install.in in gnomevfs2 to allow libgnome's key to
be in the top again.
marcus: Okay, that makes sense. Probably safe to preserve the dependencies
that way.
mezz: Right and I figure that will make the bug report to be lesser trouble
for GNOME developers and us.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3327 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gnomevfs2')
| -rw-r--r-- | devel/gnomevfs2/Makefile | 6 | ||||
| -rw-r--r-- | devel/gnomevfs2/pkg-install.in | 19 |
2 files changed, 25 insertions, 0 deletions
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index e0a3399da..4c3e7d263 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -33,6 +33,7 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} +PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall GCONF_SCHEMAS= desktop_default_applications.schemas \ @@ -96,6 +97,8 @@ post-patch: ${WRKSRC}/libgnomevfs/xdgmime.c \ ${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ + < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} + @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} pre-configure: @@ -104,4 +107,7 @@ pre-configure: ${FALSE}; \ fi +post-install: + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + .include <bsd.port.post.mk> diff --git a/devel/gnomevfs2/pkg-install.in b/devel/gnomevfs2/pkg-install.in new file mode 100644 index 000000000..6a407a1e4 --- /dev/null +++ b/devel/gnomevfs2/pkg-install.in @@ -0,0 +1,19 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# Restore gconf keys of libgnome. + +if [ "$2" != "POST-INSTALL" ]; then + exit 0 +fi + +SCHEMAS=%%X11BASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas + +if [ -f ${SCHEMAS} ]; then + env GCONF_CONFIG_SOURCE=xml::%%X11BASE%%/etc/gconf/gconf.xml.defaults \ + %%X11BASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \ + > /dev/null || /usr/bin/true +fi + +exit 0 |