From owner-svn-ports-all@FreeBSD.ORG Wed Oct 30 16:20:59 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 66E4C652; Wed, 30 Oct 2013 16:20:59 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 436032E7C; Wed, 30 Oct 2013 16:20:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9UGKxpj050309; Wed, 30 Oct 2013 16:20:59 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9UGKwTd050305; Wed, 30 Oct 2013 16:20:58 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201310301620.r9UGKwTd050305@svn.freebsd.org> From: Pawel Pekala Date: Wed, 30 Oct 2013 16:20:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332145 - in head/www/bozohttpd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Oct 2013 16:20:59 -0000 Author: pawel Date: Wed Oct 30 16:20:58 2013 New Revision: 332145 URL: http://svnweb.freebsd.org/changeset/ports/332145 Log: - Update to version 20130711 [1] - Add support for STAGEDIR PR: ports/181767 [1] Submitted by: maintainer Modified: head/www/bozohttpd/Makefile head/www/bozohttpd/distinfo (contents, props changed) head/www/bozohttpd/files/patch-Makefile (contents, props changed) head/www/bozohttpd/files/patch-bozohttpd.8 (contents, props changed) Modified: head/www/bozohttpd/Makefile ============================================================================== --- head/www/bozohttpd/Makefile Wed Oct 30 16:09:28 2013 (r332144) +++ head/www/bozohttpd/Makefile Wed Oct 30 16:20:58 2013 (r332145) @@ -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 suppor SSL_DESC= Enable SSL support CGI_DESC= Enable CGI support -NO_STAGE= yes .include .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 Modified: head/www/bozohttpd/distinfo ============================================================================== --- head/www/bozohttpd/distinfo Wed Oct 30 16:09:28 2013 (r332144) +++ head/www/bozohttpd/distinfo Wed Oct 30 16:20:58 2013 (r332145) @@ -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 Modified: head/www/bozohttpd/files/patch-Makefile ============================================================================== --- head/www/bozohttpd/files/patch-Makefile Wed Oct 30 16:09:28 2013 (r332144) +++ head/www/bozohttpd/files/patch-Makefile Wed Oct 30 16:20:58 2013 (r332145) @@ -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 +- +-.if ${MKCRYPTO} != "no" +- +-LDADD+= -lssl -lcrypto +-DPADD+= ${LIBSSL} ${LIBCRYPTO} +- +-.else +- +-COPTS+= -DNO_SSL_SUPPORT +- +-.endif ++#.include ++# ++#.if ${PORT_OPTIONS:MSSL} ++# ++#LDADD+= -lssl -lcrypto ++#DPADD+= ${LIBSSL} ${LIBCRYPTO} ++# ++#.else ++# ++#COPTS+= -DNO_SSL_SUPPORT ++# ++#.endif + + # + # Build release things. Modified: head/www/bozohttpd/files/patch-bozohttpd.8 ============================================================================== --- head/www/bozohttpd/files/patch-bozohttpd.8 Wed Oct 30 16:09:28 2013 (r332144) +++ head/www/bozohttpd/files/patch-bozohttpd.8 Wed Oct 30 16:20:58 2013 (r332145) @@ -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