4 files changed, 23 insertions, 18 deletions

diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index f70112b73ec3..73e600b2ff6c 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgda2
-PORTVERSION=	0.8.191
+PORTVERSION=	0.8.192
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/sources/libgda
+MASTER_SITE_SUBDIR=	2.0.0/sources/${PORTNAME:S/2$//}
 DISTNAME=	libgda-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -24,11 +24,10 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
@@ -57,12 +56,8 @@ pre-extract:
 	@${ECHO_MSG} "You can enable support for Postgres databases by defining WITH_POSTGRES."
 .endif
 
-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|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/databases/libgda2/distinfo b/databases/libgda2/distinfo
index bddbb8f393a8..cff75ad543bd 100644
--- a/databases/libgda2/distinfo
+++ b/databases/libgda2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgda-0.8.191.tar.bz2) = fc8d35ef19fe7c8b7a4261d5a20800b8
+MD5 (gnome2/libgda-0.8.192.tar.bz2) = c1ef31a4e8d256c29c12cbe1ed90a1a1
diff --git a/databases/libgda2/files/patch-aa b/databases/libgda2/files/patch-aa
index 6892fe3f329b..94f70db4275c 100644
--- a/databases/libgda2/files/patch-aa
+++ b/databases/libgda2/files/patch-aa
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Sun Jun  2 22:13:42 2002
-+++ Makefile.in	Sun Jun  2 22:13:50 2002
-@@ -149,7 +149,7 @@
- WARN_CFLAGS = @WARN_CFLAGS@
+--- Makefile.in.orig	Fri Jul 26 16:09:57 2002
++++ Makefile.in	Fri Jul 26 16:10:46 2002
+@@ -155,7 +155,7 @@
+ YACC = @YACC@
  cxxflags_set = @cxxflags_set@
  
--SUBDIRS =  	po 	idl 	libgda 	providers 	report 	tools 	testing 	data 	doc
-+SUBDIRS =  	po 	idl 	libgda 	providers 	report 	tools 	data 	doc
+-SUBDIRS =  	po 	idl 	libsql 	libgda 	providers 	report 	tools 	testing 	data 	doc
++SUBDIRS =  	po 	idl 	libsql 	libgda 	providers 	report 	tools 	data 	doc
  
  
  EXTRA_DIST =  	COPYING 	libgda.spec.in 	libgda.pc.in 	intltool-extract.in 	intltool-merge.in 	intltool-update.in
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index 6d25a2f2df14..bda18983da63 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -1,6 +1,8 @@
+bin/gda-config-tool
 bin/gda-run
 etc/libgda/config
 include/libgda-report/gda-report-document.h
+include/libgda-report/gda-report-types.h
 include/libgda-report/gda-report.h
 include/libgda/gda-client.h
 include/libgda/gda-command.h
@@ -21,6 +23,7 @@ include/libgda/gda-row.h
 include/libgda/gda-select.h
 include/libgda/gda-server-provider.h
 include/libgda/gda-table.h
+include/libgda/gda-transaction.h
 include/libgda/gda-util.h
 include/libgda/gda-value.h
 include/libgda/gda-xml-connection.h
@@ -54,6 +57,9 @@ lib/libgda-2.so.1
 lib/libgda-report-2.a
 lib/libgda-report-2.so
 lib/libgda-report-2.so.1
+lib/libgdasql.a
+lib/libgdasql.so
+lib/libgdasql.so.0
 lib/libgda/providers/libgda-default.so
 %%MYSQL%%lib/libgda/providers/libgda-mysql.so
 %%POSTGRES%%lib/libgda/providers/libgda-postgres.so
@@ -84,6 +90,7 @@ share/doc/libgda/libgda-gda-field.html
 share/doc/libgda/libgda-gda-log.html
 share/doc/libgda/libgda-gda-parameter.html
 share/doc/libgda/libgda-gda-quark-list.html
+share/doc/libgda/libgda-gda-report-types.html
 share/doc/libgda/libgda-gda-row.html
 share/doc/libgda/libgda-gda-util.html
 share/doc/libgda/libgda-gda-value.html
@@ -101,6 +108,7 @@ share/doc/libgda/libgda-gdareportdocument.html
 share/doc/libgda/libgda-gdaselect.html
 share/doc/libgda/libgda-gdaserverprovider.html
 share/doc/libgda/libgda-gdatable.html
+share/doc/libgda/libgda-gdatransaction.html
 share/doc/libgda/libgda-gdaxmlconnection.html
 share/doc/libgda/libgda-gdaxmldatabase.html
 share/doc/libgda/libgda-gdaxmldocument.html
@@ -125,6 +133,8 @@ share/doc/libgda/libgda-gdaxqlupdate.html
 share/doc/libgda/libgda-gdaxqlvalue.html
 share/doc/libgda/libgda-gdaxqlvalueref.html
 share/doc/libgda/libgda-libgda.html
+share/doc/libgda/libgda-provider-class.html
+share/doc/libgda/libgda-provider-recordset.html
 share/doc/libgda/libgda-providers.html
 share/doc/libgda/libgda-reports.html
 share/doc/libgda/libgda-xql.html
@@ -159,9 +169,9 @@ share/locale/vi/LC_MESSAGES/libgda-2.mo
 share/locale/zh_CN/LC_MESSAGES/libgda-2.mo
 @dirrm share/gnome/libgda/dtd
 @dirrm share/gnome/libgda
-@dirrm share/doc/libgda
 @dirrm lib/libgda/providers
 @dirrm lib/libgda
+@dirrm include/libgda/sql
 @dirrm include/libgda
 @dirrm include/libgda-report
 @dirrm etc/libgda