Update to 1.2.1 (bug fixes and an added Bulgarian translation).

4 files changed, 12 insertions, 44 deletions

diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 377dbf81fc76..64dee0863f2a 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gconf2
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/GConf
 DISTNAME=	GConf-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -23,21 +23,18 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack gnomehier
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--with-db3-includes=${LOCALBASE}/include \
-		--with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-pre-patch:
+post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
-		 s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/apps
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index 140630e77904..cf74a49ffc84 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/GConf-1.2.0.tar.bz2) = 9815ca4ee765e86047d0f096baf8783b
+MD5 (gnome2/GConf-1.2.1.tar.bz2) = 4e5ffdebd7dbf6d86459f6e57f8d772c
diff --git a/devel/gconf2/files/patch-ab b/devel/gconf2/files/patch-ab
index 3384f04f7c78..6f25900e7de2 100644
--- a/devel/gconf2/files/patch-ab
+++ b/devel/gconf2/files/patch-ab
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- Makefile.in	2002/02/15 19:08:06	1.1
-+++ Makefile.in	2002/02/15 19:10:01
+--- Makefile.in.orig	Sun Aug  4 22:38:39 2002
++++ Makefile.in	Sun Aug  4 22:39:52 2002
 @@ -35,7 +35,7 @@
  DESTDIR =
  
@@ -12,14 +9,3 @@ $FreeBSD$
  pkgincludedir = $(includedir)/@PACKAGE@
  
  top_builddir = .
-@@ -450,8 +450,8 @@
- 
- 
- install-data-local:
--	-mkdir -p $(DESTDIR)$(datadir)/aclocal
--	$(INSTALL_DATA) gconf.m4 $(DESTDIR)$(datadir)/aclocal/gconf-$(MAJOR_VERSION).m4
-+	-mkdir -p $(DESTDIR)$(prefix)/share/aclocal
-+	$(INSTALL_DATA) gconf.m4 $(DESTDIR)$(prefix)/share/aclocal/gconf-$(MAJOR_VERSION).m4
- 	-mkdir -p $(DESTDIR)$(sysconfdir)/gconf/gconf.xml.defaults
- 	-chmod 755 $(DESTDIR)$(sysconfdir)/gconf/gconf.xml.defaults
- 	-mkdir -p $(DESTDIR)$(sysconfdir)/gconf/gconf.xml.mandatory
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index e9ea1a42d2ce..180dc0cbf885 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -1,5 +1,3 @@
-bin/gconf-sanity-check-2
-bin/gconfd-2
 bin/gconftool-2
 etc/gconf/2/path
 include/gconf/2/gconf/gconf-changeset.h
@@ -16,6 +14,8 @@ lib/libgconf-2.a
 lib/libgconf-2.so
 lib/libgconf-2.so.5
 libdata/pkgconfig/gconf-2.0.pc
+libexec/gconf-sanity-check-2
+libexec/gconfd-2
 share/aclocal/gconf-2.m4
 share/doc/gconf/c120.html
 share/doc/gconf/c21.html
@@ -49,6 +49,7 @@ share/doc/gconf/x462.html
 share/doc/gconf/x485.html
 share/locale/ar/LC_MESSAGES/GConf2.mo
 share/locale/az/LC_MESSAGES/GConf2.mo
+share/locale/bg/LC_MESSAGES/GConf2.mo
 share/locale/ca/LC_MESSAGES/GConf2.mo
 share/locale/cs/LC_MESSAGES/GConf2.mo
 share/locale/da/LC_MESSAGES/GConf2.mo
@@ -86,19 +87,3 @@ share/locale/zh_TW/LC_MESSAGES/GConf2.mo
 @dirrm include/gconf/2/gconf
 @dirrm include/gconf/2
 @dirrm etc/gconf/2
-@exec   /bin/mkdir -p %D/etc/gconf/gconf.xml.defaults/apps
-@exec   /bin/mkdir -p %D/etc/gconf/gconf.xml.defaults/schemas/apps
-@exec   /bin/mkdir -p %D/etc/gconf/schemas
-@unexec /bin/rmdir    %D/lib/GConf 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir    %D/include/gconf 2>/dev/null || /usr/bin/true
-@unexec /bin/rm    -f %D/etc/gconf/gconf.xml.defaults/%%gconf.xml 2>/dev/null || true
-@unexec /bin/rm    -f %D/etc/gconf/gconf.xml.defaults/apps/%%gconf.xml 2>/dev/null || true
-@unexec /bin/rm    -f %D/etc/gconf/gconf.xml.defaults/schemas/%%gconf.xml 2>/dev/null || true
-@unexec /bin/rm    -f %D/etc/gconf/gconf.xml.defaults/schemas/apps/%%gconf.xml 2>/dev/null || true
-@unexec /bin/rmdir    %D/etc/gconf/schemas 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir    %D/etc/gconf/gconf.xml.mandatory 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir    %D/etc/gconf/gconf.xml.defaults/schemas/apps 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir    %D/etc/gconf/gconf.xml.defaults/schemas 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir    %D/etc/gconf/gconf.xml.defaults/apps 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir    %D/etc/gconf/gconf.xml.defaults 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir    %D/etc/gconf 2>/dev/null || /usr/bin/true