[pkgsrc/trunk]: pkgsrc/www/bozohttpd bozohttpd: define LICENSE, add lua and s...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9356255060ff
branches:  trunk
changeset: 454130:9356255060ff
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Jun 06 13:38:43 2021 +0000

description:
bozohttpd: define LICENSE, add lua and ssl options, honor CFLAGS

diffstat:

 www/bozohttpd/Makefile   |  18 +++++++++++++-----
 www/bozohttpd/options.mk |  23 +++++++++++++++++------
 2 files changed, 30 insertions(+), 11 deletions(-)

diffs (82 lines):

diff -r 834f35df0f55 -r 9356255060ff www/bozohttpd/Makefile
--- a/www/bozohttpd/Makefile    Sun Jun 06 13:37:13 2021 +0000
+++ b/www/bozohttpd/Makefile    Sun Jun 06 13:38:43 2021 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.96 2021/03/03 10:09:13 mrg Exp $
+# $NetBSD: Makefile,v 1.97 2021/06/06 13:38:43 nia Exp $
 #
 
 DISTNAME=      bozohttpd-20210227
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=  .tar.bz2
@@ -9,13 +10,21 @@
 MAINTAINER=    mrg%eterna.com.au@localhost
 HOMEPAGE=      http://www.eterna.com.au/bozohttpd/
 COMMENT=       Bozotic HTTP server; small and secure
+LICENSE=       2-clause-bsd
+
+BOZO_CFLAGS+=          -DNO_BLOCKLIST_SUPPORT
+BOZO_CFLAGS+=          -D_GNU_SOURCE -D_DEFAULT_SOURCE
 
 .include "options.mk"
 
-# This package is IP family agnostic.
-BUILD_DEFS+=           IPV6_READY
+MAKE_FILE=             Makefile.boot
 
-MAKE_FILE=             Makefile.boot
+# Honor pkgsrc's optimization settings, necessary when
+# combined with FORTIFY_SOURCE on e.g. Linux.
+MAKE_FLAGS+=           OPT=${CFLAGS:Q}
+
+# Apply our settings.
+MAKE_FLAGS+=           LOCAL_CFLAGS=${BOZO_CFLAGS:Q}
 
 SUBST_CLASSES+=                paths
 SUBST_MESSAGE.paths=   Fixing paths in manual page.
@@ -32,5 +41,4 @@
        ${INSTALL_MAN} ${WRKSRC}/bozohttpd.8 \
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 834f35df0f55 -r 9356255060ff www/bozohttpd/options.mk
--- a/www/bozohttpd/options.mk  Sun Jun 06 13:37:13 2021 +0000
+++ b/www/bozohttpd/options.mk  Sun Jun 06 13:38:43 2021 +0000
@@ -1,17 +1,28 @@
-# $NetBSD: options.mk,v 1.3 2014/01/02 09:02:22 mrg Exp $
+# $NetBSD: options.mk,v 1.4 2021/06/06 13:38:43 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.bozohttpd
-PKG_SUPPORTED_OPTIONS= bozohttpd-do-htpasswd
+PKG_SUPPORTED_OPTIONS= lua ssl
+PKG_SUGGESTED_OPTIONS= lua ssl
 
 .include "../../mk/bsd.options.mk"
 
 ###
-### Support Apache's .htpasswd files.
+### Support for Lua
 ###
-.if !empty(PKG_OPTIONS:Mbozohttpd-do-htpasswd)
-CPPFLAGS+=     -DDO_HTPASSWD
+.if !empty(PKG_OPTIONS:Mlua)
+.  include "../../lang/lua/buildlink3.mk"
+MAKE_FLAGS+=   EXTRALIBS="-llua"
+.else
+BOZO_CFLAGS+=  -DNO_LUA_SUPPORT
 .endif
 
 ###
-### Support for lua -- missing
+### Support for SSL
 ###
+.if !empty(PKG_OPTIONS:Mssl)
+CPPFLAGS+=     -DDO_HTPASSWD
+.  include "../../security/openssl/buildlink3.mk"
+.else
+BOZO_CFLAGS+=  -DNO_SSL_SUPPORT
+MAKE_FLAGS+=   CRYPTOLIBS=""
+.endif