diff options
Diffstat (limited to 'www/zope28')
| -rw-r--r-- | www/zope28/Makefile | 35 | ||||
| -rw-r--r-- | www/zope28/pkg-plist | 5 |
2 files changed, 18 insertions, 22 deletions
diff --git a/www/zope28/Makefile b/www/zope28/Makefile index 3585bf280bd3..5bc11b385074 100644 --- a/www/zope28/Makefile +++ b/www/zope28/Makefile @@ -53,13 +53,13 @@ PLIST_SUB= ZOPEBASEDIR=${SZOPEBASEDIR} \ WEBBASEDIR=${WEBBASEDIR} # 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: # +# since in there, Zope can live on its own. 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 + ${ECHO} "Saving existing Database to ${ZOPEBASEDIR}/var/Data.fs.preserve." ; \ + ${MV} ${ZOPEBASEDIR}/var/Data.fs ${ZOPEBASEDIR}/var/Data.fs.preserve; \ + fi @# @${MKDIR} ${ZOPEBASEDIR} @${ECHO} "===> Please be patient, some builds need their time." @@ -76,6 +76,8 @@ do-install: # ${ECHO} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \ ${CAT} Zope.cgi.orig >> Zope.cgi ; \ ${RM} Zope.cgi.orig ) + @(cd ${ZOPEBASEDIR}/pcgi/Test && ${RM} *.o) + @(cd ${ZOPEBASEDIR}/pcgi && ${RM} *.o) @# @${MKDIR} ${CGIBINDIR} @(cd ${ZOPEBASEDIR} ; \ @@ -88,11 +90,17 @@ do-install: # @${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var @${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/var/* @${RM} ${ZOPEBASEDIR}/var/.cvsignore + @if [ -e ${ZOPEBASEDIR}/var/Data.fs.preserve ] ; then \ + ${ECHO} "Restoring existing Database from ${ZOPEBASEDIR}/var/Data.fs.preserve." ; \ + ${MV} ${ZOPEBASEDIR}/var/Data.fs.preserve ${ZOPEBASEDIR}/var/Data.fs; \ + fi @# - @${ECHO} "===> Setting user/password to zopemaster/test..." - @(cd ${ZOPEBASEDIR} && \ - ${PYTHON_CMD} zpasswd.py -u zopemaster \ - -p test -e CLEARTEXT access ) + @if [ ! -f ${ZOPEBASEDIR}/access ]; then \ + ${ECHO} "===> Setting user/password to zopemaster/test..."; \ + (cd ${ZOPEBASEDIR} && \ + ${PYTHON_CMD} zpasswd.py -u zopemaster \ + -p test -e CLEARTEXT access ); \ + fi @# @${CHOWN} ${NOBODY_USER} ${ZOPEBASEDIR}/access @# @@ -114,11 +122,4 @@ do-install: # @${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. -# @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 - .include <bsd.port.mk> diff --git a/www/zope28/pkg-plist b/www/zope28/pkg-plist index 7d60cea59f35..0351cf252693 100644 --- a/www/zope28/pkg-plist +++ b/www/zope28/pkg-plist @@ -82,7 +82,6 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/ZServer/medusa/status_handler.pyc %%ZOPEBASEDIR%%/ZServer/medusa/test_logger.py %%ZOPEBASEDIR%%/ZServer/medusa/test_logger.pyc -%%ZOPEBASEDIR%%/access %%ZOPEBASEDIR%%/doc/CHANGES.txt %%ZOPEBASEDIR%%/doc/CREDITS.txt %%ZOPEBASEDIR%%/doc/DEBUGGING.txt @@ -1474,8 +1473,6 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/pcgi/Test/.cvsignore %%ZOPEBASEDIR%%/pcgi/Test/README.parseinfo %%ZOPEBASEDIR%%/pcgi/Test/parseinfo -%%ZOPEBASEDIR%%/pcgi/Test/parseinfo.o -%%ZOPEBASEDIR%%/pcgi/Test/pcgi-wrapper.o %%ZOPEBASEDIR%%/pcgi/Util/README %%ZOPEBASEDIR%%/pcgi/Util/killpcgi.py %%ZOPEBASEDIR%%/pcgi/Util/killpcgi.pyc @@ -1494,9 +1491,7 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/pcgi/install-sh %%ZOPEBASEDIR%%/pcgi/manifest %%ZOPEBASEDIR%%/pcgi/parseinfo.c -%%ZOPEBASEDIR%%/pcgi/parseinfo.o %%ZOPEBASEDIR%%/pcgi/pcgi-wrapper.c -%%ZOPEBASEDIR%%/pcgi/pcgi-wrapper.o %%ZOPEBASEDIR%%/pcgi/pcgi.h %%ZOPEBASEDIR%%/pcgi/pcgi_publisher.py %%ZOPEBASEDIR%%/pcgi/pcgi_publisher.pyc |