[Midnightbsd-cvs] mports [18025] trunk/devel/apr1: Upgrade apr 1.5.1/apr util 1.5.4
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Feb 22 10:48:24 EST 2015
Revision: 18025
http://svnweb.midnightbsd.org/mports/?rev=18025
Author: laffer1
Date: 2015-02-22 10:48:24 -0500 (Sun, 22 Feb 2015)
Log Message:
-----------
Upgrade apr 1.5.1/apr util 1.5.4
Modified Paths:
--------------
trunk/devel/apr1/Makefile
trunk/devel/apr1/distinfo
trunk/devel/apr1/pkg-plist
Modified: trunk/devel/apr1/Makefile
===================================================================
--- trunk/devel/apr1/Makefile 2015-02-22 15:47:47 UTC (rev 18024)
+++ trunk/devel/apr1/Makefile 2015-02-22 15:48:24 UTC (rev 18025)
@@ -6,7 +6,8 @@
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= apr
-DISTFILES= apr-${APR_VERSION}.tar.gz apr-util-${APU_VERSION}.tar.gz
+DISTFILES= apr-${APR_VERSION}.tar.gz \
+ apr-util-${APU_VERSION}.tar.gz
MAINTAINER= ports at MidnightBSD.org
COMMENT= Apache Portability Library
@@ -13,37 +14,58 @@
LICENSE= apache2
-LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
+USES= iconv pathfix libtool cpe
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --build=${ARCH}-midnightbsd-freebsd9.1
+
+APR_VERSION= 1.5.1
+APU_VERSION= 1.5.4
+
+CPE_VENDOR= apache
+CPE_PRODUCT= apr-util
+CPE_VERSION= ${APU_VERSION}
+
+OPTIONS_SUB= yes
OPTIONS_GROUP= APR APU
-OPTIONS_GROUP_APR= THREADS IPV6 DEVRANDOM
+OPTIONS_GROUP_APR= IPV6 DEVRANDOM
OPTIONS_GROUP_APU= BDB GDBM LDAP MYSQL NDBM PGSQL SQLITE FREETDS
OPTIONS_RADIO= CRYPTO
OPTIONS_RADIO_CRYPTO= SSL NSS
-OPTIONS_DEFAULT= THREADS IPV6 DEVRANDOM BDB GDBM SSL
+OPTIONS_DEFAULT= IPV6 DEVRANDOM BDB GDBM SSL
-DEVRANDOM_DESC= Use /dev/random or compatible
-NDBM_DESC= NDBM support
-SSL_DESC= OpenSSL crypto driver
-NSS_DESC= NSS crypto driver
+DEVRANDOM_DESC= Use /dev/random or compatible
+NDBM_DESC= NDBM support
+NSS_DESC= NSS crypto driver
+SSL_DESC= OpenSSL crypto driver
-APR_VERSION= 1.4.8
-APU_VERSION= 1.5.3
+# APR-Util Options
+BDB_USE= BDB=5+
+FREETDS_LIB_DEPENDS= libsybdb.so:${PORTSDIR}/databases/freetds
+GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm
+LDAP_USE= OPENLDAP=yes
+MYSQL_USE= MYSQL=yes
+NSS_LIB_DEPENDS= libnss3.so:${PORTSDIR}/security/nss
+PGSQL_USES= pgsql
+SQLITE_USE= SQLITE=yes
+SSL_USE= OPENSSL=yes
-USES= iconv pathfix
-USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --build=${ARCH}-midnightbsd-freebsd9.1
-
NO_WRKSUBDIR= yes
APR_WRKDIR= ${WRKDIR}/apr-${APR_VERSION}
APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VERSION}
-PLIST_SUB+= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}"
-SHLIB_APR_MAJOR= 4
-SHLIB_APU_MAJOR= 5
+SHLIB_APR_MAJOR=${APR_VERSION:C/^1/0/}
+SHLIB_APU_MAJOR=${APU_VERSION:C/^1/0/}
-APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1
+PLIST_SUB+= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" \
+ SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}"
+
+APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 \
+ --enable-threads \
+ --enable-posix-shm
+
APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \
--with-expat=${LOCALBASE} \
--with-iconv=${ICONV_PREFIX}
@@ -51,12 +73,6 @@
.include <bsd.mport.options.mk>
########## APR Options
-.if ${PORT_OPTIONS:MTHREADS}
-APR_CONF_ARGS+= --enable-threads
-.else
-APR_CONF_ARGS+= --disable-threads
-.endif
-
.if ${PORT_OPTIONS:MIPV6}
APR_CONF_ARGS+= --enable-ipv6
.else
@@ -70,126 +86,92 @@
.endif
######### APR-Util Options
+# make sure 1st include is "${APR_WRKDIR}/include"
+# to avoid failures if previous apr_version.h is present
+APU_CPPFLAGS= -I${APR_WRKDIR}/include
+
.if ${PORT_OPTIONS:MGDBM}
-PLIST_SUB+= GDBM=""
-APU_EXTRAS= yes
-LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm
APU_CONF_ARGS+= --with-gdbm=${LOCALBASE}
.else
-PLIST_SUB+= GDBM="@comment "
APU_CONF_ARGS+= --without-gdbm
.endif
.if ${PORT_OPTIONS:MBDB}
-APU_EXTRAS= yes
-PLIST_SUB+= BDB=""
-USE_BDB= 48+
APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
.else
-PLIST_SUB+= BDB="@comment "
APU_CONF_ARGS+= --without-berkeley-db
.endif
.if ${PORT_OPTIONS:MNDBM}
-APU_EXTRAS= yes
-PLIST_SUB+= NDBM=""
APU_CONF_ARGS+= --with-ndbm=/usr
.else
-PLIST_SUB+= NDBM="@comment "
APU_CONF_ARGS+= --without-ndbm
.endif
.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
+ --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
.else
-PLIST_SUB+= LDAP="@comment "
APU_CONF_ARGS+= --without-ldap
.endif
.if ${PORT_OPTIONS:MFREETDS}
-APU_EXTRAS= yes
-PLIST_SUB+= FREETDS=""
APU_CONF_ARGS+= --with-freetds=${LOCALBASE}
-LIB_DEPENDS+= sybdb:${PORTSDIR}/databases/freetds
.else
-PLIST_SUB+= FREETDS="@comment "
APU_CONF_ARGS+= --without-freetds
.endif
.if ${PORT_OPTIONS:MMYSQL}
-APU_EXTRAS= yes
-PLIST_SUB+= MYSQL=""
-USE_MYSQL= YES
APU_CONF_ARGS+= --with-mysql=${LOCALBASE}
-CONFIGURE_ENV+= LIBS="${LIBS}"
-CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
-LDFLAGS+= -L${LOCALBASE}/lib/mysql
+APU_CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
+LIBS+= -L${LOCALBASE}/lib/mysql
.else
-PLIST_SUB+= MYSQL="@comment "
APU_CONF_ARGS+= --without-mysql
.endif
.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=""
+APU_CONF_ENV+= ac_cv_path_PGSQL_CONFIG=""
.else
-PLIST_SUB+= PGSQL="@comment "
APU_CONF_ARGS+= --without-pgsql
.endif
.if ${PORT_OPTIONS:MSQLITE}
-APU_EXTRAS= yes
-PLIST_SUB+= SQLITE3=""
-USE_SQLITE= YES
APU_CONF_ARGS+= --with-sqlite3=${LOCALBASE}
.else
APU_CONF_ARGS+= --without-sqlite3
-PLIST_SUB+= SQLITE3="@comment "
.endif
# crypto (apache24)
.if ${PORT_OPTIONS:MSSL} || ${PORT_OPTIONS:MNSS}
APU_CONF_ARGS+= --with-crypto
+.else
+APU_CONF_ARGS+= --without-crypto
.endif
.if ${PORT_OPTIONS:MSSL}
-APU_EXTRAS= yes
-USE_OPENSSL= yes
-PLIST_SUB+= SSL=""
-CPPFLAGS+= -I${OPENSSLINC}
+APU_CPPFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
APU_CONF_ARGS+= --with-openssl=${OPENSSLBASE}
.else
-PLIST_SUB+= SSL="@comment "
APU_CONF_ARGS+= --without-openssl
.endif
.if ${PORT_OPTIONS:MNSS}
-APU_EXTRAS= yes
-PLIST_SUB+= NSS=""
-LIB_DEPENDS+= nss3:${PORTSDIR}/security/nss
-CPPFLAGS+= -I${LOCALBASE}/include/nss
+APU_CPPFLAGS+= -I${LOCALBASE}/include/nss
LDFLAGS+= -L${LOCALBASE}/lib/nss
APU_CONF_ARGS+= --with-nss=${LOCALBASE}
.else
-PLIST_SUB+= NSS="@comment "
+APU_CONF_ARGS+= --without-nss
.endif
-CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+APR_CONF_ENV+= ${CONFIGURE_ENV:O:u} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
+# include apu specific CPPFLAGS 1st!
+APU_CONF_ENV+= ${CONFIGURE_ENV:O:u} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${APU_CPPFLAGS} ${CPPFLAGS}"
-.if defined(APU_EXTRAS)
-PLIST_SUB+= APU_EXTRAS=""
-.else
-PLIST_SUB+= APU_EXTRAS="@comment "
-.endif
+post-extract:
+# cleanup files not used on this platform
+ @${FIND} ${WRKSRC} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' \) -delete
post-patch:
@${REINPLACE_CMD} -e 's/OSVERSION/${OSVERSION}/g' \
@@ -201,24 +183,33 @@
${APR_WRKDIR}/configure
do-configure:
- @(cd ${APR_WRKDIR} && \
- ${SETENV} ${CONFIGURE_ENV} \
- ./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS})
- @(cd ${APU_WRKDIR} && \
- ${SETENV} ${CONFIGURE_ENV} \
- ./configure ${CONFIGURE_ARGS} ${APU_CONF_ARGS})
+ @${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}"
+ (cd ${APR_WRKDIR} && \
+ ${SETENV} ${APR_CONF_ENV} ./configure ${APR_CONF_ARGS} ${CONFIGURE_ARGS})
+ @${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}"
+ (cd ${APU_WRKDIR} && \
+ ${SETENV} ${APU_CONF_ENV} ./configure ${APU_CONF_ARGS} ${CONFIGURE_ARGS})
do-build:
- @(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS})
- @(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS})
+ @${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}"
+ (cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS})
+ @${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}"
+ (cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS})
+pre-install:
+# always create the modules directory
+ @${MKDIR} ${STAGEDIR}${PREFIX}/lib/apr-util-1
+ ${ECHO} "keep me" > ${STAGEDIR}${PREFIX}/lib/apr-util-1/.keep.me
+
do-install:
@(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${FAKE_MAKEARGS} ${INSTALL_TARGET})
@(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${FAKE_MAKEARGS} ${INSTALL_TARGET})
test: build
- -@(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} test)
- -@(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} test)
+ @${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}"
+ -(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} test)
+ @${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}"
+ -(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} test)
#regression-test: test
Modified: trunk/devel/apr1/distinfo
===================================================================
--- trunk/devel/apr1/distinfo 2015-02-22 15:47:47 UTC (rev 18024)
+++ trunk/devel/apr1/distinfo 2015-02-22 15:48:24 UTC (rev 18025)
@@ -1,4 +1,4 @@
-SHA256 (apr-1.4.8.tar.gz) = 1689e415bdfab6aaa41f07836b5dd9ed4901d22ddeb99feffdb2cee3124adf49
-SIZE (apr-1.4.8.tar.gz) = 979397
-SHA256 (apr-util-1.5.3.tar.gz) = 76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743
-SIZE (apr-util-1.5.3.tar.gz) = 874462
+SHA256 (apr-1.5.1.tar.gz) = 94b1c9d9835cc9e902838b95d62ecc9a39b698f23e3e706812ec65a78ba41af7
+SIZE (apr-1.5.1.tar.gz) = 1020833
+SHA256 (apr-util-1.5.4.tar.gz) = 976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19
+SIZE (apr-util-1.5.4.tar.gz) = 874044
Modified: trunk/devel/apr1/pkg-plist
===================================================================
--- trunk/devel/apr1/pkg-plist 2015-02-22 15:47:47 UTC (rev 18024)
+++ trunk/devel/apr1/pkg-plist 2015-02-22 15:48:24 UTC (rev 18025)
@@ -13,6 +13,7 @@
include/apr-1/apr_dso.h
include/apr-1/apr_env.h
include/apr-1/apr_errno.h
+include/apr-1/apr_escape.h
include/apr-1/apr_file_info.h
include/apr-1/apr_file_io.h
include/apr-1/apr_fnmatch.h
@@ -48,6 +49,7 @@
include/apr-1/apr_sha1.h
include/apr-1/apr_shm.h
include/apr-1/apr_signal.h
+include/apr-1/apr_skiplist.h
include/apr-1/apr_strings.h
include/apr-1/apr_strmatch.h
include/apr-1/apr_support.h
@@ -69,55 +71,46 @@
include/apr-1/apu_errno.h
include/apr-1/apu_version.h
include/apr-1/apu_want.h
+lib/apr-util-1/.keep.me
%%NSS%%lib/apr-util-1/apr_crypto_nss-1.so
%%NSS%%lib/apr-util-1/apr_crypto_nss.so
-%%NSS%%lib/apr-util-1/apr_crypto_nss.la
%%NSS%%lib/apr-util-1/apr_crypto_nss.a
%%SSL%%lib/apr-util-1/apr_crypto_openssl-1.so
%%SSL%%lib/apr-util-1/apr_crypto_openssl.a
-%%SSL%%lib/apr-util-1/apr_crypto_openssl.la
%%SSL%%lib/apr-util-1/apr_crypto_openssl.so
%%FREETDS%%lib/apr-util-1/apr_dbd_freetds-1.so
%%FREETDS%%lib/apr-util-1/apr_dbd_freetds.a
-%%FREETDS%%lib/apr-util-1/apr_dbd_freetds.la
%%FREETDS%%lib/apr-util-1/apr_dbd_freetds.so
%%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
+%%SQLITE%%lib/apr-util-1/apr_dbd_sqlite3-1.so
+%%SQLITE%%lib/apr-util-1/apr_dbd_sqlite3.a
+%%SQLITE%%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
-lib/libapr-1.la
lib/libapr-1.so
+lib/libapr-1.so.0
lib/libapr-1.so.%%SHLIB_APR_MAJOR%%
lib/libaprutil-1.a
-lib/libaprutil-1.la
lib/libaprutil-1.so
+lib/libaprutil-1.so.0
lib/libaprutil-1.so.%%SHLIB_APU_MAJOR%%
libdata/pkgconfig/apr-1.pc
libdata/pkgconfig/apr-util-1.pc
@@ -126,7 +119,3 @@
%%DATADIR%%/build-1/make_exports.awk
%%DATADIR%%/build-1/make_var_export.awk
%%DATADIR%%/build-1/mkdir.sh
- at dirrm %%DATADIR%%/build-1
- at dirrm %%DATADIR%%
-%%APU_EXTRAS%%@dirrm lib/apr-util-1
- at dirrm include/apr-1
More information about the Midnightbsd-cvs
mailing list