Mon Sep 8 09:58:43 2008 UTC ()
PLIST fix for LDAP; Added options for pgsql, mysql, sqlite3
(adam)
diff -r1.5 -r1.6 pkgsrc/devel/apr-util/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/apr-util/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/devel/apr-util/options.mk
--- pkgsrc/devel/apr-util/Makefile 2008/09/06 16:39:58 1.5
+++ pkgsrc/devel/apr-util/Makefile 2008/09/08 09:58:43 1.6
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/09/06 16:39:58 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2008/09/08 09:58:43 adam Exp $
DISTNAME= apr-util-1.3.4
CATEGORIES= devel
@@ -12,17 +12,16 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
-GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
-
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr}/bin/apr-1-config
+CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat}
+CONFIGURE_ARGS+= --without-gdbm
+CONFIGURE_ARGS+= --without-sqlite3
PKGCONFIG_OVERRIDE+= apr-util.pc.in
-CONFIGURE_ARGS+= \
- --with-apr=${BUILDLINK_PREFIX.apr}/bin/apr-1-config \
- --with-expat=${BUILDLINK_PREFIX.expat} \
- --without-gdbm --without-sqlite3
-MAKE_ENV+= WRAPPER_DIR=${WRAPPER_DIR:Q}
+MAKE_ENV+= WRAPPER_DIR=${WRAPPER_DIR:Q}
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
--- pkgsrc/devel/apr-util/PLIST 2008/09/06 16:39:58 1.2
+++ pkgsrc/devel/apr-util/PLIST 2008/09/08 09:58:43 1.3
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/09/06 16:39:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/09/08 09:58:43 adam Exp $
bin/apu-1-config
include/apr-1/apr_anylock.h
include/apr-1/apr_base64.h
@@ -33,4 +33,9 @@
include/apr-1/apu_want.h
lib/aprutil.exp
lib/libaprutil-1.la
+${PLIST.ldap}lib/apr-util-1/apr_ldap.la
+${PLIST.mysql}lib/apr-util-1/apr_dbd_mysql.la
+${PLIST.pgsql}lib/apr-util-1/apr_dbd_pgsql.la
+${PLIST.sqlite3}lib/apr-util-1/apr_dbd_sqlite3.la
lib/pkgconfig/apr-util-1.pc
+@unexec ${RMDIR} %D/lib/apr-util-1 2>/dev/null || ${TRUE}
--- pkgsrc/devel/apr-util/options.mk 2007/01/24 19:37:20 1.1.1.1
+++ pkgsrc/devel/apr-util/options.mk 2008/09/08 09:58:43 1.2
@@ -1,10 +1,12 @@
-# $NetBSD: options.mk,v 1.1.1.1 2007/01/24 19:37:20 epg Exp $
+# $NetBSD: options.mk,v 1.2 2008/09/08 09:58:43 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.apr-util
-PKG_SUPPORTED_OPTIONS= db4 ldap
+PKG_SUPPORTED_OPTIONS= db4 ldap mysql pgsql sqlite3
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= ldap mysql pgsql sqlite3
+
.if !empty(PKG_OPTIONS:Mdb4)
CONFIGURE_ARGS+= \
--with-berkeley-db=${BUILDLINK_PREFIX.db4}/include:${LOCALBASE}
@@ -14,7 +16,25 @@
.endif
.if !empty(PKG_OPTIONS:Mldap)
+PLIST.ldap= yes
CONFIGURE_ARGS+= --with-ldap
-CONFIGURE_ARGS+= --with-ldap
. include "../../databases/openldap-client/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mmysql)
+PLIST.mysql= yes
+CONFIGURE_ARGS+= --with-mysql
+. include "../../mk/mysql.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mpgsql)
+PLIST.pgsql= yes
+CONFIGURE_ARGS+= --with-pgsql
+. include "../../mk/pgsql.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msqlite3)
+PLIST.sqlite3= yes
+CONFIGURE_ARGS+= --with-sqlite3
+. include "../../databases/sqlite3/buildlink3.mk"
.endif