Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Dec 2007 11:57:57 +0100 (CET)
From:      Martin Matuska <mm@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/119152: [UPDATE] devel/subversion from 1.4.4 to 1.4.6
Message-ID:  <20071230105757.03B3F398A3@mail.vx.sk>
Resent-Message-ID: <200712301100.lBUB06Z4097499@freefall.freebsd.org>

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

>Number:         119152
>Category:       ports
>Synopsis:       [UPDATE] devel/subversion from 1.4.4 to 1.4.6
>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:   Sun Dec 30 11:00:06 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 7.0-RC1 i386 and amd64
>Organization:
>Environment:
FreeBSD 7.0-RC1 i386 and amd64
>Description:
Update of devel/subversion from 1.4.4 to 1.4.6
Introduce OPTIONS to make port users happier
Make portlint little happier (NLS)

Tinderbox tested.

I got no response to my previous PR ports/115927
and I am closing it because this PR supersedes it.

The last commit from lev@ dates to 20070728
>How-To-Repeat:
>Fix:
Index: ports/devel/subversion/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/subversion/Makefile,v
retrieving revision 1.115
diff -u -r1.115 Makefile
--- ports/devel/subversion/Makefile	7 Oct 2007 05:44:56 -0000	1.115
+++ ports/devel/subversion/Makefile	30 Dec 2007 10:49:41 -0000
@@ -5,8 +5,7 @@
 # $FreeBSD: ports/devel/subversion/Makefile,v 1.115 2007/10/07 05:44:56 linimon Exp $
 
 PORTNAME=	subversion
-PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTVERSION=	1.4.6
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.2/:bookhtml \
@@ -21,7 +20,7 @@
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
@@ -41,9 +40,20 @@
 PORTDOCS=	${TXT_DOCS}
 .endif
 
-.if defined(WITH_ASVN)
-RUN_DEPENDS= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
-.endif
+OPTIONS=	PERL		"Perl bindings" off \
+		PYTHON		"Python bindings" off \
+		RUBY		"Ruby bindings" off \
+		JAVA		"Java (JavaHL) bindings" off \
+		MOD_DAV_SVN	"mod_dav_svn module for Apache 2.X" off \
+		APACHE2_APR	"Use APR from Apache 2.X" off \
+		NEON		"WebDAV/Delta-V repository access module" on \
+		BDB		"db4 repository backend" on \
+		ASVN		"Build and install Archive SVN (asvn)" off \
+		MAINTAINER_DEBUG	"Build debug version" off \
+		SVNSERVE_WRAPPER	"Enable svnserve wrapper" off \
+		BOOK		"Install the Subversion Book" off
+
+.include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
@@ -53,8 +63,6 @@
 PLIST_SUB+=		WITHOUT_GETTEXT="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fpic -DPIC
 .endif
@@ -216,6 +224,7 @@
 .endif
 
 .if defined(WITH_ASVN)
+RUN_DEPENDS=	${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
 PLIST_SUB+=	ASVN=""
 .else
 PLIST_SUB+=	ASVN="@comment "
Index: ports/devel/subversion/distinfo
===================================================================
RCS file: /home/pcvs/ports/devel/subversion/distinfo,v
retrieving revision 1.51
diff -u -r1.51 distinfo
--- ports/devel/subversion/distinfo	18 Jul 2007 11:27:49 -0000	1.51
+++ ports/devel/subversion/distinfo	30 Dec 2007 10:49:41 -0000
@@ -1,6 +1,6 @@
-MD5 (subversion/subversion-1.4.4.tar.bz2) = d4aa5aeb09acb3307841022d279ab895
-SHA256 (subversion/subversion-1.4.4.tar.bz2) = 91769f992e142eaeb5017e9ec95be52505a056ef05f93427868a3c0c89e2e966
-SIZE (subversion/subversion-1.4.4.tar.bz2) = 4723349
+MD5 (subversion/subversion-1.4.6.tar.bz2) = 9c7cf517362c1c9332b610339e5cce6b
+SHA256 (subversion/subversion-1.4.6.tar.bz2) = 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124
+SIZE (subversion/subversion-1.4.6.tar.bz2) = 4680316
 MD5 (subversion/svn-book.html) = 0d1f773db342da190baf6d6567d95b83
 SHA256 (subversion/svn-book.html) = 0fd99b2f12458e91fe299a32ed585b00bb4c29bcb74b2d75bfbbfce8ddb191e7
 SIZE (subversion/svn-book.html) = 1151598
Index: ports/devel/subversion/files/patch-configure
===================================================================
RCS file: /home/pcvs/ports/devel/subversion/files/patch-configure,v
retrieving revision 1.14
diff -u -r1.14 patch-configure
--- ports/devel/subversion/files/patch-configure	18 Jul 2007 08:03:30 -0000	1.14
+++ ports/devel/subversion/files/patch-configure	30 Dec 2007 10:49:41 -0000
@@ -1,14 +1,5 @@
---- configure.orig	Thu Jan 18 01:17:34 2007
-+++ configure	Sat Mar 17 10:48:49 2007
-@@ -3942,7 +3942,7 @@
- 
- # Either a space-separated list of allowable Neon versions, or "any" to
- # mean allow anything.
--NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2"
-+NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3 0.26.4"
- NEON_LATEST_WORKING_VER=0.25.5
- NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
- # Check whether --enable-neon-version-check or --disable-neon-version-check was given.
+--- configure.orig	2007-12-17 23:01:31.000000000 +0100
++++ configure	2007-12-30 11:12:10.000000000 +0100
 @@ -4004,7 +4004,7 @@
             test "$svn_allowed_neon" = "any"; then
              svn_allowed_neon_on_system="yes"
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071230105757.03B3F398A3>