aboutsummaryrefslogtreecommitdiff
path: root/www/baikal
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@FreeBSD.org>2012-12-16 16:39:46 +0000
committerAdam Weinberger <adamw@FreeBSD.org>2012-12-16 16:39:46 +0000
commitbce1899a777cf341f82c8205c55393fa7fdb7ead (patch)
tree7a1e927bd54e0e303fbf47c2d6e72341d0708781 /www/baikal
parent875afc47520811bafd9fa6714dde3c6ffcc5e9bf (diff)
downloadports-bce1899a777cf341f82c8205c55393fa7fdb7ead.tar.gz
ports-bce1899a777cf341f82c8205c55393fa7fdb7ead.zip
* 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]
Notes
Notes: svn path=/head/; revision=309027
Diffstat (limited to 'www/baikal')
-rw-r--r--www/baikal/Makefile20
-rw-r--r--www/baikal/files/pkg-message.in3
2 files changed, 11 insertions, 12 deletions
diff --git a/www/baikal/Makefile b/www/baikal/Makefile
index 3c69aa82335b..de66e720e03b 100644
--- a/www/baikal/Makefile
+++ b/www/baikal/Makefile
@@ -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/db/db.sqlite"
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
diff --git a/www/baikal/files/pkg-message.in b/www/baikal/files/pkg-message.in
index 403a6bcb1d7f..59389bab86ee 100644
--- a/www/baikal/files/pkg-message.in
+++ b/www/baikal/files/pkg-message.in
@@ -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