pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/zope210 - Add version number to COMMENT.
details: https://anonhg.NetBSD.org/pkgsrc/rev/928431acaf39
branches: trunk
changeset: 537326:928431acaf39
user: taca <taca%pkgsrc.org@localhost>
date: Sun Jan 06 15:59:26 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.
- Add missing sitecustomize.py{,c} in PLIST.
Bump PKGREVISION.
diffstat:
www/zope210/Makefile | 51 +++++++---------------
www/zope210/PLIST | 5 +-
www/zope210/files/sitecustomize.py | 15 ------
www/zope210/files/zeo210.sh | 78 -----------------------------------
www/zope210/files/zope210.sh | 83 --------------------------------------
5 files changed, 20 insertions(+), 212 deletions(-)
diffs (truncated from 312 to 300 lines):
diff -r 56857417167c -r 928431acaf39 www/zope210/Makefile
--- a/www/zope210/Makefile Sun Jan 06 15:57:47 2008 +0000
+++ b/www/zope210/Makefile Sun Jan 06 15:59:26 2008 +0000
@@ -1,41 +1,35 @@
-# $NetBSD: Makefile,v 1.2 2007/12/25 06:03:54 taca Exp $
+# $NetBSD: Makefile,v 1.3 2008/01/06 15:59:26 taca Exp $
# FreeBSD Id: ports/www/zope29/Makefile,v 1.86 2006/08/03 15:53:04 garga Exp
DISTNAME= Zope-${ZOPE210_VERSION}-final
PKGNAME= ${ZOPE_PKG_PREFIX}-${ZOPE210_VERSION}
+PKGREVISION= 1
CATEGORIES= www python
MASTER_SITES= http://www.zope.org/Products/Zope/${ZOPE210_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 ${ZOPE210_VERSION}, the Z Object Publishing Environment
DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat
PYTHON_VERSIONS_ACCEPTED= 24
ZOPE_VERSION= 210
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS+= --prefix=${ZOPE_DIR} --with-python=${PYTHONBIN} --quiet
-BUILD_TARGET= build version_txt
-MAKE_FILE= makefile
-#PKG_DESTDIR_SUPPORT= user-destdir
-#INSTALLATION_DIRS+= ${ZOPE_DOC_BASE}/zeo ${ZOPE_DOC_BASE}/zope
-## ${ZOPE_BASE}/bin
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS= --prefix=${ZOPE_DIR} --with-python=${PYTHONBIN}
+BUILD_TARGET= build version_txt
+MAKE_FILE= makefile
-PKG_GROUPS_VARS+= ZOPE_GROUP
-PKG_USERS_VARS+= ZOPE_USER
+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
OWN_DIRS+= ${ZOPE_BASE}/skel/etc/package-includes ${ZOPE_PRODUCTS_BASE}
-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=${ZOPE210_VERSION}
-MESSAGE_SUBST+= RCVAR_SUFFIX=${RCVAR_SUFFIX} ZOPE_VERSION=${ZOPE_VERSION}
-
SUBST_CLASSES+= param
SUBST_STAGE.param= pre-configure
SUBST_FILES.param+= skel/etc/zope.conf.in utilities/mkzopeinstance.py
@@ -48,19 +42,9 @@
lib/python/zdaemon/zdctl.py lib/python/zdaemon/zdrun.py
REPLACE_PYTHON_DIRS+= ${WRKSRC}/lib/python/ZEO/scripts ${WRKSRC}/utilities
-.include "../../mk/bsd.prefs.mk"
-
-.if ${_USE_DESTDIR} == "no"
-PRIVILEGED_STAGES+= clean
-.endif
-
-.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:
${FIND} ${WRKSRC}/doc ${WRKSRC}/lib ${WRKSRC}/skel/import \
@@ -74,8 +58,6 @@
-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 \
@@ -83,6 +65,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 56857417167c -r 928431acaf39 www/zope210/PLIST
--- a/www/zope210/PLIST Sun Jan 06 15:57:47 2008 +0000
+++ b/www/zope210/PLIST Sun Jan 06 15:59:26 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/18 15:35:28 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/01/06 15:59:26 taca Exp $
${ZOPE_DOC_BASE}/zeo/README.txt
${ZOPE_DOC_BASE}/zeo/ZopeREADME.txt
${ZOPE_DOC_BASE}/zeo/cache.txt
@@ -4970,6 +4970,8 @@
${ZOPE_BASE}/lib/python/reStructuredText/tests/__init__.pyc
${ZOPE_BASE}/lib/python/reStructuredText/tests/testReST.py
${ZOPE_BASE}/lib/python/reStructuredText/tests/testReST.pyc
+${ZOPE_BASE}/lib/python/sitecustomize.py
+${ZOPE_BASE}/lib/python/sitecustomize.pyc
${ZOPE_BASE}/lib/python/tempstorage/TemporaryStorage.py
${ZOPE_BASE}/lib/python/tempstorage/TemporaryStorage.pyc
${ZOPE_BASE}/lib/python/tempstorage/__init__.py
@@ -9245,7 +9247,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 56857417167c -r 928431acaf39 www/zope210/files/sitecustomize.py
--- a/www/zope210/files/sitecustomize.py Sun Jan 06 15:57:47 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-#
-# $NetBSD: sitecustomize.py,v 1.1.1.1 2007/12/18 15:35:28 taca Exp $
-#
-# set default character encoding
-#
-
-import os, sys
-
-env = os.environ
-
-try :
- encoding = env['ZOPE210_DEFAULT_ENCODING']
- sys.setdefaultencoding(encoding)
-except:
- pass
diff -r 56857417167c -r 928431acaf39 www/zope210/files/zeo210.sh
--- a/www/zope210/files/zeo210.sh Sun Jan 06 15:57:47 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# Startup script for Zeo server.
-#
-# $NetBSD: zeo210.sh,v 1.1.1.1 2007/12/18 15:35:28 taca Exp $
-#
-
-# PROVIDE: zeo210
-# REQUIRE: DAEMON
-# BEFORE: zope210
-#
-# You will need to set some variables in /etc/rc.conf to start one
-# or more instances.
-#
-# zeo210@RCVAR_SUFFIX@ : bool
-# Enable Zeo ("YES") or not ("NO", the default).
-#
-# zeo210_encoding : string
-# Default character encoding for zeo210 (default is "utf-8").
-#
-# zeo210_instances : list
-# List of dirs with Zeo's instances ("" by default).
-#
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-name="zeo210"
-rcvar="$name@RCVAR_SUFFIX@"
-version="@VER@"
-zeo_name="Zope ${version}"
-
-zeo210ctl () {
- for instance in $zeo210_instances; do
- if [ -d ${instance} ]; then
- echo -n " Zeo instance ${instance} -> "
- ${instance}/bin/zeoctl "$1"
- fi
- done
-}
-
-zeo210_start () {
- echo "Starting ${zeo_name}:"
- zeo210ctl "start"
-}
-
-zeo210_stop () {
- echo "Stopping ${zeo_name}:"
- zeo210ctl "stop"
-}
-
-zeo210_restart () {
- echo "Restarting ${zeo_name}:"
- zeo210ctl "restart"
-}
-
- start_cmd="zeo210_start"
- stop_cmd="zeo210_stop"
-restart_cmd="zeo210_restart"
-
-load_rc_config $name
-
-: ${zeo210_@RCVAR_SUFFIX@="NO"}
-: ${zeo210_encoding="utf-8"}
-: ${zeo210_instances=""}
-
-cmd="$1"
-[ $# -gt 0 ] && shift
-[ -n "$*" ] && zeo210_instances="$*"
-
-if [ "${zeo210_encoding}" ]; then
- ZOPE210_DEFAULT_ENCODING=${zope210_encoding}
- export ZOPE210_DEFAULT_ENCODING
-fi
-
-run_rc_command "${cmd}"
diff -r 56857417167c -r 928431acaf39 www/zope210/files/zope210.sh
--- a/www/zope210/files/zope210.sh Sun Jan 06 15:57:47 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: zope210.sh,v 1.1.1.1 2007/12/18 15:35:28 taca Exp $
-#
-
-# PROVIDE: zope210
-# REQUIRE: DAEMON
-
-# You will need to set some variables in /etc/rc.conf to start Zope
-#
-# zope210@RCVAR_SUFFIX@ : bool
-# Enable Zope ("YES") or not ("NO", the default).
-#
-# zope210_encoding : list
-# Default character encoding for zope210 (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.
-#
-# zope210_instances : list
-# List of dirs with Zope's instances ("" by default).
-#
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-name="zope210"
-rcvar="$name@RCVAR_SUFFIX@"
-version="@VER@"
-zope_name="Zope ${version}"
-start_cmd="zope210_start"
-stop_cmd="zope210_stop"
-restart_cmd="zope210_restart"
-
-zope210ctl () {
- cmd=$1
-
- for encoding in ${zope210_encoding}; do
- if [ "$encoding" ]; then
- ZOPE210_DEFAULT_ENCODING="$encoding"
- export ZOPE210_DEFAULT_ENCODING
- else
- unset ZOPE210_DEFAULT_ENCODING
- fi
- for instance in ${zope210_instances}; do
- if [ -d ${instance} ]; then
- echo -n " Zope instance ${instance} -> "
- ${instance}/bin/zopectl ${cmd}
- fi
- done
- done
-}
-
-zope210_start () {
- echo "Starting ${zope_name}:"
- zope210ctl "start"
-}
-
-zope210_stop () {
- echo "Stopping ${zope_name}:"
- zope210ctl "stop"
-}
-
-zope210_restart () {
- echo "Restarting ${zope_name}:"
- zope210ctl "restart"
-}
Home |
Main Index |
Thread Index |
Old Index