[pkgsrc/trunk]: pkgsrc/www/zope29 - Add version number to COMMENT.

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/46eadf34b22d
branches:  trunk
changeset: 537324:46eadf34b22d
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Jan 06 15:57:45 2008 +0000

description:
- Add version number to COMMENT.
- Remove -quiet option from CONFIGURE_ARGS.  This cause verbose output
  but it prevent detect errors.
- use INSTALLATION_DIRS.
- Use ../zope/Makefile.common. and common files from ../zope/files.
- Don't install unused runzope.bat.in template file.
- take maintainership.

Bump PKGREVISION.

diffstat:

 www/zope29/Makefile               |  40 ++++++-----------
 www/zope29/PLIST                  |   3 +-
 www/zope29/files/sitecustomize.py |  15 ------
 www/zope29/files/zeo29.sh         |  88 ---------------------------------------
 www/zope29/files/zope29.sh        |  83 ------------------------------------
 5 files changed, 15 insertions(+), 214 deletions(-)

diffs (truncated from 304 to 300 lines):

diff -r 4050a0c93394 -r 46eadf34b22d www/zope29/Makefile
--- a/www/zope29/Makefile       Sun Jan 06 15:53:43 2008 +0000
+++ b/www/zope29/Makefile       Sun Jan 06 15:57:45 2008 +0000
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.14 2007/12/25 06:02:54 taca Exp $
+# $NetBSD: Makefile,v 1.15 2008/01/06 15:57:45 taca Exp $
 # FreeBSD Id: ports/www/zope29/Makefile,v 1.86 2006/08/03 15:53:04 garga Exp
 
 DISTNAME=      Zope-${ZOPE29_VERSION}-final
 PKGNAME=       ${ZOPE_PKG_PREFIX}-${ZOPE29_VERSION}
+PKGREVISION=   1
 CATEGORIES=    www python
 MASTER_SITES=  http://www.zope.org/Products/Zope/${ZOPE29_VERSION}/
 EXTRACT_SUFX=  .tgz
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    taca%NetBSD.org@localhost
 HOMEPAGE=      http://www.zope.org/
-COMMENT=       Zope, the Z Object Publishing Environment
+COMMENT=       Zope ${ZOPE29_VERSION}, the Z Object Publishing Environment
 
 DEPENDS+=      ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat
 
@@ -17,20 +18,15 @@
 ZOPE_VERSION=                  29
 
 HAS_CONFIGURE= yes
-CONFIGURE_ARGS=        --prefix=${ZOPE_DIR} --with-python=${PYTHONBIN} --quiet
+CONFIGURE_ARGS=        --prefix=${ZOPE_DIR} --with-python=${PYTHONBIN}
 BUILD_TARGET=  build version_txt
 MAKE_FILE=     makefile
-PRIVILEGED_STAGES+=    clean
 
-PKG_GROUPS_VARS+=      ZOPE_GROUP
-PKG_USERS_VARS+=       ZOPE_USER
-
-PKG_GROUPS=    ${ZOPE_GROUP}
-PKG_USERS=     ${ZOPE_USER}:${ZOPE_GROUP}
-RCD_SCRIPTS=   zope${ZOPE_VERSION} zeo${ZOPE_VERSION}
-
-FILES_SUBST+=  RCVAR_SUFFIX=${RCVAR_SUFFIX} VER=${ZOPE29_VERSION}
-MESSAGE_SUBST+=        RCVAR_SUFFIX=${RCVAR_SUFFIX} ZOPE_VERSION=${ZOPE_VERSION}
+INSTALLATION_DIRS=     ${ZOPE_DOC_DIR}/zeo ${ZOPE_DOC_DIR}/zope
+OWN_DIRS+=             ${ZOPE_PRODUCTS_DIR}
+RCD_SCRIPTS=           zope${ZOPE_VERSION} zeo${ZOPE_VERSION}
+RCD_SCRIPT_SRC.zope${ZOPE_VERSION}=    ../zope/files/zope.sh
+RCD_SCRIPT_SRC.zeo${ZOPE_VERSION}=     ../zope/files/zeo.sh
 
 SUBST_CLASSES+=                param
 SUBST_STAGE.param=     pre-configure
@@ -44,18 +40,11 @@
                        lib/python/zdaemon/zdctl.py lib/python/zdaemon/zdrun.py
 REPLACE_PYTHON_DIRS+=  ${WRKSRC}/lib/python/ZConfig/scripts ${WRKSRC}/utilities
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "FreeBSD"
-RCVAR_SUFFIX=  _enable
-.else
-RCVAR_SUFFIX=  # empty
-.endif
-
-OWN_DIRS+=     ${ZOPE_PRODUCTS_DIR}
+pre-patch:
+       ${CP} ../zope/files/sitecustomize.py ${WRKSRC}/lib/python
+       ${RM} -f ${WRKSRC}/skel/bin/runzope.bat.in
 
 post-patch:
-       ${CP} ${FILESDIR}/sitecustomize.py ${WRKSRC}/lib/python
        ${FIND} ${WRKSRC}/doc ${WRKSRC}/lib ${WRKSRC}/skel/import \
                -type f -print0 | ${XARGS} -0 -- ${CHMOD} -x
 
@@ -66,8 +55,6 @@
        ${FIND} ${WRKSRC} -name '*.orig' -print0 | ${XARGS} -0 -- ${RM}
 
 post-install:
-       ${INSTALL_DATA_DIR} ${ZOPE_DOC_DIR}/zeo
-       ${INSTALL_DATA_DIR} ${ZOPE_DOC_DIR}/zope
        cd ${WRKSRC}/doc/ZEO; ${PAX} -rw *.txt ${ZOPE_DOC_DIR}/zeo
        cd ${WRKSRC}/doc; ${PAX} -rw *.txt ${ZOPE_DOC_DIR}/zope
        ${FIND} ${ZOPE_DIR} ${ZOPE_DOC_DIR} -type f -print0 \
@@ -75,6 +62,7 @@
        ${FIND} ${ZOPE_DIR} -type f -name '*.pyc' -print0 | \
                ${XARGS} -0 -- ${CHMOD} a-x
 
+.include "../../www/zope/Makefile.common"
 .include "../../www/zope/replace.mk"
 .include "../../www/zope/zopeversion.mk"
 .include "../../lang/python/application.mk"
diff -r 4050a0c93394 -r 46eadf34b22d www/zope29/PLIST
--- a/www/zope29/PLIST  Sun Jan 06 15:53:43 2008 +0000
+++ b/www/zope29/PLIST  Sun Jan 06 15:57:45 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/12/18 15:31:12 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/01/06 15:57:45 taca Exp $
 ${ZOPE_DOC_BASE}/zeo/README.txt
 ${ZOPE_DOC_BASE}/zeo/ZopeREADME.txt
 ${ZOPE_DOC_BASE}/zeo/cache.txt
@@ -8910,7 +8910,6 @@
 ${ZOPE_BASE}/skel/Extensions/README.txt
 ${ZOPE_BASE}/skel/Products/README.txt
 ${ZOPE_BASE}/skel/README.txt
-${ZOPE_BASE}/skel/bin/runzope.bat.in
 ${ZOPE_BASE}/skel/bin/runzope.in
 ${ZOPE_BASE}/skel/bin/zopectl.in
 ${ZOPE_BASE}/skel/bin/zopeservice.py.in
diff -r 4050a0c93394 -r 46eadf34b22d www/zope29/files/sitecustomize.py
--- a/www/zope29/files/sitecustomize.py Sun Jan 06 15:53:43 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-#
-# $NetBSD: sitecustomize.py,v 1.1 2007/12/18 15:31:12 taca Exp $
-#
-# set default character encoding 
-#
-
-import os, sys
-
-env = os.environ
-
-try :
-       encoding = env['ZOPE29_DEFAULT_ENCODING']
-       sys.setdefaultencoding(encoding)
-except:
-       pass
diff -r 4050a0c93394 -r 46eadf34b22d www/zope29/files/zeo29.sh
--- a/www/zope29/files/zeo29.sh Sun Jan 06 15:53:43 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# Startup script for Zeo server.
-#
-# $NetBSD: zeo29.sh,v 1.2 2007/12/18 15:31:12 taca Exp $
-#
-
-# PROVIDE: zeo29
-# REQUIRE: DAEMON
-# BEFORE: zope29
-#
-# You will need to set some variables in /etc/rc.conf to start one
-# or more instances.
-#
-# zeo29@RCVAR_SUFFIX@ : bool
-#   Enable Zeo ("YES") or not ("NO", the default).
-#
-# zeo29_encoding : list
-#   Default character encoding for zeo29 (default is "utf-8").
-#
-# zeo29_instances : list
-#   List of dirs with Zeo's instances ("" by default).
-#
-
-if [ -f /etc/rc.subr ]
-then
-       . /etc/rc.subr
-fi
-
-name="zeo29"
-rcvar="$name@RCVAR_SUFFIX@"
-version="@VER@"
-zeo_name="Zope ${version}"
-
-zeo29ctl () {
-       cmd = $1
-
-       set ${zeo29_encoding}
-       for instance in $zeo29_instances; do
-               if [ "$1" ]; then
-                       ZOPE29_DEFAULT_ENCODING="$1"
-                       export ZOPE29_DEFAULT_ENCODING
-               else
-                       unset ZOPE29_DEFAULT_ENCODING
-               fi
-               if [ -d ${instance} ]; then
-                       echo -n "  Zeo instance ${instance} -> "
-                       ${instance}/bin/zeoctl ${cmd}
-               fi
-               shift
-       done
-}
-
-zeo29_start () {
-    echo "Starting ${zeo_name}:"
-    zeo29ctl "start"
-}
-
-zeo29_stop () {
-    echo "Stopping ${zeo_name}:"
-    zeo29ctl "stop"
-}
-
-zeo29_restart () {
-    echo "Restarting ${zeo_name}:"
-    zeo29ctl "restart"
-}
-
-  start_cmd="zeo29_start"
-   stop_cmd="zeo29_stop"
-restart_cmd="zeo29_restart"
-
-load_rc_config $name
-
-: ${zeo29_@RCVAR_SUFFIX@="NO"}
-: ${zeo29_encoding="utf-8"}
-: ${zeo29_instances=""}
-
-cmd="$1"
-[ $# -gt 0 ] && shift
-[ -n  "$*" ] && zeo29_instances="$*"
-
-if [ "${zeo29_encoding}" ]; then
-       ZOPE29_DEFAULT_ENCODING=${zope29_encoding}
-       export ZOPE29_DEFAULT_ENCODING
-fi
-
-run_rc_command "${cmd}"
diff -r 4050a0c93394 -r 46eadf34b22d www/zope29/files/zope29.sh
--- a/www/zope29/files/zope29.sh        Sun Jan 06 15:53:43 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# Startup script for Zope server.
-#
-# $NetBSD: zope29.sh,v 1.2 2007/12/18 15:31:12 taca Exp $
-#
-
-# PROVIDE: zope29
-# REQUIRE: DAEMON
-
-# You will need to set some variables in /etc/rc.conf to start Zope
-#
-# zope29@RCVAR_SUFFIX@ : bool
-#   Enable Zope ("YES") or not ("NO", the default).
-#
-# zope29_encoding : list
-#   Default character encoding for zope29 (default is "utf-8").
-#   You can specify single character encoding for all Zope instances
-#   or specify a list for each Zope instance.  "none" means specify
-#   nothing.
-#
-# zope29_instances : list
-#   List of dirs with Zope's instances ("" by default).
-#
-
-if [ -f /etc/rc.subr ]
-then
-       . /etc/rc.subr
-fi
-
-name="zope29"
-rcvar="$name@RCVAR_SUFFIX@"
-version="@VER@"
-zope_name="Zope ${version}"
-start_cmd="zope29_start"
-stop_cmd="zope29_stop"
-restart_cmd="zope29_restart"
-
-zope29ctl () {
-       cmd=$1
-
-       for encoding in ${zope29_encoding}; do
-               if [ "$encoding" ]; then
-                       ZOPE29_DEFAULT_ENCODING="$encoding"
-                       export ZOPE29_DEFAULT_ENCODING
-               else
-                       unset ZOPE29_DEFAULT_ENCODING
-               fi
-               for instance in ${zope29_instances}; do
-                       if [ -d ${instance} ]; then
-                               echo -n "  Zope instance ${instance} -> "
-                               ${instance}/bin/zopectl ${cmd}
-                       fi
-               done
-       done
-}
-
-zope29_start () {
-       echo "Starting ${zope_name}:"
-       zope29ctl "start"
-}
-
-zope29_stop () {
-       echo "Stopping ${zope_name}:"
-       zope29ctl "stop"
-}
-
-zope29_restart () {
-       echo "Restarting ${zope_name}:"
-       zope29ctl "restart"
-}
-
-load_rc_config $name
-
-: ${zope29@RCVAR_SUFFIX@="NO"}
-: ${zope29_encoding="utf-8"}
-: ${zope29_instances=""}
-
-cmd="$1"