From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Aug 12 15:30:23 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 31B8116A4CE for ; Thu, 12 Aug 2004 15:30:23 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1174243D2D for ; Thu, 12 Aug 2004 15:30:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i7CFUMJJ030038 for ; Thu, 12 Aug 2004 15:30:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i7CFUMYR030036; Thu, 12 Aug 2004 15:30:22 GMT (envelope-from gnats) Resent-Date: Thu, 12 Aug 2004 15:30:22 GMT Resent-Message-Id: <200408121530.i7CFUMYR030036@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rong-En Fan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E4CF16A4CE; Thu, 12 Aug 2004 15:26:20 +0000 (GMT) Received: from muse.csie.ntu.edu.tw (muse.csie.ntu.edu.tw [140.112.28.158]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2758C43D31; Thu, 12 Aug 2004 15:26:20 +0000 (GMT) (envelope-from rafan@infor.org) Received: from localhost (localhost.csie.ntu.edu.tw [127.0.0.1]) by muse.csie.ntu.edu.tw (Postfix) with ESMTP id 4EF215246A; Thu, 12 Aug 2004 23:26:19 +0800 (CST) Received: from rafan.csie.org (220-135-116-9.HINET-IP.hinet.net [220.135.116.9]) by muse.csie.ntu.edu.tw (Postfix) with ESMTP id 8A2D452465; Thu, 12 Aug 2004 23:26:17 +0800 (CST) Received: (from rafan@localhost) by rafan.csie.org (8.12.10/8.12.10/Submit) id i7CFPgvI082391; Thu, 12 Aug 2004 23:25:42 +0800 (CST) (envelope-from rafan) Message-Id: <200408121525.i7CFPgvI082391@rafan.csie.org> Date: Thu, 12 Aug 2004 23:25:42 +0800 (CST) From: Rong-En Fan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: lev@FreeBSD.org Subject: ports/70368: [PATCH] devel/subversion: fix dependency and use %%DOCSDIR%% X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Aug 2004 15:30:23 -0000 >Number: 70368 >Category: ports >Synopsis: [PATCH] devel/subversion: fix dependency and use %%DOCSDIR%% >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Aug 12 15:30:22 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Rong-En Fan >Release: FreeBSD 5.2.1-RELEASE-p9 i386 >Organization: NTU CSIE >Environment: System: FreeBSD rafan.csie.org 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #2: Mon Jul 19 03:22:42 CST 2004 >Description: - SVN perl bindings need libswigpl.so to run. Add it to LIB_DEPENDS, otherwise devel/p5-SVN-* failed to build when checking SVN::Core in Makefile.PL due to libswigpl.so. - USE_PYTHON automatically includes bsd.python.mk Also, move USE_PYTHON before bsd.port.pre.mk as portlint says. - Use %%DOCSDIR%% Port maintainer (lev@freebsd.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- subversion-1.0.6.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/subversion/Makefile /home/rafan/tmp/ports/subversion/Makefile --- /usr/ports/devel/subversion/Makefile Tue Aug 3 20:58:34 2004 +++ /home/rafan/tmp/ports/subversion/Makefile Thu Aug 12 23:20:13 2004 @@ -29,6 +29,14 @@ MAN8= svnserve.8 MANCOMPRESSED= no +.if defined(WITH_PYTHON) +USE_PYTHON= yes +SWIG_BINDINGS+= python +PLIST_SUB+= WITH_PYTHON="" +.else +PLIST_SUB+= WITH_PYTHON="@comment " +.endif + .include SVNREPOS?= /home/svn/repos @@ -44,6 +52,7 @@ IGNORE= "Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again" .endif SWIG_BINDINGS+= perl +LIB_DEPENDS+= swigpl.0:${PORTSDIR}/devel/swig13 USE_PERL5= yes PLIST_SUB+= WITH_PERL="" MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} @@ -56,15 +65,6 @@ SVN::Wc.3 .else PLIST_SUB+= WITH_PERL="@comment " -.endif - -.if defined(WITH_PYTHON) -USE_PYTHON= yes -.include "${PORTSDIR}/Mk/bsd.python.mk" -SWIG_BINDINGS+= python -PLIST_SUB+= WITH_PYTHON="" -.else -PLIST_SUB+= WITH_PYTHON="@comment " .endif .if defined(SWIG_BINDINGS) && ${SWIG_BINDINGS} != "" diff -ruN --exclude=CVS /usr/ports/devel/subversion/pkg-plist /home/rafan/tmp/ports/subversion/pkg-plist --- /usr/ports/devel/subversion/pkg-plist Thu Feb 5 23:20:42 2004 +++ /home/rafan/tmp/ports/subversion/pkg-plist Thu Aug 12 22:53:11 2004 @@ -185,11 +185,11 @@ %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.pyc %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/libsvn %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/svn -%%PORTDOCS%%share/doc/subversion/BUGS -%%PORTDOCS%%share/doc/subversion/CHANGES -%%PORTDOCS%%share/doc/subversion/COMMITTERS -%%PORTDOCS%%share/doc/subversion/COPYING -%%PORTDOCS%%share/doc/subversion/HACKING -%%PORTDOCS%%share/doc/subversion/INSTALL -%%PORTDOCS%%share/doc/subversion/README -%%PORTDOCS%%@dirrm share/doc/subversion +%%PORTDOCS%%%%DOCSDIR%%/BUGS +%%PORTDOCS%%%%DOCSDIR%%/CHANGES +%%PORTDOCS%%%%DOCSDIR%%/COMMITTERS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/HACKING +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrm %%DOCSDIR%% --- subversion-1.0.6.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: