diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile index d0df4e2cc78a..48542d648542 100644 --- a/devel/gconf/Makefile +++ b/devel/gconf/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gconf -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/GConf diff --git a/devel/gconf/distinfo b/devel/gconf/distinfo index 6763c65a6cd2..a6edb3511d38 100644 --- a/devel/gconf/distinfo +++ b/devel/gconf/distinfo @@ -1 +1 @@ -MD5 (GConf-1.0.3.tar.gz) = 26a0e13976ed005fab57aa9f2ccb80d9 +MD5 (GConf-1.0.4.tar.gz) = 6eb7072552d8d9a02bdca38376f58863 diff --git a/devel/gconf/pkg-plist b/devel/gconf/pkg-plist index 4846a71e5619..cd619d1a453d 100644 --- a/devel/gconf/pkg-plist +++ b/devel/gconf/pkg-plist @@ -3,9 +3,7 @@ bin/gconf-config-1 bin/gconfd-1 bin/gconftool bin/gconftool-1 -@unexec if cmp -s %D/etc/gconf/1/path.example %D/etc/gconf/1/path; then rm -f %D/etc/gconf/1/path; fi -etc/gconf/1/path.example -@exec if [ ! -f %D/etc/gconf/1/path ] ; then cp -p %D/%F %B/path; fi +etc/gconf/1/path etc/gconf/schemas/desktop.schemas include/gconf/1/gconf/gconf-changeset.h include/gconf/1/gconf/gconf-client.h @@ -63,5 +61,7 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/GConf.mo @dirrm include/gconf/1 @dirrm include/gconf @dirrm etc/gconf/schemas +@dirrm etc/gconf/gconf.xml.mandatory +@dirrm etc/gconf/gconf.xml.defaults @dirrm etc/gconf/1 @dirrm etc/gconf diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index d0df4e2cc78a..48542d648542 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gconf -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/GConf diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index 6763c65a6cd2..a6edb3511d38 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1 +1 @@ -MD5 (GConf-1.0.3.tar.gz) = 26a0e13976ed005fab57aa9f2ccb80d9 +MD5 (GConf-1.0.4.tar.gz) = 6eb7072552d8d9a02bdca38376f58863 diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 4846a71e5619..cd619d1a453d 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -3,9 +3,7 @@ bin/gconf-config-1 bin/gconfd-1 bin/gconftool bin/gconftool-1 -@unexec if cmp -s %D/etc/gconf/1/path.example %D/etc/gconf/1/path; then rm -f %D/etc/gconf/1/path; fi -etc/gconf/1/path.example -@exec if [ ! -f %D/etc/gconf/1/path ] ; then cp -p %D/%F %B/path; fi +etc/gconf/1/path etc/gconf/schemas/desktop.schemas include/gconf/1/gconf/gconf-changeset.h include/gconf/1/gconf/gconf-client.h @@ -63,5 +61,7 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/GConf.mo @dirrm include/gconf/1 @dirrm include/gconf @dirrm etc/gconf/schemas +@dirrm etc/gconf/gconf.xml.mandatory +@dirrm etc/gconf/gconf.xml.defaults @dirrm etc/gconf/1 @dirrm etc/gconf