Date: Fri, 23 May 2014 18:18:16 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190151: [patch] Add staging support to www/ismail Message-ID: <201405231818.s4NIIGdZ059859@cgiserv.freebsd.org> Resent-Message-ID: <201405231820.s4NIK1TJ052014@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190151
>Category: ports
>Synopsis: [patch] Add staging support to www/ismail
>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: Fri May 23 18:20: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/ismail.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/ismail/Makefile b/www/ismail/Makefile
index 5f80c2d..a95527d 100644
--- a/www/ismail/Makefile
+++ b/www/ismail/Makefile
@@ -24,7 +24,6 @@ OPTIONS_SINGLE= DATASTORE
OPTIONS_SINGLE_DATASTORE= MYSQL PGSQL
OPTIONS_DEFAULT= MYSQL
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMYSQL}
@@ -39,7 +38,7 @@ PLIST_FILES+= ${EXAMPLESDIR_REL}/pgsql.schema
PLIST_DIRS+= ${EXAMPLESDIR_REL}
.endif
-LIB_DEPENDS+= c-client4:${PORTSDIR}/mail/cclient
+LIB_DEPENDS+= libc-client4.so:${PORTSDIR}/mail/cclient
pre-install:
@${ECHO_MSG} ""
@@ -48,20 +47,20 @@ pre-install:
@${ECHO_MSG} ""
do-install:
- @${MKDIR} ${WWWDIR}
- ${TAR} --exclude '*~' -C ${WRKSRC}/${PORTNAME} -cf - . | ${TAR} -C ${WWWDIR} -xf -
- @${CHOWN} -R www:www ${WWWDIR}
+ @${MKDIR} ${STAGEDIR}${WWWDIR}
+ ${TAR} --exclude '*~' -C ${WRKSRC}/${PORTNAME} -cf - . | ${TAR} -C ${STAGEDIR}${WWWDIR} -xf -
+ @${CHOWN} -R www:www ${STAGEDIR}${WWWDIR}
.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs.html ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs.html ${STAGEDIR}${DOCSDIR}
.endif
.if ${PORT_OPTIONS:MMYSQL}
- @${MKDIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/examples/mysql4.schema ${EXAMPLESDIR}
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/examples/mysql4.schema ${STAGEDIR}${EXAMPLESDIR}
.endif
.if ${PORT_OPTIONS:MPGSQL}
- @${MKDIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/examples/pgsql.schema ${EXAMPLESDIR}
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/examples/pgsql.schema ${STAGEDIR}${EXAMPLESDIR}
.endif
post-install:
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405231818.s4NIIGdZ059859>