ports/61352: upgrade devel/subversion to 0.36.0, with perl binding

plasma plasma at freebsd.sinica.edu.tw
Wed Jan 14 08:30:23 UTC 2004 

>Number:         61352
>Category:       ports
>Synopsis:       upgrade devel/subversion to 0.36.0, with perl binding
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 14 00:30:19 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     plasma
>Release:        FreeBSD 4.9-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD freebsd.sinica.edu.tw 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #4: Mon Sep 15 18:44:48 CST 2003 root at freebsd.sinica.edu.tw:/usr/src/sys/compile/GENERIC i386


	
>Description:
	Upgrade devel/subversion to 0.36.0, with perl binding.
>How-To-Repeat:
	None
>Fix:

	This pr obsoletes ports/57779.	


diff -ruN /usr/ports/devel/subversion/Makefile subversion/Makefile
--- /usr/ports/devel/subversion/Makefile	Tue Jan 13 09:21:25 2004
+++ subversion/Makefile	Wed Jan 14 16:22:56 2004
@@ -2,11 +2,10 @@
 # Date created:				10 September 2001
 # Whom:					rooneg at electricjellyfish.net
 #
-# $FreeBSD: ports/devel/subversion/Makefile,v 1.55 2004/01/12 10:59:32 lev Exp $
+# $FreeBSD: ports/devel/subversion/Makefile,v 1.52 2003/11/13 10:00:38 lev Exp $
 
 PORTNAME=	subversion
-PORTVERSION=	0.35.1
-PORTREVISION=	1
+PORTVERSION=	0.36.0
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/tarballs/
 
@@ -24,10 +23,9 @@
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-ssl \
 		--with-neon=${LOCALBASE} \
-		--with-berkeley-db=${LOCALBASE}/include/db4:${LOCALBASE}/lib \
-		--with-swig=no
+		--with-berkeley-db=${LOCALBASE}/include/db4:${LOCALBASE}/lib
 
-MAN1=		svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1
+MAN1=		svn.1 svnadmin.1 svndumpfilter.1 svnlook.1 svnversion.1
 MAN5=		svnserve.conf.5
 MAN8=		svnserve.8
 MANCOMPRESSED=	no
@@ -36,6 +34,37 @@
 
 SVNREPOS?=	/home/svn/repos
 
+.if defined(WITH_MAINTAINER_DEBUG)
+CONFIGURE_ARGS+=	--enable-maintainer-mode \
+			--enable-debug
+CFLAGS+=	-g
+.endif
+
+.if defined(WITH_PERL)
+.if ${PERL_LEVEL} < 500800
+IGNORE=		"Subversion's perl binding needs Perl 5.8.0 or greater, upgrade your Perl!"
+.else
+USE_PERL5=	no
+BUILD_DEPENDS+=	swig1.3:${PORTSDIR}/devel/swig13
+DEPENDS_ARGS+=	SWIG_LANGUAGES=perl
+CONFIGURE_ARGS+=	\
+			--with-swig=${LOCALBASE} \
+			--enable-swig-bindings=perl
+PLIST_SUB+=	WITH_PERL=""
+
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3=		SVN::Base.3 \
+		SVN::Client.3 \
+		SVN::Core.3 \
+		SVN::Delta.3 \
+		SVN::Ra.3 \
+		SVN::Repos.3
+.endif
+.else
+USE_PERL5=	no
+PLIST_SUB+=	WITH_PERL="@comment "
+.endif
+
 .if defined(WITH_MOD_DAV_SVN)
 WITH_APACHE2_APR=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
@@ -75,9 +104,10 @@
 pre-extract:
 .if !defined (BATCH)
 	@dialog --title "-- URGENT UPGRADE INFORMATION --" --clear --yesno \
-	 "If you upgrade Subversion from pre-0.34.0 version, please,\ndump you repository with old (pre-0.34.0) svnadmin command.\nAfter this, install new version, remove old repository, create new\none with svnadmin & load dump created from old repository\n\nVersions after 0.34.0 have different repository format and\nyour old repository could not be used with versions 0.34.0 and up.\n\nRead\nhttp://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO\nfor details.\n\nDid you dump you repository and ready to install new version?" \
-	 18 70
+	"If you upgrade Subversion from pre-0.34.0 version, please,\ndump you repository with old (pre-0.34.0) svnadmin command.\nAfter this, install new version, remove old repository, create new\none with svnadmin & load dump created from old repository\n\nVersions after 0.34.0 have different repository format and\nyour old repository could not be used with versions 0.34.0 and up.\n\nRead\nhttp://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO\nfor details.\n\nDid you dump you repository and ready to install new version?" \
+	18 70
 .endif
+
 .if defined(WITH_MOD_DAV_SVN)
 	@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
 .else
@@ -161,6 +191,13 @@
 	for f in BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README; do \
 		${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
 	done
+.endif
+.if defined(WITH_PERL)
+	cd ${WRKSRC}; \
+	  ${MAKE} install-swig-pl-lib
+	cd ${WRKSRC}/subversion/bindings/swig/perl; \
+	  ${PERL} Makefile.PL; \
+	  ${MAKE} all test install
 .endif
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
diff -ruN /usr/ports/devel/subversion/distinfo subversion/distinfo
--- /usr/ports/devel/subversion/distinfo	Mon Jan 12 08:55:16 2004
+++ subversion/distinfo	Wed Jan 14 16:01:20 2004
@@ -1 +1 @@
-MD5 (subversion-0.35.1.tar.gz) = c4473988acdd82e8b0e176eefc7d0fb7
+MD5 (subversion-0.36.0.tar.gz) = 84749fc90377e8ac23dbcd7aa4d99f75
diff -ruN /usr/ports/devel/subversion/files/patch-ac-helpers::ltmain.sh subversion/files/patch-ac-helpers::ltmain.sh
--- /usr/ports/devel/subversion/files/patch-ac-helpers::ltmain.sh	Mon Jan 12 08:55:16 2004
+++ subversion/files/patch-ac-helpers::ltmain.sh	Thu Jan  1 08:00:00 1970
@@ -1,12 +0,0 @@
---- ac-helpers/ltmain.sh.orig	Thu Oct 23 17:15:47 2003
-+++ ac-helpers/ltmain.sh	Tue Nov 11 15:04:17 2003
-@@ -1072,7 +1072,7 @@
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-
diff -ruN /usr/ports/devel/subversion/pkg-plist subversion/pkg-plist
--- /usr/ports/devel/subversion/pkg-plist	Thu Oct  9 20:50:16 2003
+++ subversion/pkg-plist	Wed Jan 14 16:01:20 2004
@@ -80,6 +80,10 @@
 lib/libsvn_subr-1.la
 lib/libsvn_subr-1.so
 lib/libsvn_subr-1.so.0
+%%WITH_PERL%%lib/libsvn_swig_perl-1.a
+%%WITH_PERL%%lib/libsvn_swig_perl-1.la
+%%WITH_PERL%%lib/libsvn_swig_perl-1.so
+%%WITH_PERL%%lib/libsvn_swig_perl-1.so.0
 lib/libsvn_wc-1.a
 lib/libsvn_wc-1.la
 lib/libsvn_wc-1.so
@@ -88,6 +92,38 @@
 %%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Base.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Client.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Core.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Delta.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Fs.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Ra.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Repos.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Wc.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client/_Client.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client/_Client.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/.packlist
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/_Core.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/_Core.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta/_Delta.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta/_Delta.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs/_Fs.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs/_Fs.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra/_Ra.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra/_Ra.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos/_Repos.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos/_Repos.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc/_Wc.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc/_Wc.so
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SVN
 %%PORTDOCS%%share/doc/subversion/BUGS
 %%PORTDOCS%%share/doc/subversion/CHANGES
 %%PORTDOCS%%share/doc/subversion/COMMITTERS
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list