Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Aug 2002 19:22:35 -0400 (EDT)
From:      Garrett Rooney <rooneg@electricjellyfish.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/41249: [MAINTAINER UPDATE] update subversion and apr ports
Message-ID:  <200208012322.g71NMZj41437@neroon.user.acm.rpi.edu>

next in thread | raw e-mail | index | archive | help

>Number:         41249
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] update subversion and apr 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:   Thu Aug 01 16:30:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Garrett Rooney
>Release:        FreeBSD 4.6-STABLE-20020704-JPSNAP i386
>Organization:
>Environment:
System: FreeBSD quicksilver.electricjellyfish.net 4.6-STABLE-20020704-JPSNAP FreeBSD 4.6-STABLE-20020704-JPSNAP #0: Wed Jul 3 23:41:20 GMT 2002 root@tora.jp.freebsd.org:/usr/src/sys/compile/GENERIC i386

>Description:
	This updates the Subversion port to the Subversion ALPHA release, and
updates devel/apr to a more recent snapshot.  It also adds iconv support to 
apr, which Subversion now uses.

>How-To-Repeat:
	N/A

>Fix:
	Apply the following patches.  Note that this removes the pkg-message 
from the suvbersion port, so that will have to be 'cvs rm'd.


diff -r -u apr-old/Makefile apr/Makefile
--- apr-old/Makefile	Thu Aug  1 19:11:06 2002
+++ apr/Makefile	Thu Aug  1 19:11:16 2002
@@ -2,21 +2,21 @@
 # Date created:		19 February 2002
 # Whom:			Garrett Rooney <rooneg@electricjellyfish.net>
 #
-# $FreeBSD: ports/devel/apr/Makefile,v 1.7 2002/07/21 02:17:43 kuriyama Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	apr
-PORTVERSION=	20020707163141
-PORTREVISION=	1
+PORTVERSION=	20020725223645
 CATEGORIES=	devel
 MASTER_SITES=	http://www.apache.org/dist/apr/not-released/
-DISTFILES=	apr_${PORTVERSION}.tar.gz apr-util_20020707163148.tar.gz
+DISTFILES=	apr_${PORTVERSION}.tar.gz apr-util_20020725223700.tar.gz
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
 BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
 		libtool:${PORTSDIR}/devel/libtool
-LIB_DEPENDS=	expat.3:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat.3:${PORTSDIR}/textproc/expat2 \
+		iconv.3:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=	yes
 
@@ -31,7 +31,7 @@
 
 do-configure:
 	@(cd ${WRKDIR}/apr/ && ./configure --prefix=${PREFIX})
-	@(cd ${WRKDIR}/apr-util/ && ./configure --prefix=${PREFIX} --with-apr=../apr/ --with-expat=${PREFIX})
+	@(cd ${WRKDIR}/apr-util/ && ${ENV} CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib ./configure --prefix=${PREFIX} --with-apr=../apr/ --with-expat=${PREFIX})
 
 do-build:
 	@(cd ${WRKDIR}/apr/ && make)
diff -r -u apr-old/distinfo apr/distinfo
--- apr-old/distinfo	Thu Aug  1 19:11:06 2002
+++ apr/distinfo	Thu Aug  1 19:11:16 2002
@@ -1,2 +1,2 @@
-MD5 (apr_20020707163141.tar.gz) = 086bee350d73724b3e9707f16eaf1879
-MD5 (apr-util_20020707163148.tar.gz) = e348b0dd55364ffd43736c81120c64e0
+MD5 (apr_20020725223645.tar.gz) = e95ba59919ae9d6d36abc2b42575f743
+MD5 (apr-util_20020725223700.tar.gz) = 9098f2d1b6c502166cd83bff8f8b22cb
Only in apr/files: .svn
diff -r -u apr-old/pkg-install apr/pkg-install
--- apr-old/pkg-install	Thu Aug  1 19:11:06 2002
+++ apr/pkg-install	Thu Aug  1 19:11:16 2002
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: ports/devel/apr/pkg-install,v 1.3 2002/07/15 17:58:32 roberto Exp $
+# $FreeBSD$
 
 if [ "$2" != "PRE-INSTALL" ]; then
   exit 0
diff -r -u apr-old/pkg-plist apr/pkg-plist
--- apr-old/pkg-plist	Thu Aug  1 19:11:06 2002
+++ apr/pkg-plist	Thu Aug  1 19:11:16 2002
@@ -29,6 +29,7 @@
 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
@@ -39,6 +40,7 @@
 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


diff -u -r subversion-old/Makefile subversion/Makefile
--- subversion-old/Makefile	Thu Aug  1 19:13:00 2002
+++ subversion/Makefile	Thu Aug  1 19:13:08 2002
@@ -2,13 +2,12 @@
 # Date created:				10 September 2001
 # Whom:					rooneg@electricjellyfish.net
 #
-# $FreeBSD: ports/devel/subversion/Makefile,v 1.15 2002/07/21 02:17:44 kuriyama Exp $
+# $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	r2376	# 0.13.2
-PORTREVISION=	1
+PORTVERSION=	r2667	# 0.14.0
 CATEGORIES=	devel
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/340/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/578/
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
@@ -19,8 +18,6 @@
 RUN_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils
 BUILD_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils
 
-MAN1=		svn.1
-
 WRKSRC=	${WRKDIR}/subversion-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
@@ -40,5 +37,6 @@
 post-configure:
 	@${REINPLACE_CMD} 's/install-swig-py-lib//g' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's/swig-py-lib//g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's/install-man install-info//g' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff -u -r subversion-old/distinfo subversion/distinfo
--- subversion-old/distinfo	Thu Aug  1 19:13:00 2002
+++ subversion/distinfo	Thu Aug  1 19:13:08 2002
@@ -1 +1 @@
-MD5 (subversion-r2376.tar.gz) = f49b9c2747ef9f306245eb89334f2a1b
+MD5 (subversion-r2667.tar.gz) = dd3273c9aa02019b1852ea96d6ddc297
Only in subversion-old: pkg-message
diff -u -r subversion-old/pkg-plist subversion/pkg-plist
--- subversion-old/pkg-plist	Thu Aug  1 19:13:00 2002
+++ subversion/pkg-plist	Thu Aug  1 19:13:08 2002
@@ -1,4 +1,5 @@
 bin/svn
+bin/svn-config
 bin/svnadmin
 bin/svnlook
 include/subversion-1/svn_auth.h
@@ -23,15 +24,10 @@
 include/subversion-1/svn_test.h
 include/subversion-1/svn_time.h
 include/subversion-1/svn_types.h
+include/subversion-1/svn_utf.h
 include/subversion-1/svn_version.h
 include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
-info/svn-design.info
-info/svn-design.info-1
-info/svn-design.info-2
-info/svn-design.info-3
-info/svn-manual.info
-info/svn_for_cvs_users.info
 lib/libsvn_auth-1.a
 lib/libsvn_auth-1.la
 lib/libsvn_auth-1.so
>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?200208012322.g71NMZj41437>