From e7201fcdab745539c91aaf74e8e83707593ac29a Mon Sep 17 00:00:00 2001 From: alane Date: Sat, 27 Jul 2002 06:29:13 +0000 Subject: 1. Use the link /usr/local/www/cgi-bin for installing the cgi scripts. 2. Maintainer changed to ports@geeksrus.net (alane@freebsd.org) due to maintainer timeouts on this port. 3. PORTREVISION bumped due to change in pkg-plist and install dirs. PR: 39687 Submitted by: ports@geeksrus.net Approved by: will --- www/zope/Makefile | 23 +++++++++++++++++++---- www/zope/pkg-comment | 2 +- www/zope/pkg-plist | 1 - www/zope210/Makefile | 23 +++++++++++++++++++---- www/zope210/pkg-comment | 2 +- www/zope210/pkg-plist | 1 - www/zope211/Makefile | 23 +++++++++++++++++++---- www/zope211/pkg-comment | 2 +- www/zope211/pkg-plist | 1 - www/zope213/Makefile | 23 +++++++++++++++++++---- www/zope213/pkg-comment | 2 +- www/zope213/pkg-plist | 1 - www/zope28/Makefile | 23 +++++++++++++++++++---- www/zope28/pkg-comment | 2 +- www/zope28/pkg-plist | 1 - www/zope29/Makefile | 23 +++++++++++++++++++---- www/zope29/pkg-comment | 2 +- www/zope29/pkg-plist | 1 - 18 files changed, 120 insertions(+), 36 deletions(-) diff --git a/www/zope/Makefile b/www/zope/Makefile index 32ca0ae..210b06e 100644 --- a/www/zope/Makefile +++ b/www/zope/Makefile @@ -7,13 +7,13 @@ PORTNAME= zope PORTVERSION= 2.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python zope MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/ DISTNAME= Zope-${PORTVERSION}-src EXTRACT_SUFX= .tgz -MAINTAINER= nbm@FreeBSD.org +MAINTAINER= ports@geeksrus.net USE_PYTHON= yes PYTHON_VERSION= python2.1 @@ -29,7 +29,7 @@ do-build: # empty, but needs to be there for the python dependency. # Change these, if you like, via the environment. WEBBASEDIR?= www SZOPEBASEDIR?= ${WEBBASEDIR}/Zope -SCGIBINDIR?= ${WEBBASEDIR}/cgi-bin.default +SCGIBINDIR?= ${WEBBASEDIR}/cgi-bin SAPACHE_CONFDIR?= etc/apache ZOPE_HTTP_PORT?= 8080 ZOPE_FTP_PORT?= 8021 @@ -48,6 +48,22 @@ PLIST_SUB= ZOPEBASEDIR=${SZOPEBASEDIR} \ VERSION=${PORTVERSION} \ WEBBASEDIR=${WEBBASEDIR} +# Force the cgi-bin dir or link to exist. +pre-everything: + @if test ! -d ${CGIBINDIR}; then \ + ${ECHO_CMD} \ + "============================================================";\ + ${ECHO_CMD} \ + "===> ${CGIBINDIR} does not exist.";\ + ${ECHO_CMD} \ + "===> Please create it (it can be a link to an existing";\ + ${ECHO_CMD} \ + "===> directory) and run ${MAKE} again.";\ + ${ECHO_CMD} \ + "============================================================";\ + ${FALSE}; \ + fi + pre-install: PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL @@ -81,7 +97,6 @@ do-install: @(cd ${ZOPEBASEDIR}/pcgi/Test && ${RM} *.o) @(cd ${ZOPEBASEDIR}/pcgi && ${RM} *.o) @# - @${MKDIR} ${CGIBINDIR} @(cd ${ZOPEBASEDIR} && \ ${MV} Zope.cgi \ pcgi/pcgi-wrapper \ diff --git a/www/zope/pkg-comment b/www/zope/pkg-comment index 00e4c4a..6a6a6bd 100644 --- a/www/zope/pkg-comment +++ b/www/zope/pkg-comment @@ -1 +1 @@ -An object-based web application platform with DB access, WebDAV, and more +An object-based web application platform with DB access, WebDAV, & more diff --git a/www/zope/pkg-plist b/www/zope/pkg-plist index 4cdc26f..2eec73d 100644 --- a/www/zope/pkg-plist +++ b/www/zope/pkg-plist @@ -2311,7 +2311,6 @@ etc/rc.d/zope.sh @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.soc @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.tmp @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.lock -@unexec rmdir %D/%%CGIBINDIR%% 2>/dev/null || true @unexec rmdir %D/%%ZOPEBASEDIR%%/var 2>/dev/null || true @dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools/tests @dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools diff --git a/www/zope210/Makefile b/www/zope210/Makefile index 32ca0ae..210b06e 100644 --- a/www/zope210/Makefile +++ b/www/zope210/Makefile @@ -7,13 +7,13 @@ PORTNAME= zope PORTVERSION= 2.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python zope MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/ DISTNAME= Zope-${PORTVERSION}-src EXTRACT_SUFX= .tgz -MAINTAINER= nbm@FreeBSD.org +MAINTAINER= ports@geeksrus.net USE_PYTHON= yes PYTHON_VERSION= python2.1 @@ -29,7 +29,7 @@ do-build: # empty, but needs to be there for the python dependency. # Change these, if you like, via the environment. WEBBASEDIR?= www SZOPEBASEDIR?= ${WEBBASEDIR}/Zope -SCGIBINDIR?= ${WEBBASEDIR}/cgi-bin.default +SCGIBINDIR?= ${WEBBASEDIR}/cgi-bin SAPACHE_CONFDIR?= etc/apache ZOPE_HTTP_PORT?= 8080 ZOPE_FTP_PORT?= 8021 @@ -48,6 +48,22 @@ PLIST_SUB= ZOPEBASEDIR=${SZOPEBASEDIR} \ VERSION=${PORTVERSION} \ WEBBASEDIR=${WEBBASEDIR} +# Force the cgi-bin dir or link to exist. +pre-everything: + @if test ! -d ${CGIBINDIR}; then \ + ${ECHO_CMD} \ + "============================================================";\ + ${ECHO_CMD} \ + "===> ${CGIBINDIR} does not exist.";\ + ${ECHO_CMD} \ + "===> Please create it (it can be a link to an existing";\ + ${ECHO_CMD} \ + "===> directory) and run ${MAKE} again.";\ + ${ECHO_CMD} \ + "============================================================";\ + ${FALSE}; \ + fi + pre-install: PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL @@ -81,7 +97,6 @@ do-install: @(cd ${ZOPEBASEDIR}/pcgi/Test && ${RM} *.o) @(cd ${ZOPEBASEDIR}/pcgi && ${RM} *.o) @# - @${MKDIR} ${CGIBINDIR} @(cd ${ZOPEBASEDIR} && \ ${MV} Zope.cgi \ pcgi/pcgi-wrapper \ diff --git a/www/zope210/pkg-comment b/www/zope210/pkg-comment index 00e4c4a..6a6a6bd 100644 --- a/www/zope210/pkg-comment +++ b/www/zope210/pkg-comment @@ -1 +1 @@ -An object-based web application platform with DB access, WebDAV, and more +An object-based web application platform with DB access, WebDAV, & more diff --git a/www/zope210/pkg-plist b/www/zope210/pkg-plist index 4cdc26f..2eec73d 100644 --- a/www/zope210/pkg-plist +++ b/www/zope210/pkg-plist @@ -2311,7 +2311,6 @@ etc/rc.d/zope.sh @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.soc @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.tmp @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.lock -@unexec rmdir %D/%%CGIBINDIR%% 2>/dev/null || true @unexec rmdir %D/%%ZOPEBASEDIR%%/var 2>/dev/null || true @dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools/tests @dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools diff --git a/www/zope211/Makefile b/www/zope211/Makefile index 32ca0ae..210b06e 100644 --- a/www/zope211/Makefile +++ b/www/zope211/Makefile @@ -7,13 +7,13 @@ PORTNAME= zope PORTVERSION= 2.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python zope MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/ DISTNAME= Zope-${PORTVERSION}-src EXTRACT_SUFX= .tgz -MAINTAINER= nbm@FreeBSD.org +MAINTAINER= ports@geeksrus.net USE_PYTHON= yes PYTHON_VERSION= python2.1 @@ -29,7 +29,7 @@ do-build: # empty, but needs to be there for the python dependency. # Change these, if you like, via the environment. WEBBASEDIR?= www SZOPEBASEDIR?= ${WEBBASEDIR}/Zope -SCGIBINDIR?= ${WEBBASEDIR}/cgi-bin.default +SCGIBINDIR?= ${WEBBASEDIR}/cgi-bin SAPACHE_CONFDIR?= etc/apache ZOPE_HTTP_PORT?= 8080 ZOPE_FTP_PORT?= 8021 @@ -48,6 +48,22 @@ PLIST_SUB= ZOPEBASEDIR=${SZOPEBASEDIR} \ VERSION=${PORTVERSION} \ WEBBASEDIR=${WEBBASEDIR} +# Force the cgi-bin dir or link to exist. +pre-everything: + @if test ! -d ${CGIBINDIR}; then \ + ${ECHO_CMD} \ + "============================================================";\ + ${ECHO_CMD} \ + "===> ${CGIBINDIR} does not exist.";\ + ${ECHO_CMD} \ + "===> Please create it (it can be a link to an existing";\ + ${ECHO_CMD} \ + "===> directory) and run ${MAKE} again.";\ + ${ECHO_CMD} \ + "============================================================";\ + ${FALSE}; \ + fi + pre-install: PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL @@ -81,7 +97,6 @@ do-install: @(cd ${ZOPEBASEDIR}/pcgi/Test && ${RM} *.o) @(cd ${ZOPEBASEDIR}/pcgi && ${RM} *.o) @# - @${MKDIR} ${CGIBINDIR} @(cd ${ZOPEBASEDIR} && \ ${MV} Zope.cgi \ pcgi/pcgi-wrapper \ diff --git a/www/zope211/pkg-comment b/www/zope211/pkg-comment index 00e4c4a..6a6a6bd 100644 --- a/www/zope211/pkg-comment +++ b/www/zope211/pkg-comment @@ -1 +1 @@ -An object-based web application platform with DB access, WebDAV, and more +An object-based web application platform with DB access, WebDAV, & more diff --git a/www/zope211/pkg-plist b/www/zope211/pkg-plist index 4cdc26f..2eec73d 100644 --- a/www/zope211/pkg-plist +++ b/www/zope211/pkg-plist @@ -2311,7 +2311,6 @@ etc/rc.d/zope.sh @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.soc @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.tmp @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.lock -@unexec rmdir %D/%%CGIBINDIR%% 2>/dev/null || true @unexec rmdir %D/%%ZOPEBASEDIR%%/var 2>/dev/null || true @dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools/tests @dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools diff --git a/www/zope213/Makefile b/www/zope213/Makefile index 32ca0ae..210b06e 100644 --- a/www/zope213/Makefile +++ b/www/zope213/Makefile @@ -7,13 +7,13 @@ PORTNAME= zope PORTVERSION= 2.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python zope MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/ DISTNAME= Zope-${PORTVERSION}-src EXTRACT_SUFX= .tgz -MAINTAINER= nbm@FreeBSD.org +MAINTAINER= ports@geeksrus.net USE_PYTHON= yes PYTHON_VERSION= python2.1 @@ -29,7 +29,7 @@ do-build: # empty, but needs to be there for the python dependency. # Change these, if you like, via the environment. WEBBASEDIR?= www SZOPEBASEDIR?= ${WEBBASEDIR}/Zope -SCGIBINDIR?= ${WEBBASEDIR}/cgi-bin.default +SCGIBINDIR?= ${WEBBASEDIR}/cgi-bin SAPACHE_CONFDIR?= etc/apache ZOPE_HTTP_PORT?= 8080 ZOPE_FTP_PORT?= 8021 @@ -48,6 +48,22 @@ PLIST_SUB= ZOPEBASEDIR=${SZOPEBASEDIR} \ VERSION=${PORTVERSION} \ WEBBASEDIR=${WEBBASEDIR} +# Force the cgi-bin dir or link to exist. +pre-everything: + @if test ! -d ${CGIBINDIR}; then \ + ${ECHO_CMD} \ + "============================================================";\ + ${ECHO_CMD} \ + "===> ${CGIBINDIR} does not exist.";\ + ${ECHO_CMD} \ + "===> Please create it (it can be a link to an existing";\ + ${ECHO_CMD} \ + "===> directory) and run ${MAKE} again.";\ + ${ECHO_CMD} \ + "============================================================";\ + ${FALSE}; \ + fi + pre-install: PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL @@ -81,7 +97,6 @@ do-install: @(cd ${ZOPEBASEDIR}/pcgi/Test && ${RM} *.o) @(cd ${ZOPEBASEDIR}/pcgi && ${RM} *.o) @# - @${MKDIR} ${CGIBINDIR} @(cd ${ZOPEBASEDIR} && \ ${MV} Zope.cgi \ pcgi/pcgi-wrapper \ diff --git a/www/zope213/pkg-comment b/www/zope213/pkg-comment index 00e4c4a..6a6a6bd 100644 --- a/www/zope213/pkg-comment +++ b/www/zope213/pkg-comment @@ -1 +1 @@ -An object-based web application platform with DB access, WebDAV, and more +An object-based web application platform with DB access, WebDAV, & more diff --git a/www/zope213/pkg-plist b/www/zope213/pkg-plist index 4cdc26f..2eec73d 100644 --- a/www/zope213/pkg-plist +++ b/www/zope213/pkg-plist @@ -2311,7 +2311,6 @@ etc/rc.d/zope.sh @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.soc @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.tmp @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.lock -@unexec rmdir %D/%%CGIBINDIR%% 2>/dev/null || true @unexec rmdir %D/%%ZOPEBASEDIR%%/var 2>/dev/null || true @dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools/tests @dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools diff --git a/www/zope28/Makefile b/www/zope28/Makefile index 32ca0ae..210b06e 100644 --- a/www/zope28/Makefile +++ b/www/zope28/Makefile @@ -7,13 +7,13 @@ PORTNAME= zope PORTVERSION= 2.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python zope MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/ DISTNAME= Zope-${PORTVERSION}-src EXTRACT_SUFX= .tgz -MAINTAINER= nbm@FreeBSD.org +MAINTAINER= ports@geeksrus.net USE_PYTHON= yes PYTHON_VERSION= python2.1 @@ -29,7 +29,7 @@ do-build: # empty, but needs to be there for the python dependency. # Change these, if you like, via the environment. WEBBASEDIR?= www SZOPEBASEDIR?= ${WEBBASEDIR}/Zope -SCGIBINDIR?= ${WEBBASEDIR}/cgi-bin.default +SCGIBINDIR?= ${WEBBASEDIR}/cgi-bin SAPACHE_CONFDIR?= etc/apache ZOPE_HTTP_PORT?= 8080 ZOPE_FTP_PORT?= 8021 @@ -48,6 +48,22 @@ PLIST_SUB= ZOPEBASEDIR=${SZOPEBASEDIR} \ VERSION=${PORTVERSION} \ WEBBASEDIR=${WEBBASEDIR} +# Force the cgi-bin dir or link to exist. +pre-everything: + @if test ! -d ${CGIBINDIR}; then \ + ${ECHO_CMD} \ + "============================================================";\ + ${ECHO_CMD} \ + "===> ${CGIBINDIR} does not exist.";\ + ${ECHO_CMD} \ + "===> Please create it (it can be a link to an existing";\ + ${ECHO_CMD} \ + "===> directory) and run ${MAKE} again.";\ + ${ECHO_CMD} \ + "============================================================";\ + ${FALSE}; \ + fi + pre-install: PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL @@ -81,7 +97,6 @@ do-install: @(cd ${ZOPEBASEDIR}/pcgi/Test && ${RM} *.o) @(cd ${ZOPEBASEDIR}/pcgi && ${RM} *.o) @# - @${MKDIR} ${CGIBINDIR} @(cd ${ZOPEBASEDIR} && \ ${MV} Zope.cgi \ pcgi/pcgi-wrapper \ diff --git a/www/zope28/pkg-comment b/www/zope28/pkg-comment index 00e4c4a..6a6a6bd 100644 --- a/www/zope28/pkg-comment +++ b/www/zope28/pkg-comment @@ -1 +1 @@ -An object-based web application platform with DB access, WebDAV, and more +An object-based web application platform with DB access, WebDAV, & more diff --git a/www/zope28/pkg-plist b/www/zope28/pkg-plist index 4cdc26f..2eec73d 100644 --- a/www/zope28/pkg-plist +++ b/www/zope28/pkg-plist @@ -2311,7 +2311,6 @@ etc/rc.d/zope.sh @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.soc @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.tmp @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.lock -@unexec rmdir %D/%%CGIBINDIR%% 2>/dev/null || true @unexec rmdir %D/%%ZOPEBASEDIR%%/var 2>/dev/null || true @dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools/tests @dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools diff --git a/www/zope29/Makefile b/www/zope29/Makefile index 32ca0ae..210b06e 100644 --- a/www/zope29/Makefile +++ b/www/zope29/Makefile @@ -7,13 +7,13 @@ PORTNAME= zope PORTVERSION= 2.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python zope MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/ DISTNAME= Zope-${PORTVERSION}-src EXTRACT_SUFX= .tgz -MAINTAINER= nbm@FreeBSD.org +MAINTAINER= ports@geeksrus.net USE_PYTHON= yes PYTHON_VERSION= python2.1 @@ -29,7 +29,7 @@ do-build: # empty, but needs to be there for the python dependency. # Change these, if you like, via the environment. WEBBASEDIR?= www SZOPEBASEDIR?= ${WEBBASEDIR}/Zope -SCGIBINDIR?= ${WEBBASEDIR}/cgi-bin.default +SCGIBINDIR?= ${WEBBASEDIR}/cgi-bin SAPACHE_CONFDIR?= etc/apache ZOPE_HTTP_PORT?= 8080 ZOPE_FTP_PORT?= 8021 @@ -48,6 +48,22 @@ PLIST_SUB= ZOPEBASEDIR=${SZOPEBASEDIR} \ VERSION=${PORTVERSION} \ WEBBASEDIR=${WEBBASEDIR} +# Force the cgi-bin dir or link to exist. +pre-everything: + @if test ! -d ${CGIBINDIR}; then \ + ${ECHO_CMD} \ + "============================================================";\ + ${ECHO_CMD} \ + "===> ${CGIBINDIR} does not exist.";\ + ${ECHO_CMD} \ + "===> Please create it (it can be a link to an existing";\ + ${ECHO_CMD} \ + "===> directory) and run ${MAKE} again.";\ + ${ECHO_CMD} \ + "============================================================";\ + ${FALSE}; \ + fi + pre-install: PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL @@ -81,7 +97,6 @@ do-install: @(cd ${ZOPEBASEDIR}/pcgi/Test && ${RM} *.o) @(cd ${ZOPEBASEDIR}/pcgi && ${RM} *.o) @# - @${MKDIR} ${CGIBINDIR} @(cd ${ZOPEBASEDIR} && \ ${MV} Zope.cgi \ pcgi/pcgi-wrapper \ diff --git a/www/zope29/pkg-comment b/www/zope29/pkg-comment index 00e4c4a..6a6a6bd 100644 --- a/www/zope29/pkg-comment +++ b/www/zope29/pkg-comment @@ -1 +1 @@ -An object-based web application platform with DB access, WebDAV, and more +An object-based web application platform with DB access, WebDAV, & more diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist index 4cdc26f..2eec73d 100644 --- a/www/zope29/pkg-plist +++ b/www/zope29/pkg-plist @@ -2311,7 +2311,6 @@ etc/rc.d/zope.sh @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.soc @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.tmp @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.lock -@unexec rmdir %D/%%CGIBINDIR%% 2>/dev/null || true @unexec rmdir %D/%%ZOPEBASEDIR%%/var 2>/dev/null || true @dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools/tests @dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools -- cgit v1.1