diff options
| -rw-r--r-- | devel/subversion-devel/Makefile | 9 | ||||
| -rw-r--r-- | devel/subversion-freebsd/Makefile | 9 | ||||
| -rw-r--r-- | devel/subversion/Makefile | 9 | ||||
| -rw-r--r-- | devel/subversion16/Makefile | 9 |
4 files changed, 32 insertions, 4 deletions
diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile index 68d2710bf71f..e80bcafbf4bd 100644 --- a/devel/subversion-devel/Makefile +++ b/devel/subversion-devel/Makefile @@ -6,6 +6,7 @@ PORTNAME= subversion PORTVERSION= 1.2.3 +PORTREVISION?= 1 CATEGORIES= devel MASTER_SITES= http://subversion.tigris.org/tarballs/ @@ -157,10 +158,16 @@ SVNGROUP?= svn APACHE2_PORT?= www/apache2 BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} +.if ${APACHE2_PORT} == "www/apache21" +APR_APU_DIR= ${LOCALBASE}/bin +APR_CONFIG= apr-1-config +APU_CONFIG= apu-1-config +.else APR_APU_DIR= ${LOCALBASE}/lib/apache2 APR_CONFIG= apr-config APU_CONFIG= apu-config -APR_PORT= www/apache2 +.endif +APR_PORT= ${APACHE2_PORT} .if !defined(WITHOUT_BDB) DEPENDS_ARGS+= WITH_BERKELEYDB=db4 OPT_NAME= WITH_BERKELEYDB=(db4|db41|db42) diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile index 68d2710bf71f..e80bcafbf4bd 100644 --- a/devel/subversion-freebsd/Makefile +++ b/devel/subversion-freebsd/Makefile @@ -6,6 +6,7 @@ PORTNAME= subversion PORTVERSION= 1.2.3 +PORTREVISION?= 1 CATEGORIES= devel MASTER_SITES= http://subversion.tigris.org/tarballs/ @@ -157,10 +158,16 @@ SVNGROUP?= svn APACHE2_PORT?= www/apache2 BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} +.if ${APACHE2_PORT} == "www/apache21" +APR_APU_DIR= ${LOCALBASE}/bin +APR_CONFIG= apr-1-config +APU_CONFIG= apu-1-config +.else APR_APU_DIR= ${LOCALBASE}/lib/apache2 APR_CONFIG= apr-config APU_CONFIG= apu-config -APR_PORT= www/apache2 +.endif +APR_PORT= ${APACHE2_PORT} .if !defined(WITHOUT_BDB) DEPENDS_ARGS+= WITH_BERKELEYDB=db4 OPT_NAME= WITH_BERKELEYDB=(db4|db41|db42) diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 68d2710bf71f..e80bcafbf4bd 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -6,6 +6,7 @@ PORTNAME= subversion PORTVERSION= 1.2.3 +PORTREVISION?= 1 CATEGORIES= devel MASTER_SITES= http://subversion.tigris.org/tarballs/ @@ -157,10 +158,16 @@ SVNGROUP?= svn APACHE2_PORT?= www/apache2 BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} +.if ${APACHE2_PORT} == "www/apache21" +APR_APU_DIR= ${LOCALBASE}/bin +APR_CONFIG= apr-1-config +APU_CONFIG= apu-1-config +.else APR_APU_DIR= ${LOCALBASE}/lib/apache2 APR_CONFIG= apr-config APU_CONFIG= apu-config -APR_PORT= www/apache2 +.endif +APR_PORT= ${APACHE2_PORT} .if !defined(WITHOUT_BDB) DEPENDS_ARGS+= WITH_BERKELEYDB=db4 OPT_NAME= WITH_BERKELEYDB=(db4|db41|db42) diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile index 68d2710bf71f..e80bcafbf4bd 100644 --- a/devel/subversion16/Makefile +++ b/devel/subversion16/Makefile @@ -6,6 +6,7 @@ PORTNAME= subversion PORTVERSION= 1.2.3 +PORTREVISION?= 1 CATEGORIES= devel MASTER_SITES= http://subversion.tigris.org/tarballs/ @@ -157,10 +158,16 @@ SVNGROUP?= svn APACHE2_PORT?= www/apache2 BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} +.if ${APACHE2_PORT} == "www/apache21" +APR_APU_DIR= ${LOCALBASE}/bin +APR_CONFIG= apr-1-config +APU_CONFIG= apu-1-config +.else APR_APU_DIR= ${LOCALBASE}/lib/apache2 APR_CONFIG= apr-config APU_CONFIG= apu-config -APR_PORT= www/apache2 +.endif +APR_PORT= ${APACHE2_PORT} .if !defined(WITHOUT_BDB) DEPENDS_ARGS+= WITH_BERKELEYDB=db4 OPT_NAME= WITH_BERKELEYDB=(db4|db41|db42) |