diff options
| -rw-r--r-- | www/bozohttpd/Makefile | 9 | ||||
| -rw-r--r-- | www/bozohttpd/distinfo | 4 | ||||
| -rw-r--r-- | www/bozohttpd/files/patch-Makefile | 46 | ||||
| -rw-r--r-- | www/bozohttpd/files/patch-bozohttpd.8 | 16 |
4 files changed, 56 insertions, 19 deletions
diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile index 48d41a798c7f..69d032c038a7 100644 --- a/www/bozohttpd/Makefile +++ b/www/bozohttpd/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bozohttpd -PORTVERSION= 20100920 +PORTVERSION= 20130711 CATEGORIES= www ipv6 MASTER_SITES= http://www.eterna.com.au/bozohttpd/ \ ${MASTER_SITE_NETBSD} @@ -23,7 +23,6 @@ HTPASSWD_DESC= Enable htpassword support SSL_DESC= Enable SSL support CGI_DESC= Enable CGI support -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MHTPASSWD} @@ -48,10 +47,8 @@ MAKE_ARGS+= 'COPTS+= -UNO_CGIBIN_SUPPORT' MAKE_ARGS+= 'COPTS+= -DNO_CGIBIN_SUPPORT' .endif -MAN8= bozohttpd.8 -MANCOMPRESSED= maybe -PLIST_FILES= libexec/bozohttpd - +PLIST_FILES= libexec/bozohttpd \ + man/man8/bozohttpd.8.gz post-patch: @${REINPLACE_CMD} -e 's|@@PREFIX@@|${PREFIX}|g' ${WRKSRC}/bozohttpd.8 diff --git a/www/bozohttpd/distinfo b/www/bozohttpd/distinfo index 337a664f63a9..7769544be426 100644 --- a/www/bozohttpd/distinfo +++ b/www/bozohttpd/distinfo @@ -1,2 +1,2 @@ -SHA256 (bozohttpd-20100920.tar.bz2) = 9bdac5c171d1cd703ecd98dcd55d6571b4eece3b50c3dc8a399358ff3908fe13 -SIZE (bozohttpd-20100920.tar.bz2) = 46550 +SHA256 (bozohttpd-20130711.tar.bz2) = b9682e37ae2c4a1b7309225e95787df8c037239fe1d8c9dd8faede35921e910b +SIZE (bozohttpd-20130711.tar.bz2) = 48974 diff --git a/www/bozohttpd/files/patch-Makefile b/www/bozohttpd/files/patch-Makefile index 1f78a0ee7fee..c4ff99269d1a 100644 --- a/www/bozohttpd/files/patch-Makefile +++ b/www/bozohttpd/files/patch-Makefile @@ -3,14 +3,54 @@ $FreeBSD$ --- Makefile.orig +++ Makefile -@@ -23,6 +23,10 @@ +@@ -19,30 +19,34 @@ + # % make COPTS="-DDO_HTPASSWD" + + COPTS+= -DDO_HTPASSWD +-PROG= httpd +-MAN= httpd.8 +-BUILDSYMLINKS+=bozohttpd.8 httpd.8 ++PROG= bozohttpd ++MAN= bozohttpd.8 ++#BUILDSYMLINKS+=bozohttpd.8 + SRCS= bozohttpd.c ssl-bozo.c auth-bozo.c cgi-bozo.c daemon-bozo.c \ + tilde-luzah-bozo.c dir-index-bozo.c content-bozo.c SRCS+= main.c +-LDADD= -lcrypt ++LDADD= -lcrypt -lcrypto -lssl + DPADD= ${LIBCRYPT} + WARNS?= 4 +NO_WERROR=1 + +BINDIR=$(PREFIX)/libexec +MANDIR=$(PREFIX)/man/man - check: - cd $(.CURDIR)/testsuite && $(MAKE) check +-.include <bsd.own.mk> +- +-.if ${MKCRYPTO} != "no" +- +-LDADD+= -lssl -lcrypto +-DPADD+= ${LIBSSL} ${LIBCRYPTO} +- +-.else +- +-COPTS+= -DNO_SSL_SUPPORT +- +-.endif ++#.include <bsd.own.mk> ++# ++#.if ${PORT_OPTIONS:MSSL} ++# ++#LDADD+= -lssl -lcrypto ++#DPADD+= ${LIBSSL} ${LIBCRYPTO} ++# ++#.else ++# ++#COPTS+= -DNO_SSL_SUPPORT ++# ++#.endif + + # + # Build release things. diff --git a/www/bozohttpd/files/patch-bozohttpd.8 b/www/bozohttpd/files/patch-bozohttpd.8 index f6219eae55c0..8f99d88410c6 100644 --- a/www/bozohttpd/files/patch-bozohttpd.8 +++ b/www/bozohttpd/files/patch-bozohttpd.8 @@ -3,23 +3,23 @@ $FreeBSD$ --- bozohttpd.8.orig +++ bozohttpd.8 -@@ -284,8 +284,8 @@ +@@ -316,8 +316,8 @@ .Xr inetd.conf 5 entry would be: .Bd -literal --http stream tcp nowait:600 httpd /usr/pkg/libexec/bozohttpd bozohttpd /var/www --http stream tcp6 nowait:600 httpd /usr/pkg/libexec/bozohttpd bozohttpd /var/www -+http stream tcp nowait:600 httpd @@PREFIX@@/libexec/bozohttpd bozohttpd /var/www -+http stream tcp6 nowait:600 httpd @@PREFIX@@/libexec/bozohttpd bozohttpd /var/www +-http stream tcp nowait:600 _httpd /usr/libexec/httpd httpd /var/www +-http stream tcp6 nowait:600 _httpd /usr/libexec/httpd httpd /var/www ++http stream tcp nowait:600 _httpd @@PREFIX@@/libexec/httpd httpd /var/www ++http stream tcp6 nowait:600 _httpd @@PREFIX@@/libexec/httpd httpd /var/www .Ed .Pp This would serve web pages from -@@ -308,7 +308,7 @@ +@@ -447,7 +447,7 @@ .Xr inetd.conf 5 entry like: .Bd -literal --http stream tcp nowait:600 httpd /usr/pkg/libexec/bozohttpd bozohttpd -v /var/vroot /var/www -+http stream tcp nowait:600 httpd @@PREFIX@@/libexec/bozohttpd bozohttpd -v /var/vroot /var/www +-http stream tcp nowait:600 _httpd /usr/libexec/httpd httpd -v /var/vroot /var/www ++http stream tcp nowait:600 _httpd @@PREFIX@@/libexec/httpd httpd -v /var/vroot /var/www .Ed .Pp and inside |