net/openldap24-*:

- Convert to USES=libtool and bump dependent ports
- Avoid USE_AUTOTOOLS
- Don't use PTHREAD_LIBS
- Use MAKE_CMD

databases/glom:
- Drop :keepla
- Add INSTALL_TARGET=install-strip

databases/libgda4* databases/libgda5*:
- Convert to USES=libtool and bump dependent ports
- USES=tar:xz
- Use INSTALL_TARGET=install-strip
- Use @sample

databases/libgdamm:
- Drop :keepla
- USES=tar:bzip2
- Use INSTALL_TARGET=install-strip

databases/libgdamm5:
- Add INSTALL_TARGET=install-strip
- Drop --enable-static (inherited from old repocopy)

devel/anjuta x11-toolkits/py-gnome-extras:
- Drop :keepla

dns/powerdns dns/powerdns-devel:
- Convert to USES=libtool
- Add INSTALL_TARGET=install-strip
- Disable static modules
- Stop creating library symlinks with .0 suffix, not needed for dynamically
  opened modules

mail/dovecot2:
- Add USES=libtool

mail/dovecot2-pigeonhole:
- Drop CONFIGURE_TARGET (incorrect for Dragonfly)
- Add USES=libtool and INSTALL_TARGET=install-strip

math/gnumeric:
- USES=libtool tar:xz

Approved by:	portmgr (implicit, bump unstaged ports)

42 files changed, 64 insertions, 112 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index bae9f77ea691..2e9b6372397f 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	evolution-data-server
 PORTVERSION=	2.32.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 70bfaea76d74..0a62d8e24731 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	glom
 PORTVERSION=	1.12.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -26,12 +26,13 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/libdata/pkgconfig/libgda-postgres-4.0.pc:${PORTSDIR}/databases/libgda4-postgresql
 
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-USES=		desktop-file-utils gettext gmake libtool:keepla pathfix \
+INSTALL_TARGET=	install-strip
+USES=		desktop-file-utils gettext gmake libtool pathfix \
 		pgsql pkgconfig shared-mime-info tar:bzip2
 USE_GNOME=	gnomedocutils gnomeprefix pygnomeextras
 USE_LDCONFIG=	yes
+USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -42,8 +43,4 @@ INSTALLS_ICONS=	yes
 BUILD_DEPENDS+=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-server
 RUN_DEPENDS+=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-server
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libglom-1.12.so.0.0.0
-	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/glom_1_12.so 
-
 .include <bsd.port.mk>
diff --git a/databases/glom/pkg-plist b/databases/glom/pkg-plist
index dd2ecb5c2561..aceda92f6460 100644
--- a/databases/glom/pkg-plist
+++ b/databases/glom/pkg-plist
@@ -45,11 +45,9 @@ include/glom-1.12/libglom/init.h
 include/glom-1.12/libglom/libglom_config.h
 include/glom-1.12/libglom/sharedptr.h
 include/glom-1.12/libglom/standard_table_prefs_fields.h
-lib/libglom-1.12.la
 lib/libglom-1.12.so
 lib/libglom-1.12.so.0
 lib/libglom-1.12.so.0.0.0
-%%PYTHON_SITELIBDIR%%/glom_1_12.la
 %%PYTHON_SITELIBDIR%%/glom_1_12.so
 libdata/pkgconfig/glom-1.12.pc
 share/applications/glom.desktop
diff --git a/databases/ldb/Makefile b/databases/ldb/Makefile
index a7884d472fc9..0f7becbee172 100644
--- a/databases/ldb/Makefile
+++ b/databases/ldb/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=		ldb
 PORTVERSION=		1.1.16
-PORTREVISION=		0
+PORTREVISION=		1
 PORTEPOCH=		0
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SAMBA}
diff --git a/databases/libgda4-bdb/Makefile b/databases/libgda4-bdb/Makefile
index 144640eaae1d..3d3d338855d5 100644
--- a/databases/libgda4-bdb/Makefile
+++ b/databases/libgda4-bdb/Makefile
@@ -1,7 +1,7 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	4-bdb
 
diff --git a/databases/libgda4-bdb/pkg-plist b/databases/libgda4-bdb/pkg-plist
index c042ec6269f4..7975a9c5f4ab 100644
--- a/databases/libgda4-bdb/pkg-plist
+++ b/databases/libgda4-bdb/pkg-plist
@@ -1,5 +1,4 @@
 lib/libgda-%%VERSION%%/providers/libgda-bdb.a
-lib/libgda-%%VERSION%%/providers/libgda-bdb.la
 lib/libgda-%%VERSION%%/providers/libgda-bdb.so
 libdata/pkgconfig/libgda-bdb-%%VERSION%%.pc
 share/libgda-%%VERSION%%/bdb_specs_dsn.xml
diff --git a/databases/libgda4-jdbc/Makefile b/databases/libgda4-jdbc/Makefile
index c6b4c72f8edb..38b62752e3fb 100644
--- a/databases/libgda4-jdbc/Makefile
+++ b/databases/libgda4-jdbc/Makefile
@@ -1,7 +1,7 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	4-jdbc
 
diff --git a/databases/libgda4-jdbc/pkg-plist b/databases/libgda4-jdbc/pkg-plist
index 5022e14534b3..ce8daaecf6fb 100644
--- a/databases/libgda4-jdbc/pkg-plist
+++ b/databases/libgda4-jdbc/pkg-plist
@@ -1,7 +1,6 @@
 bin/gda-list-jdbc-providers-%%VERSION%%
 lib/libgda-%%VERSION%%/providers/gdaprovider-%%VERSION%%.jar
 lib/libgda-%%VERSION%%/providers/libgda-jdbc.a
-lib/libgda-%%VERSION%%/providers/libgda-jdbc.la
 lib/libgda-%%VERSION%%/providers/libgda-jdbc.so
 libdata/pkgconfig/libgda-jdbc-%%VERSION%%.pc
 share/libgda-%%VERSION%%/jdbc_specs_create_table.xml
diff --git a/databases/libgda4-ldap/Makefile b/databases/libgda4-ldap/Makefile
index 3b5aa427c5b1..b34366b5137b 100644
--- a/databases/libgda4-ldap/Makefile
+++ b/databases/libgda4-ldap/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/databases/libgda4-ldap/Makefile,v 1.3 2011/10/15 15:18:35 kwm Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	4-ldap
 
diff --git a/databases/libgda4-ldap/pkg-plist b/databases/libgda4-ldap/pkg-plist
index a7e51a268510..915174d289aa 100644
--- a/databases/libgda4-ldap/pkg-plist
+++ b/databases/libgda4-ldap/pkg-plist
@@ -1,5 +1,4 @@
 lib/libgda-%%VERSION%%/providers/libgda-ldap.a
-lib/libgda-%%VERSION%%/providers/libgda-ldap.la
 lib/libgda-%%VERSION%%/providers/libgda-ldap.so
 libdata/pkgconfig/libgda-ldap-%%VERSION%%.pc
 share/libgda-%%VERSION%%/ldap_specs_auth.xml
diff --git a/databases/libgda4-mdb/Makefile b/databases/libgda4-mdb/Makefile
index 1f98f8dc4afc..0d48f7996543 100644
--- a/databases/libgda4-mdb/Makefile
+++ b/databases/libgda4-mdb/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/databases/libgda4-mdb/Makefile,v 1.5 2012/03/13 01:34:31 mezz Exp $
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	4-mdb
 
diff --git a/databases/libgda4-mdb/pkg-plist b/databases/libgda4-mdb/pkg-plist
index 30b1df5d9f44..2e765f820c7e 100644
--- a/databases/libgda4-mdb/pkg-plist
+++ b/databases/libgda4-mdb/pkg-plist
@@ -1,5 +1,4 @@
 lib/libgda-%%VERSION%%/providers/libgda-mdb.a
-lib/libgda-%%VERSION%%/providers/libgda-mdb.la
 lib/libgda-%%VERSION%%/providers/libgda-mdb.so
 libdata/pkgconfig/libgda-mdb-%%VERSION%%.pc
 share/libgda-%%VERSION%%/mdb_specs_dsn.xml
diff --git a/databases/libgda4-mysql/Makefile b/databases/libgda4-mysql/Makefile
index dc815e5a8e59..945de9f0667c 100644
--- a/databases/libgda4-mysql/Makefile
+++ b/databases/libgda4-mysql/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/databases/libgda4-mysql/Makefile,v 1.7 2011/10/15 15:18:36 kwm Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	4-mysql
 
diff --git a/databases/libgda4-mysql/pkg-plist b/databases/libgda4-mysql/pkg-plist
index b5ff48b6fe37..0013af55360e 100644
--- a/databases/libgda4-mysql/pkg-plist
+++ b/databases/libgda4-mysql/pkg-plist
@@ -1,5 +1,4 @@
 lib/libgda-%%VERSION%%/providers/libgda-mysql.a
-lib/libgda-%%VERSION%%/providers/libgda-mysql.la
 lib/libgda-%%VERSION%%/providers/libgda-mysql.so
 libdata/pkgconfig/libgda-mysql-%%VERSION%%.pc
 share/libgda-%%VERSION%%/mysql_specs_add_column.xml
diff --git a/databases/libgda4-postgresql/Makefile b/databases/libgda4-postgresql/Makefile
index e966b61630c6..1a5e36cf2680 100644
--- a/databases/libgda4-postgresql/Makefile
+++ b/databases/libgda4-postgresql/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/databases/libgda4-postgresql/Makefile,v 1.7 2012/03/13 01:34:31 mezz Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	4-postgresql
 
diff --git a/databases/libgda4-postgresql/pkg-plist b/databases/libgda4-postgresql/pkg-plist
index 02ae080c90e0..8d183c20584f 100644
--- a/databases/libgda4-postgresql/pkg-plist
+++ b/databases/libgda4-postgresql/pkg-plist
@@ -1,5 +1,4 @@
 lib/libgda-%%VERSION%%/providers/libgda-postgres.a
-lib/libgda-%%VERSION%%/providers/libgda-postgres.la
 lib/libgda-%%VERSION%%/providers/libgda-postgres.so
 libdata/pkgconfig/libgda-postgres-%%VERSION%%.pc
 share/libgda-%%VERSION%%/postgres_specs_add_column.xml
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index dac3723fe5d1..f71ade652f97 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	libgda
 PORTVERSION=	4.2.12
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX?=	4
@@ -15,7 +15,7 @@ COMMENT?=	Provides uniform access to different kinds of data sources
 
 CONFLICTS=	libgda5-ui-[0-9]*
 
-USE_XZ=		yes
+USES=		tar:xz
 LIBGDA4_SLAVE?=	no
 
 .if !defined(REFERENCE_PORT)
@@ -23,11 +23,11 @@ LIBGDA4_SLAVE?=	no
 LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
 
-USE_AUTOTOOLS=	libtool
-USES=		pathfix gettext gmake pkgconfig
+USES+=		gettext gmake libtool pathfix pkgconfig
 USE_GNOME=	gnomeprefix glib20 libxslt intlhack referencehack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=yes
 CONFIGURE_ARGS=	--without-oracle \
 		--disable-crypto \
@@ -36,7 +36,7 @@ CONFIGURE_ARGS=	--without-oracle \
 		--without-goocanvas \
 		--without-graphviz
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 .if ${LIBGDA4_SLAVE}=="no"
 OPTIONS_DEFINE=	UI SOUP KEYRING
@@ -142,7 +142,7 @@ post-patch:
 .if ${LIBGDA4_SLAVE}!="no"
 #. for d in msql firebird odbc freetds mdb ldap mysql sqlite postgres
 . for d in bdb jdbc mdb mysql postgres reuseable/postgres reuseable/mysql ldap
-	@${REINPLACE_CMD} -e 's|$$(top_builddir)/libgda/libgda-4.0.la|${LOCALBASE}/lib/libgda-4.0.la|g' \
+	@${REINPLACE_CMD} -e 's|$$(top_builddir)/libgda/libgda-4.0.la|-lgda-4.0|g' \
 		${WRKSRC}/providers/${d}/Makefile.in
 . endfor
 .endif
@@ -158,9 +158,8 @@ pre-build:
 
 .if ${LIBGDA4_SLAVE}=="no"
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/data/config \
-		${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config.default
-	@${RM} -f ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config
+	${MV} ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config \
+		${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config.sample
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/libgda4/pkg-plist b/databases/libgda4/pkg-plist
index d9ba27189abd..7202d2d3b23c 100644
--- a/databases/libgda4/pkg-plist
+++ b/databases/libgda4/pkg-plist
@@ -8,9 +8,7 @@ bin/gda-sql
 bin/gda-sql-%%VERSION%%
 bin/gda-test-connection-%%VERSION%%
 %%UI%%bin/gdaui-demo-%%VERSION%%
-@unexec if cmp -s %D/etc/libgda-%%VERSION%%/config %D/etc/libgda-%%VERSION%%/config.default; then rm -f %D/etc/libgda-%%VERSION%%/config; fi
-etc/libgda-%%VERSION%%/config.default
-@exec [ -f %B/config ] || cp %B/%f %B/config
+@sample etc/libgda-%%VERSION%%/config.sample
 etc/libgda-%%VERSION%%/sales_test.db
 include/libgda-%%VERSION%%/libgda-report/gda-report-docbook-document.h
 include/libgda-%%VERSION%%/libgda-report/gda-report-document.h
@@ -139,35 +137,32 @@ include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-data-model.h
 include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-hub.h
 include/libgda-%%VERSION%%/libgda/virtual/libgda-virtual.h
 lib/libgda-%%VERSION%%.a
-lib/libgda-%%VERSION%%.la
 lib/libgda-%%VERSION%%.so
-lib/libgda-%%VERSION%%.so.5
+lib/libgda-%%VERSION%%.so.4
+lib/libgda-%%VERSION%%.so.4.1.0
 %%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-filesel-spec.xml
 %%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-password.xml
 %%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec.xml
 %%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec_string.xml
 %%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-text-spec.xml
 %%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.a
-%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.la
 %%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.so
 %%WEB%%lib/libgda-%%VERSION%%/providers/libgda-web.a
-%%WEB%%lib/libgda-%%VERSION%%/providers/libgda-web.la
 %%WEB%%lib/libgda-%%VERSION%%/providers/libgda-web.so
 lib/libgda-%%VERSION%%/providers/libgda-sqlite.a
-lib/libgda-%%VERSION%%/providers/libgda-sqlite.la
 lib/libgda-%%VERSION%%/providers/libgda-sqlite.so
 lib/libgda-report-%%VERSION%%.a
-lib/libgda-report-%%VERSION%%.la
 lib/libgda-report-%%VERSION%%.so
-lib/libgda-report-%%VERSION%%.so.5
+lib/libgda-report-%%VERSION%%.so.4
+lib/libgda-report-%%VERSION%%.so.4.1.0
 %%UI%%lib/libgda-ui-%%VERSION%%.a
-%%UI%%lib/libgda-ui-%%VERSION%%.la
 %%UI%%lib/libgda-ui-%%VERSION%%.so
-%%UI%%lib/libgda-ui-%%VERSION%%.so.5
+%%UI%%lib/libgda-ui-%%VERSION%%.so.4
+%%UI%%lib/libgda-ui-%%VERSION%%.so.4.1.0
 lib/libgda-xslt-%%VERSION%%.a
-lib/libgda-xslt-%%VERSION%%.la
 lib/libgda-xslt-%%VERSION%%.so
-lib/libgda-xslt-%%VERSION%%.so.5
+lib/libgda-xslt-%%VERSION%%.so.4
+lib/libgda-xslt-%%VERSION%%.so.4.1.0
 libdata/pkgconfig/libgda-%%VERSION%%.pc
 libdata/pkgconfig/libgda-report-%%VERSION%%.pc
 libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc
diff --git a/databases/libgda5-bdb/Makefile b/databases/libgda5-bdb/Makefile
index 2fee4faaf509..e9c03be310cf 100644
--- a/databases/libgda5-bdb/Makefile
+++ b/databases/libgda5-bdb/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/trunk/databases/libgda5-bdb/Makefile 18393 2013-04-26 21:23:07Z kwm $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	5-bdb
 
diff --git a/databases/libgda5-bdb/pkg-plist b/databases/libgda5-bdb/pkg-plist
index c042ec6269f4..d8aee73c0c66 100644
--- a/databases/libgda5-bdb/pkg-plist
+++ b/databases/libgda5-bdb/pkg-plist
@@ -1,5 +1,3 @@
-lib/libgda-%%VERSION%%/providers/libgda-bdb.a
-lib/libgda-%%VERSION%%/providers/libgda-bdb.la
 lib/libgda-%%VERSION%%/providers/libgda-bdb.so
 libdata/pkgconfig/libgda-bdb-%%VERSION%%.pc
 share/libgda-%%VERSION%%/bdb_specs_dsn.xml
diff --git a/databases/libgda5-jdbc/Makefile b/databases/libgda5-jdbc/Makefile
index cf7033ecffdc..443e37eee79f 100644
--- a/databases/libgda5-jdbc/Makefile
+++ b/databases/libgda5-jdbc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/trunk/databases/libgda5-jdbc/Makefile 18393 2013-04-26 21:23:07Z kwm $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	5-jdbc
 
diff --git a/databases/libgda5-jdbc/pkg-plist b/databases/libgda5-jdbc/pkg-plist
index 5022e14534b3..556d7059cc9c 100644
--- a/databases/libgda5-jdbc/pkg-plist
+++ b/databases/libgda5-jdbc/pkg-plist
@@ -1,7 +1,5 @@
 bin/gda-list-jdbc-providers-%%VERSION%%
 lib/libgda-%%VERSION%%/providers/gdaprovider-%%VERSION%%.jar
-lib/libgda-%%VERSION%%/providers/libgda-jdbc.a
-lib/libgda-%%VERSION%%/providers/libgda-jdbc.la
 lib/libgda-%%VERSION%%/providers/libgda-jdbc.so
 libdata/pkgconfig/libgda-jdbc-%%VERSION%%.pc
 share/libgda-%%VERSION%%/jdbc_specs_create_table.xml
diff --git a/databases/libgda5-ldap/Makefile b/databases/libgda5-ldap/Makefile
index e4975456924e..dc313c234759 100644
--- a/databases/libgda5-ldap/Makefile
+++ b/databases/libgda5-ldap/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/trunk/databases/libgda5-ldap/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	5-ldap
 
diff --git a/databases/libgda5-ldap/pkg-plist b/databases/libgda5-ldap/pkg-plist
index a7e51a268510..edf6e110ba24 100644
--- a/databases/libgda5-ldap/pkg-plist
+++ b/databases/libgda5-ldap/pkg-plist
@@ -1,5 +1,3 @@
-lib/libgda-%%VERSION%%/providers/libgda-ldap.a
-lib/libgda-%%VERSION%%/providers/libgda-ldap.la
 lib/libgda-%%VERSION%%/providers/libgda-ldap.so
 libdata/pkgconfig/libgda-ldap-%%VERSION%%.pc
 share/libgda-%%VERSION%%/ldap_specs_auth.xml
diff --git a/databases/libgda5-mdb/Makefile b/databases/libgda5-mdb/Makefile
index e0d8b1c32668..d59ccfba3607 100644
--- a/databases/libgda5-mdb/Makefile
+++ b/databases/libgda5-mdb/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/trunk/databases/libgda5-mdb/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	5-mdb
 
diff --git a/databases/libgda5-mdb/pkg-plist b/databases/libgda5-mdb/pkg-plist
index 30b1df5d9f44..2300d6e2fd4e 100644
--- a/databases/libgda5-mdb/pkg-plist
+++ b/databases/libgda5-mdb/pkg-plist
@@ -1,5 +1,3 @@
-lib/libgda-%%VERSION%%/providers/libgda-mdb.a
-lib/libgda-%%VERSION%%/providers/libgda-mdb.la
 lib/libgda-%%VERSION%%/providers/libgda-mdb.so
 libdata/pkgconfig/libgda-mdb-%%VERSION%%.pc
 share/libgda-%%VERSION%%/mdb_specs_dsn.xml
diff --git a/databases/libgda5-mysql/Makefile b/databases/libgda5-mysql/Makefile
index a7e0a9daa248..dc40a5da7812 100644
--- a/databases/libgda5-mysql/Makefile
+++ b/databases/libgda5-mysql/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/trunk/databases/libgda5-mysql/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	5-mysql
 
diff --git a/databases/libgda5-mysql/pkg-plist b/databases/libgda5-mysql/pkg-plist
index b5ff48b6fe37..2fc6e5e35c38 100644
--- a/databases/libgda5-mysql/pkg-plist
+++ b/databases/libgda5-mysql/pkg-plist
@@ -1,5 +1,3 @@
-lib/libgda-%%VERSION%%/providers/libgda-mysql.a
-lib/libgda-%%VERSION%%/providers/libgda-mysql.la
 lib/libgda-%%VERSION%%/providers/libgda-mysql.so
 libdata/pkgconfig/libgda-mysql-%%VERSION%%.pc
 share/libgda-%%VERSION%%/mysql_specs_add_column.xml
diff --git a/databases/libgda5-postgresql/Makefile b/databases/libgda5-postgresql/Makefile
index 7b0302ccb605..0f529c322aa9 100644
--- a/databases/libgda5-postgresql/Makefile
+++ b/databases/libgda5-postgresql/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/trunk/databases/libgda5-postgresql/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	5-postgresql
 
diff --git a/databases/libgda5-postgresql/pkg-plist b/databases/libgda5-postgresql/pkg-plist
index 02ae080c90e0..e25ad9eb123d 100644
--- a/databases/libgda5-postgresql/pkg-plist
+++ b/databases/libgda5-postgresql/pkg-plist
@@ -1,5 +1,3 @@
-lib/libgda-%%VERSION%%/providers/libgda-postgres.a
-lib/libgda-%%VERSION%%/providers/libgda-postgres.la
 lib/libgda-%%VERSION%%/providers/libgda-postgres.so
 libdata/pkgconfig/libgda-postgres-%%VERSION%%.pc
 share/libgda-%%VERSION%%/postgres_specs_add_column.xml
diff --git a/databases/libgda5-ui/Makefile b/databases/libgda5-ui/Makefile
index 0801eab4fefb..dd27a4c787ac 100644
--- a/databases/libgda5-ui/Makefile
+++ b/databases/libgda5-ui/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/trunk/databases/libgda5-ui/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	5-ui
 
diff --git a/databases/libgda5-ui/pkg-plist b/databases/libgda5-ui/pkg-plist
index e15fff798fac..30871a8ce7b7 100644
--- a/databases/libgda5-ui/pkg-plist
+++ b/databases/libgda5-ui/pkg-plist
@@ -34,13 +34,10 @@ lib/libgda-%%VERSION%%/plugins/gdaui-entry-password.xml
 lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec.xml
 lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec_string.xml
 lib/libgda-%%VERSION%%/plugins/gdaui-entry-text-spec.xml
-lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.a
-lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.la
 lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.so
-lib/libgda-ui-%%VERSION%%.a
-lib/libgda-ui-%%VERSION%%.la
 lib/libgda-ui-%%VERSION%%.so
-lib/libgda-ui-%%VERSION%%.so.5
+lib/libgda-ui-%%VERSION%%.so.4
+lib/libgda-ui-%%VERSION%%.so.4.1.0
 libdata/pkgconfig/libgda-ui-%%VERSION%%.pc
 share/applications/gda-browser-%%VERSION%%.desktop
 share/applications/gda-control-center-%%VERSION%%.desktop
diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
index 976c27157c7a..0648e4f31533 100644
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	libgda
 PORTVERSION?=	5.0.3
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX?=	5
@@ -13,7 +13,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	Provides uniform access to different kinds of data sources
 
-USE_XZ=		yes
+USES=		tar:xz
 LIBGDA5_SLAVE?=	no
 
 .if !defined(REFERENCE_PORT)
@@ -22,18 +22,18 @@ LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
 		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
 
-USE_AUTOTOOLS=	libtool
-USES=		gettext gmake pathfix pkgconfig
+USES+=		gettext gmake libtool pathfix pkgconfig
 USE_GNOME=	gnomeprefix glib20 libxslt intlhack referencehack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=yes
 CONFIGURE_ARGS=	--without-oracle \
 		--disable-crypto \
 		--disable-default-binary \
 		--disable-introspection
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
@@ -109,8 +109,8 @@ post-patch:
 		${WRKSRC}/providers/bdb/gda-bdb-test.c
 .if ${LIBGDA5_SLAVE}!="no"
 	@${FIND} ${WRKSRC} -name Makefile.in -exec ${REINPLACE_CMD} \
-		-e 's|$$(top_builddir)/libgda/libgda-5.0.la|${LOCALBASE}/lib/libgda-5.0.la|g' \
-		-e 's|../libgda/libgda-5.0.la|${LOCALBASE}/lib/libgda-5.0.la|g' \
+		-e 's|$$(top_builddir)/libgda/libgda-5.0.la|-lgda-5.0|g' \
+		-e 's|../libgda/libgda-5.0.la|-lgda-5.0|g' \
 		{} \;
 .endif
 
@@ -129,9 +129,8 @@ pre-build:
 
 .if ${LIBGDA5_SLAVE}==no
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/data/config \
-		${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config.default
-	@${RM} -f ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config
+	${MV} ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config \
+		${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config.sample
 .endif
 .if ${LIBGDA5_SLAVE}==ui
 post-install:
diff --git a/databases/libgda5/pkg-plist b/databases/libgda5/pkg-plist
index ea4251e7f230..bc796402f904 100644
--- a/databases/libgda5/pkg-plist
+++ b/databases/libgda5/pkg-plist
@@ -2,9 +2,7 @@ bin/gda-list-config-%%VERSION%%
 bin/gda-list-server-op-%%VERSION%%
 bin/gda-sql-%%VERSION%%
 bin/gda-test-connection-%%VERSION%%
-@unexec if cmp -s %D/etc/libgda-%%VERSION%%/config %D/etc/libgda-%%VERSION%%/config.default; then rm -f %D/etc/libgda-%%VERSION%%/config; fi
-etc/libgda-%%VERSION%%/config.default
-@exec [ -f %B/config ] || cp %B/%f %B/config
+@sample etc/libgda-%%VERSION%%/config.sample
 etc/libgda-%%VERSION%%/sales_test.db
 include/libgda-%%VERSION%%/libgda-report/gda-report-docbook-document.h
 include/libgda-%%VERSION%%/libgda-report/gda-report-document.h
@@ -105,24 +103,17 @@ include/libgda-%%VERSION%%/libgda/virtual/gda-virtual-provider.h
 include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-data-model.h
 include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-hub.h
 include/libgda-%%VERSION%%/libgda/virtual/libgda-virtual.h
-lib/libgda-%%VERSION%%.a
-lib/libgda-%%VERSION%%.la
 lib/libgda-%%VERSION%%.so
-lib/libgda-%%VERSION%%.so.5
-lib/libgda-%%VERSION%%/providers/libgda-web.a
-lib/libgda-%%VERSION%%/providers/libgda-web.la
+lib/libgda-%%VERSION%%.so.4
+lib/libgda-%%VERSION%%.so.4.1.0
 lib/libgda-%%VERSION%%/providers/libgda-web.so
-lib/libgda-%%VERSION%%/providers/libgda-sqlite.a
-lib/libgda-%%VERSION%%/providers/libgda-sqlite.la
 lib/libgda-%%VERSION%%/providers/libgda-sqlite.so
-lib/libgda-report-%%VERSION%%.a
-lib/libgda-report-%%VERSION%%.la
 lib/libgda-report-%%VERSION%%.so
-lib/libgda-report-%%VERSION%%.so.5
-lib/libgda-xslt-%%VERSION%%.a
-lib/libgda-xslt-%%VERSION%%.la
+lib/libgda-report-%%VERSION%%.so.4
+lib/libgda-report-%%VERSION%%.so.4.1.0
 lib/libgda-xslt-%%VERSION%%.so
-lib/libgda-xslt-%%VERSION%%.so.5
+lib/libgda-xslt-%%VERSION%%.so.4
+lib/libgda-xslt-%%VERSION%%.so.4.1.0
 libdata/pkgconfig/libgda-%%VERSION%%.pc
 libdata/pkgconfig/libgda-report-%%VERSION%%.pc
 libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 98c88e305f10..9976bcdbce7d 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	libgdamm
 PORTVERSION=	3.99.21
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -15,14 +15,11 @@ COMMENT=	C++ wrapper for libgda4 library
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_BZIP2=	yes
-USES=		gmake libtool:keepla pathfix pkgconfig
+USES=		gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	glibmm libgda4
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-documentation
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdamm-4.0.so.12.0.0
-
 .include <bsd.port.mk>
diff --git a/databases/libgdamm/pkg-plist b/databases/libgdamm/pkg-plist
index c38c79da770c..6de69e8f9547 100644
--- a/databases/libgdamm/pkg-plist
+++ b/databases/libgdamm/pkg-plist
@@ -77,7 +77,6 @@ include/libgdamm-4.0/libgdamm/throw_exception.h
 include/libgdamm-4.0/libgdamm/value.h
 include/libgdamm-4.0/libgdamm/wrap_init.h
 include/libgdamm-4.0/libgdamm/xatransaction.h
-lib/libgdamm-4.0.la
 lib/libgdamm-4.0.so
 lib/libgdamm-4.0.so.12
 lib/libgdamm-4.0.so.12.0.0
diff --git a/databases/libgdamm5/Makefile b/databases/libgdamm5/Makefile
index 45ef1d976981..3c00ce2f64f8 100644
--- a/databases/libgdamm5/Makefile
+++ b/databases/libgdamm5/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	libgdamm
 PORTVERSION=	4.99.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -14,13 +14,12 @@ COMMENT=	C++ wrapper for libgda5 library
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-LATEST_LINK=	libgdamm5
-
 USES=		gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	libgda5 glibmm
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--enable-static --disable-documentation
+CONFIGURE_ARGS=	--disable-documentation
 
 OPTIONS_DEFINE=	BDB
 
diff --git a/databases/libgdamm5/pkg-plist b/databases/libgdamm5/pkg-plist
index eda134ba7536..b6b22b98acec 100644
--- a/databases/libgdamm5/pkg-plist
+++ b/databases/libgdamm5/pkg-plist
@@ -79,7 +79,6 @@ include/libgdamm-5.0/libgdamm/throw_exception.h
 include/libgdamm-5.0/libgdamm/value.h
 include/libgdamm-5.0/libgdamm/wrap_init.h
 include/libgdamm-5.0/libgdamm/xatransaction.h
-lib/libgdamm-5.0.a
 lib/libgdamm-5.0.so
 lib/libgdamm-5.0.so.13
 lib/libgdamm-5.0.so.13.0.0
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 1e8bc1dfc093..a574c2a1bbb8 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	postgresql
 DISTVERSION?=	8.4.21
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 6d03be717250..900877f7db59 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	postgresql
 DISTVERSION?=	9.1.13
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index de3d2df219bf..56824d09387d 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	postgresql
 DISTVERSION?=	9.2.8
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index c60c9829f64f..f8d57a90dc27 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	virtuoso
 PORTVERSION=	6.1.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-opensource-${PORTVERSION}