aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2006-12-30 17:10:50 +0000
committerMartin Wilke <miwi@FreeBSD.org>2006-12-30 17:10:50 +0000
commit5b16deb49343bad8fd3a56535c9f102f3083ef67 (patch)
tree032f5a51a430c66770526ea42a450162b4ae443c
parent17349613d09093a0d7e479982344615c5ef2bbc4 (diff)
downloadports-5b16deb49343bad8fd3a56535c9f102f3083ef67.tar.gz
ports-5b16deb49343bad8fd3a56535c9f102f3083ef67.zip
Notes
-rw-r--r--www/twiki/Makefile11
-rw-r--r--www/twiki/files/pkg-install.in5
-rw-r--r--www/twiki/pkg-plist4
3 files changed, 11 insertions, 9 deletions
diff --git a/www/twiki/Makefile b/www/twiki/Makefile
index 3b96e2583219..8c9e87bf55cd 100644
--- a/www/twiki/Makefile
+++ b/www/twiki/Makefile
@@ -38,9 +38,14 @@ pre-everything::
@${ECHO} "****************************************************************"
@sleep 10
-post-extract:
- @# move config to sample
- @${MV} ${WRKSRC}/lib/TWiki.cfg ${WRKSRC}/lib/TWiki.cfg.sample
+post-patch:
+ @${REINPLACE_CMD} -i "" -e "s|\/home\/httpd\/twiki|${TWIKIDIR}|g" \
+ ${WRKSRC}/twiki_httpd_conf.txt
+ @${REINPLACE_CMD} -i "" -e "s|\/home\/httpd\/twiki|${TWIKIDIR}|g" \
+ ${WRKSRC}/lib/LocalSite.cfg.txt
+ @${REINPLACE_CMD} -i "" -e "s|\/home\/httpd\/twiki|${TWIKIDIR}|g" \
+ ${WRKSRC}/lib/TWiki.cfg
+ @${CP} ${WRKSRC}/lib/TWiki.cfg ${WRKSRC}/lib/TWiki.cfg.sample
do-install:
${INSTALL} -d -m 0755 ${TWIKIDIR}
diff --git a/www/twiki/files/pkg-install.in b/www/twiki/files/pkg-install.in
index c742681e7bd3..e4ec413ffb65 100644
--- a/www/twiki/files/pkg-install.in
+++ b/www/twiki/files/pkg-install.in
@@ -29,10 +29,7 @@ case $2 in
done
find ${TWIKIDIR}/data -type f -name \*.bak | xargs rm
- chown ${WWWUSER}:${WWWGROUP} `find ${TWIKIDIR}/data -type f`
- chown ${WWWUSER}:${WWWGROUP} `find ${TWIKIDIR}/data -type d`
- chown ${WWWUSER}:${WWWGROUP} `find ${TWIKIDIR}/pub -type f`
- chown ${WWWUSER}:${WWWGROUP} `find ${TWIKIDIR}/pub -type d`
+ chown -R ${WWWUSER}:${WWWGROUP} ${TWIKIDIR}
chmod 755 ${TWIKIDIR}/bin/*
chmod 664 `find ${TWIKIDIR}/data -type f`
diff --git a/www/twiki/pkg-plist b/www/twiki/pkg-plist
index f8a1d80536e0..43b58cdbae3f 100644
--- a/www/twiki/pkg-plist
+++ b/www/twiki/pkg-plist
@@ -2262,7 +2262,7 @@
@dirrm %%TWIKI%%/lib/CPAN/lib/Algorithm
@dirrm %%TWIKI%%/lib/CPAN/lib
@dirrm %%TWIKI%%/lib/CPAN
-@dirrm %%TWIKI%%/lib
+@dirrmtry %%TWIKI%%/lib
@dirrm %%TWIKI%%/data/_empty
@dirrm %%TWIKI%%/data/_default
@dirrm %%TWIKI%%/data/Trash
@@ -2272,4 +2272,4 @@
@dirrm %%TWIKI%%/data
@dirrm %%TWIKI%%/bin/logos
@dirrm %%TWIKI%%/bin
-@dirrm %%TWIKI%%
+@dirrmtry %%TWIKI%%