Date: Wed, 28 May 2014 22:03:23 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190356: [patch] Add staging support to www/pligg Message-ID: <201405282203.s4SM3NH5030691@cgiserv.freebsd.org> Resent-Message-ID: <201405282210.s4SMA1xS018503@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405282203.s4SM3NH5030691>