diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-11-07 20:12:25 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-11-07 20:12:25 +0800 |
| commit | 04e1ae879e4d12a020cec963438e268226f17fe7 (patch) | |
| tree | 8988ef181c8f9af9c1af0cfb2f348e9aa87c27f7 /devel | |
| parent | f5c2cebda4c71c9800665ac5f17653caca90b215 (diff) | |
| download | marcuscom-ports-04e1ae879e4d12a020cec963438e268226f17fe7.tar marcuscom-ports-04e1ae879e4d12a020cec963438e268226f17fe7.tar.gz marcuscom-ports-04e1ae879e4d12a020cec963438e268226f17fe7.tar.bz2 marcuscom-ports-04e1ae879e4d12a020cec963438e268226f17fe7.tar.lz marcuscom-ports-04e1ae879e4d12a020cec963438e268226f17fe7.tar.xz marcuscom-ports-04e1ae879e4d12a020cec963438e268226f17fe7.tar.zst marcuscom-ports-04e1ae879e4d12a020cec963438e268226f17fe7.zip | |
Fix some more /etc/dconf paths to respect ${PREFIX}, this apparently
killed gdm. Tracked down by Gustau.
While here stageify.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18855 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/dconf-editor/Makefile | 2 | ||||
| -rw-r--r-- | devel/dconf/Makefile | 18 | ||||
| -rw-r--r-- | devel/dconf/pkg-plist | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/devel/dconf-editor/Makefile b/devel/dconf-editor/Makefile index c99938642..732f06bb2 100644 --- a/devel/dconf-editor/Makefile +++ b/devel/dconf-editor/Makefile @@ -18,6 +18,6 @@ do-build: @cd ${WRKSRC}/editor && ${GMAKE} do-install: - @cd ${WRKSRC}/editor && ${GMAKE} install + @cd ${WRKSRC}/editor && DESTDIR=${STAGEDIR} ${GMAKE} install .include "${MASTERDIR}/Makefile" diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile index 81ce7972c..9df3bf655 100644 --- a/devel/dconf/Makefile +++ b/devel/dconf/Makefile @@ -4,7 +4,7 @@ PORTNAME?= dconf PORTVERSION= 0.16.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DISTNAME= dconf-${PORTVERSION} @@ -17,7 +17,6 @@ BUILD_DEPENDS= vala>=0.18.1:${PORTSDIR}/lang/vala \ docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus -NO_STAGE= yes USE_XZ= yes USES= gettext gmake pathfix pkgconfig USE_GNOME= glib20 gnomehier intltool @@ -38,15 +37,13 @@ LIB_DEPENDS+= libdconf.so:${PORTSDIR}/devel/dconf CONFIGURE_ARGS+=--disable-editor .endif -.if ${DCONF_SLAVE} == no -MAN1= dconf-editor.1 dconf-service.1 dconf.1 -MAN7= dconf.7 -.endif - post-patch: @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ ${WRKSRC}/engine/dconf-engine.c \ - ${WRKSRC}/bin/dconf-update.c + ${WRKSRC}/engine/dconf-engine-profile.c \ + ${WRKSRC}/engine/dconf-engine-source-system.c \ + ${WRKSRC}/bin/dconf-update.c \ + ${WRKSRC}/tests/engine.c @${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \ ${WRKSRC}/editor/dconf-model.c @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \ @@ -57,8 +54,7 @@ post-patch: ${WRKSRC}/editor/Makefile.in post-install: - -${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gio/modules - @${MKDIR} ${PREFIX}/etc/dconf/db - @${MKDIR} ${PREFIX}/etc/dconf/profile + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/dconf/db + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/dconf/profile .include <bsd.port.mk> diff --git a/devel/dconf/pkg-plist b/devel/dconf/pkg-plist index 6f4d19692..9228851fa 100644 --- a/devel/dconf/pkg-plist +++ b/devel/dconf/pkg-plist @@ -12,6 +12,10 @@ lib/libdconf-dbus-1.so.0 libdata/pkgconfig/dconf.pc libdata/pkgconfig/dconf-dbus-1.pc libexec/dconf-service +man/man1/dconf-editor.1.gz +man/man1/dconf-service.1.gz +man/man1/dconf.1.gz +man/man7/dconf.7.gz share/bash-completion/completions/dconf share/dbus-1/services/ca.desrt.dconf.service share/gtk-doc/html/dconf/dconf-DConfChangeset.html |