aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorjohans <johans@FreeBSD.org>2009-02-13 16:45:44 +0800
committerjohans <johans@FreeBSD.org>2009-02-13 16:45:44 +0800
commit661fa1421e613bc6a3abb3e3e506136ab22d7914 (patch)
tree79a88b302e62b4dd3d7b47eca27463c6d3b1e7f1 /www
parent606d653b4b74aa4110c8b072b5a8e62d51af3245 (diff)
downloadfreebsd-ports-gnome-661fa1421e613bc6a3abb3e3e506136ab22d7914.tar.gz
freebsd-ports-gnome-661fa1421e613bc6a3abb3e3e506136ab22d7914.tar.zst
freebsd-ports-gnome-661fa1421e613bc6a3abb3e3e506136ab22d7914.zip
- Update to 3.7 beta 8
- Remove pcre option: this is now a standard dependency
Diffstat (limited to 'www')
-rw-r--r--www/xshttpd-devel/Makefile17
-rw-r--r--www/xshttpd-devel/distinfo6
2 files changed, 8 insertions, 15 deletions
diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile
index 72416024b026..0c0ebdde1657 100644
--- a/www/xshttpd-devel/Makefile
+++ b/www/xshttpd-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xshttpd
-DISTVERSION= 3.7b05
+DISTVERSION= 3.7b08
CATEGORIES= www ipv6
MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ \
ftp://mud.stack.nl/pub/xs-httpd/release/
@@ -18,6 +18,7 @@ COMMENT= A webserver with CGI as own user and SSL suport
RUN_DEPENDS= run-mailcap:${PORTSDIR}/misc/mime-support \
ppmtogif:${PORTSDIR}/graphics/netpbm
+LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
CONFLICTS+= xshttpd-[0-9]*
@@ -31,8 +32,7 @@ USE_RC_SUBR= xshttpd.sh
GNU_CONFIGURE= yes
-OPTIONS= PCRE "Enable pcre rewriting support" On \
- LDAP "Enable ldap support" Off \
+OPTIONS= LDAP "Enable ldap support" Off \
CURL "Enable curl (proxy) support" Off \
M4_CONFIG "Enable m4 configuration preprocessor" Off \
PERSISTENT_PERL "Enable persistent perl interpreter" Off
@@ -42,7 +42,6 @@ PORTDOCS= README COPYING ChangeLog
.include <bsd.port.pre.mk>
# By default XS-HTTPD stores its data in ${PREFIX}/lib/httpd
WWWDIR?= ${PREFIX}/www/${PORTNAME}
-CONFIGURE_ARGS+=--with-rootdir=${WWWDIR} --with-ssl --with-pcre
.if defined(WITH_LDAP)
USE_OPENLDAP= yes
@@ -68,13 +67,6 @@ CONFIGURE_ARGS+=--without-perl
PLIST_SUB+= PERL="@comment "
.endif
-.if defined(WITH_PCRE)
-LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
-CONFIGURE_ARGS+=--with-pcre=yes
-.else
-CONFIGURE_ARGS+=--with-pcre=no
-.endif
-
.if defined(WITH_CURL)
LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+=--with-curl
@@ -83,11 +75,12 @@ CONFIGURE_ARGS+=--without-curl
.endif
post-patch:
-.for i in man/httpd.1.in man/httpd.conf.5 config/httpd.conf.sample \
+.for i in man/httpd.1.in man/httpd.conf.5 config/httpd.conf.sample dirs.conf\
contrib/SSL-Makefile contrib/logrotate.sh
@${REINPLACE_CMD} \
-e 's|/wwwsys|${WWWDIR}|g' \
-e 's|/usr/local/lib/httpd|${WWWDIR}|g' \
+ -e 's|.(prefix)/lib/httpd|${WWWDIR}|g' \
-e 's|nobody|${WWWOWN}|g' \
-e 's|nogroup|${WWWGRP}|g' \
${WRKSRC}/$i
diff --git a/www/xshttpd-devel/distinfo b/www/xshttpd-devel/distinfo
index ec8b54e97fa1..eaf32840438d 100644
--- a/www/xshttpd-devel/distinfo
+++ b/www/xshttpd-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (xshttpd-37b05.tar.bz2) = aee34245f6890a61ef6720621122a851
-SHA256 (xshttpd-37b05.tar.bz2) = 37c6e0437f20b5497fd7f84246ced40e5b0b23193818ebc04b615fc6db2ecf75
-SIZE (xshttpd-37b05.tar.bz2) = 265275
+MD5 (xshttpd-37b08.tar.bz2) = 668e15fa0d11f398a513f3d56bc2cfd9
+SHA256 (xshttpd-37b08.tar.bz2) = 7117159ca0cd3e924b042c3472b14bc6315785930fadcec3f3e9c797ce7910a3
+SIZE (xshttpd-37b08.tar.bz2) = 265457