diff --git a/UPDATING b/UPDATING index bdb68ff54411..f427464a4939 100644 --- a/UPDATING +++ b/UPDATING @@ -45,7 +45,7 @@ you update your ports collection, before attempting any port upgrades. Binding ports could be build with Subversion 1.7.0 (Default) or with Subversion 1.6.x. To buiuld bindings with subversion 1.6.x - you should set variable USE_SUBVERSION to "16". + you should set variable WITH_SUBVERSION_VER to "16". There are several ways to upgrade, depends on what did you use before and what you want to get after upgrade. @@ -81,10 +81,10 @@ you update your ports collection, before attempting any port upgrades. # cd /usr/ports/devel/subversion16 && make config # portupgrade -o devel/subversion16 devel/subversion - # portupgrade -m "USE_SUBVERSION=16" -r devel/subversion16 + # portupgrade -m "WITH_SUBVERSION_VER=16" -r devel/subversion16 or # portmaster -o devel/subversion16 devel/subversion - # portmaster -m "USE_SUBVERSION=16" -R -r subversion-1.6 + # portmaster -m "WITH_SUBVERSION_VER=16" -R -r subversion-1.6 (d) You use devel/subversion-freebsd and, maybe, some bindings. You want good old subversion 1.6.x, with FreeBSD patches. @@ -93,10 +93,10 @@ you update your ports collection, before attempting any port upgrades. # cd /usr/ports/devel/subversion16 && make config # portupgrade -o devel/subversion16 devel/subversion-freebsd - # portupgrade -m "USE_SUBVERSION=16" -r devel/subversion16 + # portupgrade -m "WITH_SUBVERSION_VER=16" -r devel/subversion16 or # portmaster -o devel/subversion16 devel/subversion-freebsd - # portmaster -m "USE_SUBVERSION=16" -R -r subversion-1.6 + # portmaster -m "WITH_SUBVERSION_VER=16" -R -r subversion-1.6 20111005: AFFECTS: users of lang/erlang diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile index 3582c8c8f71c..fed8fd24c22a 100644 --- a/devel/p5-subversion/Makefile +++ b/devel/p5-subversion/Makefile @@ -10,7 +10,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= lev@FreeBSD.org COMMENT= Perl bindings for Version control system -.if defined(USE_SUBVERSION) && ${USE_SUBVERSION} == 16 +.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16 MASTERDIR= ${.CURDIR}/../../devel/subversion16 .else MASTERDIR= ${.CURDIR}/../../devel/subversion diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile index d3d0bcb31c50..71da2cf16006 100644 --- a/devel/py-subversion/Makefile +++ b/devel/py-subversion/Makefile @@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= lev@FreeBSD.org COMMENT= Python bindings for version control system -.if defined(USE_SUBVERSION) && ${USE_SUBVERSION} == 16 +.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16 MASTERDIR= ${.CURDIR}/../../devel/subversion16 .else MASTERDIR= ${.CURDIR}/../../devel/subversion diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile index 07100591241c..11baf77517b5 100644 --- a/devel/ruby-subversion/Makefile +++ b/devel/ruby-subversion/Makefile @@ -10,7 +10,7 @@ PKGNAMEPREFIX= ruby- MAINTAINER= lev@FreeBSD.org COMMENT= Ruby bindings for version control system -.if defined(USE_SUBVERSION) && ${USE_SUBVERSION} == 16 +.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16 MASTERDIR= ${.CURDIR}/../../devel/subversion16 .else MASTERDIR= ${.CURDIR}/../../devel/subversion diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index de11fefd1172..928e0903f12f 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -209,6 +209,7 @@ pre-install: post-install: ${MKREPOS_TARGET} .if defined(WITH_MOD_DAV_SVN) + ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav_svn ${PREFIX}/${APACHEMODDIR}/mod_dav_svn.so ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n authz_svn ${PREFIX}/${APACHEMODDIR}/mod_authz_svn.so #.if defined(WITH_MOD_DONTDOTHAT) # cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \ diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index c6ad005d1756..780ebca2b888 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -6,7 +6,7 @@ PORTNAME= subversion PORTVERSION= 1.7.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE}:main \ http://svnbook.red-bean.com/en/1.6/:book diff --git a/java/subversion-java/Makefile b/java/subversion-java/Makefile index 6459aa0498ea..93533137002c 100644 --- a/java/subversion-java/Makefile +++ b/java/subversion-java/Makefile @@ -11,7 +11,7 @@ CATEGORIES= java MAINTAINER= lev@FreeBSD.org COMMENT= Java bindings for Version control system -.if defined(USE_SUBVERSION) && ${USE_SUBVERSION} == 16 +.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16 MASTERDIR= ${.CURDIR}/../../devel/subversion16 .else MASTERDIR= ${.CURDIR}/../../devel/subversion