diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2007-03-24 14:04:36 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-03-24 14:04:36 +0000 |
commit | 47649f7033a40f88bdbb902b00bb10fde1c82e2a (patch) | |
tree | c9128f0ea50cfa1c45671f3e7a79326f4cf05185 /shells/wapsh | |
parent | - bsd.efl.mk is now in ports/Mk (diff) |
- WWWDIR is now defined in bsd.ports.mk
PR: ports/105529
Submitted by: laszlof
Notes
Notes:
svn path=/head/; revision=188173
Diffstat (limited to 'shells/wapsh')
-rw-r--r-- | shells/wapsh/Makefile | 15 | ||||
-rw-r--r-- | shells/wapsh/files/pkg-message.in | 14 | ||||
-rw-r--r-- | shells/wapsh/pkg-plist | 36 |
3 files changed, 25 insertions, 40 deletions
diff --git a/shells/wapsh/Makefile b/shells/wapsh/Makefile index aaecfd7fe8f0..bf855c9f4733 100644 --- a/shells/wapsh/Makefile +++ b/shells/wapsh/Makefile @@ -19,10 +19,6 @@ USE_RC_SUBR= htshd.sh WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} -WWWOWN?= www -WWWGRP?= www -WWWDIR?= www/${PORTNAME} -DATADIR= ${PREFIX}/${WWWDIR} SUB_FILES= pkg-message USERGUIDEDOCS= Image10.jpg Image11.jpg Image12.jpg Image13.jpg \ @@ -57,10 +53,9 @@ do-build: pre-install: @${ECHO_MSG} "----------------------------------------------------------------" - @${ECHO_MSG} "Set WWWDIR to the location of your web server's document root," - @${ECHO_MSG} "relative to ${PREFIX}" + @${ECHO_MSG} "Set WWWDIR to the location of your web server's document root" @${ECHO_MSG} "" - @${ECHO_MSG} "${PORTNAME} will be installed under ${PREFIX}/\$$WWWDIR/" + @${ECHO_MSG} "${PORTNAME} will be installed under \$$WWWDIR/" @${ECHO_MSG} "" @${ECHO_MSG} "The current value of WWWDIR is: ${WWWDIR}" @${ECHO_MSG} "" @@ -80,11 +75,11 @@ do-install: fi .endfor - ${MKDIR} ${DATADIR} + ${MKDIR} ${WWWDIR} .for H in ${HTDOCS} - ${INSTALL_DATA} ${WRKSRC}/htdocs/$H ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/htdocs/$H ${WWWDIR} .endfor - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DATADIR} + ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR}/admin_guide diff --git a/shells/wapsh/files/pkg-message.in b/shells/wapsh/files/pkg-message.in index 13148eb610ae..34083969a931 100644 --- a/shells/wapsh/files/pkg-message.in +++ b/shells/wapsh/files/pkg-message.in @@ -3,21 +3,11 @@ wapsh/htsh is now installed. Sample configuration files can be found in %%PREFIX%%/etc/wapsh -PHP scripts for both HTTP and WAP access have been installed in -%%DATADIR%% - -Please read the installed documentation for information on how to create -the configuration files. ------------------------------------------------------------------------- - -wapsh/htsh is now installed. - -Sample configuration files can be found in %%PREFIX%%/etc/wapsh - HTML documentation has been installed in %%PREFIX%%/share/doc/wapsh PHP scripts for both HTTP and WAP access have been installed in -%%PREFIX%%/share/wapsh/htdocs +%%WWWDIR%% Please read the installed documentation for information on how to create the configuration files. +------------------------------------------------------------------------ diff --git a/shells/wapsh/pkg-plist b/shells/wapsh/pkg-plist index b84887bfd56d..bca2225b24d8 100644 --- a/shells/wapsh/pkg-plist +++ b/shells/wapsh/pkg-plist @@ -8,23 +8,23 @@ etc/wapsh/htshd.conf.dist @unexec if cmp -s %D/etc/wapsh/loginhosts %D/etc/wapsh/loginhosts.dist; then rm -f %D/etc/wapsh/loginhosts; fi etc/wapsh/loginhosts.dist @exec [ -f %B/loginhosts ] || cp %B/%f %B/loginhosts -%%DATADIR%%/command.php -%%DATADIR%%/command_html.inc -%%DATADIR%%/command_wml.inc -%%DATADIR%%/common.inc -%%DATADIR%%/common_html.inc -%%DATADIR%%/common_wml.inc -%%DATADIR%%/controls_wml.php -%%DATADIR%%/displayfuncs.inc -%%DATADIR%%/getloginhosts.inc -%%DATADIR%%/history_edit_wml.php -%%DATADIR%%/history_html.php -%%DATADIR%%/history_wml.php -%%DATADIR%%/index.html -%%DATADIR%%/login_html.php -%%DATADIR%%/login_wml.php -%%DATADIR%%/scroll_wml.php -%%DATADIR%%/shortcuts_wml.php +%%WWWDIR%%/command.php +%%WWWDIR%%/command_html.inc +%%WWWDIR%%/command_wml.inc +%%WWWDIR%%/common.inc +%%WWWDIR%%/common_html.inc +%%WWWDIR%%/common_wml.inc +%%WWWDIR%%/controls_wml.php +%%WWWDIR%%/displayfuncs.inc +%%WWWDIR%%/getloginhosts.inc +%%WWWDIR%%/history_edit_wml.php +%%WWWDIR%%/history_html.php +%%WWWDIR%%/history_wml.php +%%WWWDIR%%/index.html +%%WWWDIR%%/login_html.php +%%WWWDIR%%/login_wml.php +%%WWWDIR%%/scroll_wml.php +%%WWWDIR%%/shortcuts_wml.php %%PORTDOCS%%%%DOCSDIR%%/Image1.jpg %%PORTDOCS%%%%DOCSDIR%%/Image2.jpg %%PORTDOCS%%%%DOCSDIR%%/Image3.jpg @@ -94,5 +94,5 @@ etc/wapsh/loginhosts.dist %%PORTDOCS%%@dirrm %%DOCSDIR%%/implementation_notes %%PORTDOCS%%@dirrm %%DOCSDIR%%/user_guide %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%DATADIR%% +@dirrm %%WWWDIR%% @dirrmtry www/data |