From owner-svn-ports-head@FreeBSD.ORG Sat Sep 20 12:14:20 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A3703B9F; Sat, 20 Sep 2014 12:14:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 83176384; Sat, 20 Sep 2014 12:14:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8KCEKah067039; Sat, 20 Sep 2014 12:14:20 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8KCEKa0067038; Sat, 20 Sep 2014 12:14:20 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201409201214.s8KCEKa0067038@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Sat, 20 Sep 2014 12:14:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368634 - head/devel/apr1 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Sep 2014 12:14:20 -0000 Author: ohauer Date: Sat Sep 20 12:14:19 2014 New Revision: 368634 URL: http://svnweb.freebsd.org/changeset/ports/368634 QAT: https://qat.redports.org/buildarchive/r368634/ Log: - adopt new ${opt}_ARGS for USE and DEPENDS - small cleanup and restructure - add LICENSE - no version bump [1] [1] A new apr-util release is in the pipe and with this commit the next changes are more transparent. with hat apache@ Modified: head/devel/apr1/Makefile Modified: head/devel/apr1/Makefile ============================================================================== --- head/devel/apr1/Makefile Sat Sep 20 11:02:19 2014 (r368633) +++ head/devel/apr1/Makefile Sat Sep 20 12:14:19 2014 (r368634) @@ -12,8 +12,17 @@ DISTFILES= apr-${APR_VERSION}.tar.gz apr MAINTAINER= apache@FreeBSD.org COMMENT= Apache Portability Library +LICENSE= APACHE20 + LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 +USES= iconv pathfix libtool:keepla +USE_LDCONFIG= yes +GNU_CONFIGURE= yes + +APR_VERSION= 1.5.1 +APU_VERSION= 1.5.3 + OPTIONS_SUB= yes OPTIONS_GROUP= APR APU OPTIONS_GROUP_APR= THREADS IPV6 DEVRANDOM @@ -22,28 +31,35 @@ OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= SSL NSS OPTIONS_DEFAULT= THREADS 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 - -APR_VERSION= 1.5.1 -APU_VERSION= 1.5.3 - -USES= iconv pathfix libtool:keepla -USE_LDCONFIG= yes -GNU_CONFIGURE= yes +DEVRANDOM_DESC= Use /dev/random or compatible +NDBM_DESC= NDBM support +NSS_DESC= NSS crypto driver +SSL_DESC= OpenSSL crypto driver + +# APR-Util Options +BDB_USE= BDB=48+ +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_USE= PGSQL=yes +SQLITE_USE= SQLITE=yes +SSL_USE= OPENSSL=yes 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= ${APR_VERSION:C/^1/0/} -SHLIB_APU_MAJOR= ${APU_VERSION:C/^1/0/} +SHLIB_APR_MAJOR=${APR_VERSION:C/^1/0/} +SHLIB_APU_MAJOR=${APU_VERSION:C/^1/0/} + +PLIST_SUB+= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" \ + SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}" APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 \ --enable-posix-shm + APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ --with-expat=${LOCALBASE} \ --with-iconv=${ICONV_PREFIX} @@ -72,7 +88,6 @@ APR_CONF_ARGS+= --without-devrandom ######### APR-Util Options .if ${PORT_OPTIONS:MGDBM} APU_EXTRAS= yes -LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm APU_CONF_ARGS+= --with-gdbm=${LOCALBASE} .else APU_CONF_ARGS+= --without-gdbm @@ -80,7 +95,6 @@ APU_CONF_ARGS+= --without-gdbm .if ${PORT_OPTIONS:MBDB} APU_EXTRAS= yes -USE_BDB= 48+ APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} .else APU_CONF_ARGS+= --without-berkeley-db @@ -95,9 +109,8 @@ APU_CONF_ARGS+= --without-ndbm .if ${PORT_OPTIONS:MLDAP} APU_EXTRAS= yes -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 APU_CONF_ARGS+= --without-ldap .endif @@ -105,14 +118,12 @@ APU_CONF_ARGS+= --without-ldap .if ${PORT_OPTIONS:MFREETDS} APU_EXTRAS= yes APU_CONF_ARGS+= --with-freetds=${LOCALBASE} -LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds .else APU_CONF_ARGS+= --without-freetds .endif .if ${PORT_OPTIONS:MMYSQL} APU_EXTRAS= yes -USE_MYSQL= yes APU_CONF_ARGS+= --with-mysql=${LOCALBASE} CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H LIBS+= -L${LOCALBASE}/lib/mysql @@ -122,7 +133,6 @@ APU_CONF_ARGS+= --without-mysql .if ${PORT_OPTIONS:MPGSQL} APU_EXTRAS= yes -USE_PGSQL= yes APU_CONF_ARGS+= --with-pgsql=${LOCALBASE} CONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG="" .else @@ -131,7 +141,6 @@ APU_CONF_ARGS+= --without-pgsql .if ${PORT_OPTIONS:MSQLITE} APU_EXTRAS= yes -USE_SQLITE= yes APU_CONF_ARGS+= --with-sqlite3=${LOCALBASE} .else APU_CONF_ARGS+= --without-sqlite3 @@ -144,7 +153,6 @@ APU_CONF_ARGS+= --with-crypto .if ${PORT_OPTIONS:MSSL} APU_EXTRAS= yes -USE_OPENSSL= yes CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} APU_CONF_ARGS+= --with-openssl=${OPENSSLBASE} @@ -154,7 +162,6 @@ APU_CONF_ARGS+= --without-openssl .if ${PORT_OPTIONS:MNSS} APU_EXTRAS= yes -LIB_DEPENDS+= libnss3.so:${PORTSDIR}/security/nss CPPFLAGS+= -I${LOCALBASE}/include/nss LDFLAGS+= -L${LOCALBASE}/lib/nss APU_CONF_ARGS+= --with-nss=${LOCALBASE} @@ -162,6 +169,10 @@ APU_CONF_ARGS+= --with-nss=${LOCALBASE} CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" +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 + .if defined(APU_EXTRAS) PLIST_SUB+= APU_EXTRAS="" .else @@ -179,9 +190,9 @@ post-patch: do-configure: @(cd ${APR_WRKDIR} && \ - ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS}) + ${SETENV} ${CONFIGURE_ENV} ./configure ${APR_CONF_ARGS} ${CONFIGURE_ARGS}) @(cd ${APU_WRKDIR} && \ - ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} ${APU_CONF_ARGS}) + ${SETENV} ${CONFIGURE_ENV} ./configure ${APU_CONF_ARGS} ${CONFIGURE_ARGS}) do-build: @(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS}) @@ -192,7 +203,7 @@ do-install: @(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} ${MAKE_ARGS}) post-install: - @${FIND} ${STAGEDIR}${PREFIX}/lib/ -name \*.so | ${XARGS} ${STRIP_CMD} + @${FIND} ${STAGEDIR}${PREFIX}/lib/ -name \*.so | ${XARGS} ${STRIP_CMD} test: build -@(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} test)