aboutsummaryrefslogtreecommitdiff
path: root/databases/libgda4
diff options
context:
space:
mode:
Diffstat (limited to 'databases/libgda4')
-rw-r--r--databases/libgda4/Makefile17
-rw-r--r--databases/libgda4/pkg-plist23
2 files changed, 17 insertions, 23 deletions
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