diff options
Diffstat (limited to 'devel')
-rw-r--r-- | devel/gconf2/Makefile | 4 | ||||
-rw-r--r-- | devel/gconf2/pkg-install | 16 | ||||
-rw-r--r-- | devel/gnome-vfs/Makefile | 10 | ||||
-rw-r--r-- | devel/gnome-vfs/pkg-deinstall.in | 19 | ||||
-rw-r--r-- | devel/gnome-vfs/pkg-install.in | 19 | ||||
-rw-r--r-- | devel/gnomevfs2/Makefile | 10 | ||||
-rw-r--r-- | devel/gnomevfs2/pkg-deinstall.in | 19 | ||||
-rw-r--r-- | devel/gnomevfs2/pkg-install.in | 19 |
8 files changed, 95 insertions, 21 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 diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 7f63607d6785..400cb9fb444a 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomevfs2 PORTVERSION= 2.8.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.8 @@ -33,6 +33,9 @@ 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 \ desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ system_http_proxy.schemas system_smb.schemas @@ -114,6 +117,10 @@ post-patch: .endif @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \ ${WRKSRC}/Makefile.in + @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ + < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} + @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ + < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} pre-configure: @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \ @@ -122,6 +129,7 @@ pre-configure: fi post-install: + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .if !defined(WITHOUT_KDE_MENUS) @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders .endif diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in new file mode 100644 index 000000000000..7e289a563dd1 --- /dev/null +++ b/devel/gnome-vfs/pkg-deinstall.in @@ -0,0 +1,19 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# Restore gconf keys of libgnome. + +if [ "$2" != "POST-DEINSTALL" ]; 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 diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in new file mode 100644 index 000000000000..6a407a1e4f42 --- /dev/null +++ b/devel/gnome-vfs/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 diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index 7f63607d6785..400cb9fb444a 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomevfs2 PORTVERSION= 2.8.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.8 @@ -33,6 +33,9 @@ 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 \ desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ system_http_proxy.schemas system_smb.schemas @@ -114,6 +117,10 @@ post-patch: .endif @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \ ${WRKSRC}/Makefile.in + @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ + < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} + @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ + < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} pre-configure: @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \ @@ -122,6 +129,7 @@ pre-configure: fi post-install: + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .if !defined(WITHOUT_KDE_MENUS) @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders .endif diff --git a/devel/gnomevfs2/pkg-deinstall.in b/devel/gnomevfs2/pkg-deinstall.in new file mode 100644 index 000000000000..7e289a563dd1 --- /dev/null +++ b/devel/gnomevfs2/pkg-deinstall.in @@ -0,0 +1,19 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# Restore gconf keys of libgnome. + +if [ "$2" != "POST-DEINSTALL" ]; 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 diff --git a/devel/gnomevfs2/pkg-install.in b/devel/gnomevfs2/pkg-install.in new file mode 100644 index 000000000000..6a407a1e4f42 --- /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 |