cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Add three empty dirs that belonged to gnomehier to devel/gconf2,

Browse Source 
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
This commit is contained in:
Antoine Brodin 2014-12-23 13:47:10 +00:00
parent e8ff9b7b28
commit cf0b040a44
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=375326
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Mk/Scripts/check-stagedir.sh
View File

@ -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

5
devel/gconf2/Makefile
View File

@ -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

3
devel/gconf2/pkg-plist
View File

@ -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