svn commit: r437856 - in head/www/thttpd: . files

[Alexey Dokuchaev]

Author: danfe
Date: Thu Apr  6 07:08:10 2017
New Revision: 437856
URL: https://svnweb.freebsd.org/changeset/ports/437856

Log:
  - Fix location of makeweb(1) in post-install message
  - Rename IPREAL -> REAL_IP option while I'm here
  
  PR:	218414

Modified:
  head/www/thttpd/Makefile
  head/www/thttpd/files/pkg-message.in

Modified: head/www/thttpd/Makefile
==============================================================================
--- head/www/thttpd/Makefile	Thu Apr  6 06:43:30 2017	(r437855)
+++ head/www/thttpd/Makefile	Thu Apr  6 07:08:10 2017	(r437856)
@@ -19,11 +19,11 @@ SUB_FILES=	pkg-message thttpd.conf.sampl
 SUB_LIST=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 CPE_VENDOR=	acme
 
-OPTIONS_DEFINE=	SENDFILE IPREAL INDEXES HTACCESS STATS LOG_UNKNOWN FLUSH_LOG
-OPTIONS_DEFAULT=	SENDFILE IPREAL STATS FLUSH_LOG
+OPTIONS_DEFINE=	SENDFILE REAL_IP INDEXES HTACCESS STATS LOG_UNKNOWN FLUSH_LOG
+OPTIONS_DEFAULT=	SENDFILE REAL_IP STATS FLUSH_LOG
 
 SENDFILE_DESC=	Use sendfile(2) to serve files
-IPREAL_DESC=	Respect (pass on) "X-Forwarded-For" header
+REAL_IP_DESC=	Respect (pass on) "X-Forwarded-For" header
 INDEXES_DESC=	Generate index pages for directories
 HTACCESS_DESC=	IP-based authorization (.htaccess) support
 STATS_DESC=	Collect internal stats and print to system log
@@ -31,7 +31,7 @@ LOG_UNKNOWN_DESC=	Log unknown request he
 FLUSH_LOG_DESC=	fflush() the log file after each request
 
 SENDFILE_EXTRA_PATCHES=	${FILESDIR}/extra-patch-config.h
-IPREAL_EXTRA_PATCHES=	${FILESDIR}/extra-patch-ip_real
+REAL_IP_EXTRA_PATCHES=	${FILESDIR}/extra-patch-ip_real
 HTACCESS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-htaccess
 LOG_UNKNOWN_EXTRA_PATCHES=	${FILESDIR}/extra-patch-log_unknown_headers
 

Modified: head/www/thttpd/files/pkg-message.in
==============================================================================
--- head/www/thttpd/files/pkg-message.in	Thu Apr  6 06:43:30 2017	(r437855)
+++ head/www/thttpd/files/pkg-message.in	Thu Apr  6 07:08:10 2017	(r437856)
@@ -3,8 +3,8 @@ If you want users to be able to create t
 subdirectories off of the main web directory, you need to:
 
   1. Add a group for www admins (or use "%%WWWGRP%%")
-  2. chgrp thatgroup %%PREFIX%%/bin/makeweb %%WWWDIR%%
-  3. chmod g+sx %%PREFIX%%/bin/makeweb
+  2. chgrp thatgroup %%PREFIX%%/sbin/makeweb %%WWWDIR%%
+  3. chmod g+sx %%PREFIX%%/sbin/makeweb
   4. Tell users about makeweb(1)
 
 See http://www.acme.com/software/thttpd/notes.html for more