Sun Dec 5 18:17:24 2021 UTC ()
Reorder CONFIGURE_ARGS from previous. NFCI.


(schmonz)
diff -r1.106 -r1.107 pkgsrc/www/lighttpd/Makefile
cvs diff -r1.106 -r1.107 pkgsrc/www/lighttpd/Makefile (switch to unified diff)

--- pkgsrc/www/lighttpd/Makefile 2021/12/05 18:15:19 1.106
+++ pkgsrc/www/lighttpd/Makefile 2021/12/05 18:17:24 1.107
@@ -1,85 +1,85 @@ @@ -1,85 +1,85 @@
1# $NetBSD: Makefile,v 1.106 2021/12/05 18:15:19 schmonz Exp $ 1# $NetBSD: Makefile,v 1.107 2021/12/05 18:17:24 schmonz Exp $
2 2
3DISTNAME= lighttpd-1.4.63 3DISTNAME= lighttpd-1.4.63
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/ 5MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.lighttpd.net/ 9HOMEPAGE= https://www.lighttpd.net/
10COMMENT= Fast, light-footprint HTTP server 10COMMENT= Fast, light-footprint HTTP server
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14SHLIBTOOL_OVERRIDE= # empty 14SHLIBTOOL_OVERRIDE= # empty
15USE_TOOLS+= pkg-config perl:test 15USE_TOOLS+= pkg-config perl:test
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17GNU_CONFIGURE_LIBSUBDIR= ${PKGBASE} 17GNU_CONFIGURE_LIBSUBDIR= ${PKGBASE}
18CONFIGURE_ARGS+= --with-pcre2 18CONFIGURE_ARGS+= --with-pcre2
 19CONFIGURE_ARGS+= --with-xxhash
19# used for digest auth when no SSL library is available 20# used for digest auth when no SSL library is available
20CONFIGURE_ARGS+= --without-nettle 21CONFIGURE_ARGS+= --without-nettle
21CONFIGURE_ARGS+= --with-xxhash 
22TEST_TARGET= check 22TEST_TARGET= check
23 23
24DOCDIR= ${PREFIX}/share/doc/${PKGBASE} 24DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
25EGDIR= ${PREFIX}/share/examples/${PKGBASE} 25EGDIR= ${PREFIX}/share/examples/${PKGBASE}
26PKG_SYSCONFSUBDIR= ${PKGBASE} 26PKG_SYSCONFSUBDIR= ${PKGBASE}
27RCD_SCRIPTS= lighttpd 27RCD_SCRIPTS= lighttpd
28 28
29.include "options.mk" 29.include "options.mk"
30 30
31CNFS_cmd= ${SED} -ne "s,^share/examples/lighttpd/,,p" PLIST 31CNFS_cmd= ${SED} -ne "s,^share/examples/lighttpd/,,p" PLIST
32CNFS= ${CNFS_cmd:sh} 32CNFS= ${CNFS_cmd:sh}
33.for file in ${CNFS} 33.for file in ${CNFS}
34CONF_FILES+= ${EGDIR}/${file:Q} ${PKG_SYSCONFDIR}/${file:Q} 34CONF_FILES+= ${EGDIR}/${file:Q} ${PKG_SYSCONFDIR}/${file:Q}
35.endfor 35.endfor
36 36
37BUILD_DEFS+= VARBASE LIGHTTPD_LOGDIR LIGHTTPD_STATEDIR 37BUILD_DEFS+= VARBASE LIGHTTPD_LOGDIR LIGHTTPD_STATEDIR
38BUILD_DEFS+= LIGHTTPD_CACHEDIR LIGHTTPD_HOMEDIR 38BUILD_DEFS+= LIGHTTPD_CACHEDIR LIGHTTPD_HOMEDIR
39BUILD_DEFS+= LIGHTTPD_USER LIGHTTPD_GROUP 39BUILD_DEFS+= LIGHTTPD_USER LIGHTTPD_GROUP
40 40
41.include "../../mk/bsd.prefs.mk" 41.include "../../mk/bsd.prefs.mk"
42 42
43LIGHTTPD_CACHEDIR?= ${VARBASE}/cache/lighttpd 43LIGHTTPD_CACHEDIR?= ${VARBASE}/cache/lighttpd
44LIGHTTPD_HOMEDIR?= ${VARBASE}/lib/lighttpd 44LIGHTTPD_HOMEDIR?= ${VARBASE}/lib/lighttpd
45LIGHTTPD_LOGDIR?= ${VARBASE}/log/lighttpd 45LIGHTTPD_LOGDIR?= ${VARBASE}/log/lighttpd
46LIGHTTPD_STATEDIR?= ${VARBASE}/run 46LIGHTTPD_STATEDIR?= ${VARBASE}/run
47LIGHTTPD_USER?= lighttpd 47LIGHTTPD_USER?= lighttpd
48LIGHTTPD_GROUP?= lighttpd 48LIGHTTPD_GROUP?= lighttpd
49PKG_GROUPS+= ${LIGHTTPD_GROUP} 49PKG_GROUPS+= ${LIGHTTPD_GROUP}
50PKG_USERS+= ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} 50PKG_USERS+= ${LIGHTTPD_USER}:${LIGHTTPD_GROUP}
51PKG_GROUPS_VARS+= LIGHTTPD_GROUP 51PKG_GROUPS_VARS+= LIGHTTPD_GROUP
52PKG_USERS_VARS+= LIGHTTPD_USER 52PKG_USERS_VARS+= LIGHTTPD_USER
53 53
54INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} ${EGDIR}/conf.d ${EGDIR}/vhosts.d 54INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} ${EGDIR}/conf.d ${EGDIR}/vhosts.d
55OWN_DIRS= ${PKG_SYSCONFDIR}/conf.d 55OWN_DIRS= ${PKG_SYSCONFDIR}/conf.d
56OWN_DIRS+= ${PKG_SYSCONFDIR}/vhosts.d 56OWN_DIRS+= ${PKG_SYSCONFDIR}/vhosts.d
57OWN_DIRS_PERMS= ${LIGHTTPD_LOGDIR} ${LIGHTTPD_USER} ${LIGHTTPD_GROUP} 0755 57OWN_DIRS_PERMS= ${LIGHTTPD_LOGDIR} ${LIGHTTPD_USER} ${LIGHTTPD_GROUP} 0755
58OWN_DIRS+= ${LIGHTTPD_STATEDIR} 58OWN_DIRS+= ${LIGHTTPD_STATEDIR}
59 59
60SUBST_CLASSES+= path 60SUBST_CLASSES+= path
61SUBST_MESSAGE.path= Fixing config file paths 61SUBST_MESSAGE.path= Fixing config file paths
62SUBST_STAGE.path= pre-configure 62SUBST_STAGE.path= pre-configure
63SUBST_FILES.path= doc/config/lighttpd.conf doc/lighttpd.8 63SUBST_FILES.path= doc/config/lighttpd.conf doc/lighttpd.8
64SUBST_VARS.path= LIGHTTPD_LOGDIR LIGHTTPD_STATEDIR LIGHTTPD_USER \ 64SUBST_VARS.path= LIGHTTPD_LOGDIR LIGHTTPD_STATEDIR LIGHTTPD_USER \
65 LIGHTTPD_CACHEDIR LIGHTTPD_HOMEDIR \ 65 LIGHTTPD_CACHEDIR LIGHTTPD_HOMEDIR \
66 LIGHTTPD_GROUP PKG_SYSCONFDIR VARBASE 66 LIGHTTPD_GROUP PKG_SYSCONFDIR VARBASE
67 67
68post-install: 68post-install:
69 set -e; cd ${WRKSRC}/doc; \ 69 set -e; cd ${WRKSRC}/doc; \
70 for f in *.css outdated/*.dot outdated/*.txt; do \ 70 for f in *.css outdated/*.dot outdated/*.txt; do \
71 ${INSTALL_DATA} $$f ${DESTDIR}${DOCDIR}; \ 71 ${INSTALL_DATA} $$f ${DESTDIR}${DOCDIR}; \
72 done; \ 72 done; \
73 for f in config/*.conf scripts/*.sh; do \ 73 for f in config/*.conf scripts/*.sh; do \
74 ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}; \ 74 ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}; \
75 done; \ 75 done; \
76 for f in config/conf.d/*.conf config/conf.d/mod.*; do \ 76 for f in config/conf.d/*.conf config/conf.d/mod.*; do \
77 ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}/conf.d; \ 77 ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}/conf.d; \
78 done; \ 78 done; \
79 ${INSTALL_DATA} config/vhosts.d/*.template ${DESTDIR}${EGDIR}/vhosts.d 79 ${INSTALL_DATA} config/vhosts.d/*.template ${DESTDIR}${EGDIR}/vhosts.d
80 80
81.include "../../devel/xxhash/buildlink3.mk" 81.include "../../devel/xxhash/buildlink3.mk"
82.include "../../devel/pcre2/buildlink3.mk" 82.include "../../devel/pcre2/buildlink3.mk"
83.include "../../devel/zlib/buildlink3.mk" 83.include "../../devel/zlib/buildlink3.mk"
84.include "../../mk/dlopen.buildlink3.mk" 84.include "../../mk/dlopen.buildlink3.mk"
85.include "../../mk/bsd.pkg.mk" 85.include "../../mk/bsd.pkg.mk"