diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-10-24 23:37:25 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-10-24 23:37:25 +0000 |
commit | 4acc6fb2a411b291c9c210d82bafe7c62e71c77d (patch) | |
tree | bc16420eb52d65511ceb520c00171d219210a473 /databases/libgda2 | |
parent | 97dfcc1b41c5b4581b1d73128a866beec069c5bf (diff) |
Notes
Diffstat (limited to 'databases/libgda2')
-rw-r--r-- | databases/libgda2/Makefile | 17 | ||||
-rw-r--r-- | databases/libgda2/pkg-plist | 16 |
2 files changed, 17 insertions, 16 deletions
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile index 75da5884c391..1c7df563d32c 100644 --- a/databases/libgda2/Makefile +++ b/databases/libgda2/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/libgda2/Makefile,v 1.35 2006/09/10 00:51:06 mezz Exp $ +# $MCom: ports/databases/libgda2/Makefile,v 1.41 2007/10/21 03:13:52 mezz Exp $ # PORTNAME= libgda2 PORTVERSION= 1.2.4 -PORTREVISION?= 1 +PORTREVISION?= 3 PORTEPOCH?= 1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -23,14 +23,13 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt -RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper +LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ + rarian.0:${PORTSDIR}/textproc/rarian CONFLICTS= libgda-0* USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack glib20 libxslt referencehack +USE_GNOME= gnomeprefix gnomehack glib20 libxslt referencehack intlhack USE_GETTEXT= yes USE_XLIB= yes INSTALLS_OMF= yes @@ -61,8 +60,10 @@ WITH_MYSQL= yes WITH_LDAP=yes .endif -.if exists(${LOCALBASE}/lib/libgds.so) +.if exists(${LOCALBASE}/lib/libgds.so.1) WITH_FIREBIRD= yes +.elif exists(${LOCALBASE}/lib/libgds.so.2) +WITHOUT_FIREBIRD=yes .endif .if exists(${LOCALBASE}/lib/libtds.so) @@ -117,7 +118,7 @@ LIB_DEPENDS+= gds.1:${PORTSDIR}/databases/firebird-client CONFIGURE_ARGS+= --with-firebird=${LOCALBASE} PLIST_SUB+= FIREBIRD:="" .else -CONFIGURE_ARGS+= --without-interbase +CONFIGURE_ARGS+= --without-firebird PLIST_SUB+= FIREBIRD:="@comment " .endif diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist index f14263451fbd..f014a85934d3 100644 --- a/databases/libgda2/pkg-plist +++ b/databases/libgda2/pkg-plist @@ -109,11 +109,11 @@ lib/libgda/providers/libgda-xml.a lib/libgda/providers/libgda-xml.la lib/libgda/providers/libgda-xml.so libdata/pkgconfig/libgda.pc -share/gnome/libgda/xml/gda-report.dtd -share/gnome/libgda/xml/gda-report-result.dtd -share/gnome/libgda/xml/gda-xml-query.dtd -share/gnome/libgda/xml/gda-xml-query.xsl -share/gnome/omf/libgda/libgda-C.omf +share/libgda/xml/gda-report.dtd +share/libgda/xml/gda-report-result.dtd +share/libgda/xml/gda-xml-query.dtd +share/libgda/xml/gda-xml-query.xsl +share/omf/libgda/libgda-C.omf share/locale/az/LC_MESSAGES/libgda-2.mo share/locale/ca/LC_MESSAGES/libgda-2.mo share/locale/cs/LC_MESSAGES/libgda-2.mo @@ -152,9 +152,9 @@ share/locale/uk/LC_MESSAGES/libgda-2.mo share/locale/vi/LC_MESSAGES/libgda-2.mo share/locale/zh_CN/LC_MESSAGES/libgda-2.mo share/locale/zh_TW/LC_MESSAGES/libgda-2.mo -@dirrm share/gnome/omf/libgda -@dirrm share/gnome/libgda/xml -@dirrm share/gnome/libgda +@dirrm share/omf/libgda +@dirrm share/libgda/xml +@dirrm share/libgda @dirrm lib/libgda/providers @dirrm lib/libgda @dirrm include/libgda-%%VERSION%%/sql |