2 files changed, 16 insertions, 26 deletions

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