Date: Thu, 12 Aug 2004 23:25:42 +0800 (CST) From: Rong-En Fan <rafan@infor.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lev@FreeBSD.org Subject: ports/70368: [PATCH] devel/subversion: fix dependency and use %%DOCSDIR%% Message-ID: <200408121525.i7CFPgvI082391@rafan.csie.org> Resent-Message-ID: <200408121530.i7CFUMYR030036@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408121525.i7CFPgvI082391>