aboutsummaryrefslogtreecommitdiff
path: root/devel/apr1
diff options
context:
space:
mode:
authorOlli Hauer <ohauer@FreeBSD.org>2012-07-08 16:48:26 +0000
committerOlli Hauer <ohauer@FreeBSD.org>2012-07-08 16:48:26 +0000
commit4ff4041826383395723547fc074e78666edf475c (patch)
treef1317d6fcf84cf0f84a3a88d8829adc5bf8f8b0d /devel/apr1
parent1b911d084e948829f9b7edfd20d4b3464b31b2c6 (diff)
downloadports-4ff4041826383395723547fc074e78666edf475c.tar.gz
ports-4ff4041826383395723547fc074e78666edf475c.zip
Notes
Diffstat (limited to 'devel/apr1')
-rw-r--r--devel/apr1/Makefile135
-rw-r--r--devel/apr1/pkg-plist72
2 files changed, 105 insertions, 102 deletions
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index f3e20ab5554e..d0b3a1297192 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -15,20 +15,25 @@ DISTFILES= apr-${APR_VERSION}.tar.gz apr-util-${APU_VERSION}.tar.gz
MAINTAINER= apache@FreeBSD.org
COMMENT= Apache Portability Library
-LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2
MAKE_JOBS_SAFE= yes
-OPTIONS= THREADS "Enable Threads in apr" on \
- IPV6 "Enable IPV6 Support in apr" on \
- BDB "Enable Berkley BDB support in apr-util" on \
- GDBM "Enable GNU dbm support in apr-util" on \
- LDAP "Enable LDAP support in apr-util" off \
- MYSQL "Enable MySQL suport in apr-util" off \
- NDBM "Enable NDBM support in apr-util" off \
- PGSQL "Enable Postgresql suport in apr-util" off \
- SQLITE "Enable SQLite3 support in apr-util" off \
- DEVRANDOM "Use /dev/random or compatible in apr" on
+OPTIONS_DEFINE= THREADS IPV6 BDB GDBM LDAP MYSQL NDBM PGSQL SQLITE DEVRANDOM
+OPTIONS_DEFAULT=THREADS IPV6 BDB GDBM DEVRANDOM
+
+THREADS_DESC= Enable Threads in apr
+IPV6_DESC= Enable IPV6 Support in apr
+BDB_DESC= Enable Berkley BDB support in apr-util
+GDBM_DESC= Enable GNU dbm support in apr-util
+LDAP_DESC= Enable LDAP support in apr-util
+MYSQL_DESC= Enable MySQL suport in apr-util
+NDBM_DESC= Enable NDBM support in apr-util
+PGSQL_DESC= Enable Postgresql suport in apr-util
+SQLITE_DESC= Enable SQLite3 support in apr-util
+DEVRANDOM_DESC= Use /dev/random or compatible in apr
+
+.include <bsd.port.options.mk>
APR_VERSION= 1.4.5
APU_VERSION= 1.3.12
@@ -55,104 +60,102 @@ APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \
--with-expat=${LOCALBASE} \
--with-iconv=${LOCALBASE}
-.include <bsd.port.options.mk>
-
########## APR Options
-.if defined(WITHOUT_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
+APR_CONF_ARGS+= --enable-threads
+.else
APR_CONF_ARGS+= --disable-threads
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nothr
-.else
+. else
PKGNAMESUFFIX= -nothr
-.endif
-.else
-APR_CONF_ARGS+= --enable-threads
+. endif
.endif
-.if defined(WITHOUT_IPV6)
-APR_CONF_ARGS+= --disable-ipv6
-.else
+.if ${PORT_OPTIONS:MIPV6}
APR_CONF_ARGS+= --enable-ipv6
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ipv6
-.else
+. else
PKGNAMESUFFIX= -ipv6
-.endif
+. endif
+.else
+APR_CONF_ARGS+= --disable-ipv6
.endif
-.if defined(WITHOUT_DEVRANDOM)
-APR_CONF_ARGS+= --without-devrandom
-.else
+.if ${PORT_OPTIONS:MDEVRANDOM}
APR_CONF_ARGS+= --with-devrandom
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-devrandom
-.else
+. else
PKGNAMESUFFIX= -devrandom
-.endif
+. endif
+.else
+APR_CONF_ARGS+= --without-devrandom
.endif
######### APR-Util Options
-.if defined(WITHOUT_GDBM)
-PLIST_SUB+= GDBM="@comment "
-APU_CONF_ARGS+= --without-gdbm
-.else
+.if ${PORT_OPTIONS:MGDBM}
PLIST_SUB+= GDBM=""
APU_EXTRAS= yes
-LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm
APU_CONF_ARGS+= --with-gdbm=${LOCALBASE}
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gdbm
-.else
+. else
PKGNAMESUFFIX= -gdbm
-.endif
+. endif
+.else
+PLIST_SUB+= GDBM="@comment "
+APU_CONF_ARGS+= --without-gdbm
.endif
-.if defined(WITHOUT_BDB)
-PLIST_SUB+= BDB="@comment "
-APU_CONF_ARGS+= --without-berkeley-db
-.else
+.if ${PORT_OPTIONS:MBDB}
APU_EXTRAS= yes
PLIST_SUB+= BDB=""
USE_BDB= 42+
APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
-.else
+. else
PKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
-.endif
+. endif
+.else
+PLIST_SUB+= BDB="@comment "
+APU_CONF_ARGS+= --without-berkeley-db
.endif
-.if defined(WITH_NDBM)
+.if ${PORT_OPTIONS:MNDBM}
APU_EXTRAS= yes
PLIST_SUB+= NDBM=""
APU_CONF_ARGS+= --with-ndbm=/usr
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ndbm
-.else
+. else
PKGNAMESUFFIX= -ndbm
-.endif
+. endif
.else
PLIST_SUB+= NDBM="@comment "
APU_CONF_ARGS+= --without-ndbm
.endif
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
APU_EXTRAS= yes
PLIST_SUB+= LDAP=""
USE_OPENLDAP= yes
APU_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \
--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap${OPENLDAP_VER}
-.else
+. else
PKGNAMESUFFIX= -ldap
-.endif
+. endif
.else
PLIST_SUB+= LDAP="@comment "
APU_CONF_ARGS+= --without-ldap
.endif
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
APU_EXTRAS= yes
PLIST_SUB+= MYSQL=""
USE_MYSQL= YES
@@ -160,42 +163,42 @@ APU_CONF_ARGS+= --with-mysql=${LOCALBASE}
CONFIGURE_ENV+= LIBS="${LIBS}"
CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
LDFLAGS+= -L${LOCALBASE}/lib/mysql
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-mysql${MYSQL_VER}
-.else
+. else
PKGNAMESUFFIX= -mysql
-.endif
+. endif
.else
PLIST_SUB+= MYSQL="@comment "
APU_CONF_ARGS+= --without-mysql
.endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
APU_EXTRAS= yes
PLIST_SUB+= PGSQL=""
USE_PGSQL= YES
APU_CONF_ARGS+= --with-pgsql=${LOCALBASE}
CONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG=""
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-pgsql${PGSQL_VER}
-.else
+. else
PKGNAMESUFFIX= -pgsql
-.endif
+. endif
.else
PLIST_SUB+= PGSQL="@comment "
APU_CONF_ARGS+= --without-pgsql
.endif
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
APU_EXTRAS= yes
PLIST_SUB+= SQLITE3=""
USE_SQLITE= YES
APU_CONF_ARGS+= --with-sqlite3=${LOCALBASE}
-.if defined(PKGNAMESUFFIX)
+. if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-sqlite3
-.else
+. else
PKGNAMESUFFIX= -sqlite3
-.endif
+. endif
.else
APU_CONF_ARGS+= --without-sqlite3
PLIST_SUB+= SQLITE3="@comment "
diff --git a/devel/apr1/pkg-plist b/devel/apr1/pkg-plist
index b89a75c8eec4..b95280bb5c44 100644
--- a/devel/apr1/pkg-plist
+++ b/devel/apr1/pkg-plist
@@ -1,10 +1,5 @@
bin/apr-1-config
bin/apu-1-config
-%%DATADIR%%/build-1/apr_rules.mk
-%%DATADIR%%/build-1/libtool
-%%DATADIR%%/build-1/make_exports.awk
-%%DATADIR%%/build-1/make_var_export.awk
-%%DATADIR%%/build-1/mkdir.sh
include/apr-1/apr.h
include/apr-1/apr_allocator.h
include/apr-1/apr_anylock.h
@@ -72,8 +67,34 @@ include/apr-1/apr_xml.h
include/apr-1/apu.h
include/apr-1/apu_version.h
include/apr-1/apu_want.h
-libdata/pkgconfig/apr-1.pc
-libdata/pkgconfig/apr-util-1.pc
+%%MYSQL%%lib/apr-util-1/apr_dbd_mysql-1.so
+%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.a
+%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.la
+%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.so
+%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql-1.so
+%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.a
+%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.la
+%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.so
+%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3-1.so
+%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.a
+%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.la
+%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.so
+%%BDB%%lib/apr-util-1/apr_dbm_db-1.so
+%%BDB%%lib/apr-util-1/apr_dbm_db.a
+%%BDB%%lib/apr-util-1/apr_dbm_db.la
+%%BDB%%lib/apr-util-1/apr_dbm_db.so
+%%GDBM%%lib/apr-util-1/apr_dbm_gdbm-1.so
+%%GDBM%%lib/apr-util-1/apr_dbm_gdbm.a
+%%GDBM%%lib/apr-util-1/apr_dbm_gdbm.la
+%%GDBM%%lib/apr-util-1/apr_dbm_gdbm.so
+%%NDBM%%lib/apr-util-1/apr_dbm_ndbm-1.so
+%%NDBM%%lib/apr-util-1/apr_dbm_ndbm.a
+%%NDBM%%lib/apr-util-1/apr_dbm_ndbm.la
+%%NDBM%%lib/apr-util-1/apr_dbm_ndbm.so
+%%LDAP%%lib/apr-util-1/apr_ldap-1.so
+%%LDAP%%lib/apr-util-1/apr_ldap.a
+%%LDAP%%lib/apr-util-1/apr_ldap.la
+%%LDAP%%lib/apr-util-1/apr_ldap.so
lib/apr.exp
lib/aprutil.exp
lib/libapr-1.a
@@ -84,35 +105,14 @@ lib/libaprutil-1.a
lib/libaprutil-1.la
lib/libaprutil-1.so
lib/libaprutil-1.so.%%SHLIB_APU_MAJOR%%
-%%BDB%%lib/apr-util-1/apr_dbm_db-1.so
-%%BDB%%lib/apr-util-1/apr_dbm_db.so
-%%BDB%%lib/apr-util-1/apr_dbm_db.la
-%%BDB%%lib/apr-util-1/apr_dbm_db.a
-%%GDBM%%lib/apr-util-1/apr_dbm_gdbm-1.so
-%%GDBM%%lib/apr-util-1/apr_dbm_gdbm.so
-%%GDBM%%lib/apr-util-1/apr_dbm_gdbm.la
-%%GDBM%%lib/apr-util-1/apr_dbm_gdbm.a
-%%NDBM%%lib/apr-util-1/apr_dbm_ndbm-1.so
-%%NDBM%%lib/apr-util-1/apr_dbm_ndbm.so
-%%NDBM%%lib/apr-util-1/apr_dbm_ndbm.la
-%%NDBM%%lib/apr-util-1/apr_dbm_ndbm.a
-%%LDAP%%lib/apr-util-1/apr_ldap-1.so
-%%LDAP%%lib/apr-util-1/apr_ldap.so
-%%LDAP%%lib/apr-util-1/apr_ldap.la
-%%LDAP%%lib/apr-util-1/apr_ldap.a
-%%MYSQL%%lib/apr-util-1/apr_dbd_mysql-1.so
-%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.so
-%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.la
-%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.a
-%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql-1.so
-%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.so
-%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.la
-%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.a
-%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3-1.so
-%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.so
-%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.la
-%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.a
-%%APU_EXTRAS%%@dirrm lib/apr-util-1
+libdata/pkgconfig/apr-1.pc
+libdata/pkgconfig/apr-util-1.pc
+%%DATADIR%%/build-1/apr_rules.mk
+%%DATADIR%%/build-1/libtool
+%%DATADIR%%/build-1/make_exports.awk
+%%DATADIR%%/build-1/make_var_export.awk
+%%DATADIR%%/build-1/mkdir.sh
@dirrm %%DATADIR%%/build-1
@dirrm %%DATADIR%%
+%%APU_EXTRAS%%@dirrm lib/apr-util-1
@dirrm include/apr-1