[Midnightbsd-cvs] mports [16498] U trunk/www/bozohttpd/files: bozohttpd 20130711

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Aug 21 07:33:04 EDT 2014 

Revision: 16498
          http://svnweb.midnightbsd.org/mports/?rev=16498
Author:   laffer1
Date:     2014-08-21 07:33:03 -0400 (Thu, 21 Aug 2014)
Log Message:
-----------
bozohttpd 20130711

Modified Paths:
--------------
    trunk/www/bozohttpd/Makefile
    trunk/www/bozohttpd/distinfo
    trunk/www/bozohttpd/files/bozohttpd.in
    trunk/www/bozohttpd/files/patch-Makefile
    trunk/www/bozohttpd/files/patch-bozohttpd.8

Property Changed:
----------------
    trunk/www/bozohttpd/files/bozohttpd.in
    trunk/www/bozohttpd/files/patch-Makefile
    trunk/www/bozohttpd/files/patch-bozohttpd.8

Modified: trunk/www/bozohttpd/Makefile
===================================================================
--- trunk/www/bozohttpd/Makefile	2014-08-21 11:29:47 UTC (rev 16497)
+++ trunk/www/bozohttpd/Makefile	2014-08-21 11:33:03 UTC (rev 16498)
@@ -1,13 +1,7 @@
-# New ports collection makefile for:    bozohttpd
-# Date created:         21.03.2002
-# Whom:                 Janos.Mohacsi at bsd.hu
-#
 # $MidnightBSD$
-# $FreeBSD: ports/www/bozohttpd/Makefile,v 1.12 2006/07/08 05:16:35 clsung Exp $
-#
 
 PORTNAME=	bozohttpd
-PORTVERSION=	20100920
+PORTVERSION=	20130711
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.eterna.com.au/bozohttpd/ \
 		${MASTER_SITE_NETBSD}
@@ -14,10 +8,10 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	The bozotic HTTP server
+
 LICENSE=	bsd3
 
 FAKE_OPTS=	trueprefix
-USE_BZIP2=	YES
 USE_RC_SUBR=	bozohttpd
 
 #options handling
@@ -25,34 +19,39 @@
 		SSL			"Enable SSL support"		on \
 		CGI			"Enable CGI support"		on
 
-#make happy portlint
-.if defined(WITHOUT_SSL)
-.else
-USE_OPENSSL=	yes
-.endif
+USES=		uidfix tar:bzip2
 
-.include <bsd.port.pre.mk>
+HTPASSWD_DESC=		Enable htpassword support
+SSL_DESC=		Enable SSL support
+CGI_DESC=		Enable CGI support
 
-.if defined(WITH_HTPASSWD_SUPPORT)
-CFLAGS+=	-DDO_HTPASSWD
-MAKE_ARGS+=	'LDFLAGS+= -lcrypt'
+.include <bsd.mport.options.mk>
+
+.if ${PORT_OPTIONS:MHTPASSWD}
+MAKE_ARGS+=	'COPTS+=	-DDO_HTPASSWD' \
+		'LDFLAGS+= -lcrypt'
+.else
+MAKE_ARGS+=	'COPTS+=	-UDO_HTPASSWD'
 .endif
 
-.if defined(WITHOUT_SSL)
-CFLAGS+=	-DNO_SSL_SUPPORT
+.if ${PORT_OPTIONS:MSSL}
+USE_OPENSSL=	yes
+MAKE_ARGS+=	'COPTS+=	-UNO_SSL_SUPPORT'
 .else
-#USE_OPENSSL=	yes
-CFLAGS+=	-UNO_SSL_SUPPORT
+MAKE_ARGS+=	'COPTS+=	-DNO_SSL_SUPPORT' \
+		'CRYPTOLIBS=' \
+		'CRYPTODEPS='
 .endif
 
-.if defined(WITHOUT_CGI)
-CFLAGS+=	-DNO_CGIBIN_SUPPORT
+.if ${PORT_OPTIONS:MCGI}
+MAKE_ARGS+=	'COPTS+=	-UNO_CGIBIN_SUPPORT'
 .else
-CFLAGS+=	-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
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/www/bozohttpd/distinfo
===================================================================
--- trunk/www/bozohttpd/distinfo	2014-08-21 11:29:47 UTC (rev 16497)
+++ trunk/www/bozohttpd/distinfo	2014-08-21 11:33:03 UTC (rev 16498)
@@ -1,3 +1,2 @@
-SHA256 (bozohttpd-20100920.tar.bz2) = 9bdac5c171d1cd703ecd98dcd55d6571b4eece3b50c3dc8a399358ff3908fe13
-RMD160 (bozohttpd-20100920.tar.bz2) = b6f36a6e0f5bfacb8591e5193beac0e0611a8488
-SIZE (bozohttpd-20100920.tar.bz2) = 46550
+SHA256 (bozohttpd-20130711.tar.bz2) = b9682e37ae2c4a1b7309225e95787df8c037239fe1d8c9dd8faede35921e910b
+SIZE (bozohttpd-20130711.tar.bz2) = 48974

Modified: trunk/www/bozohttpd/files/bozohttpd.in
===================================================================
--- trunk/www/bozohttpd/files/bozohttpd.in	2014-08-21 11:29:47 UTC (rev 16497)
+++ trunk/www/bozohttpd/files/bozohttpd.in	2014-08-21 11:33:03 UTC (rev 16498)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/www/bozohttpd/files/bozohttpd.in,v 1.2 2010/03/27 00:15:10 dougb Exp $
+# $FreeBSD: head/www/bozohttpd/files/bozohttpd.in 340872 2014-01-24 00:14:07Z mat $
 #
 # PROVIDE: bozohttpd
 # REQUIRE: DAEMON
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name="bozohttpd"
-rcvar=`set_rcvar`
+rcvar=bozohttpd_enable
 
 load_rc_config $name
 


Property changes on: trunk/www/bozohttpd/files/bozohttpd.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/www/bozohttpd/files/patch-Makefile
===================================================================
--- trunk/www/bozohttpd/files/patch-Makefile	2014-08-21 11:29:47 UTC (rev 16497)
+++ trunk/www/bozohttpd/files/patch-Makefile	2014-08-21 11:33:03 UTC (rev 16498)
@@ -1,11 +1,26 @@
 
-$FreeBSD: ports/www/bozohttpd/files/patch-Makefile,v 1.3 2010/05/30 17:47:14 arved Exp $
+$FreeBSD: head/www/bozohttpd/files/patch-Makefile 332145 2013-10-30 16:20:58Z pawel $
 
 --- 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
 + 
@@ -12,5 +27,30 @@
 +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.


Property changes on: trunk/www/bozohttpd/files/patch-Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/www/bozohttpd/files/patch-bozohttpd.8
===================================================================
--- trunk/www/bozohttpd/files/patch-bozohttpd.8	2014-08-21 11:29:47 UTC (rev 16497)
+++ trunk/www/bozohttpd/files/patch-bozohttpd.8	2014-08-21 11:33:03 UTC (rev 16498)
@@ -1,25 +1,25 @@
 
-$FreeBSD: ports/www/bozohttpd/files/patch-bozohttpd.8,v 1.3 2011/02/16 02:28:36 wen Exp $
+$FreeBSD: head/www/bozohttpd/files/patch-bozohttpd.8 332145 2013-10-30 16:20:58Z pawel $
 
 --- 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


Property changes on: trunk/www/bozohttpd/files/patch-bozohttpd.8
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property

More information about the Midnightbsd-cvs mailing list