Index: branches/2015Q3/www/zope213/Makefile =================================================================== --- branches/2015Q3/www/zope213/Makefile (revision 392068) +++ branches/2015Q3/www/zope213/Makefile (revision 392069) @@ -1,122 +1,101 @@ # $FreeBSD$ PORTNAME= zope213 PORTVERSION= 2.13.22 +PORTREVISION= 1 CATEGORIES= www python zope MASTER_SITES= CHEESESHOP DISTNAME= Zope2-${PORTVERSION} DIST_SUBDIR= zope MAINTAINER= zope@FreeBSD.org COMMENT= Object-based web application platform Version 2.13 LICENSE= ZPL21 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=2.13.2:${PORTSDIR}/security/py-AccessControl \ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \ ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:${PORTSDIR}/devel/py-DocumentTemplate \ ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \ ${PYTHON_PKGNAMEPREFIX}Missing>=0:${PORTSDIR}/devel/py-Missing \ ${PYTHON_PKGNAMEPREFIX}MultiMapping>=0:${PORTSDIR}/devel/py-MultiMapping \ ${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence \ ${PYTHON_PKGNAMEPREFIX}Products.OFSP>=2.13.2:${PORTSDIR}/devel/py-Products.OFSP \ ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=0:${PORTSDIR}/devel/py-Products.ZCatalog \ ${PYTHON_PKGNAMEPREFIX}Products.ZCTextIndex>=0:${PORTSDIR}/devel/py-Products.ZCTextIndex \ ${PYTHON_PKGNAMEPREFIX}Record>=0:${PORTSDIR}/devel/py-Record \ ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:${PORTSDIR}/security/py-RestrictedPython \ ${PYTHON_PKGNAMEPREFIX}zconfig>=0:${PORTSDIR}/devel/py-zconfig \ zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \ ${PYTHON_PKGNAMEPREFIX}ZopeUndo>=0:${PORTSDIR}/devel/py-ZopeUndo \ ${PYTHON_PKGNAMEPREFIX}docutils>=0:${PORTSDIR}/textproc/py-docutils \ ${PYTHON_PKGNAMEPREFIX}initgroups>=0:${PORTSDIR}/devel/py-initgroups \ ${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \ ${PYTHON_PKGNAMEPREFIX}tempstorage>=0:${PORTSDIR}/devel/py-tempstorage \ ${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \ ${PYTHON_PKGNAMEPREFIX}zdaemon>=0:${PORTSDIR}/sysutils/py-zdaemon \ ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:${PORTSDIR}/devel/py-zExceptions \ ${PYTHON_PKGNAMEPREFIX}zLOG>=0:${PORTSDIR}/devel/py-zLOG \ ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \ ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:${PORTSDIR}/devel/py-zope.browsermenu \ ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:${PORTSDIR}/devel/py-zope.browserpage \ ${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:${PORTSDIR}/devel/py-zope.browserresource \ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \ ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:${PORTSDIR}/devel/py-zope.contentprovider \ ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:${PORTSDIR}/devel/py-zope.contenttype \ ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:${PORTSDIR}/devel/py-zope.deferredimport \ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \ ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \ ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:${PORTSDIR}/devel/py-zope.pagetemplate \ ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime \ ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:${PORTSDIR}/net/py-zope.proxy \ ${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:${PORTSDIR}/devel/py-zope.ptresource \ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \ ${PYTHON_PKGNAMEPREFIX}zope.sendmail>=0:${PORTSDIR}/mail/py-zope.sendmail \ ${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:${PORTSDIR}/devel/py-zope.sequencesort \ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \ ${PYTHON_PKGNAMEPREFIX}zope.size>=0:${PORTSDIR}/devel/py-zope.size \ ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:${PORTSDIR}/textproc/py-zope.structuredtext \ ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:${PORTSDIR}/textproc/py-zope.tal \ ${PYTHON_PKGNAMEPREFIX}zope.tales>=3.5.0:${PORTSDIR}/devel/py-zope.tales \ ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=0:${PORTSDIR}/devel/py-zope.testbrowser \ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:${PORTSDIR}/devel/py-zope.viewlet \ ${PYTHON_PKGNAMEPREFIX}Products.BTreeFolder2>=0:${PORTSDIR}/devel/py-Products.BTreeFolder2 \ ${PYTHON_PKGNAMEPREFIX}Products.ExternalMethod>=0:${PORTSDIR}/devel/py-Products.ExternalMethod \ ${PYTHON_PKGNAMEPREFIX}Products.MailHost>=0:${PORTSDIR}/mail/py-Products.MailHost \ ${PYTHON_PKGNAMEPREFIX}Products.MIMETools>=0:${PORTSDIR}/devel/py-Products.MIMETools \ ${PYTHON_PKGNAMEPREFIX}Products.PythonScripts>=0:${PORTSDIR}/devel/py-Products.PythonScripts \ ${PYTHON_PKGNAMEPREFIX}Products.StandardCacheManagers>=0:${PORTSDIR}/devel/py-Products.StandardCacheManagers \ ${PYTHON_PKGNAMEPREFIX}manuel>=0:${PORTSDIR}/devel/py-manuel USES= python:2 zip -USE_PYTHON= distutils autoplist +USE_PYTHON= autoplist distutils +NO_ARCH= yes -PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= instance-message package-pkg-message pkg-message -SUB_LIST= ZOPEINSTANCEBASE=${ZOPEINSTANCEBASE} \ - ZOPE_USER=${ZOPE_USER} \ +SUB_FILES= pkg-message +SUB_LIST= ZOPE_USER=${ZOPE_USER} \ ZOPEINSTANCEDIR=${ZOPEINSTANCEDIR} USE_RC_SUBR= ${PORTNAME} ZOPE_USER?= www ZOPEINSTANCEBASE?= ${PREFIX}/www/Zope213 ZOPEINSTANCEDIR?= ${ZOPEINSTANCEBASE}/${ZOPEINSTANCENAME} -.if defined(BATCH) -ISBATCH= --user admin:test123 -.else -ISBATCH= "" -.endif - -.if defined(INSTANCENAME) -ZOPEINSTANCENAME= ${INSTANCENAME} -.endif - -instance: - @${LOCALBASE}/bin/mkzopeinstance --dir ${ZOPEINSTANCEDIR} ${ISBATCH} - @${CHOWN} ${ZOPE_USER}:${ZOPE_USER} ${ZOPEINSTANCEDIR}/var - @${CHOWN} ${ZOPE_USER}:${ZOPE_USER} ${ZOPEINSTANCEDIR}/log - @${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/zope.conf_changes \ - | ${PATCH} --silent ${ZOPEINSTANCEDIR}/etc/zope.conf - @${RM} ${ZOPEINSTANCEDIR}/etc/zope.conf.orig - @${CAT} ${WRKDIR}/instance-message - -post-install: - @${CAT} ${WRKDIR}/pkg-message - -pre-package: - @${INSTALL_DATA} ${WRKDIR}/package-pkg-message ${PKGMESSAGE} +post-patch: + @${REINPLACE_CMD} -e 's/#.*effective-user chrism/effective-user ${ZOPE_USER}/' \ + ${WRKSRC}/src/Zope2/utilities/skel/etc/zope.conf.in + @${RM} ${WRKSRC}/src/Zope2/utilities/skel/etc/zope.conf.in.bak .include Index: branches/2015Q3/www/zope213/files/zope.conf_changes =================================================================== --- branches/2015Q3/www/zope213/files/zope.conf_changes (revision 392068) +++ branches/2015Q3/www/zope213/files/zope.conf_changes (nonexistent) @@ -1,10 +0,0 @@ ---- zope.conf.in 2011-11-30 15:30:18.000000000 +0400 -+++ zope.conf 2011-11-30 15:43:40.000000000 +0400 -@@ -161,6 +161,7 @@ - # - # effective-user chrism - -+effective-user %%ZOPE_USER%% - - # Directive: enable-product-installation - # Property changes on: branches/2015Q3/www/zope213/files/zope.conf_changes ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q3/www/zope213/files/package-pkg-message.in =================================================================== --- branches/2015Q3/www/zope213/files/package-pkg-message.in (revision 392068) +++ branches/2015Q3/www/zope213/files/package-pkg-message.in (nonexistent) @@ -1,28 +0,0 @@ -********************************************************************** - -Zope Successfull installed. - -To create an instance of Zope please run -%%LOCALBASE%%/bin/mkzopeinstance --dir - - is the directory where the instance files should - be installed. This can be %%ZOPEINSTANCEBASE%% - -Command-line options to 'mkzopeinstance' are available, and can be -investigated by running 'mkzopeinstance --help'. - -Zope instances, created by mkzopeinstance, will not be removed -when the package is deinstalled. You'll have to delete them yourself. - -If Zope should get started automatically when the system starts, -please add the following line to /etc/rc.conf - -zope213_enable="YES" - -If you are using not default instance location, please add this -line to /etc/rc.conf to make it working: - -zope213_instances="" - -Additional Zope instances have to be added to zope213_instances -separated by a space. Property changes on: branches/2015Q3/www/zope213/files/package-pkg-message.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q3/www/zope213/files/instance-message.in =================================================================== --- branches/2015Q3/www/zope213/files/instance-message.in (revision 392068) +++ branches/2015Q3/www/zope213/files/instance-message.in (nonexistent) @@ -1,16 +0,0 @@ -********************************************************************** - -Zope instance successfully installed - -If Zope should get started automatically when the system starts, -please add the following line to /etc/rc.conf - -zope213_enable="YES" - -If you are using not default instance location, please add this -line to /etc/rc.conf to make it working: - -zope213_instances="%%ZOPEINSTANCEDIR%%" - -If there is already a zope213_instances entry please add -%%ZOPEINSTANCEDIR%% separated by a space. Property changes on: branches/2015Q3/www/zope213/files/instance-message.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q3/www/zope213/files/pkg-message.in =================================================================== --- branches/2015Q3/www/zope213/files/pkg-message.in (revision 392068) +++ branches/2015Q3/www/zope213/files/pkg-message.in (revision 392069) @@ -1,23 +1,28 @@ ********************************************************************** Zope Successfull installed. -To create an instance of Zope please run -make instance +To create an instance of Zope using the default location, please run: -You can set the following Variables in /etc/make.conf +%%LOCALBASE%%/bin/mkzopeinstance --dir %%ZOPEINSTANCEDIR%% +chown %%ZOPE_USER%%:%%ZOPE_USER%% %%ZOPEINSTANCEDIR%%var +chown %%ZOPE_USER%%:%%ZOPE_USER%% %%ZOPEINSTANCEDIR%%log -ZOPEINSTANCEBASE Directory where Zope instance should go - (default: %%ZOPEINSTANCEBASE%%) -ZOPEINSTANCENAME Default name for a new Zope instance - (default: none) +Command-line options to 'mkzopeinstance' are available, and can be +investigated by running 'mkzopeinstance --help'. -If you want have multiple Zope you should run -make instance INSTANCENAME= +Zope instances, created by mkzopeinstance, will not be removed +when the package is deinstalled. You'll have to delete them yourself. -You may also define BATCH option if you want instance to be created with -default username/password pair for instance administartor (admin:test123): -make instance BATCH=yes +If you are not using the default instance location, please use the +desired paths during creation and add this line to /etc/rc.conf: -Zope instances, created by `make instance', will not be removed when the -port is deinstalled. You'll have to delete them yourself. +zope213_instances="" + +Additional Zope instances have to be added to zope213_instances +separated by a space. + +If Zope should get started automatically when the system starts, +please add the following line to /etc/rc.conf: + +zope213_enable="YES" Index: branches/2015Q3 =================================================================== --- branches/2015Q3 (revision 392068) +++ branches/2015Q3 (revision 392069) Property changes on: branches/2015Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r391274