Date: Mon, 6 May 2002 20:42:07 -0400 (EDT) From: Garrett Rooney <rooneg@neroon.user.acm.rpi.edu> To: FreeBSD-gnats-submit@FreeBSD.org Cc: roberto@FreeBSD.org, will@FreeBSD.org Subject: ports/37810: [maintainer update] update subversion and apr-devel ports Message-ID: <200205070042.g470g7P05424@neroon.user.acm.rpi.edu>
next in thread | raw e-mail | index | archive | help
>Number: 37810 >Category: ports >Synopsis: [maintainer update] update subversion and apr-devel ports >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon May 06 17:50:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Garrett Rooney >Release: FreeBSD 4.4-RELEASE i386 >Organization: >Environment: System: FreeBSD neroon.user.acm.rpi.edu 4.4-RELEASE FreeBSD 4.4-RELEASE #1: Sun Sep 30 20:50:57 EDT 2001 root@neroon.user.acm.rpi.edu:/usr/obj/usr/src/sys/NEROON i386 >Description: the apr-devel and subversion ports are out of date >How-To-Repeat: n/a >Fix: apply the following patches. note, these remove several patches, which will need to be cvs rm'd. Index: apr-devel/distinfo =================================================================== --- apr-devel/distinfo +++ tmp.41628.00001 Mon May 6 20:36:22 2002 @@ -1,2 +1,2 @@ -MD5 (apr_20020309172416.tar.gz) = fcb5fa3a2ea700619588699a6e69f9e3 -MD5 (apr-util_20020309172426.tar.gz) = e7d418d7144b790ab6941984e20d2ac2 +MD5 (apr_20020504162319.tar.gz) = 7d5221373291a635b1ecfb0e46242a3b +MD5 (apr-util_20020504162329.tar.gz) = b09fd003133237af1ea441e64c7f4341 Index: apr-devel/files/patch-apr-config =================================================================== --- apr-devel/files/patch-apr-config +++ tmp.72.00001 Mon May 6 20:36:25 2002 @@ -1,17 +0,0 @@ -Index: apr/apr-config.in -=================================================================== -RCS file: /home/cvspublic/apr/apr-config.in,v -retrieving revision 1.13 -diff -u -r1.13 apr-config.in ---- apr-config.in 13 Mar 2002 20:39:08 -0000 1.13 -+++ apr-config.in 14 Mar 2002 00:44:38 -0000 -@@ -111,7 +111,8 @@ - - thisdir="`dirname $0`" - thisdir="`cd $thisdir && pwd`" --if test "$bindir" = "$thisdir"; then -+tmpbindir="`cd $bindir && pwd`" -+if test "$tmpbindir" = "$thisdir"; then - location=installed - elif test "$APR_SOURCE_DIR" = "$thisdir"; then - location=source Index: apr-devel/files/patch-apu-config =================================================================== --- apr-devel/files/patch-apu-config +++ tmp.72.00001 Mon May 6 20:36:25 2002 @@ -1,17 +0,0 @@ -Index: apr-util/apu-config.in -=================================================================== -RCS file: /home/cvspublic/apr-util/apu-config.in,v -retrieving revision 1.7 -diff -u -r1.7 apu-config.in ---- apu-config.in 13 Mar 2002 20:40:46 -0000 1.7 -+++ apu-config.in 14 Mar 2002 00:45:06 -0000 -@@ -97,7 +97,8 @@ - - thisdir="`dirname $0`" - thisdir="`cd $thisdir && pwd`" --if test "$bindir" = "$thisdir"; then -+tmpbindir="`cd $bindir && pwd`" -+if test "$tmpbindir" = "$thisdir"; then - location=installed - elif test "$APR_SOURCE_DIR" = "$thisdir"; then - location=source Index: apr-devel/pkg-plist =================================================================== --- apr-devel/pkg-plist +++ tmp.41628.00001 Mon May 6 20:36:28 2002 @@ -1,6 +1,7 @@ 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 @@ -21,7 +22,6 @@ include/apr_inherit.h include/apr_ldap.h include/apr_lib.h -include/apr_lock.h include/apr_md4.h include/apr_md5.h include/apr_mmap.h Index: apr-devel/Makefile =================================================================== --- apr-devel/Makefile +++ tmp.41628.00001 Mon May 6 20:36:29 2002 @@ -6,16 +6,16 @@ # PORTNAME= apr-devel -PORTVERSION= 20020309172416 +PORTVERSION= 20020504162319 CATEGORIES= devel MASTER_SITES= http://www.apache.org/dist/apr/not-released/ -DISTFILES= apr_20020309172416.tar.gz apr-util_20020309172426.tar.gz +DISTFILES= apr_${PORTVERSION}.tar.gz apr-util_20020504162329.tar.gz MAINTAINER= rooneg@electricjellyfish.net BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf \ libtool:${PORTSDIR}/devel/libtool -LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat +LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2 GNU_CONFIGURE= yes Index: subversion/distinfo =================================================================== --- subversion/distinfo +++ tmp.41628.00001 Mon May 6 20:36:30 2002 @@ -1 +1 @@ -MD5 (subversion-r1682+.tar.gz) = cc8c6748031f3315f3c0529541cd8e4f +MD5 (subversion-r1868.tar.gz) = f4a2c531797a0af297bd89757e75645f Index: subversion/files/patch-build.conf =================================================================== --- subversion/files/patch-build.conf +++ tmp.72.00001 Mon May 6 20:36:25 2002 @@ -1,217 +0,0 @@ ---- build.conf.orig Fri Mar 8 17:19:05 2002 -+++ build.conf Fri Mar 8 18:42:28 2002 -@@ -63,7 +63,7 @@ - type = exe - path = subversion/clients/cmdline - libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr -- $(SVN_APR_LIBS) libexpat -+ $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - manpages = subversion/clients/cmdline/man/svn.1 - infopages = doc/user/manual/svn-manual.info - doc/user/svn_for_cvs_users/svn_for_cvs_users.info -@@ -77,14 +77,14 @@ - type = exe - path = subversion/svnadmin - install = fs-bin --libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - - # The subversion repository inspection tool - [svnlook] - type = exe - path = subversion/svnlook - install = fs-bin --libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - - # Library needed by all subversion clients - [libsvn_client] -@@ -141,7 +141,7 @@ - type = lib - install = base-lib - path = subversion/libsvn_subr --libs = $(SVN_APR_LIBS) libexpat -+libs = $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - - # Working copy management lib - [libsvn_wc] -@@ -161,12 +161,12 @@ - install = apache-mod - - # Simple XML-parsing lib --[libexpat] --type = lib --install = base-lib --path = expat-lite -+#[libexpat] -+#type = lib -+#install = base-lib -+#path = expat-lite - # there are some .c files included by others, so *.c isn't appropriate --sources = hashtable.c xmlparse.c xmlrole.c xmltok.c -+#sources = hashtable.c xmlparse.c xmlrole.c xmltok.c - - # ---------------------------------------------------------------------------- - # -@@ -210,7 +210,7 @@ - sources = fs-test.c - install = fs-test - libs = libsvn_test libsvn_test_fs libsvn_fs libsvn_delta libsvn_subr -- $(SVN_APR_LIBS) libexpat -+ $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - # run-fs-tests.sh will run this for us - testing = skip - -@@ -220,7 +220,7 @@ - path = subversion/tests/libsvn_fs - sources = skel-test.c - install = fs-test --libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - # run-fs-tests.sh will run this for us - testing = skip - -@@ -230,7 +230,7 @@ - path = subversion/tests/libsvn_fs - sources = key-test.c - install = fs-test --libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - # run-fs-tests.sh will run this for us - testing = skip - -@@ -241,7 +241,7 @@ - sources = strings-reps-test.c - install = fs-test - libs = libsvn_test libsvn_test_fs libsvn_fs libsvn_delta libsvn_subr -- $(SVN_APR_LIBS) libexpat -+ $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - # run-fs-tests.sh will run this for us - testing = skip - -@@ -251,7 +251,7 @@ - path = subversion/tests/libsvn_repos - sources = md5args.c - install = test --libs = libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - # run-repos-tests.sh will run this for us - testing = skip - -@@ -262,7 +262,7 @@ - sources = repos-test.c dir-delta-editor.c - install = fs-test - libs = libsvn_test libsvn_test_fs libsvn_repos libsvn_fs libsvn_delta -- libsvn_subr $(SVN_APR_LIBS) libexpat -+ libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - # run-repos-tests.sh will run this for us - testing = skip - -@@ -272,7 +272,7 @@ - path = subversion/tests/libsvn_subr - sources = hashdump-test.c - install = test --libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - - # test svn_stringbuf_t utilities - [stringtest] -@@ -280,7 +280,7 @@ - path = subversion/tests/libsvn_subr - sources = stringtest.c - install = test --libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - - # test path library - [path-test] -@@ -296,7 +296,7 @@ - path = subversion/tests/libsvn_wc - sources = translate-test.c - install = test --libs = libsvn_test libsvn_delta libsvn_wc libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_test libsvn_delta libsvn_wc libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - - # use random data to test delta processing - [random-test] -@@ -304,7 +304,7 @@ - path = subversion/tests/libsvn_delta - sources = random-test.c - install = test --libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - - - ### Tests that are simply broken (fix?) ---------- -@@ -315,7 +315,7 @@ - path = subversion/tests/libsvn_delta - sources = delta-combine-test.c - install = test --libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - # disabled for now -- the delta combiner isn't written, and we - # don't really have any idea if the interface would be compatible - # with this test, anyway. -@@ -328,7 +328,7 @@ - sources = ra-local-test.c - install = fs-test - libs = libsvn_test libsvn_ra libsvn_fs libsvn_delta libsvn_subr -- $(SVN_APR_LIBS) libexpat -+ $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - # disabled for now, BROKEN. - testing = skip - -@@ -341,7 +341,7 @@ - path = subversion/tests/libsvn_subr - sources = target-test.c - install = test --libs = libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - # target-test.sh will run this for us - testing = skip - -@@ -351,7 +351,7 @@ - path = subversion/tests/libsvn_delta - sources = xml-output-test.c - install = test --libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - # this is really redundant with our XML svn-test*.sh tests. - testing = skip - -@@ -361,7 +361,7 @@ - path = subversion/tests/libsvn_wc - sources = checkout-test.c - install = test --libs = libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - # this is really redundant with our XML svn-test*.sh tests. - testing = skip - -@@ -384,7 +384,7 @@ - path = subversion/tests/libsvn_delta - sources = deltaparse-test.c - install = test --libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - testing = skip - - -@@ -397,7 +397,7 @@ - path = subversion/tests/libsvn_delta - sources = svndiff-test.c - install = test --libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - testing = skip - - # compare two files, print txdelta windows -@@ -406,7 +406,7 @@ - path = subversion/tests/libsvn_delta - sources = vdelta-test.c - install = test --libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat -+libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) - testing = skip - - Index: subversion/files/patch-build_buildcheck.sh =================================================================== --- subversion/files/patch-build_buildcheck.sh +++ tmp.72.00001 Mon May 6 20:36:25 2002 @@ -1,13 +0,0 @@ ---- build/buildcheck.sh.orig Fri Apr 26 17:39:27 2002 -+++ build/buildcheck.sh Fri Apr 26 17:39:47 2002 -@@ -53,8 +53,8 @@ - #-------------------------------------------------------------------------- - # check for the correct version of Neon - # --NEON_WANTED_REGEX=0.19.[2-3] --NEON_LATEST_WORKING_VER=0.19.3 -+NEON_WANTED_REGEX=0.19.[2-4] -+NEON_LATEST_WORKING_VER=0.19.4 - NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz" - if test -d ./neon; then - NEON_VERSION="`./ac-helpers/get-neon-ver.sh neon`" Index: subversion/Makefile =================================================================== --- subversion/Makefile +++ tmp.41628.00001 Mon May 6 20:36:36 2002 @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= subversion -PORTVERSION= r1682+ +PORTVERSION= r1868 CATEGORIES= devel MASTER_SITES= http://www.tigris.org/files/15/48/ @@ -13,11 +13,10 @@ LIB_DEPENDS= db4:${PORTSDIR}/databases/db4 \ neon.19:${PORTSDIR}/www/neon \ - expat:${PORTSDIR}/textproc/expat \ + expat.2:${PORTSDIR}/textproc/expat2 \ apr:${PORTSDIR}/devel/apr-devel RUN_DEPENDS= gdiff3:${PORTSDIR}/textproc/diffutils BUILD_DEPENDS= gdiff3:${PORTSDIR}/textproc/diffutils \ - python:${PORTSDIR}/lang/python MAN1= svn.1 @@ -39,10 +38,6 @@ @${RM} -r ${WRKSRC}/apr-util post-configure: - # regenerate build-outputs.mk so we can use our installed expat, - # rather than the expat-lite in svn's tree - (cd ${WRKSRC} && ./gen-make.py -s build.conf) - # make sure we don't install the swig stuff, even if it was found @${PERL} -pi -e 's/install-swig-py-lib//g' ${WRKSRC}/Makefile @${PERL} -pi -e 's/swig-py-lib//g' ${WRKSRC}/Makefile >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?200205070042.g470g7P05424>