Update to 1.1.6.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2648 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 37 insertions, 61 deletions

diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 0ea53c57f..3ca69ce6f 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgda2
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.6
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.1
@@ -25,7 +25,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier glib20 libxslt
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/databases/libgda2/distinfo b/databases/libgda2/distinfo
index 8edd259ab..88feb1bc1 100644
--- a/databases/libgda2/distinfo
+++ b/databases/libgda2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgda-1.1.5.tar.bz2) = b08d701b53052dafed1009119a5a11be
-SIZE (gnome2/libgda-1.1.5.tar.bz2) = 1085292
+MD5 (gnome2/libgda-1.1.6.tar.bz2) = 971142a54704f73224b0d49d7e5b10ad
+SIZE (gnome2/libgda-1.1.6.tar.bz2) = 1169045
diff --git a/databases/libgda2/files/patch-ltmain.sh b/databases/libgda2/files/patch-ltmain.sh
deleted file mode 100644
index 860ddda64..000000000
--- a/databases/libgda2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Tue Aug  5 18:08:30 2003
-+++ ltmain.sh	Wed Aug  6 08:18:27 2003
-@@ -1278,7 +1278,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1288,8 +1288,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -3008,6 +3016,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5457,10 +5468,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/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/files/patch-po_Makefile.in.in b/databases/libgda2/files/patch-po_Makefile.in.in
new file mode 100644
index 000000000..1e6984b6b
--- /dev/null
+++ b/databases/libgda2/files/patch-po_Makefile.in.in
@@ -0,0 +1,10 @@
+--- po/Makefile.in.in.orig	Sat Aug 14 00:43:46 2004
++++ po/Makefile.in.in	Sat Aug 14 00:45:54 2004
+@@ -35,6 +35,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+ CC = @CC@
+ GENCAT = @GENCAT@
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index 33620e2b2..ec17b10cf 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -101,6 +101,10 @@ libdata/pkgconfig/libgda.pc
 %%DOCSDIR%%/ch09s04.html
 %%DOCSDIR%%/ch09s05.html
 %%DOCSDIR%%/ch09s06.html
+%%DOCSDIR%%/compiling.html
+%%DOCSDIR%%/connecting.html
+%%DOCSDIR%%/connections.html
+%%DOCSDIR%%/data-model.html
 %%DOCSDIR%%/fdl-section1.html
 %%DOCSDIR%%/fdl-section10.html
 %%DOCSDIR%%/fdl-section2.html
@@ -113,12 +117,15 @@ libdata/pkgconfig/libgda.pc
 %%DOCSDIR%%/fdl-section9.html
 %%DOCSDIR%%/fdl-using.html
 %%DOCSDIR%%/fdl.html
+%%DOCSDIR%%/home.png
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/index.sgml
 %%DOCSDIR%%/installation-configuring.html
 %%DOCSDIR%%/installation-installing.html
 %%DOCSDIR%%/installation.html
 %%DOCSDIR%%/introduction.html
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libgda.devhelp
 %%DOCSDIR%%/libgda-GdaClient.html
 %%DOCSDIR%%/libgda-GdaConnection.html
 %%DOCSDIR%%/libgda-GdaDataModel.html
@@ -187,6 +194,15 @@ libdata/pkgconfig/libgda.pc
 %%DOCSDIR%%/libgda-reports.html
 %%DOCSDIR%%/libgda-server-provider-details.html
 %%DOCSDIR%%/libgda-xql.html
+%%DOCSDIR%%/main_example.html
+%%DOCSDIR%%/manage-gdavalue.html
+%%DOCSDIR%%/managing-errors.html
+%%DOCSDIR%%/migration-configuration.html
+%%DOCSDIR%%/migration-executing-commands.html
+%%DOCSDIR%%/migration.html
+%%DOCSDIR%%/processing-queries.html
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/up.png
 share/gnome/libgda/xml/gda-report.dtd
 share/gnome/libgda/xml/gda-report-result.dtd
 share/gnome/libgda/xml/gda-xml-query.dtd
@@ -233,6 +249,7 @@ share/locale/zh_TW/LC_MESSAGES/libgda-2.mo
 @dirrm share/gnome/omf/libgda
 @dirrm share/gnome/libgda/xml
 @dirrm share/gnome/libgda
+@dirrm %%DOCSDIR%%
 @dirrm lib/libgda/providers
 @dirrm lib/libgda
 @dirrm include/libgda/sql
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index c6b4b2bb9..c7b6a04da 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgnomedb
-PORTVERSION=	1.1.5
-PORTREVISION=	2
+PORTVERSION=	1.1.6
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/libgnomedb/1.1
@@ -20,8 +19,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libgda2 gtksourceview \
-		intlhack lthack
-USE_INC_LIBTOOL_VER=	13
+		intlhack
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo
index 17d7be970..bf6c1de74 100644
--- a/databases/libgnomedb/distinfo
+++ b/databases/libgnomedb/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomedb-1.1.5.tar.bz2) = b037ca22c5a19804435be95d59138104
-SIZE (gnome2/libgnomedb-1.1.5.tar.bz2) = 645366
+MD5 (gnome2/libgnomedb-1.1.6.tar.bz2) = 8d410f0fa1b2bfed5abbaa7bb9f05df6
+SIZE (gnome2/libgnomedb-1.1.6.tar.bz2) = 647778
diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist
index 774fc6a92..2e5d87427 100644
--- a/databases/libgnomedb/pkg-plist
+++ b/databases/libgnomedb/pkg-plist
@@ -125,6 +125,7 @@ share/gnome/pixmaps/libgnomedb/gnome-db-database_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-database_48x48.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-field_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-indexes_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-no-transaction_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-procedures_16x16.png