Date: Sun, 24 Nov 2013 19:42:15 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334778 - in head/devel/apr1: . files Message-ID: <201311241942.rAOJgFGY031509@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sun Nov 24 19:42:15 2013 New Revision: 334778 URL: http://svnweb.freebsd.org/changeset/ports/334778 Log: - update apr-util to 1.5.3 - *no update* to apr-1.5.0 [1] Changes with APR-util 1.5.3 *) Fix warnings in odbc driver on 64bit systems. PR 55197 [Tom Donovan] *) Add support to apr_memcache for unix domain sockets. PR 54573 [Remi Gacogne <rgacogne+asf aquaray.com>] *) Add support for Berkeley DB 6.0. [Rainer Jung] [1] apache24 is broken if build against apr-1.5.0 and enable-v4-mapped is set to ON (the default) Modified: head/devel/apr1/Makefile head/devel/apr1/distinfo head/devel/apr1/files/patch-apr-util__dbd__apr_dbd_freetds.c Modified: head/devel/apr1/Makefile ============================================================================== --- head/devel/apr1/Makefile Sun Nov 24 19:42:02 2013 (r334777) +++ head/devel/apr1/Makefile Sun Nov 24 19:42:15 2013 (r334778) @@ -11,7 +11,7 @@ DISTFILES= apr-${APR_VERSION}.tar.gz apr MAINTAINER= apache@FreeBSD.org COMMENT= Apache Portability Library -LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 OPTIONS_GROUP= APR APU @@ -27,7 +27,7 @@ SSL_DESC= OpenSSL crypto driver NSS_DESC= NSS crypto driver APR_VERSION= 1.4.8 -APU_VERSION= 1.5.2 +APU_VERSION= 1.5.3 USES= iconv pathfix USE_LDCONFIG= yes @@ -37,12 +37,10 @@ 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}" +PLIST_SUB+= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}" SHLIB_APR_MAJOR= 4 SHLIB_APU_MAJOR= 5 -# candidate for next release -#CFLAGS+= -fPIC APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ --with-expat=${LOCALBASE} \ @@ -73,7 +71,7 @@ APR_CONF_ARGS+= --without-devrandom .if ${PORT_OPTIONS:MGDBM} PLIST_SUB+= GDBM="" APU_EXTRAS= yes -LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm +LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm APU_CONF_ARGS+= --with-gdbm=${LOCALBASE} .else PLIST_SUB+= GDBM="@comment " @@ -114,7 +112,7 @@ APU_CONF_ARGS+= --without-ldap APU_EXTRAS= yes PLIST_SUB+= FREETDS="" APU_CONF_ARGS+= --with-freetds=${LOCALBASE} -LIB_DEPENDS+= sybdb:${PORTSDIR}/databases/freetds +LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds .else PLIST_SUB+= FREETDS="@comment " APU_CONF_ARGS+= --without-freetds @@ -174,7 +172,7 @@ APU_CONF_ARGS+= --without-openssl .if ${PORT_OPTIONS:MNSS} APU_EXTRAS= yes PLIST_SUB+= NSS="" -LIB_DEPENDS+= nss3:${PORTSDIR}/security/nss +LIB_DEPENDS+= libnss3.so:${PORTSDIR}/security/nss CPPFLAGS+= -I${LOCALBASE}/include/nss LDFLAGS+= -L${LOCALBASE}/lib/nss APU_CONF_ARGS+= --with-nss=${LOCALBASE} Modified: head/devel/apr1/distinfo ============================================================================== --- head/devel/apr1/distinfo Sun Nov 24 19:42:02 2013 (r334777) +++ head/devel/apr1/distinfo Sun Nov 24 19:42:15 2013 (r334778) @@ -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.2.tar.gz) = a1ec5025373815795d2fa5bfac40c0984675feffc88e049be9a162c408c2f613 -SIZE (apr-util-1.5.2.tar.gz) = 867573 +SHA256 (apr-util-1.5.3.tar.gz) = 76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743 +SIZE (apr-util-1.5.3.tar.gz) = 874462 Modified: head/devel/apr1/files/patch-apr-util__dbd__apr_dbd_freetds.c ============================================================================== --- head/devel/apr1/files/patch-apr-util__dbd__apr_dbd_freetds.c Sun Nov 24 19:42:02 2013 (r334777) +++ head/devel/apr1/files/patch-apr-util__dbd__apr_dbd_freetds.c Sun Nov 24 19:42:15 2013 (r334778) @@ -4,8 +4,8 @@ # I've made the FreeTDS-driver work again -- and submitted the patch to Apache: # https://issues.apache.org/bugzilla/show_bug.cgi?id=53666 =================================================================================== ---- ./apr-util-1.5.2/dbd/apr_dbd_freetds.c.orig 2012-08-05 23:09:15.000000000 +0200 -+++ ./apr-util-1.5.2/dbd/apr_dbd_freetds.c 2013-07-04 22:55:08.000000000 +0200 +--- ./apr-util-1.5.3/dbd/apr_dbd_freetds.c.orig 2012-08-05 23:09:15.000000000 +0200 ++++ ./apr-util-1.5.3/dbd/apr_dbd_freetds.c 2013-07-04 22:55:08.000000000 +0200 @@ -40,12 +40,12 @@ #include <freetds/sybdb.h> #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311241942.rAOJgFGY031509>