diff options
author | Neil Blakey-Milner <nbm@FreeBSD.org> | 2000-09-06 22:12:35 +0000 |
---|---|---|
committer | Neil Blakey-Milner <nbm@FreeBSD.org> | 2000-09-06 22:12:35 +0000 |
commit | 038906146902b5f0a6e21315a1277db4aaa9189a (patch) | |
tree | 9fd4b220b006e2493fe1f01f2666b286805e7afe /www/zope29 | |
parent | Update to 1.6.0-preview3. (diff) |
Update to Zope 2.2.1.
Zope shutdown bug fixed.
Reported by: Marc Rassbach <marc@milestonerdl.com>
Reported by: Jimmy Olgeni <olgeni@uli.it>
Zope startup bug fixed (I think).
Notes
Notes:
svn path=/head/; revision=32350
Diffstat (limited to 'www/zope29')
-rw-r--r-- | www/zope29/Makefile | 90 | ||||
-rw-r--r-- | www/zope29/distinfo | 2 | ||||
-rw-r--r-- | www/zope29/files/zope.sh.in | 4 | ||||
-rw-r--r-- | www/zope29/pkg-plist | 2 |
4 files changed, 55 insertions, 43 deletions
diff --git a/www/zope29/Makefile b/www/zope29/Makefile index c6e824c7ffc2..b5925d44eb60 100644 --- a/www/zope29/Makefile +++ b/www/zope29/Makefile @@ -6,7 +6,7 @@ # PORTNAME= zope -PORTVERSION= 2.2.1b1 +PORTVERSION= 2.2.1 CATEGORIES= www python MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/ DISTNAME= Zope-${PORTVERSION}-src @@ -15,6 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= nbm@FreeBSD.org BUILD_DEPENDS= python1.5:${PORTSDIR}/lang/python + #RUN_DEPENDS= ${LOCALBASE}/sbin/apache:${PORTSDIR}/www/apache13-modssl # Build has to be done in the final location after installing the sources @@ -25,55 +26,68 @@ do-build: # empty, but needs to be there for the python dependency. # then on, data, cgi-bin and such. Thus, I decided that Zope belongs # there, too. I don't know whether this still applies to current apache # releases, though. I still run 2.2.8-STABLE. -PLIST_SUB= ZOPEBASEDIR=www/Zope CGIBINDIR=www/cgi-bin.default VERSION=${PORTVERSION} + WEBBASEDIR?= ${PREFIX}/www ZOPEBASEDIR?= ${WEBBASEDIR}/Zope -CGI_BIN_DIR?= ${PREFIX}/www/cgi-bin.default +CGIBINDIR?= ${PREFIX}/www/cgi-bin.default APACHE_CONFDIR?= ${PREFIX}/etc/apache PYTHON15?= ${LOCALBASE}/bin/python1.5 +PLIST_SUB= ZOPEBASEDIR=${ZOPEBASEDIR} \ + CGIBINDIR=${CGIBINDIR} \ + VERSION=${PORTVERSION} + # 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 # around (about four), but I can use Zope's own building mechanism. do-install: # - @if [ -e ${ZOPEBASEDIR}/var/Data.fs ] ; then \ - ${ECHO} "Saving existing Database to /tmp/Data.fs.BAK." ; \ - ${MV} ${ZOPEBASEDIR}/var/Data.fs /tmp/Data.fs.BAK ; \ - fi - @( ${MKDIR} ${ZOPEBASEDIR} ; \ - ${ECHO} "===> Please be patient, some builds need their time." ; \ - ${ECHO} "===> Copying..." ; \ - ${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/ ; \ - cd ${ZOPEBASEDIR} ; \ + @if [ -e ${ZOPEBASEDIR}/var/Data.fs ] ; then \ + ${ECHO} "Saving existing Database to /tmp/Data.fs.BAK." ; \ + ${MV} ${ZOPEBASEDIR}/var/Data.fs /tmp/Data.fs.BAK ; \ + fi + @${MKDIR} ${ZOPEBASEDIR} + @${ECHO} "===> Please be patient, some builds need their time." + @${ECHO} "===> Copying..." + @${CP} -Rp ${WRKSRC}/* ${ZOPEBASEDIR}/ + @(cd ${ZOPEBASEDIR} ; \ ${PYTHON15} w_pcgi.py ; \ ${PYTHON15} wo_pcgi.py ; \ ${MV} Zope.cgi Zope.cgi.orig ; \ - ${ECHO} "#! ${CGI_BIN_DIR}/pcgi-wrapper" > Zope.cgi ; \ - ${CAT} Zope.cgi.orig >> Zope.cgi ; \ - ${MKDIR} ${CGI_BIN_DIR} ; \ - ${INSTALL} -o nobody -m 555 Zope.cgi pcgi/pcgi-wrapper ${CGI_BIN_DIR} ; \ - ${ECHO} "===> Fixing permissions of Zope's own var directory..." ; \ - ${CHMOD} ugo+rwt var ; \ - ${CHOWN} nobody var ; \ - ${CHOWN} nobody var/* ; \ - ${ECHO} "===> Setting user/password to zopemaster/test..." ; \ - ${PYTHON15} zpasswd.py -u zopemaster -p test -e CLEARTEXT access ; \ - ${CHOWN} nobody access; \ - ${ECHO} "===> Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-Changes." ; \ - ${MKDIR} ${APACHE_CONFDIR} ; \ - ${CP} -p ${FILESDIR}/apache.conf.Zope-Changes ${APACHE_CONFDIR}/ ; \ - ${ECHO} "===> Please have a look at this file and the instructions" ; \ - ${ECHO} "===> therein and incorporate them to your apache.conf." ; \ - ${ECHO} "===> Creating rc startup file for Zope-${PORTVERSION}..." ; \ - ${SED} -e "s|%%ZOPEBASEDIR%%|${ZOPEBASEDIR}|g" -e "s|%%CGI_BIN_DIR%%|${CGI_BIN_DIR}|g" \ - < ${FILESDIR}/zope.sh.in > ${PREFIX}/etc/rc.d/zope.sh; \ - ${CHMOD} ug+x,o-rwx ${PREFIX}/etc/rc.d/zope.sh ; \ - ${ECHO} "===> Done with ${PREFIX}/etc/rc.d/zope.sh." ; \ - ${CAT} ${FILESDIR}/Message ; \ - ${ECHO} "===> Your Zope base directory is ${ZOPEBASEDIR}." ; \ - ${ECHO} "===> The Zope license is in ${ZOPEBASEDIR}/LICENSE.txt." ; \ - ${ECHO} "===> For Apache changes see ${APACHE_CONFDIR}/apache.conf.Zope-Changes." ; \ - ${ECHO} "===> Zope.cgi and pcgi-wrapper live in ${CGI_BIN_DIR}." ) + ${ECHO} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \ + ${CAT} Zope.cgi.orig >> Zope.cgi ) + @${MKDIR} ${CGIBINDIR} + @(cd ${ZOPEBASEDIR} ; \ + ${INSTALL} -o nobody -m 555 Zope.cgi \ + pcgi/pcgi-wrapper \ + ${CGIBINDIR} ) + @${ECHO} "===> Fixing permissions of Zope's own var directory..." + @${CHMOD} ugo+rwt ${ZOPEBASDIR}/var + @${CHOWN} nobody ${ZOPEBASDIR}/var + @${CHOWN} nobody ${ZOPEBASDIR}/var/* + # + @${ECHO} "===> Setting user/password to zopemaster/test..." + @(cd ${ZOPEBASEDIR} && \ + ${PYTHON15} zpasswd.py -u zopemaster \ + -p test -e CLEARTEXT access ) + # + @${CHOWN} nobody ${ZOPEBASEDIR}/access + # + @${ECHO} "===> Copying Apache config file changes to ${APACHE_CONFDIR}/apache.conf.Zope-Changes." + @${MKDIR} ${APACHE_CONFDIR} + @${CP} -p ${FILESDIR}/apache.conf.Zope-Changes ${APACHE_CONFDIR}/ + # + @${ECHO} "===> Please have a look at this file and the instructions" + @${ECHO} "===> therein and incorporate them to your apache.conf." + @${ECHO} "===> Creating rc startup file for Zope-${PORTVERSION}..." + @${SED} -e "s|%%ZOPEBASEDIR%%|${ZOPEBASEDIR}|g" -e "s|%%CGIBINDIR%%|${CGIBINDIR}|g" \ + < ${FILESDIR}/zope.sh.in > ${PREFIX}/etc/rc.d/zope.sh + @${CHMOD} ug+x,o-rwx ${PREFIX}/etc/rc.d/zope.sh + @${ECHO} "===> Done with ${PREFIX}/etc/rc.d/zope.sh." + @${CAT} ${FILESDIR}/Message + @${ECHO} "===> Your Zope base directory is ${ZOPEBASEDIR}." + @${ECHO} "===> The Zope license is in ${ZOPEBASEDIR}/LICENSE.txt." + @${ECHO} "===> For Apache changes see ${APACHE_CONFDIR}/apache.conf.Zope-Changes." + @${ECHO} "===> Zope.cgi and pcgi-wrapper live in ${CGIBINDIR}." #pre-deinstall: # Save Database contents. I expect /tmp to have sufficient # # space to hold it for the time being. diff --git a/www/zope29/distinfo b/www/zope29/distinfo index f01de064fe03..d328dd0da274 100644 --- a/www/zope29/distinfo +++ b/www/zope29/distinfo @@ -1 +1 @@ -MD5 (Zope-2.2.1b1-src.tgz) = bcf659c1c5ed508f92e0e980d0732b3a +MD5 (Zope-2.2.1-src.tgz) = 28275d775dfe131558c109d8fccd50bb diff --git a/www/zope29/files/zope.sh.in b/www/zope29/files/zope.sh.in index 156a319c8125..c8cb98f77348 100644 --- a/www/zope29/files/zope.sh.in +++ b/www/zope29/files/zope.sh.in @@ -2,11 +2,11 @@ case "$1" in start) - %%ZOPEBASEDIR%%/start -w '' -f '' -m '' -p %%CGI_BIN_DIR%%/Zope.cgi & + nohup %%ZOPEBASEDIR%%/start -w '' -f '' -m '' -p %%CGIBINDIR%%/Zope.cgi >> %%ZOPEBASEDIR%%/var/zope-output & echo -n " Zope" ;; stop) - %%ZOPEBASEDIR%% stop + %%ZOPEBASEDIR%%/stop echo -n " Zope" ;; *) diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist index 0780261b5e9f..adfd865a145f 100644 --- a/www/zope29/pkg-plist +++ b/www/zope29/pkg-plist @@ -126,8 +126,6 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/AqAlg.pyc %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/COPYRIGHT.txt %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/ComputedAttribute.c -%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/ComputedAttribute.py -%%ZOPEBASEDIR%%/lib/Components/ExtensionClass/ComputedAttribute.pyc %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/ExtensionClass.c %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/ExtensionClass.h %%ZOPEBASEDIR%%/lib/Components/ExtensionClass/ExtensionClass.stx |