svn commit: r375326 - in head: Mk/Scripts devel/gconf2

[Antoine Brodin]

Author: antoine
Date: Tue Dec 23 13:47:10 2014
New Revision: 375326
URL: https://svnweb.freebsd.org/changeset/ports/375326
QAT: https://qat.redports.org/buildarchive/r375326/

Log:
  - Add three empty dirs that belonged to gnomehier to devel/gconf2,
    this prevents stage violations during build of ports using gconftool-2
  - White list etc/gconf/gconf.xml.defaults from stage orphans as gconftool-2
    is unpredictable
  
  With hat:	portmgr

Modified:
  head/Mk/Scripts/check-stagedir.sh
  head/devel/gconf2/Makefile
  head/devel/gconf2/pkg-plist

Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh	Tue Dec 23 13:33:46 2014	(r375325)
+++ head/Mk/Scripts/check-stagedir.sh	Tue Dec 23 13:47:10 2014	(r375326)
@@ -303,6 +303,7 @@ check_orphans_from_plist() {
 		share/mime/treemagic) ;;
 		share/mime/types) ;;
 		share/mime/version) ;;
+		'@dir etc/gconf/gconf.xml.defaults');;
 		*)
 			# An orphan was found, return non-zero status
 			ret=1

Modified: head/devel/gconf2/Makefile
==============================================================================
--- head/devel/gconf2/Makefile	Tue Dec 23 13:33:46 2014	(r375325)
+++ head/devel/gconf2/Makefile	Tue Dec 23 13:47:10 2014	(r375326)
@@ -4,7 +4,7 @@
 
 PORTNAME=	gconf2
 PORTVERSION=	3.2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -49,6 +49,9 @@ CONFIGURE_ARGS+=--without-openldap
 PLIST_SUB+=	LDAP="@comment "
 .endif
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/gconf/gconf.xml.system
+
 .include <bsd.port.mk>
 
 .endif

Modified: head/devel/gconf2/pkg-plist
==============================================================================
--- head/devel/gconf2/pkg-plist	Tue Dec 23 13:33:46 2014	(r375325)
+++ head/devel/gconf2/pkg-plist	Tue Dec 23 13:47:10 2014	(r375326)
@@ -148,5 +148,8 @@ share/locale/zh_HK/LC_MESSAGES/GConf2.mo
 share/locale/zh_TW/LC_MESSAGES/GConf2.mo
 share/polkit-1/actions/org.gnome.gconf.defaults.policy
 share/sgml/gconf/gconf-1.0.dtd
+ at dir etc/gconf/gconf.xml.defaults
+ at dir etc/gconf/gconf.xml.mandatory
+ at dir etc/gconf/gconf.xml.system
 @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
 @unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true