cvs commit: ports/devel/apr2 Makefile distinfo pkg-plist
ports/devel/apr2/files patch-bdb5 patch-buildconf
Philip M. Gollucci
pgollucci at p6m7g8.com
Sun Aug 21 20:08:52 UTC 2011
On 08/21/11 18:03, Olli Hauer wrote:
> Note: LDAP is no longer supported by apr2.
Why do you think this ?
>
> PR: ports/159660
> Submitted by: Daniel S. Haischt <daniel.haischt _at_ gmail.com>
>
> Revision Changes Path
> 1.115 +2 -19 ports/devel/apr2/Makefile
> 1.31 +2 -2 ports/devel/apr2/distinfo
> 1.3 +0 -144 ports/devel/apr2/files/patch-bdb5 (dead)
> http://cvsweb.FreeBSD.org/ports/devel/apr2/files/patch-bdb5?rev=1.2&content-type=text/x-cvsweb-markup
> 1.6 +19 -14 ports/devel/apr2/files/patch-buildconf
> 1.27 +0 -9 ports/devel/apr2/pkg-plist
>
> http://cvsweb.FreeBSD.org/ports/devel/apr2/Makefile.diff?r1=1.114&r2=1.115&f=h
> | --- ports/devel/apr2/Makefile 2010/12/04 07:31:00 1.114
> | +++ ports/devel/apr2/Makefile 2011/08/21 18:03:43 1.115
> | @@ -2,13 +2,13 @@
> | # Date created: 19 February 2002
> | # Whom: Garrett Rooney <rooneg at electricjellyfish.net>
> | #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/devel/apr2/Makefile,v 1.114 2010/12/04 07:31:00 ade Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/devel/apr2/Makefile,v 1.115 2011/08/21 18:03:43 ohauer Exp $
> |
> | PORTNAME= apr
> | PORTVERSION= 2.0.${SNAPDATE}
> | PORTREVISION= 1
> | CATEGORIES= devel
> | -MASTER_SITES= http://svn.apache.org/snapshots/apr/
> | +MASTER_SITES= http://svn-master.apache.org/snapshots/apr/
> | DISTNAME= ${PORTNAME}_${SNAPDATE}
> |
> | MAINTAINER= apache at FreeBSD.org
> | @@ -18,7 +18,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textpro
> |
> | NO_LATEST_LINK= yes
> |
> | -SNAPDATE= 20100610211336
> | +SNAPDATE= 20110821151329
> |
> | MAKE_JOBS_SAFE= yes
> |
> | @@ -26,7 +26,6 @@ OPTIONS= THREADS "Enable Threads in apr"
> | 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 \
> | @@ -136,22 +135,6 @@ PLIST_SUB+= NDBM="@comment "
> | CONFIGURE_ARGS+= --without-ndbm
> | .endif
> |
> | -.if defined(WITH_LDAP)
> | -EXTRAS= yes
> | -PLIST_SUB+= LDAP=""
> | -USE_OPENLDAP= yes
> | -CONFIGURE_ARGS+= --with-ldap-include=${LOCALBASE}/include \
> | - --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
> | -.if defined(PKGNAMESUFFIX)
> | -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap${OPENLDAP_VER}
> | -.else
> | -PKGNAMESUFFIX= -ldap
> | -.endif
> | -.else
> | -PLIST_SUB+= LDAP="@comment "
> | -CONFIGURE_ARGS+= --without-ldap
> | -.endif
> | -
> | .if defined(WITH_MYSQL)
> | EXTRAS= yes
> | PLIST_SUB+= MYSQL=""
> http://cvsweb.FreeBSD.org/ports/devel/apr2/distinfo.diff?r1=1.30&r2=1.31&f=h
> | --- ports/devel/apr2/distinfo 2011/07/03 14:55:11 1.30
> | +++ ports/devel/apr2/distinfo 2011/08/21 18:03:43 1.31
> | @@ -1,2 +1,2 @@
> | -SHA256 (apr_20100610211336.tar.gz) = bd94edc1699bda3f98bfaab2b37cc047df0c730e1fd79fb0081c8318854ab746
> | -SIZE (apr_20100610211336.tar.gz) = 990268
> | +SHA256 (apr_20110821151329.tar.gz) = 2a1597f102428b1f6ce81362561f450f83ecff04066e685bf70f1da70ce4932d
> | +SIZE (apr_20110821151329.tar.gz) = 977267
> http://cvsweb.FreeBSD.org/ports/devel/apr2/files/patch-buildconf.diff?r1=1.5&r2=1.6&f=h
> | --- ports/devel/apr2/files/patch-buildconf 2010/06/01 22:35:25 1.5
> | +++ ports/devel/apr2/files/patch-buildconf 2011/08/21 18:03:43 1.6
> | @@ -1,18 +1,23 @@
> | ---- ./buildconf.orig 2009-11-13 22:13:59.000000000 -0500
> | -+++ ./buildconf 2010-05-26 23:19:19.245814435 -0400
> | -@@ -69,6 +69,7 @@
> | +--- ./buildconf.orig 2011-08-10 22:03:47.000000000 +0200
> | ++++ ./buildconf 2011-08-10 22:08:22.000000000 +0200
> | +@@ -81,6 +81,7 @@
> | fi
> | # Do we need this anymore?
> | echo "buildconf: Using libtool.m4 at ${ltfile}."
> | -+ chmod 644 build/libtool.m4
> | - cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
> | - fi
> | - if test "$1" = "2"; then
> | -@@ -76,6 +77,7 @@
> | - # Wouldn't it just be better to define top_builddir??
> | - mv build/libtool.m4 build/libtool.m4.$$
> | - cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
> | -+ chmod 644 build/libtool.m4.$$
> | - rm build/libtool.m4.$$
> | - fi
> | ++ chmod 644 build/libtool.m4
> | + rm -f build/libtool.m4
> | + cp -p $ltfile build/libtool.m4
> |
> | +@@ -94,9 +95,12 @@
> | + # Not sure, would it interfere with httpd top_builddir when bundled?
> | + mv build/libtool.m4 build/libtool.m4.$$
> | + sed -e 's/\(LIBTOOL=.*\)top_build/\1apr_build/' < build/libtool.m4.$$ > build/libtool.m4
> | ++chmod 644 build/libtool.m4.$$
> | + rm -f build/libtool.m4.$$
> | +
> | + # Clean up any leftovers
> | ++chmod 644 aclocal.m4
> | ++chmod 644 libtool.m4
> | + rm -f aclocal.m4 libtool.m4
> | +
> | + #
> http://cvsweb.FreeBSD.org/ports/devel/apr2/pkg-plist.diff?r1=1.26&r2=1.27&f=h
> | --- ports/devel/apr2/pkg-plist 2010/06/01 22:35:25 1.26
> | +++ ports/devel/apr2/pkg-plist 2011/08/21 18:03:43 1.27
> | @@ -27,11 +27,6 @@ include/apr-2/apr_global_mutex.h
> | include/apr-2/apr_hash.h
> | include/apr-2/apr_hooks.h
> | include/apr-2/apr_inherit.h
> | -include/apr-2/apr_ldap.h
> | -include/apr-2/apr_ldap_init.h
> | -include/apr-2/apr_ldap_option.h
> | -include/apr-2/apr_ldap_rebind.h
> | -include/apr-2/apr_ldap_url.h
> | include/apr-2/apr_lib.h
> | include/apr-2/apr_md4.h
> | include/apr-2/apr_md5.h
> | @@ -91,10 +86,6 @@ lib/libapr-2.so.%%SHLIB_MAJOR%%
> | %%NDBM%%lib/apr-2/apr_dbm_ndbm.so
> | %%NDBM%%lib/apr-2/apr_dbm_ndbm.la
> | %%NDBM%%lib/apr-2/apr_dbm_ndbm.a
> | -%%LDAP%%lib/apr-2/apr_ldap-2.so
> | -%%LDAP%%lib/apr-2/apr_ldap.so
> | -%%LDAP%%lib/apr-2/apr_ldap.la
> | -%%LDAP%%lib/apr-2/apr_ldap.a
> | %%MYSQL%%lib/apr-2/apr_dbd_mysql-2.so
> | %%MYSQL%%lib/apr-2/apr_dbd_mysql.so
> | %%MYSQL%%lib/apr-2/apr_dbd_mysql.la
--
------------------------------------------------------------------------
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollucci at p6m7g8.com) c: 703.336.9354
VP Infrastructure, Apache Software Foundation
Committer, FreeBSD Foundation
Consultant, P6M7G8 Inc.
Sr. System Admin, Ridecharge Inc.
Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.
More information about the cvs-all
mailing list