Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Jul 2002 20:55:24 -0400 (EDT)
From:      Garrett Rooney <rooneg@electricjellyfish.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/40395: MAINTAINER UPDATE: new version of devel/apr-devel and devel/subversion
Message-ID:  <200207100055.g6A0tOL19841@neroon.user.acm.rpi.edu>

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

>Number:         40395
>Category:       ports
>Synopsis:       MAINTAINER UPDATE: new version of devel/apr-devel and devel/subversion
>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:   Tue Jul 09 18:00:09 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Garrett Rooney
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
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:
	the apr-devel and subversion ports are quite out of date.
>How-To-Repeat:
	N/A
>Fix:
	apply the following patches.  note that the subversion patch adds a 
new file (pkg-message) which will have to be cvs added.

Index: ./apr-devel/distinfo
===================================================================
--- ./apr-devel/distinfo
+++ ./apr-devel/distinfo	Sun Jul  7 16:31:52 2002
@@ -1,2 +1,2 @@
-MD5 (apr_20020504162319.tar.gz) = 7d5221373291a635b1ecfb0e46242a3b
-MD5 (apr-util_20020504162329.tar.gz) = b09fd003133237af1ea441e64c7f4341
+MD5 (apr_20020707163141.tar.gz) = 086bee350d73724b3e9707f16eaf1879
+MD5 (apr-util_20020707163148.tar.gz) = e348b0dd55364ffd43736c81120c64e0
Index: ./apr-devel/pkg-plist
===================================================================
--- ./apr-devel/pkg-plist
+++ ./apr-devel/pkg-plist	Sun Jul  7 16:36:24 2002
@@ -38,6 +38,7 @@
 include/apr_shm.h
 include/apr_signal.h
 include/apr_strings.h
+include/apr_strmatch.h
 include/apr_tables.h
 include/apr_thread_cond.h
 include/apr_thread_mutex.h
Index: ./apr-devel/Makefile
===================================================================
--- ./apr-devel/Makefile
+++ ./apr-devel/Makefile	Sun Jul  7 17:00:11 2002
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	apr-devel
-PORTVERSION=	20020504162319
+PORTVERSION=	20020707163141
 CATEGORIES=	devel
 MASTER_SITES=	http://www.apache.org/dist/apr/not-released/
-DISTFILES=	apr_${PORTVERSION}.tar.gz apr-util_20020504162329.tar.gz
+DISTFILES=	apr_${PORTVERSION}.tar.gz apr-util_20020707163148.tar.gz
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
@@ -22,25 +22,22 @@
 WRKSRC=	${WRKDIR}
 
 pre-fetch:
-	${SH} pkg-install apr-devel PRE-INSTALL
+	@${SH} pkg-install apr-devel PRE-INSTALL
 
 pre-configure:
-	(find ${WRKDIR}/apr-util/ -name Makefile.in -exec \
-	 ${PERL} -pi -e 's/\@APRUTIL_INCLUDES\@ \@APRUTIL_PRIV_INCLUDES\@/\@APRUTIL_PRIV_INCLUDES\@ \@APRUTIL_INCLUDES\@/g' \{\} \;)
-
-	(cd ${WRKDIR}/apr/ && ./buildconf)
-	(cd ${WRKDIR}/apr-util/ && ./buildconf)
+	@(cd ${WRKDIR}/apr/ && ./buildconf)
+	@(cd ${WRKDIR}/apr-util/ && ./buildconf)
 
 do-configure:
-	(cd ${WRKDIR}/apr/ && ./configure --prefix=${PREFIX})
-	(cd ${WRKDIR}/apr-util/ && ./configure --prefix=${PREFIX} --with-apr=../apr/ --with-expat=${PREFIX})
+	@(cd ${WRKDIR}/apr/ && ./configure --prefix=${PREFIX})
+	@(cd ${WRKDIR}/apr-util/ && ./configure --prefix=${PREFIX} --with-apr=../apr/ --with-expat=${PREFIX})
 
 do-build:
-	(cd ${WRKDIR}/apr/ && make)
-	(cd ${WRKDIR}/apr-util/ && make)
+	@(cd ${WRKDIR}/apr/ && make)
+	@(cd ${WRKDIR}/apr-util/ && make)
 
 do-install:
-	(cd ${WRKDIR}/apr/ && make install)
+	@(cd ${WRKDIR}/apr/ && make install)
 	(cd ${WRKDIR}/apr-util/ && make install)
 
 .include <bsd.port.mk>

Index: ./subversion/distinfo
===================================================================
--- ./subversion/distinfo
+++ ./subversion/distinfo	Sun Jul  7 16:41:45 2002
@@ -1 +1 @@
-MD5 (subversion-r1868.tar.gz) = f4a2c531797a0af297bd89757e75645f
+MD5 (subversion-r2376.tar.gz) = f49b9c2747ef9f306245eb89334f2a1b
Index: ./subversion/pkg-plist
===================================================================
--- ./subversion/pkg-plist
+++ ./subversion/pkg-plist	Sun Jul  7 16:56:14 2002
@@ -1,68 +1,75 @@
 bin/svn
 bin/svnadmin
 bin/svnlook
-include/svn_base64.h
-include/svn_client.h
-include/svn_config.h
-include/svn_dav.h
-include/svn_delta.h
-include/svn_error.h
-include/svn_error_codes.h
-include/svn_fs.h
-include/svn_hash.h
-include/svn_io.h
-include/svn_path.h
-include/svn_pools.h
-include/svn_quoprint.h
-include/svn_ra.h
-include/svn_repos.h
-include/svn_sorts.h
-include/svn_string.h
-include/svn_test.h
-include/svn_time.h
-include/svn_types.h
-include/svn_version.h
-include/svn_wc.h
-include/svn_xml.h
+include/subversion-1/svn_auth.h
+include/subversion-1/svn_base64.h
+include/subversion-1/svn_client.h
+include/subversion-1/svn_config.h
+include/subversion-1/svn_dav.h
+include/subversion-1/svn_delta.h
+include/subversion-1/svn_diff.h
+include/subversion-1/svn_error.h
+include/subversion-1/svn_error_codes.h
+include/subversion-1/svn_fs.h
+include/subversion-1/svn_hash.h
+include/subversion-1/svn_io.h
+include/subversion-1/svn_path.h
+include/subversion-1/svn_pools.h
+include/subversion-1/svn_quoprint.h
+include/subversion-1/svn_ra.h
+include/subversion-1/svn_repos.h
+include/subversion-1/svn_sorts.h
+include/subversion-1/svn_string.h
+include/subversion-1/svn_test.h
+include/subversion-1/svn_time.h
+include/subversion-1/svn_types.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_client.a
-lib/libsvn_client.la
-lib/libsvn_client.so
-lib/libsvn_client.so.0
-lib/libsvn_delta.a
-lib/libsvn_delta.la
-lib/libsvn_delta.so
-lib/libsvn_delta.so.0
-lib/libsvn_fs.a
-lib/libsvn_fs.la
-lib/libsvn_fs.so
-lib/libsvn_fs.so.0
-lib/libsvn_ra.a
-lib/libsvn_ra.la
-lib/libsvn_ra.so
-lib/libsvn_ra.so.0
-lib/libsvn_ra_dav.a
-lib/libsvn_ra_dav.la
-lib/libsvn_ra_dav.so
-lib/libsvn_ra_dav.so.0
-lib/libsvn_ra_local.a
-lib/libsvn_ra_local.la
-lib/libsvn_ra_local.so
-lib/libsvn_ra_local.so.0
-lib/libsvn_repos.a
-lib/libsvn_repos.la
-lib/libsvn_repos.so
-lib/libsvn_repos.so.0
-lib/libsvn_subr.a
-lib/libsvn_subr.la
-lib/libsvn_subr.so
-lib/libsvn_subr.so.0
-lib/libsvn_wc.a
-lib/libsvn_wc.la
-lib/libsvn_wc.so
-lib/libsvn_wc.so.0
+lib/libsvn_auth-1.a
+lib/libsvn_auth-1.la
+lib/libsvn_auth-1.so
+lib/libsvn_auth-1.so.0
+lib/libsvn_client-1.a
+lib/libsvn_client-1.la
+lib/libsvn_client-1.so
+lib/libsvn_client-1.so.0
+lib/libsvn_delta-1.a
+lib/libsvn_delta-1.la
+lib/libsvn_delta-1.so
+lib/libsvn_delta-1.so.0
+lib/libsvn_fs-1.a
+lib/libsvn_fs-1.la
+lib/libsvn_fs-1.so
+lib/libsvn_fs-1.so.0
+lib/libsvn_ra-1.a
+lib/libsvn_ra-1.la
+lib/libsvn_ra-1.so
+lib/libsvn_ra-1.so.0
+lib/libsvn_ra_dav-1.a
+lib/libsvn_ra_dav-1.la
+lib/libsvn_ra_dav-1.so
+lib/libsvn_ra_dav-1.so.0
+lib/libsvn_ra_local-1.a
+lib/libsvn_ra_local-1.la
+lib/libsvn_ra_local-1.so
+lib/libsvn_ra_local-1.so.0
+lib/libsvn_repos-1.a
+lib/libsvn_repos-1.la
+lib/libsvn_repos-1.so
+lib/libsvn_repos-1.so.0
+lib/libsvn_subr-1.a
+lib/libsvn_subr-1.la
+lib/libsvn_subr-1.so
+lib/libsvn_subr-1.so.0
+lib/libsvn_wc-1.a
+lib/libsvn_wc-1.la
+lib/libsvn_wc-1.so
+lib/libsvn_wc-1.so.0
+@dirrm include/subversion-1
Index: ./subversion/Makefile
===================================================================
--- ./subversion/Makefile
+++ ./subversion/Makefile	Mon Jul  8 21:53:10 2002
@@ -5,9 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	r1868	# 0.12.0
+PORTVERSION=	r2376	# 0.13.2
 CATEGORIES=	devel
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/196/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/340/
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
@@ -22,24 +22,25 @@
 
 WRKSRC=	${WRKDIR}/subversion-${PORTVERSION}
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ARGS= --with-ssl \
 		--with-neon=${LOCALBASE} \
+		--with-berkeley-db=${LOCALBASE}/include/db4:${LOCALBASE}/lib \
 		--with-apr=${LOCALBASE} \
 		--with-apr-util=${LOCALBASE}
 
 post-extract:
-	# work around libdb4's name.
-	@${PERL} -pi -e 's/ldb/ldb4/g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} 's/ldb/ldb4/g' ${WRKSRC}/configure
 
-	# axe the neon, apr, and apr-util subdirs to keep svn's build process
-	# from using them, since we're providing our own.
 	@${RM} -r ${WRKSRC}/neon
 	@${RM} -r ${WRKSRC}/apr
 	@${RM} -r ${WRKSRC}/apr-util
 
 post-configure:
-	# 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
+	@${REINPLACE_CMD} 's/install-swig-py-lib//g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's/swig-py-lib//g' ${WRKSRC}/Makefile
+
+post-install:
+	@${CAT} pkg-message
 
 .include <bsd.port.mk>
Index: ./subversion/pkg-message
===================================================================
--- ./subversion/pkg-message
+++ ./subversion/pkg-message	Tue Jul  9 08:13:11 2002
@@ -0,0 +1,14 @@
+
+                              WARNING!!!
+
+Subversion is still pre-alpha software and should not be used in anything 
+even approaching a production environment.  The working copy and repository 
+formats are almost certainly going to change in ways that are not backwards 
+compatable, and Murphy's Law says that you will be the one that runs into 
+the nasty bug that munges all your data in a completely non-recoverable way.  
+
+If this hasn't scared you off yet, please use this port to download the most 
+recent development code from the main Subversion repository located at 
+http://svn.collab.net/repos/svn/trunk, and report any bugs you encounter to 
+the development mailing list at dev@subversion.tigris.org.
+
>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?200207100055.g6A0tOL19841>