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
cvs diff -r1.5 -r1.6 pkgsrc/devel/apr-util/Makefile (expand / switch to unified diff)

--- 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,33 +1,32 @@ @@ -1,33 +1,32 @@
1# $NetBSD: Makefile,v 1.5 2008/09/06 16:39:58 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2008/09/08 09:58:43 adam Exp $
2 2
3DISTNAME= apr-util-1.3.4 3DISTNAME= apr-util-1.3.4
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_APACHE:=apr/} 5MASTER_SITES= ${MASTER_SITE_APACHE:=apr/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://apr.apache.org/ 8HOMEPAGE= http://apr.apache.org/
9COMMENT= Apache Portable Runtime utilities 9COMMENT= Apache Portable Runtime utilities
10 10
11PKG_DESTDIR_SUPPORT= user-destdir 11PKG_DESTDIR_SUPPORT= user-destdir
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14 14
15GNU_CONFIGURE= yes 
16USE_LIBTOOL= yes 15USE_LIBTOOL= yes
17USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
18 17GNU_CONFIGURE= yes
 18CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr}/bin/apr-1-config
 19CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat}
 20CONFIGURE_ARGS+= --without-gdbm
 21CONFIGURE_ARGS+= --without-sqlite3
19PKGCONFIG_OVERRIDE+= apr-util.pc.in 22PKGCONFIG_OVERRIDE+= apr-util.pc.in
20 23
21CONFIGURE_ARGS+= \ 24MAKE_ENV+= WRAPPER_DIR=${WRAPPER_DIR:Q}
22 --with-apr=${BUILDLINK_PREFIX.apr}/bin/apr-1-config \ 
23 --with-expat=${BUILDLINK_PREFIX.expat} \ 
24 --without-gdbm --without-sqlite3 
25MAKE_ENV+= WRAPPER_DIR=${WRAPPER_DIR:Q} 
26 25
27.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
28.include "options.mk" 27.include "options.mk"
29 28
30.include "../../converters/libiconv/buildlink3.mk" 29.include "../../converters/libiconv/buildlink3.mk"
31.include "../../devel/apr/buildlink3.mk" 30.include "../../devel/apr/buildlink3.mk"
32.include "../../textproc/expat/buildlink3.mk" 31.include "../../textproc/expat/buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/apr-util/PLIST (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2008/09/06 16:39:58 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.3 2008/09/08 09:58:43 adam Exp $
2bin/apu-1-config 2bin/apu-1-config
3include/apr-1/apr_anylock.h 3include/apr-1/apr_anylock.h
4include/apr-1/apr_base64.h 4include/apr-1/apr_base64.h
5include/apr-1/apr_buckets.h 5include/apr-1/apr_buckets.h
6include/apr-1/apr_date.h 6include/apr-1/apr_date.h
7include/apr-1/apr_dbd.h 7include/apr-1/apr_dbd.h
8include/apr-1/apr_dbm.h 8include/apr-1/apr_dbm.h
9include/apr-1/apr_hooks.h 9include/apr-1/apr_hooks.h
10include/apr-1/apr_ldap.h 10include/apr-1/apr_ldap.h
11include/apr-1/apr_ldap_init.h 11include/apr-1/apr_ldap_init.h
12include/apr-1/apr_ldap_option.h 12include/apr-1/apr_ldap_option.h
13include/apr-1/apr_ldap_rebind.h 13include/apr-1/apr_ldap_rebind.h
14include/apr-1/apr_ldap_url.h 14include/apr-1/apr_ldap_url.h
@@ -23,14 +23,19 @@ include/apr-1/apr_rmm.h @@ -23,14 +23,19 @@ include/apr-1/apr_rmm.h
23include/apr-1/apr_sdbm.h 23include/apr-1/apr_sdbm.h
24include/apr-1/apr_sha1.h 24include/apr-1/apr_sha1.h
25include/apr-1/apr_strmatch.h 25include/apr-1/apr_strmatch.h
26include/apr-1/apr_thread_pool.h 26include/apr-1/apr_thread_pool.h
27include/apr-1/apr_uri.h 27include/apr-1/apr_uri.h
28include/apr-1/apr_uuid.h 28include/apr-1/apr_uuid.h
29include/apr-1/apr_xlate.h 29include/apr-1/apr_xlate.h
30include/apr-1/apr_xml.h 30include/apr-1/apr_xml.h
31include/apr-1/apu.h 31include/apr-1/apu.h
32include/apr-1/apu_version.h 32include/apr-1/apu_version.h
33include/apr-1/apu_want.h 33include/apr-1/apu_want.h
34lib/aprutil.exp 34lib/aprutil.exp
35lib/libaprutil-1.la 35lib/libaprutil-1.la
 36${PLIST.ldap}lib/apr-util-1/apr_ldap.la
 37${PLIST.mysql}lib/apr-util-1/apr_dbd_mysql.la
 38${PLIST.pgsql}lib/apr-util-1/apr_dbd_pgsql.la
 39${PLIST.sqlite3}lib/apr-util-1/apr_dbd_sqlite3.la
36lib/pkgconfig/apr-util-1.pc 40lib/pkgconfig/apr-util-1.pc
 41@unexec ${RMDIR} %D/lib/apr-util-1 2>/dev/null || ${TRUE}
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/apr-util/options.mk (expand / switch to unified diff)

--- 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,20 +1,40 @@ @@ -1,20 +1,40 @@
1# $NetBSD: options.mk,v 1.1.1.1 2007/01/24 19:37:20 epg Exp $ 1# $NetBSD: options.mk,v 1.2 2008/09/08 09:58:43 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.apr-util 3PKG_OPTIONS_VAR= PKG_OPTIONS.apr-util
4PKG_SUPPORTED_OPTIONS= db4 ldap 4PKG_SUPPORTED_OPTIONS= db4 ldap mysql pgsql sqlite3
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
 8PLIST_VARS+= ldap mysql pgsql sqlite3
 9
8.if !empty(PKG_OPTIONS:Mdb4) 10.if !empty(PKG_OPTIONS:Mdb4)
9CONFIGURE_ARGS+= \ 11CONFIGURE_ARGS+= \
10 --with-berkeley-db=${BUILDLINK_PREFIX.db4}/include:${LOCALBASE} 12 --with-berkeley-db=${BUILDLINK_PREFIX.db4}/include:${LOCALBASE}
11. include "../../databases/db4/buildlink3.mk" 13. include "../../databases/db4/buildlink3.mk"
12.else 14.else
13CONFIGURE_ARGS+= --with-dbm=sdbm 15CONFIGURE_ARGS+= --with-dbm=sdbm
14.endif 16.endif
15 17
16.if !empty(PKG_OPTIONS:Mldap) 18.if !empty(PKG_OPTIONS:Mldap)
17CONFIGURE_ARGS+= --with-ldap 19PLIST.ldap= yes
18CONFIGURE_ARGS+= --with-ldap 20CONFIGURE_ARGS+= --with-ldap
19. include "../../databases/openldap-client/buildlink3.mk" 21. include "../../databases/openldap-client/buildlink3.mk"
20.endif 22.endif
 23
 24.if !empty(PKG_OPTIONS:Mmysql)
 25PLIST.mysql= yes
 26CONFIGURE_ARGS+= --with-mysql
 27. include "../../mk/mysql.buildlink3.mk"
 28.endif
 29
 30.if !empty(PKG_OPTIONS:Mpgsql)
 31PLIST.pgsql= yes
 32CONFIGURE_ARGS+= --with-pgsql
 33. include "../../mk/pgsql.buildlink3.mk"
 34.endif
 35
 36.if !empty(PKG_OPTIONS:Msqlite3)
 37PLIST.sqlite3= yes
 38CONFIGURE_ARGS+= --with-sqlite3
 39. include "../../databases/sqlite3/buildlink3.mk"
 40.endif