From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 18 18:30:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6EEB12A7 for ; Sun, 18 May 2014 18:30:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 4BB2C2043 for ; Sun, 18 May 2014 18:30:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4IIU10C022131 for ; Sun, 18 May 2014 18:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4IIU1Jf022130; Sun, 18 May 2014 18:30:01 GMT (envelope-from gnats) Resent-Date: Sun, 18 May 2014 18:30:01 GMT Resent-Message-Id: <201405181830.s4IIU1Jf022130@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Joseph Benden Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0DCDEF48 for ; Sun, 18 May 2014 18:22:09 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E27E32FDC for ; Sun, 18 May 2014 18:22:08 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4IIM8RP003536 for ; Sun, 18 May 2014 18:22:08 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4IIM8n6003532; Sun, 18 May 2014 18:22:08 GMT (envelope-from nobody) Message-Id: <201405181822.s4IIM8n6003532@cgiserv.freebsd.org> Date: Sun, 18 May 2014 18:22:08 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/189916: [patch] Add staging support to www/zen-cart X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 May 2014 18:30:01 -0000 >Number: 189916 >Category: ports >Synopsis: [patch] Add staging support to www/zen-cart >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun May 18 18:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Joseph Benden >Release: FreeBSD 11 >Organization: >Environment: FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014 root@lucy:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Adds staging support and general portlint cleanup to www/zen-cart. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/zen-cart/Makefile b/www/zen-cart/Makefile index f31ba46..3c62d29 100644 --- a/www/zen-cart/Makefile +++ b/www/zen-cart/Makefile @@ -14,10 +14,9 @@ COMMENT= PHP-based user-friendly, open source shopping cart LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/license.txt -USES= zip +USES= zip dos2unix USE_PHP= yes WANT_PHP_WEB= yes -USE_DOS2UNIX= yes DOS2UNIX_REGEX= .*\.php EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME} @@ -27,42 +26,41 @@ SUB_LIST= WWWDIR="${WWWDIR}" PORTNAME="${PORTNAME}" PLIST_SUB+= WWWDIR=${WWWDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} EXAMPLESDIR_REL=${EXAMPLESDIR_REL} \ PORTNAME=${PORTNAME} -NO_STAGE= yes do-install: - @if [ ! -d ${WWWDIR} ]; then mkdir ${WWWDIR} ; fi - @cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${EXAMPLESDIR} && rm -rf ${WRKSRC}/docs - @cd ${WRKSRC} && mv vbv_learn_more.html ${EXAMPLESDIR}/ - @cd ${WRKSRC} && mv mcs_learn_more.html ${EXAMPLESDIR}/ - @cd ${WRKSRC} && mv robots_example.txt ${EXAMPLESDIR}/ - @cd ${WRKSRC} && mv install.txt ${EXAMPLESDIR}/ - @cd ${WRKSRC} && mv nddbc.html ${EXAMPLESDIR}/ - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR}/ - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - @${CHMOD} -R 0755 ${WWWDIR} - @${CHMOD} 0777 ${WWWDIR}/cache - @cd ${WWWDIR}/images && find . -type d -exec chmod 0777 {} \; - @cd ${WWWDIR}/includes/languages/english && find html_includes -type d -exec chmod 0777 {} \; - @${CHMOD} 0777 ${WWWDIR}/media - @${CHMOD} 0777 ${WWWDIR}/pub - @${CHMOD} 0777 ${WWWDIR}/admin/backups - @${CHMOD} 0777 ${WWWDIR}/admin/images/graphs + @if [ ! -d ${STAGEDIR}${WWWDIR} ]; then ${MKDIR} ${STAGEDIR}${WWWDIR} ; fi + @cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${EXAMPLESDIR} && ${RM} -rf ${WRKSRC}/docs + @cd ${WRKSRC} && ${MV} vbv_learn_more.html ${STAGEDIR}${EXAMPLESDIR}/ + @cd ${WRKSRC} && ${MV} mcs_learn_more.html ${STAGEDIR}${EXAMPLESDIR}/ + @cd ${WRKSRC} && ${MV} robots_example.txt ${STAGEDIR}${EXAMPLESDIR}/ + @cd ${WRKSRC} && ${MV} install.txt ${STAGEDIR}${EXAMPLESDIR}/ + @cd ${WRKSRC} && ${MV} nddbc.html ${STAGEDIR}${EXAMPLESDIR}/ + @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/ + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} + @${CHMOD} -R 0755 ${STAGEDIR}${WWWDIR} + @${CHMOD} 0777 ${STAGEDIR}${WWWDIR}/cache + @cd ${STAGEDIR}${WWWDIR}/images && ${FIND} . -type d -exec ${CHMOD} 0777 {} \; + @cd ${STAGEDIR}${WWWDIR}/includes/languages/english && ${FIND} html_includes -type d -exec ${CHMOD} 0777 {} \; + @${CHMOD} 0777 ${STAGEDIR}${WWWDIR}/media + @${CHMOD} 0777 ${STAGEDIR}${WWWDIR}/pub + @${CHMOD} 0777 ${STAGEDIR}${WWWDIR}/admin/backups + @${CHMOD} 0777 ${STAGEDIR}${WWWDIR}/admin/images/graphs @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST} @${ECHO_CMD} '@exec ${CHMOD} -R 0755 ${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST} @${ECHO_CMD} '@exec ${CHMOD} 0777 ${WWWDIR}/cache' >> ${TMPPLIST} - @${ECHO_CMD} '@exec cd ${WWWDIR}/images && find . -type d -exec chmod 0777 {} \;' >> ${TMPPLIST} - @${ECHO_CMD} '@exec cd ${WWWDIR}/includes/languages/english && find html_includes -type d -exec chmod 0777 {} \;' >> ${TMPPLIST} + @${ECHO_CMD} '@exec cd ${WWWDIR}/images && ${FIND} . -type d -exec ${CHMOD} 0777 {} \;' >> ${TMPPLIST} + @${ECHO_CMD} '@exec cd ${WWWDIR}/includes/languages/english && ${FIND} html_includes -type d -exec ${CHMOD} 0777 {} \;' >> ${TMPPLIST} @${ECHO_CMD} '@exec ${CHMOD} 0777 ${WWWDIR}/media' >> ${TMPPLIST} @${ECHO_CMD} '@exec ${CHMOD} 0777 ${WWWDIR}/pub' >> ${TMPPLIST} @${ECHO_CMD} '@exec ${CHMOD} 0777 ${WWWDIR}/admin/backups' >> ${TMPPLIST} @${ECHO_CMD} '@exec ${CHMOD} 0777 ${WWWDIR}/admin/images/graphs' >> ${TMPPLIST} post-install: - @if [ ! -f ${WWWDIR}/includes/configure.php ]; then \ - ${CP} -p ${WWWDIR}/includes/dist-configure.php ${WWWDIR}/includes/configure.php ; \ + @if [ ! -f ${STAGEDIR}${WWWDIR}/includes/configure.php ]; then \ + ${CP} -p ${STAGEDIR}${WWWDIR}/includes/dist-configure.php ${STAGEDIR}${WWWDIR}/includes/configure.php ; \ fi - @if [ ! -f ${WWWDIR}/admin/includes/configure.php ]; then \ - ${CP} -p ${WWWDIR}/admin/includes/dist-configure.php ${WWWDIR}/admin/includes/configure.php ; \ + @if [ ! -f ${STAGEDIR}${WWWDIR}/admin/includes/configure.php ]; then \ + ${CP} -p ${STAGEDIR}${WWWDIR}/admin/includes/dist-configure.php ${STAGEDIR}${WWWDIR}/admin/includes/configure.php ; \ fi .if !defined(BATCH) diff --git a/www/zen-cart/distinfo b/www/zen-cart/distinfo index 39d99b6..3ca16dd 100644 --- a/www/zen-cart/distinfo +++ b/www/zen-cart/distinfo @@ -1,2 +1,2 @@ -SHA256 (zen-cart-v1.3.9h-full-fileset-10262010.zip) = 493b14e35c5977c1dcea0dedf990c4c86fbf00be23a7e8099d2232c9b2bd0694 -SIZE (zen-cart-v1.3.9h-full-fileset-10262010.zip) = 4463316 +SHA256 (zen-cart-v1.3.9h-full-fileset-10262010.zip) = 485407c4c23bf3807bb8b5e0ed1231ee94f29aa8ec79cca062f0422ab0e8fa28 +SIZE (zen-cart-v1.3.9h-full-fileset-10262010.zip) = 4308992 >Release-Note: >Audit-Trail: >Unformatted: