From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 31 11:10:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE9001065685 for ; Sat, 31 May 2008 11:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id BB1358FC28 for ; Sat, 31 May 2008 11:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m4VBA1mS092798 for ; Sat, 31 May 2008 11:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m4VBA1fo092797; Sat, 31 May 2008 11:10:01 GMT (envelope-from gnats) Resent-Date: Sat, 31 May 2008 11:10:01 GMT Resent-Message-Id: <200805311110.m4VBA1fo092797@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, Martin Birgmeier Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9DBFC106566C for ; Sat, 31 May 2008 11:07:15 +0000 (UTC) (envelope-from martin@email.aon.at) Received: from email.aon.at (nat-warsl417-01.aon.at [195.3.96.119]) by mx1.freebsd.org (Postfix) with ESMTP id 3C3B48FC28 for ; Sat, 31 May 2008 11:07:13 +0000 (UTC) (envelope-from martin@email.aon.at) Received: (qmail 10046 invoked from network); 31 May 2008 10:40:33 -0000 Received: from unknown (HELO email.aon.at) ([172.18.5.237]) (envelope-sender ) by fallback01.highway.telekom.at (qmail-ldap-1.03) with SMTP for ; 31 May 2008 10:40:33 -0000 Received: (qmail 10977 invoked from network); 31 May 2008 10:40:30 -0000 Received: from 80-121-19-70.adsl.highway.telekom.at (HELO gandalf.xyzzy) ([80.121.19.70]) (envelope-sender ) by smarthub93.highway.telekom.at (qmail-ldap-1.03) with SMTP for ; 31 May 2008 10:40:29 -0000 Received: from gandalf.xyzzy (localhost.xyzzy [127.0.0.1]) by gandalf.xyzzy (8.14.2/8.14.2) with ESMTP id m4VAeSfS018419 for ; Sat, 31 May 2008 12:40:29 +0200 (CEST) (envelope-from martin@gandalf.xyzzy) Received: (from martin@localhost) by gandalf.xyzzy (8.14.2/8.14.2/Submit) id m4VAeSfa018418; Sat, 31 May 2008 12:40:28 +0200 (CEST) (envelope-from martin) Message-Id: <200805311040.m4VAeSfa018418@gandalf.xyzzy> Date: Sat, 31 May 2008 12:40:28 +0200 (CEST) From: Martin Birgmeier To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/124161: [patch] fix unnecessary conflicts between devel/subversion, devel/subversion-perl, devel-subversion-python, and devel/subversion-ruby X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Martin Birgmeier List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 May 2008 11:10:02 -0000 >Number: 124161 >Category: ports >Synopsis: [patch] fix unnecessary conflicts between devel/subversion, devel/subversion-perl, devel-subversion-python, and devel/subversion-ruby >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat May 31 11:10:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Martin Birgmeier >Release: FreeBSD 6.3-RELEASE i386, FreeBSD 7.0-RELEASE i386 >Organization: MBi at home >Environment: System: FreeBSD gandalf.xyzzy 6.3-RELEASE FreeBSD 6.3-RELEASE #0: Sat Jan 26 16:14:29 CET 2008 root@gandalf.xyzzy:/d/14.1/OBJ/FreeBSD/RELENG_6_3_0_RELEASE/src/sys/XYZZY i386 FreeBSD atpcdvvc.xyzzy 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Thu May 22 17:20:59 CEST 2008 root@atpcdvvc.xyzzy:/usr/VOL/OBJ/FreeBSD/RELENG_7_0_0_RELEASE/src/sys/XYZZY_SMP_NA i386 >Description: The ports devel/subversion, devel/subversion-perl, devel-subversion-python, devel/subversion-ruby unnecessarily exclude each other, thereby preventing the simultaneous installation of ports which depend on them. Please note that the reply address is invalid, as I do not want to receive spam mail. Simply add to the bug report, I'll check back from time to time. >How-To-Repeat: Try installing any two of these ports simultaneously. >Fix: The workaround up till now was to set WITH_PERL, WITH_PYTHON, and WITH_RUBY when installing devel/subversion, and only install this port. A real fix is below. It mostly preserves the current logic in devel/subversion/Makefile. --- ./devel/subversion-perl/Makefile.ORIG 2008-02-02 19:02:42.000000000 +0100 +++ ./devel/subversion-perl/Makefile 2008-05-31 11:16:48.000000000 +0200 @@ -9,12 +9,10 @@ MAINTAINER= autrijus@autrijus.org COMMENT= Version control system with Perl bindings -CONFLICTS= subversion-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]* + +RUN_DEPENDS+= ${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion MASTERDIR= ${.CURDIR}/../../devel/subversion PKGDIR= ${.CURDIR} -PLIST= ${MASTERDIR}/pkg-plist - -WITH_PERL= yes .include "${MASTERDIR}/Makefile" --- ./devel/subversion-perl/pkg-plist.ORIG 2008-05-31 09:09:37.000000000 +0200 +++ ./devel/subversion-perl/pkg-plist 2008-05-31 09:09:34.000000000 +0200 @@ -0,0 +1,36 @@ +lib/libsvn_swig_perl-1.a +lib/libsvn_swig_perl-1.la +lib/libsvn_swig_perl-1.so +lib/libsvn_swig_perl-1.so.0 +%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Base.pm +%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Client.pm +%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Core.pm +%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Delta.pm +%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Fs.pm +%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Ra.pm +%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Repos.pm +%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Wc.pm +%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client/_Client.bs +%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client/_Client.so +%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/.packlist +%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/_Core.bs +%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/_Core.so +%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta/_Delta.bs +%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta/_Delta.so +%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs/_Fs.bs +%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs/_Fs.so +%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra/_Ra.bs +%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra/_Ra.so +%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos/_Repos.bs +%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos/_Repos.so +%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc/_Wc.bs +%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc/_Wc.so +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SVN --- ./devel/subversion-python/Makefile.ORIG 2008-02-02 19:02:42.000000000 +0100 +++ ./devel/subversion-python/Makefile 2008-05-31 11:16:55.000000000 +0200 @@ -9,12 +9,10 @@ MAINTAINER= thinker@branda.to COMMENT= Version control system with Python bindings -CONFLICTS= subversion-[0-9]* subversion-perl-[0-9]* subversion-ruby-[0-9]* + +RUN_DEPENDS+= ${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion MASTERDIR= ${.CURDIR}/../../devel/subversion PKGDIR= ${.CURDIR} -PLIST= ${MASTERDIR}/pkg-plist - -WITH_PYTHON= yes .include "${MASTERDIR}/Makefile" --- ./devel/subversion-python/pkg-plist.ORIG 2008-05-31 09:23:32.000000000 +0200 +++ ./devel/subversion-python/pkg-plist 2008-05-31 09:23:28.000000000 +0200 @@ -0,0 +1,59 @@ +lib/libsvn_swig_py-1.a +lib/libsvn_swig_py-1.la +lib/libsvn_swig_py-1.so +lib/libsvn_swig_py-1.so.0 +%%PYTHON_SITELIBDIR%%/libsvn/__init__.py +%%PYTHON_SITELIBDIR%%/libsvn/__init__.pyc +%%PYTHON_SITELIBDIR%%/libsvn/_client.a +%%PYTHON_SITELIBDIR%%/libsvn/_client.la +%%PYTHON_SITELIBDIR%%/libsvn/_client.so +%%PYTHON_SITELIBDIR%%/libsvn/_core.a +%%PYTHON_SITELIBDIR%%/libsvn/_core.la +%%PYTHON_SITELIBDIR%%/libsvn/_core.so +%%PYTHON_SITELIBDIR%%/libsvn/_delta.a +%%PYTHON_SITELIBDIR%%/libsvn/_delta.la +%%PYTHON_SITELIBDIR%%/libsvn/_delta.so +%%PYTHON_SITELIBDIR%%/libsvn/_fs.a +%%PYTHON_SITELIBDIR%%/libsvn/_fs.la +%%PYTHON_SITELIBDIR%%/libsvn/_fs.so +%%PYTHON_SITELIBDIR%%/libsvn/_ra.a +%%PYTHON_SITELIBDIR%%/libsvn/_ra.la +%%PYTHON_SITELIBDIR%%/libsvn/_ra.so +%%PYTHON_SITELIBDIR%%/libsvn/_repos.a +%%PYTHON_SITELIBDIR%%/libsvn/_repos.la +%%PYTHON_SITELIBDIR%%/libsvn/_repos.so +%%PYTHON_SITELIBDIR%%/libsvn/_wc.a +%%PYTHON_SITELIBDIR%%/libsvn/_wc.la +%%PYTHON_SITELIBDIR%%/libsvn/_wc.so +%%PYTHON_SITELIBDIR%%/libsvn/client.py +%%PYTHON_SITELIBDIR%%/libsvn/client.pyc +%%PYTHON_SITELIBDIR%%/libsvn/core.py +%%PYTHON_SITELIBDIR%%/libsvn/core.pyc +%%PYTHON_SITELIBDIR%%/libsvn/delta.py +%%PYTHON_SITELIBDIR%%/libsvn/delta.pyc +%%PYTHON_SITELIBDIR%%/libsvn/fs.py +%%PYTHON_SITELIBDIR%%/libsvn/fs.pyc +%%PYTHON_SITELIBDIR%%/libsvn/ra.py +%%PYTHON_SITELIBDIR%%/libsvn/ra.pyc +%%PYTHON_SITELIBDIR%%/libsvn/repos.py +%%PYTHON_SITELIBDIR%%/libsvn/repos.pyc +%%PYTHON_SITELIBDIR%%/libsvn/wc.py +%%PYTHON_SITELIBDIR%%/libsvn/wc.pyc +%%PYTHON_SITELIBDIR%%/svn/__init__.py +%%PYTHON_SITELIBDIR%%/svn/__init__.pyc +%%PYTHON_SITELIBDIR%%/svn/client.py +%%PYTHON_SITELIBDIR%%/svn/client.pyc +%%PYTHON_SITELIBDIR%%/svn/core.py +%%PYTHON_SITELIBDIR%%/svn/core.pyc +%%PYTHON_SITELIBDIR%%/svn/delta.py +%%PYTHON_SITELIBDIR%%/svn/delta.pyc +%%PYTHON_SITELIBDIR%%/svn/fs.py +%%PYTHON_SITELIBDIR%%/svn/fs.pyc +%%PYTHON_SITELIBDIR%%/svn/ra.py +%%PYTHON_SITELIBDIR%%/svn/ra.pyc +%%PYTHON_SITELIBDIR%%/svn/repos.py +%%PYTHON_SITELIBDIR%%/svn/repos.pyc +%%PYTHON_SITELIBDIR%%/svn/wc.py +%%PYTHON_SITELIBDIR%%/svn/wc.pyc +@dirrm %%PYTHON_SITELIBDIR%%/libsvn +@dirrm %%PYTHON_SITELIBDIR%%/svn --- ./devel/subversion-ruby/Makefile.ORIG 2008-02-02 19:02:42.000000000 +0100 +++ ./devel/subversion-ruby/Makefile 2008-05-31 11:17:02.000000000 +0200 @@ -9,12 +9,10 @@ MAINTAINER= don@na.rim.or.jp COMMENT= Version control system with Ruby bindings -CONFLICTS= subversion-[0-9]* subversion-perl-[0-9]* subversion-python-[0-9]* + +RUN_DEPENDS+= ${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion MASTERDIR= ${.CURDIR}/../../devel/subversion PKGDIR= ${.CURDIR} -PLIST= ${MASTERDIR}/pkg-plist - -WITH_RUBY= yes .include "${MASTERDIR}/Makefile" --- ./devel/subversion-ruby/pkg-plist.ORIG 2008-05-31 09:27:09.000000000 +0200 +++ ./devel/subversion-ruby/pkg-plist 2008-05-31 09:27:04.000000000 +0200 @@ -0,0 +1,38 @@ +lib/libsvn_swig_ruby-1.a +lib/libsvn_swig_ruby-1.la +lib/libsvn_swig_ruby-1.so +lib/libsvn_swig_ruby-1.so.0 +%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.a +%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.la +%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.so +%%RUBY_SITEARCHLIBDIR%%/svn/ext/client.a +%%RUBY_SITEARCHLIBDIR%%/svn/ext/client.la +%%RUBY_SITEARCHLIBDIR%%/svn/ext/client.so +%%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.a +%%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.la +%%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.so +%%RUBY_SITEARCHLIBDIR%%/svn/ext/fs.a +%%RUBY_SITEARCHLIBDIR%%/svn/ext/fs.la +%%RUBY_SITEARCHLIBDIR%%/svn/ext/fs.so +%%RUBY_SITEARCHLIBDIR%%/svn/ext/ra.a +%%RUBY_SITEARCHLIBDIR%%/svn/ext/ra.la +%%RUBY_SITEARCHLIBDIR%%/svn/ext/ra.so +%%RUBY_SITEARCHLIBDIR%%/svn/ext/repos.a +%%RUBY_SITEARCHLIBDIR%%/svn/ext/repos.la +%%RUBY_SITEARCHLIBDIR%%/svn/ext/repos.so +%%RUBY_SITEARCHLIBDIR%%/svn/ext/wc.a +%%RUBY_SITEARCHLIBDIR%%/svn/ext/wc.la +%%RUBY_SITEARCHLIBDIR%%/svn/ext/wc.so +%%RUBY_SITELIBDIR%%/svn/client.rb +%%RUBY_SITELIBDIR%%/svn/core.rb +%%RUBY_SITELIBDIR%%/svn/delta.rb +%%RUBY_SITELIBDIR%%/svn/error.rb +%%RUBY_SITELIBDIR%%/svn/fs.rb +%%RUBY_SITELIBDIR%%/svn/info.rb +%%RUBY_SITELIBDIR%%/svn/ra.rb +%%RUBY_SITELIBDIR%%/svn/repos.rb +%%RUBY_SITELIBDIR%%/svn/util.rb +%%RUBY_SITELIBDIR%%/svn/wc.rb +@dirrm %%RUBY_SITEARCHLIBDIR%%/svn/ext +@dirrm %%RUBY_SITEARCHLIBDIR%%/svn +@dirrm %%RUBY_SITELIBDIR%%/svn --- ./devel/subversion/Makefile.ORIG 2008-05-09 19:00:06.000000000 +0200 +++ ./devel/subversion/Makefile 2008-05-31 11:30:02.000000000 +0200 @@ -17,7 +17,7 @@ MAINTAINER= lev@freebsd.org COMMENT= Version control system -CONFLICTS?= subversion-perl-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]* +PKGNAMESUFFIX?= LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 @@ -29,18 +29,18 @@ CONFIGURE_ARGS= --with-ssl WANT_PERL= yes +.if ${PKGNAMESUFFIX} == "" USE_RC_SUBR= svnserve MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnsync.1 svnversion.1 MAN5= svnserve.conf.5 MAN8= svnserve.8 +.endif TXT_DOCS= BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README -OPTIONS= PERL "Perl bindings" off \ - PYTHON "Python bindings" off \ - RUBY "Ruby bindings" off \ - JAVA "Java (JavaHL) bindings" off \ +.if ${PKGNAMESUFFIX} == "" +OPTIONS= 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 \ @@ -49,6 +49,7 @@ MAINTAINER_DEBUG "Build debug version" off \ SVNSERVE_WRAPPER "Enable svnserve wrapper" off \ BOOK "Install the Subversion Book" off +.endif .include @@ -97,10 +98,9 @@ PLIST_SUB+= WITHOUT_BDB="" .endif -.if defined(WITH_PERL) +.if ${PKGNAMESUFFIX} == "-perl" USE_PERL5= 5.8.0+ SWIG_BINDINGS+= yes -PLIST_SUB+= WITH_PERL="" MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= SVN::Base.3 \ SVN::Client.3 \ @@ -110,26 +110,18 @@ SVN::Ra.3 \ SVN::Repos.3 \ SVN::Wc.3 -.else -PLIST_SUB+= WITH_PERL="@comment " .endif -.if defined(WITH_PYTHON) +.if ${PKGNAMESUFFIX} == "-python" USE_PYTHON= yes .include "${PORTSDIR}/Mk/bsd.python.mk" SWIG_BINDINGS+= yes -PLIST_SUB+= WITH_PYTHON="" -.else -PLIST_SUB+= WITH_PYTHON="@comment " .endif -.if defined(WITH_RUBY) +.if ${PKGNAMESUFFIX} == "-ruby" USE_RUBY= yes .include "${PORTSDIR}/Mk/bsd.ruby.mk" SWIG_BINDINGS+= yes -PLIST_SUB+= WITH_RUBY="" -.else -PLIST_SUB+= WITH_RUBY="@comment " .endif .if defined(WITH_JAVA) @@ -207,6 +199,7 @@ SUB_LIST+= SVNSERVE_BIN_EXT="" .endif +.if ${PKGNAMESUFFIX} == "" .if !defined(NOPORTDOCS) && defined(WITH_BOOK) BOOK_HTML= svn-book-html.tar.bz2 BOOK_PDF= svn-book.pdf @@ -215,9 +208,10 @@ .else PLIST_SUB+= BOOK="@comment " .endif +.endif .if defined(WITH_ASVN) -RUN_DEPENDS= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install +RUN_DEPENDS+= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install PLIST_SUB+= ASVN="" .else PLIST_SUB+= ASVN="@comment " @@ -229,6 +223,7 @@ pre-everything:: @${ECHO_MSG} "" +.if ${PKGNAMESUFFIX} == "" .if defined(WITHOUT_NEON) @${ECHO_MSG} "WebDAV/Delta-V repository access module disabled." .else @@ -249,25 +244,6 @@ @${ECHO_MSG} "You can enable debug build by defining WITH_MAINTAINER_DEBUG." .endif @${ECHO_MSG} "" -.if defined(WITH_PERL) - @${ECHO_MSG} "Build with perl bindings." - @${ECHO_MSG} "Be sure, that apr library and perl both uses OR not uses threads in same time." -.else - @${ECHO_MSG} "You can enable perl bindings by defining WITH_PERL" -.endif - @${ECHO_MSG} "" -.if defined(WITH_PYTHON) - @${ECHO_MSG} "Build with Python bindings." -.else - @${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON." -.endif - @${ECHO_MSG} "" -.if defined(WITH_RUBY) - @${ECHO_MSG} "Build with Ruby bindings." -.else - @${ECHO_MSG} "You can enable Ruby bindings by defining WITH_RUBY." -.endif - @${ECHO_MSG} "" .if defined(WITH_JAVA) @${ECHO_MSG} "Build with Java (JavaHL) bindings." .else @@ -330,6 +306,17 @@ .endif @${ECHO_MSG} "" @${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}}" +.elif ${PKGNAMESUFFIX} == "-perl" + @${ECHO_MSG} "Building perl bindings for subversion." + @${ECHO_MSG} "Be sure that apr library and perl either both use or both do not use threads." +.elif ${PKGNAMESUFFIX} == "-python" + @${ECHO_MSG} "Building Python bindings for subversion." +.elif ${PKGNAMESUFFIX} == "-ruby" + @${ECHO_MSG} "Building Ruby bindings for subversion." +.else + @${ECHO_MSG} "Unknown PKGNAMESUFFIX \"${PKGNAMESUFFIX}\" - aborted." + @${FALSE} +.endif post-extract: @${RM} -rf ${WRKSRC}/neon @@ -366,30 +353,52 @@ fi .endif -post-build: -.if defined(WITH_PERL) +.if ${PKGNAMESUFFIX} == "-perl" +do-build: cd ${WRKSRC} ; \ ${MAKE} swig-pl -.endif -.if defined(WITH_PYTHON) +.elif ${PKGNAMESUFFIX} == "-python" +do-build: cd ${WRKSRC} ; \ ${MAKE} swig-py -.endif -.if defined(WITH_RUBY) +.elif ${PKGNAMESUFFIX} == "-ruby" +do-build: cd ${WRKSRC} ; \ ${MAKE} swig-rb .endif + +.if ${PKGNAMESUFFIX} == "" .if defined(WITH_JAVA) +post-build: @${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes cd ${WRKSRC} ; \ ${MAKE} javahl .endif +.endif +.if ${PKGNAMESUFFIX} == "" .if defined(WITH_MOD_DAV_SVN) pre-install: ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav ${PREFIX}/${APACHEMODDIR}/mod_dav.so .endif +.endif +.if ${PKGNAMESUFFIX} == "-perl" +do-install: + cd ${WRKSRC} ; \ + ${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile ; \ + ${MAKE} install-swig-pl +.elif ${PKGNAMESUFFIX} == "-python" +do-install: + cd ${WRKSRC} ; \ + ${MAKE} install-swig-py +.elif ${PKGNAMESUFFIX} == "-ruby" +do-install: + cd ${WRKSRC} ; \ + ${MAKE} install-swig-rb +.endif + +.if ${PKGNAMESUFFIX} == "" post-install: ${MKREPOS_TARGET} @${MKDIR} ${DATADIR} cd ${WRKSRC}/tools ; \ @@ -408,19 +417,6 @@ .if defined(WITH_ASVN) ${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin .endif -.if defined(WITH_PERL) - cd ${WRKSRC} ; \ - ${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile ; \ - ${MAKE} install-swig-pl -.endif -.if defined(WITH_PYTHON) - cd ${WRKSRC} ; \ - ${MAKE} install-swig-py -.endif -.if defined(WITH_RUBY) - cd ${WRKSRC} ; \ - ${MAKE} install-swig-rb -.endif .if defined(WITH_JAVA) cd ${WRKSRC} ; \ ${MAKE} install-javahl @@ -428,6 +424,7 @@ .if defined(WITH_SVNSERVE_WRAPPER) @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve .endif +.endif repository: _mkrepos @@ -467,9 +464,11 @@ .endif .endif +.if ${PKGNAMESUFFIX} == "" post-deinstall: .if defined(WITH_MOD_DAV_SVN) @PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL .endif +.endif .include --- ./devel/subversion/pkg-plist.ORIG 2008-05-31 09:36:54.000000000 +0200 +++ ./devel/subversion/pkg-plist 2008-05-31 09:26:50.000000000 +0200 @@ -258,139 +258,6 @@ %%WITH_JAVA%%lib/svn-javahl/svn-javahl.jar %%WITH_JAVA%%@dirrm lib/svn-javahl/include %%WITH_JAVA%%@dirrm lib/svn-javahl -%%WITH_PERL%%lib/libsvn_swig_perl-1.a -%%WITH_PERL%%lib/libsvn_swig_perl-1.la -%%WITH_PERL%%lib/libsvn_swig_perl-1.so -%%WITH_PERL%%lib/libsvn_swig_perl-1.so.0 -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Base.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Client.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Core.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Delta.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Fs.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Ra.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Repos.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Wc.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client/_Client.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client/_Client.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/.packlist -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/_Core.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/_Core.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta/_Delta.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta/_Delta.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs/_Fs.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs/_Fs.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra/_Ra.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra/_Ra.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos/_Repos.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos/_Repos.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc/_Wc.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc/_Wc.so -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SVN -%%WITH_PYTHON%%lib/libsvn_swig_py-1.a -%%WITH_PYTHON%%lib/libsvn_swig_py-1.la -%%WITH_PYTHON%%lib/libsvn_swig_py-1.so -%%WITH_PYTHON%%lib/libsvn_swig_py-1.so.0 -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.a -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.la -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.so -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.a -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.la -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.so -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.a -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.la -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.so -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.a -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.la -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.so -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.a -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.la -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.so -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.a -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.la -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.so -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.a -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.la -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.so -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/core.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/core.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/delta.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/delta.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/fs.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/fs.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/ra.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/ra.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/repos.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/repos.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/wc.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/wc.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/__init__.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/__init__.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/client.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/client.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/core.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/core.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/delta.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/delta.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/fs.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/fs.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/ra.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/ra.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/repos.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/repos.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.pyc -%%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/libsvn -%%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/svn -%%WITH_RUBY%%lib/libsvn_swig_ruby-1.a -%%WITH_RUBY%%lib/libsvn_swig_ruby-1.la -%%WITH_RUBY%%lib/libsvn_swig_ruby-1.so -%%WITH_RUBY%%lib/libsvn_swig_ruby-1.so.0 -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.a -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.la -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.so -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/client.a -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/client.la -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/client.so -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.a -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.la -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.so -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/fs.a -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/fs.la -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/fs.so -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/ra.a -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/ra.la -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/ra.so -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/repos.a -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/repos.la -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/repos.so -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/wc.a -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/wc.la -%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/wc.so -%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/client.rb -%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/core.rb -%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/delta.rb -%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/error.rb -%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/fs.rb -%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/info.rb -%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/ra.rb -%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/repos.rb -%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/util.rb -%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/wc.rb -%%WITH_RUBY%%@dirrm %%RUBY_SITEARCHLIBDIR%%/svn/ext -%%WITH_RUBY%%@dirrm %%RUBY_SITEARCHLIBDIR%%/svn -%%WITH_RUBY%%@dirrm %%RUBY_SITELIBDIR%%/svn %%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html/images %%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html %%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted: