Attachment #83414 for bug #119152

View | Details | Raw Unified | Return to bug 119152
Collapse All | Expand All




# $FreeBSD: ports/devel/subversion/Makefile,v 1.115 2007/10/07 05:44:56 linimon Exp $

PORTNAME=	subversion
PORTVERSION=	1.4.6
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
		http://svnbook.red-bean.com/en/1.2/:bookhtml \


LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2

USE_LDCONFIG=	yes

USE_BZIP2=	yes
USE_AUTOTOOLS=	libtool:15

PORTDOCS=	${TXT_DOCS}
.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

PLIST_SUB+=		WITHOUT_GETTEXT="@comment "
.endif

.include <bsd.port.pre.mk>

.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
CFLAGS+=	-fpic -DPIC
.endif

.endif

.if defined(WITH_ASVN)
RUN_DEPENDS=	${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
PLIST_SUB+=	ASVN=""
.else
PLIST_SUB+=	ASVN="@comment "

Lines 1-6 Link Here

(-)ports/devel/subversion/distinfo (-3 / +3 lines)
1	MD5 (subversion/subversion-1.4.4.tar.bz2) = d4aa5aeb09acb3307841022d279ab895	1	MD5 (subversion/subversion-1.4.6.tar.bz2) = 9c7cf517362c1c9332b610339e5cce6b
2	SHA256 (subversion/subversion-1.4.4.tar.bz2) = 91769f992e142eaeb5017e9ec95be52505a056ef05f93427868a3c0c89e2e966	2	SHA256 (subversion/subversion-1.4.6.tar.bz2) = 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124
3	SIZE (subversion/subversion-1.4.4.tar.bz2) = 4723349	3	SIZE (subversion/subversion-1.4.6.tar.bz2) = 4680316
4	MD5 (subversion/svn-book.html) = 0d1f773db342da190baf6d6567d95b83	4	MD5 (subversion/svn-book.html) = 0d1f773db342da190baf6d6567d95b83
5	SHA256 (subversion/svn-book.html) = 0fd99b2f12458e91fe299a32ed585b00bb4c29bcb74b2d75bfbbfce8ddb191e7	5	SHA256 (subversion/svn-book.html) = 0fd99b2f12458e91fe299a32ed585b00bb4c29bcb74b2d75bfbbfce8ddb191e7
6	SIZE (subversion/svn-book.html) = 1151598	6	SIZE (subversion/svn-book.html) = 1151598




--- configure.orig	2007-12-17 23:01:31.000000000 +0100
+++ configure	2007-12-30 11:12:10.000000000 +0100
@@ -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.
@@ -4004,7 +4004,7 @@
            test "$svn_allowed_neon" = "any"; then
             svn_allowed_neon_on_system="yes"

Return to bug 119152

Lines 5-12 Link Here

(-)ports/devel/subversion/Makefile (-8 / +17 lines)
5	# $FreeBSD: ports/devel/subversion/Makefile,v 1.115 2007/10/07 05:44:56 linimon Exp $	5	# $FreeBSD: ports/devel/subversion/Makefile,v 1.115 2007/10/07 05:44:56 linimon Exp $
6		6
7	PORTNAME= subversion	7	PORTNAME= subversion
8	PORTVERSION= 1.4.4	8	PORTVERSION= 1.4.6
9	PORTREVISION= 1
10	CATEGORIES= devel	9	CATEGORIES= devel
11	MASTER_SITES= http://subversion.tigris.org/downloads/:main \	10	MASTER_SITES= http://subversion.tigris.org/downloads/:main \
12	http://svnbook.red-bean.com/en/1.2/:bookhtml \	11	http://svnbook.red-bean.com/en/1.2/:bookhtml \
Lines 21-27 Link Here
21		20
22	LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2	21	LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
23		22
24	INSTALLS_SHLIB= yes	23	USE_LDCONFIG= yes
25		24
26	USE_BZIP2= yes	25	USE_BZIP2= yes
27	USE_AUTOTOOLS= libtool:15	26	USE_AUTOTOOLS= libtool:15
Lines 41-49 Link Here
41	PORTDOCS= ${TXT_DOCS}	40	PORTDOCS= ${TXT_DOCS}
42	.endif	41	.endif
43		42
44	.if defined(WITH_ASVN)	43	OPTIONS= PERL "Perl bindings" off \
45	RUN_DEPENDS= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install	44	PYTHON "Python bindings" off \
46	.endif	45	RUBY "Ruby bindings" off \
		46	JAVA "Java (JavaHL) bindings" off \
		47	MOD_DAV_SVN "mod_dav_svn module for Apache 2.X" off \
		48	APACHE2_APR "Use APR from Apache 2.X" off \
		49	NEON "WebDAV/Delta-V repository access module" on \
		50	BDB "db4 repository backend" on \
		51	ASVN "Build and install Archive SVN (asvn)" off \
		52	MAINTAINER_DEBUG "Build debug version" off \
		53	SVNSERVE_WRAPPER "Enable svnserve wrapper" off \
		54	BOOK "Install the Subversion Book" off
		55
		56	.include <bsd.port.pre.mk>
47		57
48	.if !defined(WITHOUT_NLS)	58	.if !defined(WITHOUT_NLS)
49	USE_GETTEXT= yes	59	USE_GETTEXT= yes
Lines 53-60 Link Here
53	PLIST_SUB+= WITHOUT_GETTEXT="@comment "	63	PLIST_SUB+= WITHOUT_GETTEXT="@comment "
54	.endif	64	.endif
55		65
56	.include <bsd.port.pre.mk>
57
58	.if ${ARCH} == "amd64" \|\| ${ARCH} == "ia64"	66	.if ${ARCH} == "amd64" \|\| ${ARCH} == "ia64"
59	CFLAGS+= -fpic -DPIC	67	CFLAGS+= -fpic -DPIC
60	.endif	68	.endif
Lines 216-221 Link Here
216	.endif	224	.endif
217		225
218	.if defined(WITH_ASVN)	226	.if defined(WITH_ASVN)
		227	RUN_DEPENDS= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
219	PLIST_SUB+= ASVN=""	228	PLIST_SUB+= ASVN=""
220	.else	229	.else
221	PLIST_SUB+= ASVN="@comment "	230	PLIST_SUB+= ASVN="@comment "

Lines 1-14 Link Here

(-)ports/devel/subversion/files/patch-configure (-11 / +2 lines)
1	--- configure.orig Thu Jan 18 01:17:34 2007	1	--- configure.orig 2007-12-17 23:01:31.000000000 +0100
2	+++ configure Sat Mar 17 10:48:49 2007	2	+++ configure 2007-12-30 11:12:10.000000000 +0100
3	@@ -3942,7 +3942,7 @@
4
5	# Either a space-separated list of allowable Neon versions, or "any" to
6	# mean allow anything.
7	-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"
8	+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"
9	NEON_LATEST_WORKING_VER=0.25.5
10	NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
11	# Check whether --enable-neon-version-check or --disable-neon-version-check was given.
12	@@ -4004,7 +4004,7 @@	3	@@ -4004,7 +4004,7 @@
13	test "$svn_allowed_neon" = "any"; then	4	test "$svn_allowed_neon" = "any"; then
14	svn_allowed_neon_on_system="yes"	5	svn_allowed_neon_on_system="yes"