diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile index 9a99f4581e3..52cd1dbd324 100644 --- a/www/bozohttpd/Makefile +++ b/www/bozohttpd/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.15 2013/11/01 07:18:11 benoit Exp $ +# $OpenBSD: Makefile,v 1.16 2014/04/06 15:48:24 benoit Exp $ COMMENT = bozotic HTTP server -DISTNAME = bozohttpd-20130711 +DISTNAME = bozohttpd-20140201 CATEGORIES = www HOMEPAGE = http://www.eterna.com.au/bozohttpd/ @@ -12,14 +12,14 @@ MAINTAINER = Benoit Lecocq # BSD PERMIT_PACKAGE_CDROM = Yes -WANTLIB = c crypto ssl +WANTLIB = c crypto ssl MASTER_SITES = ${HOMEPAGE} - EXTRACT_SUFX = .tar.bz2 FAKE_FLAGS = BINDIR=${PREFIX}/libexec MANDIR=${PREFIX}/man/man -TEST_TARGET = check +do-test: + cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} ${MAKE_FLAGS} check .include diff --git a/www/bozohttpd/distinfo b/www/bozohttpd/distinfo index 3201b4e46ee..032258b6016 100644 --- a/www/bozohttpd/distinfo +++ b/www/bozohttpd/distinfo @@ -1,2 +1,2 @@ -SHA256 (bozohttpd-20130711.tar.bz2) = uWguN64sShtzCSJelXh9+MA3I5/h2Mndj67eNZIekQs= -SIZE (bozohttpd-20130711.tar.bz2) = 48974 +SHA256 (bozohttpd-20140201.tar.bz2) = rRS549MUQohZzYlkC+etvmzaFlRySNkI2zv31Nw28lk= +SIZE (bozohttpd-20140201.tar.bz2) = 51821 diff --git a/www/bozohttpd/patches/patch-Makefile b/www/bozohttpd/patches/patch-Makefile index 6cc77e613b7..a88d9613f77 100644 --- a/www/bozohttpd/patches/patch-Makefile +++ b/www/bozohttpd/patches/patch-Makefile @@ -1,23 +1,25 @@ -$OpenBSD: patch-Makefile,v 1.3 2013/11/01 07:18:11 benoit Exp $ ---- Makefile.orig Thu Jul 11 10:52:21 2013 -+++ Makefile Fri Nov 1 08:02:21 2013 -@@ -19,30 +19,30 @@ +$OpenBSD: patch-Makefile,v 1.4 2014/04/06 15:48:25 benoit Exp $ +--- Makefile.orig Thu Jan 2 09:24:28 2014 ++++ Makefile Sun Apr 6 17:29:51 2014 +@@ -19,31 +19,31 @@ + # for setting CFLAGS relevant to your make, eg # % make COPTS="-DDO_HTPASSWD" - COPTS+= -DDO_HTPASSWD +-COPTS+= -DDO_HTPASSWD -PROG= httpd -MAN= httpd.8 ++COPTS+= -DDO_HTPASSWD -DNO_LUA_SUPPORT +PROG= bozohttpd +MAN= bozohttpd.8 BUILDSYMLINKS+=bozohttpd.8 httpd.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 + tilde-luzah-bozo.c dir-index-bozo.c content-bozo.c lua-bozo.c SRCS+= main.c --LDADD= -lcrypt --DPADD= ${LIBCRYPT} -+#LDADD= -lcrypt -+#DPADD= ${LIBCRYPT} +-LDADD= -lcrypt -llua -lm +-DPADD= ${LIBCRYPT} ${LIBLUA} ${LIBM} ++LDADD= -lm ++DPADD= ${LIBM} WARNS?= 4