svn commit: r309027 - in head/www/baikal: . files
Adam Weinberger
adamw at FreeBSD.org
Sun Dec 16 16:39:47 UTC 2012
Author: adamw
Date: Sun Dec 16 16:39:46 2012
New Revision: 309027
URL: http://svnweb.freebsd.org/changeset/ports/309027
Log:
* Don't give www ownership of anything it shouldn't need to write to
* Use PORT_OPTIONS:MDOCS instead of NOPORTDOCS [1]
* PORTREVISION bump
Submitted by: jgh [1]
Modified:
head/www/baikal/Makefile
head/www/baikal/files/pkg-message.in
Modified: head/www/baikal/Makefile
==============================================================================
--- head/www/baikal/Makefile Sun Dec 16 16:35:19 2012 (r309026)
+++ head/www/baikal/Makefile Sun Dec 16 16:39:46 2012 (r309027)
@@ -3,6 +3,7 @@
PORTNAME= baikal
PORTVERSION= 0.2.4
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://baikal.codr.fr/get/
DISTNAME= ${PORTNAME}-regular-${PORTVERSION}
@@ -20,15 +21,12 @@ PLIST_SUB+= CALDB="${WWWDIR}/Specific/d
SUB_LIST+= CALDB="${WWWDIR}/Specific/db/db.sqlite"
SUB_FILES= pkg-install pkg-message
-.if !defined(NOPORTDOCS)
PORTDOCS= *
-.endif
-.if !defined(NOPORTEXAMPLES)
PORTEXAMPLES= *
-.endif
+.include <bsd.port.options.mk>
post-patch:
- ${FIND} ${WRKSRC} -type f \! -name '*.php' -exec ${CHMOD} ${SHAREMODE} {} \;
+ ${FIND} ${WRKSRC} -type f -not -name '*.php' -exec ${CHMOD} ${SHAREMODE} {} \;
${FIND} ${WRKSRC} -type f -name '*.php' -exec ${CHMOD} ${BINMODE} {} \;
${FIND} ${WRKSRC} -type d -exec ${CHMOD} 0755 {} \;
${MV} ${WRKSRC}/Specific/db/db.sqlite \
@@ -42,18 +40,20 @@ post-patch:
do-install:
${MKDIR} ${WWWDIR}
-.for DIR in Core html Specific
- cd ${WRKSRC} && ${FIND} ${DIR} \! -path '*/virtualhosts*' | \
- ${CPIO} -pdmu -R ${WWWOWN}:${WWWGRP} --quiet ${WWWDIR}
+.for DIR in Core html
+ cd ${WRKSRC} && ${FIND} ${DIR} | \
+ ${CPIO} -pdmu -R ${BINOWN}:${BINGRP} --quiet ${WWWDIR}
.endfor
+ cd ${WRKSRC} && ${FIND} Specific -not -path '*/virtualhosts*' | \
+ ${CPIO} -pdmu -R ${WWWOWN}:${WWWGRP} --quiet ${WWWDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
.for f in INSTALL.md LICENSE.txt README.md TROUBLESHOOTING.md
${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}
.endfor
.endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
.for f in apache2 nginx
${INSTALL_DATA} ${WRKSRC}/Specific/virtualhosts/baikal.$f ${EXAMPLESDIR}
.endfor
Modified: head/www/baikal/files/pkg-message.in
==============================================================================
--- head/www/baikal/files/pkg-message.in Sun Dec 16 16:35:19 2012 (r309026)
+++ head/www/baikal/files/pkg-message.in Sun Dec 16 16:39:46 2012 (r309027)
@@ -1,7 +1,6 @@
To finish installing Baikal:
- 1) Set up an httpd directive; Baikal *MUST* run from
- the root of a VirtualHost or subdomain.
+ 1) Set up an httpd directive
See %%EXAMPLESDIR%%
2) touch %%WWWDIR%%/Specific/ENABLE_INSTALL
3) Browse http://your.host.here/admin
More information about the svn-ports-all
mailing list