aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordanfe <danfe@FreeBSD.org>2017-04-06 15:08:10 +0800
committerdanfe <danfe@FreeBSD.org>2017-04-06 15:08:10 +0800
commit8c586b1ed2d26f0b19f6873a1a3789bfb2a803bb (patch)
tree840c6bf60ff6f21d20fb13f83e75325b2c9f329f
parent000c4b5adfe80346dc1c4d208fe72f5c52fa4f22 (diff)
downloadfreebsd-ports-gnome-8c586b1ed2d26f0b19f6873a1a3789bfb2a803bb.tar.gz
freebsd-ports-gnome-8c586b1ed2d26f0b19f6873a1a3789bfb2a803bb.tar.zst
freebsd-ports-gnome-8c586b1ed2d26f0b19f6873a1a3789bfb2a803bb.zip
- Fix location of makeweb(1) in post-install message
- Rename IPREAL -> REAL_IP option while I'm here PR: 218414
-rw-r--r--www/thttpd/Makefile8
-rw-r--r--www/thttpd/files/pkg-message.in4
2 files changed, 6 insertions, 6 deletions
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index 376190dcd1de..026da9b3dd7c 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -19,11 +19,11 @@ SUB_FILES= pkg-message thttpd.conf.sample
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 headers
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
diff --git a/www/thttpd/files/pkg-message.in b/www/thttpd/files/pkg-message.in
index c85d0bf9ac24..d779cb3782ae 100644
--- a/www/thttpd/files/pkg-message.in
+++ b/www/thttpd/files/pkg-message.in
@@ -3,8 +3,8 @@ If you want users to be able to create their own web
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