Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Oct 2002 13:14:56 +0200 (CEST)
From:      Janos Mohacsi <mohacsi@niif.hu>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        rooneg@electricjellyfish.net
Subject:   ports/43656: New version of subversion r3200 (0.34.2)
Message-ID:  <200210041114.g94BEufW053109@norfolk.ki.iif.hu>

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

>Number:         43656
>Category:       ports
>Synopsis:       New version of subversion r3200 (0.34.2)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 04 04:20:06 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Janos Mohacsi
>Release:        FreeBSD 4.7-PRERELEASE i386
>Organization:
NIIF
>Environment:
System: FreeBSD norfolk.ki.iif.hu 4.7-PRERELEASE FreeBSD 4.7-PRERELEASE #2: Wed Sep 18 10:30:33 CEST 2002 root@norfolk.ki.iif.hu:/usr/src/sys/compile/NORFOLK i386

>Description:
	Updated version of subversion is attached to this e-mail. 
	This version is a bit different from devel/subversion:
	It is installing manual pages.
	It is installing mod_dav_svn if you have installed apache2 or 
	you define BUILD_SVN_SERVER.
	Fixing bug installing shared library.

	In the same time it is the latest stable version of subversion that is 
	available in tarball.


>How-To-Repeat:
	Apply this diff.
>Fix:

diff -ruN subversion.bak/Makefile subversion/Makefile
--- subversion.bak/Makefile	Thu Sep 19 05:47:28 2002
+++ subversion/Makefile	Fri Oct  4 10:27:11 2002
@@ -1,32 +1,46 @@
 # New ports collection makefile for:	subversion
 # Date created:				10 September 2001
 # Whom:					rooneg@electricjellyfish.net
+# Modified for subversion dav server	janos.mohacsi@bsd.hu
 #
 # $FreeBSD: ports/devel/subversion/Makefile,v 1.19 2002/09/19 03:47:28 will Exp $
 
 PORTNAME=	subversion
-PORTVERSION=	r3033	# 0.14.2
+PORTVERSION=	r3200	# 0.14.3
 CATEGORIES=	devel
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/718/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/841/
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
 LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
-		neon.22:${PORTSDIR}/www/neon \
-		expat.4:${PORTSDIR}/textproc/expat2 \
-		apr:${PORTSDIR}/devel/apr
+		neon.23:${PORTSDIR}/www/neon \
+		expat.4:${PORTSDIR}/textproc/expat2
 RUN_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils
 BUILD_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils
 
 WRKSRC=	${WRKDIR}/subversion-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS= --with-ssl \
+CONFIGURE_ARGS=	--with-ssl \
 		--with-neon=${LOCALBASE} \
 		--with-berkeley-db=${LOCALBASE}/include/db4:${LOCALBASE}/lib \
 		--with-apr=${LOCALBASE} \
 		--with-apr-util=${LOCALBASE}
 
+MAN1=		svn.1 svnadmin.1
+INSTALLS_SHLIB=	yes
+
+.include <bsd.port.pre.mk>
+
+.if defined(BUILD_SVN_SERVER) || exists(${LOCALBASE}/etc/apache2/httpd.conf)
+BUILD_SVN_SERVER=yes
+RUN_DEPENDS+=	${LOCALBASE}/etc/apache2/httpd.conf:${PORTSDIR}/www/apache2
+BUILD_DEPENDS+=	${LOCALBASE}/etc/apache2/httpd.conf:${PORTSDIR}/www/apache2
+CONFIGURE_ARGS+=	--with-apxs=${LOCALBASE}/sbin/apxs
+.else
+LIB_DEPENDS+=	apr:${PORTSDIR}/devel/apr
+.endif
+
 post-extract:
 	@${REINPLACE_CMD} 's/ldb/ldb4/g' ${WRKSRC}/configure
 
@@ -37,6 +51,11 @@
 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
+	@${REINPLACE_CMD} 's/install-info//g' ${WRKSRC}/Makefile
+
+post-install:
+.if defined(BUILD_SVN_SERVER)
+	${ECHO} libexec/apache2/mod_dav_svn.so >>${TMPPLIST}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN subversion.bak/distinfo subversion/distinfo
--- subversion.bak/distinfo	Thu Sep 19 09:31:59 2002
+++ subversion/distinfo	Fri Oct  4 10:24:39 2002
@@ -1 +1 @@
-MD5 (subversion-r3033.tar.gz) = 83f283eab9da5d2822dae7413e4bc4fc
+MD5 (subversion-r3200.tar.gz) = 22afd8046d45049904aeb9f96f4c6afe
diff -ruN subversion.bak/pkg-message subversion/pkg-message
--- subversion.bak/pkg-message	Mon Jul 15 20:33:45 2002
+++ subversion/pkg-message	Fri Oct  4 10:25:35 2002
@@ -12,3 +12,5 @@
 http://svn.collab.net/repos/svn/trunk, and report any bugs you encounter to
 the development mailing list at dev@subversion.tigris.org.
 
+If you installed and you want to enable subversion server add dav directives 
+to your apache config.

>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?200210041114.g94BEufW053109>