5 files changed, 33 insertions, 78 deletions

diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index dc4502eb3442..4f562e0062ca 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -7,13 +7,15 @@
 
 PORTNAME=	libgda
 PORTVERSION=	0.2.90
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-db
 
 MAINTAINER=	gnome@FreeBSD.org
 
+BUILD_DEPENDS=	automake:${PORTSDIR}/devel/automake \
+		libtool:${PORTSDIR}/devel/libtool
 LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm \
 		bonobo.2:${PORTSDIR}/devel/bonobo
 
@@ -34,4 +36,17 @@ pre-patch:
 		 s|share/idl|share/gnome/idl|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
+# <GNOME release management sucks!!!>
+MISSED=		install-sh config.sub config.guess mkinstalldirs
+
+pre-configure:
+.for file in ${MISSED}
+	@${LN} -sf ${LOCALBASE}/share/automake/${file} ${WRKSRC}/
+	@${LN} -sf ${LOCALBASE}/share/automake/${file} ${WRKDIR}/
+.endfor
+
+pre-build:
+	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}/
+# </GNOME release management sucks!!!>
+
 .include <bsd.port.mk>
diff --git a/databases/libgda2/distinfo b/databases/libgda2/distinfo
index 55b7ab4742a7..25c1452519be 100644
--- a/databases/libgda2/distinfo
+++ b/databases/libgda2/distinfo
@@ -1 +1 @@
-MD5 (libgda-0.2.90.tar.gz) = 32b81cfcebcaa52f872b991ec34e9c2e
+MD5 (libgda-0.2.90.tar.gz) = 1ccb154df3a2cebee3a1dcb2848b3bbb
diff --git a/databases/libgda2/files/patch-aa b/databases/libgda2/files/patch-aa
index ab7e324837b7..041e76617dad 100644
--- a/databases/libgda2/files/patch-aa
+++ b/databases/libgda2/files/patch-aa
@@ -1,7 +1,14 @@
---- Makefile.in.orig	Tue Jun 19 00:17:33 2001
-+++ Makefile.in	Tue Jun 19 00:18:07 2001
-@@ -148,3 +148,3 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Tue Aug 14 10:29:18 2001
++++ Makefile.in	Tue Aug 14 10:41:04 2001
+@@ -146,7 +146,7 @@
+ XML_I18N_UPDATE = @XML_I18N_UPDATE@
+ XML_LIBS = @XML_LIBS@
  
 -SUBDIRS =  	po 	intl 	macros 	idl 	lib 	bindings 	providers 	tools 	testing 	doc
-+SUBDIRS =  	po 	intl 	macros 	idl 	lib 	bindings 	providers 	tools 	doc
++SUBDIRS =  	po 	intl 	macros	idl 	lib 	bindings 	providers 	tools 	doc
  
+ 
+ EXTRA_DIST =  	COPYING 	libgda.spec.in 	xml-i18n-extract.in 	xml-i18n-merge.in 	xml-i18n-update.in
diff --git a/databases/libgda2/files/patch-ltmain.sh b/databases/libgda2/files/patch-ltmain.sh
deleted file mode 100644
index 0c594216b0e1..000000000000
--- a/databases/libgda2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/07/23 09:45:58	1.1
-+++ ltmain.sh	2001/07/23 09:46:28
-@@ -4175,10 +4175,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index bae674a538c8..aa108899acd2 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -46,15 +46,19 @@ include/gda/gda-xml-item.h
 include/gda/gda-xml-list-item.h
 include/gda/gda-xml-util.h
 lib/libgda-client.a
+lib/libgda-client.la
 lib/libgda-client.so
 lib/libgda-client.so.0
 lib/libgda-clientcpp.a
+lib/libgda-clientcpp.la
 lib/libgda-clientcpp.so
 lib/libgda-clientcpp.so.0
 lib/libgda-common.a
+lib/libgda-common.la
 lib/libgda-common.so
 lib/libgda-common.so.0
 lib/libgda-server.a
+lib/libgda-server.la
 lib/libgda-server.so
 lib/libgda-server.so.0
 share/gnome/gda/templates/gda-srv-command.c.tmpl
@@ -101,69 +105,15 @@ share/gnome/help/libgda/C/providers-implementation.html
 share/gnome/help/libgda/C/providers.html
 share/gnome/help/libgda/C/reports.html
 share/gnome/help/libgda/C/topic.dat
-share/gnome/help/libgda/es/architecture.html
-share/gnome/help/libgda/es/clients-building-corba.html
-share/gnome/help/libgda/es/clients-building.html
-share/gnome/help/libgda/es/clients.html
-share/gnome/help/libgda/es/docbook.css
-share/gnome/help/libgda/es/gda-client-batch.html
-share/gnome/help/libgda/es/gda-client-meta.html
-share/gnome/help/libgda/es/gda-client-objects.html
-share/gnome/help/libgda/es/gda-client-types.html
-share/gnome/help/libgda/es/gda-client.html
-share/gnome/help/libgda/es/gda-common-logs.html
-share/gnome/help/libgda/es/gda-common-xml-databases.html
-share/gnome/help/libgda/es/gda-common-xml-queries.html
-share/gnome/help/libgda/es/gda-common.html
-share/gnome/help/libgda/es/index.html
-share/gnome/help/libgda/es/installation-configuring.html
-share/gnome/help/libgda/es/installation-installing.html
-share/gnome/help/libgda/es/installation.html
-share/gnome/help/libgda/es/introduction.html
-share/gnome/help/libgda/es/ln47.html
-share/gnome/help/libgda/es/providers-actual-implementation.html
-share/gnome/help/libgda/es/providers-examples.html
-share/gnome/help/libgda/es/providers-implementation.html
-share/gnome/help/libgda/es/providers.html
-share/gnome/help/libgda/es/reports.html
 share/gnome/help/libgda/es/topic.dat
-share/gnome/help/libgda/pt_BR/architecture.html
-share/gnome/help/libgda/pt_BR/c162.html
-share/gnome/help/libgda/pt_BR/c182.html
-share/gnome/help/libgda/pt_BR/c323.html
-share/gnome/help/libgda/pt_BR/c350.html
-share/gnome/help/libgda/pt_BR/clients-building-corba.html
-share/gnome/help/libgda/pt_BR/clients-building.html
-share/gnome/help/libgda/pt_BR/docbook.css
-share/gnome/help/libgda/pt_BR/gda-client-batch.html
-share/gnome/help/libgda/pt_BR/gda-client-meta.html
-share/gnome/help/libgda/pt_BR/gda-client-objects.html
-share/gnome/help/libgda/pt_BR/gda-client-types.html
-share/gnome/help/libgda/pt_BR/gda-common-logs.html
-share/gnome/help/libgda/pt_BR/gda-common-xml-databases.html
-share/gnome/help/libgda/pt_BR/gda-common-xml-queries.html
-share/gnome/help/libgda/pt_BR/index.html
-share/gnome/help/libgda/pt_BR/installation-configuring.html
-share/gnome/help/libgda/pt_BR/installation-installing.html
-share/gnome/help/libgda/pt_BR/installation.html
-share/gnome/help/libgda/pt_BR/introduction.html
-share/gnome/help/libgda/pt_BR/libgda.html
-share/gnome/help/libgda/pt_BR/ln38.html
-share/gnome/help/libgda/pt_BR/providers-actual-implementation.html
-share/gnome/help/libgda/pt_BR/providers-examples.html
-share/gnome/help/libgda/pt_BR/providers-implementation.html
 share/gnome/help/libgda/pt_BR/topic.dat
-share/gnome/html/libgda-client-decl.txt
 share/gnome/html/libgda-client-sections.txt
 share/gnome/html/libgda-client.args
 share/gnome/html/libgda-client.hierarchy
-share/gnome/html/libgda-client.signals
 share/gnome/html/libgda-client.types
-share/gnome/html/libgda-common-decl.txt
 share/gnome/html/libgda-common-sections.txt
 share/gnome/html/libgda-common.args
 share/gnome/html/libgda-common.hierarchy
-share/gnome/html/libgda-common.signals
 share/gnome/html/libgda-common.types
 share/gnome/idl/GDA.idl
 share/gnome/idl/GDA_Command.idl
@@ -187,6 +137,7 @@ share/locale/hu/LC_MESSAGES/libgda.mo
 share/locale/it/LC_MESSAGES/libgda.mo
 share/locale/ja/LC_MESSAGES/libgda.mo
 share/locale/nl/LC_MESSAGES/libgda.mo
+share/locale/nn/LC_MESSAGES/libgda.mo
 share/locale/no/LC_MESSAGES/libgda.mo
 share/locale/pl/LC_MESSAGES/libgda.mo
 share/locale/pt_BR/LC_MESSAGES/libgda.mo