From owner-svn-ports-head@FreeBSD.ORG Tue Dec 23 13:47:12 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 24712C63; Tue, 23 Dec 2014 13:47:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA93C1850; Tue, 23 Dec 2014 13:47:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBNDlBi1037551; Tue, 23 Dec 2014 13:47:11 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBNDlB2s037547; Tue, 23 Dec 2014 13:47:11 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201412231347.sBNDlB2s037547@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Tue, 23 Dec 2014 13:47:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375326 - in head: Mk/Scripts devel/gconf2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Dec 2014 13:47:12 -0000 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 .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 +@dir etc/gconf/gconf.xml.defaults +@dir etc/gconf/gconf.xml.mandatory +@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