svn commit: r391274 - in head/www/zope213: . files

[Ruslan Makhmatkhanov]

Author: rm
Date: Fri Jul  3 21:11:15 2015
New Revision: 391274
URL: https://svnweb.freebsd.org/changeset/ports/391274

Log:
  www/zope213: make this port usable when installed from packages
  
  Both ports users and package users now follow uniform procedure of creating
  application instance.
  
  Summary:
  - Clean up port and remove `make instance` functionality that duplicates native
    Zope tool functionality
  - Standardize and ensure pkg-message instructions correctly set up Zope
  - Make Portlint and Poudriere testport clean
  - Set NO_ARCH
  
  PR:		200040
  Submitted by:	Jason Unovitch <jason.unovitch at gmail.com>
  MFH:		2015Q3

Deleted:
  head/www/zope213/files/instance-message.in
  head/www/zope213/files/package-pkg-message.in
  head/www/zope213/files/zope.conf_changes
Modified:
  head/www/zope213/Makefile
  head/www/zope213/files/pkg-message.in

Modified: head/www/zope213/Makefile
==============================================================================
--- head/www/zope213/Makefile	Fri Jul  3 20:58:37 2015	(r391273)
+++ head/www/zope213/Makefile	Fri Jul  3 21:11:15 2015	(r391274)
@@ -2,6 +2,7 @@
 
 PORTNAME=	zope213
 PORTVERSION=	2.13.22
+PORTREVISION=	1
 CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 DISTNAME=	Zope2-${PORTVERSION}
@@ -80,12 +81,11 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Acce
 		${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}
@@ -93,30 +93,9 @@ 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 <bsd.port.mk>

Modified: head/www/zope213/files/pkg-message.in
==============================================================================
--- head/www/zope213/files/pkg-message.in	Fri Jul  3 20:58:37 2015	(r391273)
+++ head/www/zope213/files/pkg-message.in	Fri Jul  3 21:11:15 2015	(r391274)
@@ -2,22 +2,27 @@
 
 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=<somename>
+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="<INSTANCEDIR>"
+
+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"