From owner-svn-ports-all@FreeBSD.ORG Fri Jun 6 13:04:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 08CD5168; Fri, 6 Jun 2014 13:04:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA2402E5F; Fri, 6 Jun 2014 13:04:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s56D4cqK026319; Fri, 6 Jun 2014 13:04:38 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s56D4cLH026316; Fri, 6 Jun 2014 13:04:38 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201406061304.s56D4cLH026316@svn.freebsd.org> From: Martin Wilke Date: Fri, 6 Jun 2014 13:04:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356779 - head/www/py-webware X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jun 2014 13:04:39 -0000 Author: miwi Date: Fri Jun 6 13:04:37 2014 New Revision: 356779 URL: http://svnweb.freebsd.org/changeset/ports/356779 QAT: https://qat.redports.org/buildarchive/r356779/ Log: - Stage support PR: 190377 Modified: head/www/py-webware/Makefile head/www/py-webware/pkg-install head/www/py-webware/pkg-plist Modified: head/www/py-webware/Makefile ============================================================================== --- head/www/py-webware/Makefile Fri Jun 6 13:03:53 2014 (r356778) +++ head/www/py-webware/Makefile Fri Jun 6 13:04:37 2014 (r356779) @@ -18,6 +18,8 @@ NO_BUILD= yes WEBWARE_USER?= webkit WEBWARE_GROUP?= ${WEBWARE_USER} +USERS=${WEBWARE_USER} +GROUPS=${WEBWARE_GROUP} WEBWARE_MASTER_DIR?=${PREFIX}/share/webware WEBKIT_HOME_DIR?=${PREFIX}/www/webkit INSTALL_ENV= PKG_PREFIX=${PREFIX} \ @@ -30,7 +32,6 @@ INSTALL_ENV= PKG_PREFIX=${PREFIX} \ PLIST_SUB+= WEBWARE_MASTER_DIR=${WEBWARE_MASTER_DIR:S,^${PREFIX}/,,} -NO_STAGE= yes .include post-patch: @@ -39,23 +40,22 @@ post-patch: @${RM} ${WRKSRC}/WebKit/Adapters/mod_webkit2/Makefile.bak @${RM} ${WRKSRC}/WebKit/Adapters/mod_webkit1/Makefile.bak -pre-install: - @ ${ECHO} '---> Making webware default user and its group' - ${SETENV} ${INSTALL_ENV} ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL - do-install: - @${MKDIR} ${WEBWARE_MASTER_DIR} - @${CP} -R ${WRKSRC}/* ${WEBWARE_MASTER_DIR} + @${MKDIR} ${STAGEDIR}${WEBWARE_MASTER_DIR} + @${CP} -R ${WRKSRC}/* ${STAGEDIR}${WEBWARE_MASTER_DIR} @ ${ECHO} '---> Installing start/stop script' + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d ${SED} -e "s|%%WEBKIT_HOME_DIR%%|${WEBKIT_HOME_DIR}|g" \ < ${FILESDIR}/webkit.sh.tmpl \ - > ${PREFIX}/etc/rc.d/webkit.sh-dist - ${CHMOD} 755 ${PREFIX}/etc/rc.d/webkit.sh-dist && \ - ${CHOWN} root:wheel ${PREFIX}/etc/rc.d/webkit.sh-dist + > ${STAGEDIR}${PREFIX}/etc/rc.d/webkit.sh-dist + ${CHMOD} 755 ${STAGEDIR}${PREFIX}/etc/rc.d/webkit.sh-dist && \ + ${CHOWN} root:wheel ${STAGEDIR}${PREFIX}/etc/rc.d/webkit.sh-dist post-install: @ ${ECHO} '---> Compiling Python files and making webkit home directory' - ${SETENV} ${INSTALL_ENV} ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL + ${SETENV} ${INSTALL_ENV} STAGEDIR=${STAGEDIR} ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL + ${FIND} ${STAGEDIR} \( -name "*.pyc" -o -name "*.html" -o -name "*.cgi" -o -name "*.log" -o -name "*.py" \) -exec ${REINPLACE_CMD} -e "s|${STAGEDIR}||g" {} \; + ${FIND} ${STAGEDIR} -name "*.bak" -exec ${RM} {} \; .include Modified: head/www/py-webware/pkg-install ============================================================================== --- head/www/py-webware/pkg-install Fri Jun 6 13:03:53 2014 (r356778) +++ head/www/py-webware/pkg-install Fri Jun 6 13:04:37 2014 (r356779) @@ -11,8 +11,8 @@ PATH=/bin:/usr/sbin:${LOCALBASE}/bin: # set these if not provided by the Makefile WEBWARE_USER=${WEBWARE_USER:-webkit} WEBWARE_GROUP=${WEBWARE_USER:-webkit} -WEBWARE_MASTER_DIR=${WEBWARE_MASTER_DIR:-${PKG_PREFIX}/share/webware} -WEBKIT_HOME_DIR=${WEBKIT_HOME_DIR:-${PKG_PREFIX}/www/webkit} +WEBWARE_MASTER_DIR=${STAGEDIR}${WEBWARE_MASTER_DIR:-${PKG_PREFIX}/share/webware} +WEBKIT_HOME_DIR=${STAGEDIR}${WEBKIT_HOME_DIR:-${PKG_PREFIX}/www/webkit} add_webkit_account() { @@ -56,13 +56,6 @@ make_webkit_home_dir() # make application workdir for webkit user ${PYTHON} ${WEBWARE_MASTER_DIR}/bin/MakeAppWorkDir.py \ ${WEBKIT_HOME_DIR} - chown -R root:wheel ${WEBKIT_HOME_DIR} - echo chown -R ${WEBWARE_USER}:${WEBWARE_GROUP} \ - ${WEBKIT_HOME_DIR}/Cache ${WEBKIT_HOME_DIR}/ErrorMsgs \ - ${WEBKIT_HOME_DIR}/Logs ${WEBKIT_HOME_DIR}/Sessions - chown -R ${WEBWARE_USER}:${WEBWARE_GROUP} \ - ${WEBKIT_HOME_DIR}/Cache ${WEBKIT_HOME_DIR}/ErrorMsgs \ - ${WEBKIT_HOME_DIR}/Logs ${WEBKIT_HOME_DIR}/Sessions fi } Modified: head/www/py-webware/pkg-plist ============================================================================== --- head/www/py-webware/pkg-plist Fri Jun 6 13:03:53 2014 (r356778) +++ head/www/py-webware/pkg-plist Fri Jun 6 13:04:37 2014 (r356779) @@ -1826,6 +1826,7 @@ www/webkit/MyContext/__init__.py www/webkit/WebKit.cgi www/webkit/error404.html www/webkit/webkit +@exec chown -R webkit:webkit %D/www/webkit/Cache %D/www/webkit/Logs %D/www/webkit/ErrorMsgs %D/www/webkit/Sessions @dirrm www/webkit/Cache @dirrm www/webkit/Configs @dirrm www/webkit/ErrorMsgs