Date: Tue, 20 Sep 2005 20:40:13 GMT From: johans@stack.nl (Johan van Selst) To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/86376: [maintainer] www/xshttpd: update to version 33b27 Message-ID: <200509202040.j8KKeD6A091850@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/86376; it has been noted by GNATS. From: johans@stack.nl (Johan van Selst) To: bug-followup@FreeBSD.org,johans@stack.nl Cc: Subject: Re: ports/86376: [maintainer] www/xshttpd: update to version 33b27 Date: Tue, 20 Sep 2005 22:31:55 +0200 (CEST) Improved version, thanks to pav. Removed GPG crap and move checking of WITH_* to after <bsd.port.pre.mk> (patch against current port) diff -uNr xshttpd/Makefile xshttpd/Makefile --- xshttpd/Makefile Fri Sep 16 01:04:31 2005 +++ xshttpd/Makefile Tue Sep 20 22:29:05 2005 @@ -6,9 +6,10 @@ # PORTNAME= xshttpd -DISTVERSION= 3.3b26 +DISTVERSION= 3.3b27 CATEGORIES= www -MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ +MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ \ + ftp://mud.stack.nl/pub/xs-httpd/release/ DISTNAME= ${PORTNAME}-${DISTVERSION:S/.//} MAINTAINER= johans@stack.nl @@ -23,10 +24,19 @@ MAN5= httpd.conf.5 xsauth.5 xsscripts.5 USE_RC_SUBR= xshttpd.sh +USE_REINPLACE= yes + +OPTIONS= SSL "Enable https support" On \ + LDAP "Enable ldap support" Off \ + PCRE "Enable pcre rewriting support" Off \ + PERSISTENT_PERL "Enable persistent perl interpreter" Off + # By default XS-HTTPD stores its data in ${PREFIX}/lib/httpd DATADIR= ${PREFIX}/www CONFIGURE_ARGS+=--with-rootdir=${DATADIR} +.include <bsd.port.pre.mk> + .if !defined(WITHOUT_SSL) USE_OPENSSL= yes CONFIGURE_ARGS+=--with-ssl @@ -56,13 +66,14 @@ .endif post-patch: -.for i in "man/httpd.1" "man/httpd.conf.5" "config/httpd.conf.sample" \ - "contrib/SSL-Makefile" "contrib/logrotate.sh" - @${SED} \ +.for i in man/httpd.1 man/httpd.conf.5 config/httpd.conf.sample \ + contrib/SSL-Makefile contrib/logrotate.sh + @${REINPLACE_CMD} \ -e 's|/wwwsys|${DATADIR}|g' \ -e 's|/usr/local/lib/httpd|${DATADIR}|g' \ - ${WRKSRC}/$i > ${WRKSRC}/$i.tmp - @${MV} ${WRKSRC}/$i.tmp ${WRKSRC}/$i + -e 's|nobody|${WWWOWN}|g' \ + -e 's|nogroup|${WWWGRP}|g' \ + ${WRKSRC}/$i .endfor -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -uNr xshttpd/distinfo xshttpd/distinfo --- xshttpd/distinfo Fri Sep 16 01:04:31 2005 +++ xshttpd/distinfo Tue Sep 20 18:51:13 2005 @@ -1,2 +1,4 @@ -MD5 (xshttpd-33b26.tar.gz) = 704ed6e2be411c01207821ee94b84070 -SIZE (xshttpd-33b26.tar.gz) = 206980 +MD5 (xshttpd-33b27.tar.gz) = 74289c1caf0dbe41b8b57283848e259c +SIZE (xshttpd-33b27.tar.gz) = 208254 +MD5 (xshttpd-33b27.tar.gz.asc) = 5539722cca5002a1fc698d5d0a40fea1 +SIZE (xshttpd-33b27.tar.gz.asc) = 183 diff -uNr xshttpd/pkg-descr xshttpd/pkg-descr --- xshttpd/pkg-descr Fri Sep 16 01:04:31 2005 +++ xshttpd/pkg-descr Tue Sep 20 11:02:00 2005 @@ -20,4 +20,4 @@ - Serves SSL (https) and http connections through the same daemon - Full support for IPv6 -WWW: http://www.stack.nl/~johans/xs-httpd/ +WWW: http://www.stack.nl/xs-httpd/ diff -uNr xshttpd/pkg-plist xshttpd/pkg-plist --- xshttpd/pkg-plist Fri Sep 16 01:04:31 2005 +++ xshttpd/pkg-plist Tue Sep 20 18:28:42 2005 @@ -12,6 +12,7 @@ %%DATADIR%%/contrib/logrotate.sh %%DATADIR%%/contrib/persistent.pl %%DATADIR%%/contrib/wwwstats.pl +%%DATADIR%%/contrib/agentstats.pl %%DATADIR%%/compress.methods.sample %%DATADIR%%/gfxcount/digital0.ppm %%DATADIR%%/gfxcount/digital1.ppm @@ -62,9 +63,9 @@ %%DATADIR%%/mime.index %%DATADIR%%/mime.types %%DATADIR%%/script.methods.sample -@unexec rmdir %%DATADIR%%/cgi-bin 2> /dev/null || true -@unexec rmdir %%DATADIR%%/htdocs 2> /dev/null || true -@unexec rmdir %%DATADIR%%/logs 2> /dev/null || true +@dirrm %%DATADIR%%/cgi-bin +@dirrm %%DATADIR%%/htdocs +@dirrm %%DATADIR%%/logs @dirrm %%DATADIR%%/contrib @dirrm %%DATADIR%%/gfxcount @dirrm %%DATADIR%%/icons
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509202040.j8KKeD6A091850>