aboutsummaryrefslogtreecommitdiffstats
path: root/devel/gconf2
diff options
context:
space:
mode:
authormezz <mezz@FreeBSD.org>2005-01-30 04:21:04 +0800
committermezz <mezz@FreeBSD.org>2005-01-30 04:21:04 +0800
commit577add6b6109b07287b844f81160629bacd060a7 (patch)
tree0c4c9cce0682ec238270e554edd2aa9c35a30cfc /devel/gconf2
parentfebc1080d7da9f632819f9e1ad4e04af95aaec4d (diff)
downloadfreebsd-ports-gnome-577add6b6109b07287b844f81160629bacd060a7.tar.gz
freebsd-ports-gnome-577add6b6109b07287b844f81160629bacd060a7.tar.zst
freebsd-ports-gnome-577add6b6109b07287b844f81160629bacd060a7.zip
devel/gconf2
Remove the post-install/pkg-install, since gnomehier is taking care of it. devel/gnomevfs2 Add pkg-install and pkg-deinstall to restore libgnome's gconf key if libgnome's .schemas exists. This fix the plist complained by pointyhat. Why restore libgnome's gconf key during the installtion if it exists? Because, libgnome always depend on gnomevfs2 so make sure the libgnome is still in the top when we either reinstall or upgrade gnomevfs2. misc/gnomehier Remove the etc/gconf/gconf.xml.defaults/*, since the gconftool is taking care of it. ie: GCONF_SCHEMAS x11/libgnome Add pkg-deinstall to restore gnomevfs2's gconf key if gnomevfs2's schemas exists. This fix the plist complained by pointyhat. Also, this is a real fix for the weird keyboard problem when you uninstall libgnome without reinstall it. Bump the PORTREVISION in all of four ports above to fix everything with gconf keys stuff for plist. Those have been tested in the MarcusCom CVS, GNOME tinderbox, and my tinderbox.
Diffstat (limited to 'devel/gconf2')
-rw-r--r--devel/gconf2/Makefile4
-rw-r--r--devel/gconf2/pkg-install16
2 files changed, 1 insertions, 19 deletions
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 23495787a660..de9618dd1fcd 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gconf2
PORTVERSION= 2.8.1
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/GConf/2.8
@@ -29,7 +30,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN1= gconftool-2.1
-post-install:
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
.include <bsd.port.mk>
diff --git a/devel/gconf2/pkg-install b/devel/gconf2/pkg-install
deleted file mode 100644
index 13898d569f3a..000000000000
--- a/devel/gconf2/pkg-install
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-case $2 in
-POST-INSTALL)
- dirs="etc/gconf/gconf.xml.defaults/apps \
- etc/gconf/gconf.xml.defaults/schemas/apps \
- etc/gconf/schemas"
- for i in ${dirs}; do
- mkdir -p ${PKG_PREFIX}/${i}
- done
- ;;
-esac
-
-exit 0