Sun Jun 6 13:38:43 2021 UTC ()
bozohttpd: define LICENSE, add lua and ssl options, honor CFLAGS


(nia)
diff -r1.96 -r1.97 pkgsrc/www/bozohttpd/Makefile
diff -r1.3 -r1.4 pkgsrc/www/bozohttpd/options.mk
cvs diff -r1.96 -r1.97 pkgsrc/www/bozohttpd/Makefile (expand / switch to unified diff)

--- pkgsrc/www/bozohttpd/Makefile 2021/03/03 10:09:13 1.96
+++ pkgsrc/www/bozohttpd/Makefile 2021/06/06 13:38:43 1.97
@@ -1,36 +1,44 @@ @@ -1,36 +1,44 @@
1# $NetBSD: Makefile,v 1.96 2021/03/03 10:09:13 mrg Exp $ 1# $NetBSD: Makefile,v 1.97 2021/06/06 13:38:43 nia Exp $
2# 2#
3 3
4DISTNAME= bozohttpd-20210227 4DISTNAME= bozohttpd-20210227
 5PKGREVISION= 1
5CATEGORIES= www 6CATEGORIES= www
6MASTER_SITES= ${MASTER_SITE_LOCAL} 7MASTER_SITES= ${MASTER_SITE_LOCAL}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= mrg@eterna.com.au 10MAINTAINER= mrg@eterna.com.au
10HOMEPAGE= http://www.eterna.com.au/bozohttpd/ 11HOMEPAGE= http://www.eterna.com.au/bozohttpd/
11COMMENT= Bozotic HTTP server; small and secure 12COMMENT= Bozotic HTTP server; small and secure
 13LICENSE= 2-clause-bsd
12 14
13.include "options.mk" 15BOZO_CFLAGS+= -DNO_BLOCKLIST_SUPPORT
 16BOZO_CFLAGS+= -D_GNU_SOURCE -D_DEFAULT_SOURCE
14 17
15# This package is IP family agnostic. 18.include "options.mk"
16BUILD_DEFS+= IPV6_READY 
17 19
18MAKE_FILE= Makefile.boot 20MAKE_FILE= Makefile.boot
19 21
 22# Honor pkgsrc's optimization settings, necessary when
 23# combined with FORTIFY_SOURCE on e.g. Linux.
 24MAKE_FLAGS+= OPT=${CFLAGS:Q}
 25
 26# Apply our settings.
 27MAKE_FLAGS+= LOCAL_CFLAGS=${BOZO_CFLAGS:Q}
 28
20SUBST_CLASSES+= paths 29SUBST_CLASSES+= paths
21SUBST_MESSAGE.paths= Fixing paths in manual page. 30SUBST_MESSAGE.paths= Fixing paths in manual page.
22SUBST_STAGE.paths= pre-build 31SUBST_STAGE.paths= pre-build
23SUBST_FILES.paths= bozohttpd.8 32SUBST_FILES.paths= bozohttpd.8
24SUBST_SED.paths= -e "s|/usr/pkg/|"${PREFIX:Q}"/|g" 33SUBST_SED.paths= -e "s|/usr/pkg/|"${PREFIX:Q}"/|g"
25 34
26INSTALLATION_DIRS= libexec ${PKGMANDIR}/man8 35INSTALLATION_DIRS= libexec ${PKGMANDIR}/man8
27 36
28LDFLAGS.SunOS+= -lsocket -lnsl 37LDFLAGS.SunOS+= -lsocket -lnsl
29 38
30do-install: 39do-install:
31 ${INSTALL_PROGRAM} ${WRKSRC}/bozohttpd ${DESTDIR}${PREFIX}/libexec 40 ${INSTALL_PROGRAM} ${WRKSRC}/bozohttpd ${DESTDIR}${PREFIX}/libexec
32 ${INSTALL_MAN} ${WRKSRC}/bozohttpd.8 \ 41 ${INSTALL_MAN} ${WRKSRC}/bozohttpd.8 \
33 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 42 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
34 43
35.include "../../security/openssl/buildlink3.mk" 
36.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/www/bozohttpd/options.mk (expand / switch to unified diff)

--- pkgsrc/www/bozohttpd/options.mk 2014/01/02 09:02:22 1.3
+++ pkgsrc/www/bozohttpd/options.mk 2021/06/06 13:38:43 1.4
@@ -1,17 +1,28 @@ @@ -1,17 +1,28 @@
1# $NetBSD: options.mk,v 1.3 2014/01/02 09:02:22 mrg Exp $ 1# $NetBSD: options.mk,v 1.4 2021/06/06 13:38:43 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.bozohttpd 3PKG_OPTIONS_VAR= PKG_OPTIONS.bozohttpd
4PKG_SUPPORTED_OPTIONS= bozohttpd-do-htpasswd 4PKG_SUPPORTED_OPTIONS= lua ssl
 5PKG_SUGGESTED_OPTIONS= lua ssl
5 6
6.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
7 8
8### 9###
9### Support Apache's .htpasswd files. 10### Support for Lua
10### 11###
11.if !empty(PKG_OPTIONS:Mbozohttpd-do-htpasswd) 12.if !empty(PKG_OPTIONS:Mlua)
12CPPFLAGS+= -DDO_HTPASSWD 13. include "../../lang/lua/buildlink3.mk"
 14MAKE_FLAGS+= EXTRALIBS="-llua"
 15.else
 16BOZO_CFLAGS+= -DNO_LUA_SUPPORT
13.endif 17.endif
14 18
15### 19###
16### Support for lua -- missing 20### Support for SSL
17### 21###
 22.if !empty(PKG_OPTIONS:Mssl)
 23CPPFLAGS+= -DDO_HTPASSWD
 24. include "../../security/openssl/buildlink3.mk"
 25.else
 26BOZO_CFLAGS+= -DNO_SSL_SUPPORT
 27MAKE_FLAGS+= CRYPTOLIBS=""
 28.endif