Date: Fri, 20 Dec 2002 00:57:42 -0500 (EST) From: Craig Rodrigues <rodrigc@attbi.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: rooneg@electricjellyfish.net Subject: ports/46390: Port update for devel/apr Message-ID: <200212200557.gBK5vgU3004192@dibbler.ne.client2.attbi.com>
next in thread | raw e-mail | index | archive | help
>Number: 46390 >Category: ports >Synopsis: Port update for devel/apr >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Dec 19 22:00:17 PST 2002 >Closed-Date: >Last-Modified: >Originator: Craig Rodrigues >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD dibbler.ne.client2.attbi.com 5.0-CURRENT FreeBSD 5.0-CURRENT #10: Thu Dec 19 05:13:00 EST 2002 rodrigc@dibbler.ne.client2.attbi.com:/usr/obj/usr/src/sys/MYKERNEL1 i386 >Description: New versions of subversion require newer versions of apr (Apache Portable Runtime). >How-To-Repeat: >Fix: diff -ruN apr.bak/Makefile apr/Makefile --- apr.bak/Makefile Thu Nov 7 06:54:20 2002 +++ apr/Makefile Fri Dec 20 00:20:06 2002 @@ -6,11 +6,10 @@ # PORTNAME= apr -PORTVERSION= 20020725223645 -PORTREVISION= 1 +PORTVERSION= 0.9.1 CATEGORIES= devel -MASTER_SITES= http://www.apache.org/dist/apr/not-released/ -DISTFILES= apr_${PORTVERSION}.tar.gz apr-util_20020725223700.tar.gz +MASTER_SITES= http://www.apache.org/dist/apr/ +DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz MAINTAINER= rooneg@electricjellyfish.net @@ -28,19 +27,19 @@ @${SH} pkg-install apr PRE-INSTALL pre-configure: - @(cd ${WRKDIR}/apr/ && ./buildconf) - @(cd ${WRKDIR}/apr-util/ && ./buildconf) + @(cd ${WRKDIR}/apr-${PORTVERSION}/ && ./buildconf) + @(cd ${WRKDIR}/apr-util-${PORTVERSION}/ && ./buildconf) do-configure: - @(cd ${WRKDIR}/apr/ && ./configure --prefix=${PREFIX}) - @(cd ${WRKDIR}/apr-util/ && ${ENV} CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib ./configure --prefix=${PREFIX} --with-apr=../apr/ --with-expat=${PREFIX}) + @(cd ${WRKDIR}/apr-${PORTVERSION}/ && ./configure --prefix=${PREFIX}) + @(cd ${WRKDIR}/apr-util-${PORTVERSION}/ && ${ENV} CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib ./configure --prefix=${PREFIX} --with-apr=../apr-${PORTVERSION}/ --with-expat=${PREFIX}) do-build: - @(cd ${WRKDIR}/apr/ && make) - @(cd ${WRKDIR}/apr-util/ && make) + @(cd ${WRKDIR}/apr-${PORTVERSION}/ && make) + @(cd ${WRKDIR}/apr-util-${PORTVERSION}/ && make) do-install: - @(cd ${WRKDIR}/apr/ && make install) - (cd ${WRKDIR}/apr-util/ && make install) + @(cd ${WRKDIR}/apr-${PORTVERSION}/ && make install) + (cd ${WRKDIR}/apr-util-${PORTVERSION}/ && make install) .include <bsd.port.mk> diff -ruN apr.bak/distinfo apr/distinfo --- apr.bak/distinfo Mon Aug 5 05:38:24 2002 +++ apr/distinfo Thu Dec 19 16:21:21 2002 @@ -1,2 +1,2 @@ -MD5 (apr_20020725223645.tar.gz) = e95ba59919ae9d6d36abc2b42575f743 -MD5 (apr-util_20020725223700.tar.gz) = 9098f2d1b6c502166cd83bff8f8b22cb +MD5 (apr-0.9.1.tar.gz) = 862ab3e00695f065235f6f25ea6cbace +MD5 (apr-util-0.9.1.tar.gz) = fb1a1e360a2b643ab447e993975e3397 diff -ruN apr.bak/files/patch-apr-Makefile.in apr/files/patch-apr-Makefile.in --- apr.bak/files/patch-apr-Makefile.in Wed Mar 20 01:22:10 2002 +++ apr/files/patch-apr-Makefile.in Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- apr/Makefile.in.orig Mon Mar 18 20:14:35 2002 -+++ apr/Makefile.in Mon Mar 18 20:11:05 2002 -@@ -42,7 +42,7 @@ - includedir=@includedir@ - srcdir=@srcdir@ - top_srcdir=@top_srcdir@ --top_blddir=@top_builddir@ -+top_blddir=@apr_builddir@ - - EXPORT_FILES = $(top_srcdir)/include/*.h - diff -ruN apr.bak/files/patch-apr-misc-unix-getopt.c apr/files/patch-apr-misc-unix-getopt.c --- apr.bak/files/patch-apr-misc-unix-getopt.c Mon Aug 12 11:57:49 2002 +++ apr/files/patch-apr-misc-unix-getopt.c Wed Dec 31 19:00:00 1969 @@ -1,15 +0,0 @@ ---- apr/misc/unix/getopt.c.orig Thu Nov 29 06:19:51 2001 -+++ apr/misc/unix/getopt.c Sun Aug 11 11:29:01 2002 -@@ -237,10 +237,12 @@ - for (i = 0; ; i++) { - if (opts[i].optch == 0) /* No match */ - return serr(os, "invalid option", p - 2, APR_BADCH); -+ if (opts[i].name) { - len = strlen(opts[i].name); - if (strncmp(p, opts[i].name, len) == 0 - && (p[len] == '\0' || p[len] == '=')) - break; -+ } - } - *optch = opts[i].optch; - diff -ruN apr.bak/files/patch-apr-util-configure.in apr/files/patch-apr-util-configure.in --- apr.bak/files/patch-apr-util-configure.in Wed Dec 31 19:00:00 1969 +++ apr/files/patch-apr-util-configure.in Thu Dec 19 23:41:31 2002 @@ -0,0 +1,19 @@ +--- apr-util-0.9.1/configure.in.orig Tue Sep 10 06:10:50 2002 ++++ apr-util-0.9.1/configure.in Thu Dec 19 23:36:48 2002 +@@ -6,13 +6,13 @@ + AC_INIT(export_vars.sh.in) + + AC_CONFIG_HEADER(include/private/apu_config.h) +-AC_CONFIG_AUX_DIR(../apr/build) ++AC_CONFIG_AUX_DIR(../apr-0.9.1/build) + + sinclude(build/apu-conf.m4) + sinclude(build/apu-iconv.m4) + sinclude(build/apu-hints.m4) +-sinclude(../apr/build/apr_common.m4) +-sinclude(../apr/build/find_apr.m4) ++sinclude(../apr-0.9.1/build/apr_common.m4) ++sinclude(../apr-0.9.1/build/find_apr.m4) + + dnl Generate ./config.nice for reproducing runs of configure + dnl diff -ruN apr.bak/pkg-plist apr/pkg-plist --- apr.bak/pkg-plist Mon Aug 5 05:38:24 2002 +++ apr/pkg-plist Fri Dec 20 00:19:30 2002 @@ -1,69 +1,70 @@ -bin/apr-config -bin/apu-config -include/apr.h -include/apr_allocator.h -include/apr_anylock.h -include/apr_atomic.h -include/apr_base64.h -include/apr_buckets.h -include/apr_compat.h -include/apr_date.h -include/apr_dbm.h -include/apr_dso.h -include/apr_errno.h -include/apr_file_info.h -include/apr_file_io.h -include/apr_fnmatch.h -include/apr_general.h -include/apr_getopt.h -include/apr_global_mutex.h -include/apr_hash.h -include/apr_hooks.h -include/apr_inherit.h -include/apr_ldap.h -include/apr_lib.h -include/apr_md4.h -include/apr_md5.h -include/apr_mmap.h -include/apr_network_io.h -include/apr_optional.h -include/apr_optional_hooks.h -include/apr_pools.h -include/apr_poll.h -include/apr_portable.h -include/apr_proc_mutex.h -include/apr_ring.h -include/apr_rmm.h -include/apr_sdbm.h -include/apr_sha1.h -include/apr_shm.h -include/apr_signal.h -include/apr_strings.h -include/apr_strmatch.h -include/apr_support.h -include/apr_tables.h -include/apr_thread_cond.h -include/apr_thread_mutex.h -include/apr_thread_proc.h -include/apr_thread_rwlock.h -include/apr_time.h -include/apr_uri.h -include/apr_user.h -include/apr_uuid.h -include/apr_version.h -include/apr_want.h -include/apr_xlate.h -include/apr_xml.h -include/apu.h -include/apu_compat.h -lib/APRVARS +include/apr-0/apr.h +include/apr-0/apr_version.h +include/apr-0/apr_user.h +include/apr-0/apr_time.h +include/apr-0/apr_thread_rwlock.h +include/apr-0/apr_thread_proc.h +include/apr-0/apr_thread_mutex.h +include/apr-0/apr_thread_cond.h +include/apr-0/apr_tables.h +include/apr-0/apr_support.h +include/apr-0/apr_strings.h +include/apr-0/apr_signal.h +include/apr-0/apr_shm.h +include/apr-0/apr_ring.h +include/apr-0/apr_proc_mutex.h +include/apr-0/apr_portable.h +include/apr-0/apr_pools.h +include/apr-0/apr_poll.h +include/apr-0/apr_network_io.h +include/apr-0/apr_mmap.h +include/apr-0/apr_lib.h +include/apr-0/apr_inherit.h +include/apr-0/apr_hash.h +include/apr-0/apr_global_mutex.h +include/apr-0/apr_getopt.h +include/apr-0/apr_general.h +include/apr-0/apr_fnmatch.h +include/apr-0/apr_file_io.h +include/apr-0/apr_file_info.h +include/apr-0/apr_errno.h +include/apr-0/apr_dso.h +include/apr-0/apr_compat.h +include/apr-0/apr_atomic.h +include/apr-0/apr_allocator.h +include/apr-0/apr_want.h +include/apr-0/apr_anylock.h +include/apr-0/apu_compat.h +include/apr-0/apu.h +include/apr-0/apr_xml.h +include/apr-0/apr_xlate.h +include/apr-0/apr_uuid.h +include/apr-0/apr_uri.h +include/apr-0/apr_strmatch.h +include/apr-0/apr_sha1.h +include/apr-0/apr_sdbm.h +include/apr-0/apr_rmm.h +include/apr-0/apr_reslist.h +include/apr-0/apr_queue.h +include/apr-0/apr_optional_hooks.h +include/apr-0/apr_optional.h +include/apr-0/apr_md5.h +include/apr-0/apr_md4.h +include/apr-0/apr_ldap.h +include/apr-0/apr_hooks.h +include/apr-0/apr_dbm.h +include/apr-0/apr_date.h +include/apr-0/apr_buckets.h +include/apr-0/apr_base64.h +include/apr-0/apu_version.h +lib/libapr-0.so.9 +lib/libapr-0.la +lib/libapr-0.a lib/apr.exp +lib/libaprutil-0.so.9 +lib/libaprutil-0.la +lib/libaprutil-0.a lib/aprutil.exp -lib/libapr.a -lib/libapr.la -lib/libapr.so -lib/libapr.so.0 -lib/libaprutil.a -lib/libaprutil.la -lib/libaprutil.so -lib/libaprutil.so.0 +build/libtool +bin/apr-config +bin/apu-config >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212200557.gBK5vgU3004192>