(1) Look for ${PREFIX}/sbin/apache instead of apache.

Submitted by:	David Kirchner <dpk@nwserv.com>

(2) Remove CHMOD definition, we already do it in bsd.port.mk

6 files changed, 6 insertions, 12 deletions

diff --git a/www/zope/Makefile b/www/zope/Makefile
index 4674d05197f7..bd9314dfbeab 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.ORG
 
 BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python
-RUN_DEPENDS=	apache:${PORTSDIR}/www/apache13-modssl
+RUN_DEPENDS=	${PREFIX}/sbin/apache:${PORTSDIR}/www/apache13-modssl
 
 # Build has to be done in the final location after installing the sources
 # there. It were a major action to fix all paths otherwise.
@@ -31,7 +31,6 @@ ZOPEBASEDIR?=	${WEBBASEDIR}/Zope-${VERSION}
 CGI_BIN_DIR?=	${PREFIX}/share/apache/cgi-bin
 APACHE_CONFDIR?=	${PREFIX}/etc/apache
 PYTHON15?=	${PREFIX}/bin/python1.5
-CHMOD=	/bin/chmod
 
 # I decided to consider the whole souce tree to be part of the package
 # since in there, Zope can live on its own. It does leave some *.o files
diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index 4674d05197f7..bd9314dfbeab 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.ORG
 
 BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python
-RUN_DEPENDS=	apache:${PORTSDIR}/www/apache13-modssl
+RUN_DEPENDS=	${PREFIX}/sbin/apache:${PORTSDIR}/www/apache13-modssl
 
 # Build has to be done in the final location after installing the sources
 # there. It were a major action to fix all paths otherwise.
@@ -31,7 +31,6 @@ ZOPEBASEDIR?=	${WEBBASEDIR}/Zope-${VERSION}
 CGI_BIN_DIR?=	${PREFIX}/share/apache/cgi-bin
 APACHE_CONFDIR?=	${PREFIX}/etc/apache
 PYTHON15?=	${PREFIX}/bin/python1.5
-CHMOD=	/bin/chmod
 
 # I decided to consider the whole souce tree to be part of the package
 # since in there, Zope can live on its own. It does leave some *.o files
diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index 4674d05197f7..bd9314dfbeab 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.ORG
 
 BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python
-RUN_DEPENDS=	apache:${PORTSDIR}/www/apache13-modssl
+RUN_DEPENDS=	${PREFIX}/sbin/apache:${PORTSDIR}/www/apache13-modssl
 
 # Build has to be done in the final location after installing the sources
 # there. It were a major action to fix all paths otherwise.
@@ -31,7 +31,6 @@ ZOPEBASEDIR?=	${WEBBASEDIR}/Zope-${VERSION}
 CGI_BIN_DIR?=	${PREFIX}/share/apache/cgi-bin
 APACHE_CONFDIR?=	${PREFIX}/etc/apache
 PYTHON15?=	${PREFIX}/bin/python1.5
-CHMOD=	/bin/chmod
 
 # I decided to consider the whole souce tree to be part of the package
 # since in there, Zope can live on its own. It does leave some *.o files
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index 4674d05197f7..bd9314dfbeab 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.ORG
 
 BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python
-RUN_DEPENDS=	apache:${PORTSDIR}/www/apache13-modssl
+RUN_DEPENDS=	${PREFIX}/sbin/apache:${PORTSDIR}/www/apache13-modssl
 
 # Build has to be done in the final location after installing the sources
 # there. It were a major action to fix all paths otherwise.
@@ -31,7 +31,6 @@ ZOPEBASEDIR?=	${WEBBASEDIR}/Zope-${VERSION}
 CGI_BIN_DIR?=	${PREFIX}/share/apache/cgi-bin
 APACHE_CONFDIR?=	${PREFIX}/etc/apache
 PYTHON15?=	${PREFIX}/bin/python1.5
-CHMOD=	/bin/chmod
 
 # I decided to consider the whole souce tree to be part of the package
 # since in there, Zope can live on its own. It does leave some *.o files
diff --git a/www/zope28/Makefile b/www/zope28/Makefile
index 4674d05197f7..bd9314dfbeab 100644
--- a/www/zope28/Makefile
+++ b/www/zope28/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.ORG
 
 BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python
-RUN_DEPENDS=	apache:${PORTSDIR}/www/apache13-modssl
+RUN_DEPENDS=	${PREFIX}/sbin/apache:${PORTSDIR}/www/apache13-modssl
 
 # Build has to be done in the final location after installing the sources
 # there. It were a major action to fix all paths otherwise.
@@ -31,7 +31,6 @@ ZOPEBASEDIR?=	${WEBBASEDIR}/Zope-${VERSION}
 CGI_BIN_DIR?=	${PREFIX}/share/apache/cgi-bin
 APACHE_CONFDIR?=	${PREFIX}/etc/apache
 PYTHON15?=	${PREFIX}/bin/python1.5
-CHMOD=	/bin/chmod
 
 # I decided to consider the whole souce tree to be part of the package
 # since in there, Zope can live on its own. It does leave some *.o files
diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index 4674d05197f7..bd9314dfbeab 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.ORG
 
 BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python
-RUN_DEPENDS=	apache:${PORTSDIR}/www/apache13-modssl
+RUN_DEPENDS=	${PREFIX}/sbin/apache:${PORTSDIR}/www/apache13-modssl
 
 # Build has to be done in the final location after installing the sources
 # there. It were a major action to fix all paths otherwise.
@@ -31,7 +31,6 @@ ZOPEBASEDIR?=	${WEBBASEDIR}/Zope-${VERSION}
 CGI_BIN_DIR?=	${PREFIX}/share/apache/cgi-bin
 APACHE_CONFDIR?=	${PREFIX}/etc/apache
 PYTHON15?=	${PREFIX}/bin/python1.5
-CHMOD=	/bin/chmod
 
 # I decided to consider the whole souce tree to be part of the package
 # since in there, Zope can live on its own. It does leave some *.o files