3 files changed, 18 insertions, 11 deletions

diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index ee9780017881..1c188695ea5e 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnomedb
-PORTVERSION=	0.8.191
+PORTVERSION=	0.8.192
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/sources/libgnomedb
+MASTER_SITE_SUBDIR=	2.0.0/sources/libgnomedb
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -21,6 +21,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
@@ -29,13 +31,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-pre-patch:
+post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|-pthread|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|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo
index 7e6bf9076ec5..e1d3fd81bd42 100644
--- a/databases/libgnomedb/distinfo
+++ b/databases/libgnomedb/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomedb-0.8.191.tar.bz2) = 4a8171aad90d81d493a4a10bf72abfdd
+MD5 (gnome2/libgnomedb-0.8.192.tar.bz2) = d48ff114749eeb20d357dc7c7a5c4147
diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist
index 8358a5ca72ad..2d78b782845a 100644
--- a/databases/libgnomedb/pkg-plist
+++ b/databases/libgnomedb/pkg-plist
@@ -1,4 +1,4 @@
-bin/gnome-database-components
+bin/gnome-database-properties
 etc/gconf/gconf.xml.defaults/apps/gnome-db/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome-db/Shell/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome-db/UI/%gconf.xml
@@ -42,6 +42,7 @@ lib/libgnomedb-2.so.1
 libdata/pkgconfig/libgnomedb.pc
 libdata/bonobo/servers/GNOME_Database_Components.server
 libdata/bonobo/servers/GNOME_Database_Monikers.server
+libexec/gnome-database-components
 share/doc/libgnomedb/fdl-section1.html
 share/doc/libgnomedb/fdl-section10.html
 share/doc/libgnomedb/fdl-section2.html
@@ -59,6 +60,7 @@ share/doc/libgnomedb/index.sgml
 share/doc/libgnomedb/libgnomedb-basic.html
 share/doc/libgnomedb/libgnomedb-bonobo.html
 share/doc/libgnomedb/libgnomedb-gnome-db-model.html
+share/doc/libgnomedb/libgnomedb-gnome-db-stock.html
 share/doc/libgnomedb/libgnomedb-gnome-db-util.html
 share/doc/libgnomedb/libgnomedb-gnomedbbrowser.html
 share/doc/libgnomedb/libgnomedb-gnomedbcombo.html
@@ -84,18 +86,26 @@ share/doc/libgnomedb/libgnomedb-gnomedbwindow.html
 share/doc/libgnomedb/libgnomedb-introduction.html
 share/doc/libgnomedb/libgnomedb-libgnomedb.html
 share/doc/libgnomedb/libgnomedb-widgets.html
+share/gnome/control-center-2.0/capplets/database-properties.desktop
 share/gnome/mime-info/libgnomedb.keys
 share/gnome/mime-info/libgnomedb.mime
-share/gnome/pixmaps/gnome-db.png
+share/gnome/pixmaps/libgnomedb/gnome-db-aggregates_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-connect_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-database_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-database_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-designer_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-disconnect_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-indexes_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-procedures_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-sequences_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-sql_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-sql_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-tables_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-tables_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-triggers_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-types_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-views_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db.png
 share/locale/az/LC_MESSAGES/libgnomedb-2.mo
 share/locale/ca/LC_MESSAGES/libgnomedb-2.mo
 share/locale/da/LC_MESSAGES/libgnomedb-2.mo