svn commit: r347804 - head/devel/dconf

[Koop Mast]

Author: kwm
Date: Mon Mar 10 19:42:32 2014
New Revision: 347804
URL: http://svnweb.freebsd.org/changeset/ports/347804
QAT: https://qat.redports.org/buildarchive/r347804/

Log:
  Fix dconf db paths. We put the dconf db in LOCALBASE.
  While here stagify.
  
  PR:		ports/186616 (based on)
  Submitted by:	Henry Hu <henry.hu.sh at gmail.com>

Modified:
  head/devel/dconf/Makefile
  head/devel/dconf/pkg-plist

Modified: head/devel/dconf/Makefile
==============================================================================
--- head/devel/dconf/Makefile	Mon Mar 10 19:36:56 2014	(r347803)
+++ head/devel/dconf/Makefile	Mon Mar 10 19:42:32 2014	(r347804)
@@ -4,7 +4,7 @@
 
 PORTNAME?=	dconf
 PORTVERSION=	0.14.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DISTNAME=	dconf-${PORTVERSION}
@@ -37,16 +37,13 @@ LIB_DEPENDS+=	libdconf.so:${PORTSDIR}/de
 CONFIGURE_ARGS+=--disable-editor
 .endif
 
-.if ${DCONF_SLAVE} == "no"
-MAN1=		dconf-editor.1 dconf-service.1 dconf.1
-MAN7=		dconf.7
-.endif
-
-NO_STAGE=	yes
 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' \
@@ -56,12 +53,7 @@ post-patch:
 		${WRKSRC}/client/Makefile.in \
 		${WRKSRC}/editor/Makefile.in
 
-#pre-build:
-#	${GMAKE} -C ${WRKSRC}/client dconf-client.c libdconf.so.0
-#	${GMAKE} -C ${WRKSRC}/dbus-1 dconf-dbus-1.c libdconf-dbus-1.so.0
-
 post-install:
-	-${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gio/modules
 	@${MKDIR} ${PREFIX}/etc/dconf/db
 	@${MKDIR} ${PREFIX}/etc/dconf/profile
 

Modified: head/devel/dconf/pkg-plist
==============================================================================
--- head/devel/dconf/pkg-plist	Mon Mar 10 19:36:56 2014	(r347803)
+++ head/devel/dconf/pkg-plist	Mon Mar 10 19:42:32 2014	(r347804)
@@ -5,7 +5,6 @@ include/dconf-dbus-1/dconf-dbus-1.h
 include/dconf/common/dconf-paths.h
 include/dconf/dconf.h
 lib/gio/modules/libdconfsettings.so
-lib/gio/modules/giomodule.cache
 lib/libdconf.so
 lib/libdconf.so.1
 lib/libdconf-dbus-1.so
@@ -13,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