From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 28 22:10:02 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 16A38FB0 for ; Wed, 28 May 2014 22:10:02 +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 E73F22AD0 for ; Wed, 28 May 2014 22:10: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 s4SMA1db018504 for ; Wed, 28 May 2014 22:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4SMA1xS018503; Wed, 28 May 2014 22:10:01 GMT (envelope-from gnats) Resent-Date: Wed, 28 May 2014 22:10:01 GMT Resent-Message-Id: <201405282210.s4SMA1xS018503@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 [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 D3CB8E28 for ; Wed, 28 May 2014 22:03:23 +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 B49612A87 for ; Wed, 28 May 2014 22:03:23 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4SM3N3j030692 for ; Wed, 28 May 2014 22:03:23 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4SM3NH5030691; Wed, 28 May 2014 22:03:23 GMT (envelope-from nobody) Message-Id: <201405282203.s4SM3NH5030691@cgiserv.freebsd.org> Date: Wed, 28 May 2014 22:03:23 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190356: [patch] Add staging support to www/pligg 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: Wed, 28 May 2014 22:10:02 -0000 >Number: 190356 >Category: ports >Synopsis: [patch] Add staging support to www/pligg >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: Wed May 28 22:10:01 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 to www/pligg. I was unable to download the distfiles inside Poudriere and I gave up. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/pligg/Makefile b/www/pligg/Makefile index 9c54070..c856b51 100644 --- a/www/pligg/Makefile +++ b/www/pligg/Makefile @@ -20,39 +20,29 @@ WRKSRC= ${WRKDIR}/pligg NO_BUILD= yes SUB_FILES= pkg-message -NO_STAGE= yes .include do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - @${CHMOD} -R 755 ${WWWDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} + @${CHMOD} -R 755 ${STAGEDIR}${WWWDIR} @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \ >> ${TMPPLIST} @${ECHO_CMD} '@exec ${CHMOD} -R 755 ${WWWDIR}' \ >> ${TMPPLIST} - @if [ ! -f ${WWWDIR}/settings.php ]; then \ - ${CP} -p ${WWWDIR}/settings.php.default ${WWWDIR}/settings.php; fi - - @if [ ! -f ${WWWDIR}/libs/dbconnect.php ]; then \ - ${CP} -p ${WWWDIR}/libs/dbconnect.php.default \ - ${WWWDIR}/libs/dbconnect.php; fi - - @${CHMOD} 666 ${WWWDIR}/settings.php + @${CHMOD} 666 ${STAGEDIR}${WWWDIR}/settings.php @${ECHO_CMD} '@exec ${CHMOD} 666 ${WWWDIR}/settings.php' \ >> ${TMPPLIST} - @${CHMOD} 666 ${WWWDIR}/libs/dbconnect.php @${ECHO_CMD} '@exec ${CHMOD} 666 ${WWWDIR}/libs/dbconnect.php' \ >> ${TMPPLIST} - @${CHMOD} 655 ${WWWDIR}/config.php @${ECHO_CMD} '@exec ${CHMOD} 655 ${WWWDIR}/config.php' \ >> ${TMPPLIST} .for d in admin/backup cache avatars/groups_uploaded avatars/user_uploaded languages - @${CHMOD} -R 777 ${WWWDIR}/${d} + @${CHMOD} -R 777 ${STAGEDIR}${WWWDIR}/${d} @${ECHO_CMD} '@exec ${CHMOD} 777 ${WWWDIR}/${d}' >> ${TMPPLIST} .endfor diff --git a/www/pligg/pkg-plist b/www/pligg/pkg-plist index a88a869..cb18956 100644 --- a/www/pligg/pkg-plist +++ b/www/pligg/pkg-plist @@ -165,8 +165,9 @@ %%WWWDIR%%/libs/comment.php %%WWWDIR%%/libs/csrf.php %%WWWDIR%%/libs/db.php -%%WWWDIR%%/libs/dbconnect.php +@unexec if cmp -s %D/%%WWWDIR%%/libs/dbconnect.php %D/%%WWWDIR%%/libs/dbconnect.php.default; then rm -f %D/%%WWWDIR%%/libs/dbconnect.php; fi %%WWWDIR%%/libs/dbconnect.php.default +@exec cp -n %D/%F %B/libs/dbconnect.php %%WWWDIR%%/libs/dbtree.php %%WWWDIR%%/libs/define_tables.php %%WWWDIR%%/libs/extra_fields.php @@ -750,8 +751,9 @@ %%WWWDIR%%/rsssearch.php %%WWWDIR%%/search.php %%WWWDIR%%/settemplate.php -%%WWWDIR%%/settings.php +@unexec if cmp -s %D/%%WWWDIR%%/settings.php %D/%%WWWDIR%%/settings.php.default; then rm -f %D/%%WWWDIR%%/settings.php; fi %%WWWDIR%%/settings.php.default +@exec cp -n %D/%F %B/settings.php %%WWWDIR%%/spamlog.log %%WWWDIR%%/story.php %%WWWDIR%%/storyrss.php >Release-Note: >Audit-Trail: >Unformatted: