Fri Mar 20 11:39:43 2020 UTC ()
yaws: fix linux PLIST. Installs .la files; set USE_LIBTOOL


(tnn)
diff -r1.18 -r1.19 pkgsrc/www/yaws/Makefile
diff -r1.1 -r1.2 pkgsrc/www/yaws/PLIST.DragonFly
diff -r1.1 -r1.2 pkgsrc/www/yaws/PLIST.FreeBSD
diff -r0 -r1.1 pkgsrc/www/yaws/PLIST.Linux

cvs diff -r1.18 -r1.19 pkgsrc/www/yaws/Makefile (switch to unified diff)

--- pkgsrc/www/yaws/Makefile 2019/08/11 13:25:10 1.18
+++ pkgsrc/www/yaws/Makefile 2020/03/20 11:39:43 1.19
@@ -1,65 +1,66 @@ @@ -1,65 +1,66 @@
1# $NetBSD: Makefile,v 1.18 2019/08/11 13:25:10 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2020/03/20 11:39:43 tnn Exp $
2# 2#
3 3
4DISTNAME= yaws-2.0.6 4DISTNAME= yaws-2.0.6
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://yaws.hyber.org/download/ 7MASTER_SITES= http://yaws.hyber.org/download/
8 8
9MAINTAINER= bartosz.kuzma@gmail.com 9MAINTAINER= bartosz.kuzma@gmail.com
10HOMEPAGE= http://yaws.hyber.org/ 10HOMEPAGE= http://yaws.hyber.org/
11COMMENT= High perfomance HTTP 1.1 webserver written in Erlang 11COMMENT= High perfomance HTTP 1.1 webserver written in Erlang
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14BUILD_DEFS+= VARBASE 14BUILD_DEFS+= VARBASE
15 15
 16USE_LIBTOOL= yes
16USE_TOOLS+= gmake perl tar 17USE_TOOLS+= gmake perl tar
17GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
18 19
19PKG_SYSCONFSUBDIR= yaws 20PKG_SYSCONFSUBDIR= yaws
20 21
21.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
22 23
23CONFIGURE_ARGS+= --localstatedir=${VARBASE} 24CONFIGURE_ARGS+= --localstatedir=${VARBASE}
24CONFIGURE_ARGS+= --with-extrainclude=${PAMBASE}/include/security 25CONFIGURE_ARGS+= --with-extrainclude=${PAMBASE}/include/security
25CONFIGURE_ARGS+= ERLANG_INSTALL_LIB_DIR_yaws=${PREFIX}/lib/yaws 26CONFIGURE_ARGS+= ERLANG_INSTALL_LIB_DIR_yaws=${PREFIX}/lib/yaws
26CONFIGURE_ARGS+= wwwdir=${WWWDIR} 27CONFIGURE_ARGS+= wwwdir=${WWWDIR}
27 28
28# Not compatible with SunOS PAM headers 29# Not compatible with SunOS PAM headers
29.if ${OPSYS} == "SunOS" 30.if ${OPSYS} == "SunOS"
30CONFIGURE_ARGS+= --disable-pam 31CONFIGURE_ARGS+= --disable-pam
31.endif 32.endif
32 33
33EGDIR= ${PREFIX}/share/examples/yaws 34EGDIR= ${PREFIX}/share/examples/yaws
34CONF_FILES= ${EGDIR}/yaws.conf ${PKG_SYSCONFDIR}/yaws.conf 35CONF_FILES= ${EGDIR}/yaws.conf ${PKG_SYSCONFDIR}/yaws.conf
35RCD_SCRIPTS= yaws 36RCD_SCRIPTS= yaws
36RCD_SCRIPT_SRC.yaws= ${WRKSRC}/scripts/netbsd/yaws.sh 37RCD_SCRIPT_SRC.yaws= ${WRKSRC}/scripts/netbsd/yaws.sh
37 38
38WWWDIR= ${PREFIX}/share/yaws/www 39WWWDIR= ${PREFIX}/share/yaws/www
39 40
40OWN_DIRS= ${VARBASE}/log/yaws 41OWN_DIRS= ${VARBASE}/log/yaws
41 42
42REPLACE_PYTHON= www/cgi-bin/foo.py 43REPLACE_PYTHON= www/cgi-bin/foo.py
43CHECK_INTERPRETER_SKIP= share/yaws/www/cgi-bin/foo.py 44CHECK_INTERPRETER_SKIP= share/yaws/www/cgi-bin/foo.py
44 45
45INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples 46INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
46 47
47FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 48FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
48 49
49post-extract: 50post-extract:
50 cd ${WRKSRC} && ${CHMOD} -R g-w www 51 cd ${WRKSRC} && ${CHMOD} -R g-w www
51 ${RM} -Rf ${WRKSRC}/www/testdir 52 ${RM} -Rf ${WRKSRC}/www/testdir
52 53
53post-configure: 54post-configure:
54 ${SED} -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \ 55 ${SED} -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
55 -e "s|@PREFIX@|${PREFIX}|g" \ 56 -e "s|@PREFIX@|${PREFIX}|g" \
56 -e "s|@VARBASE@|${VARBASE}|g" \ 57 -e "s|@VARBASE@|${VARBASE}|g" \
57 ${FILESDIR}/yaws.conf > ${WRKDIR}/yaws.conf 58 ${FILESDIR}/yaws.conf > ${WRKDIR}/yaws.conf
58 59
59post-install: 60post-install:
60 ${RM} -f ${DESTDIR}${WWWDIR}/code/Makefile* 61 ${RM} -f ${DESTDIR}${WWWDIR}/code/Makefile*
61 ${RM} -f ${DESTDIR}${WWWDIR}/shoppingcart/Makefile* 62 ${RM} -f ${DESTDIR}${WWWDIR}/shoppingcart/Makefile*
62 63
63.include "../../lang/erlang/buildlink3.mk" 64.include "../../lang/erlang/buildlink3.mk"
64.include "../../mk/pam.buildlink3.mk" 65.include "../../mk/pam.buildlink3.mk"
65.include "../../mk/bsd.pkg.mk" 66.include "../../mk/bsd.pkg.mk"

cvs diff -r1.1 -r1.2 pkgsrc/www/yaws/PLIST.DragonFly (switch to unified diff)

--- pkgsrc/www/yaws/PLIST.DragonFly 2012/05/21 15:51:27 1.1
+++ pkgsrc/www/yaws/PLIST.DragonFly 2020/03/20 11:39:43 1.2
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
1@comment $NetBSD: PLIST.DragonFly,v 1.1 2012/05/21 15:51:27 marino Exp $ 1@comment $NetBSD: PLIST.DragonFly,v 1.2 2020/03/20 11:39:43 tnn Exp $
2lib/yaws/priv/lib/yaws_sendfile_drv.so 2lib/yaws/priv/lib/yaws_sendfile_drv.la

cvs diff -r1.1 -r1.2 pkgsrc/www/yaws/PLIST.FreeBSD (switch to unified diff)

--- pkgsrc/www/yaws/PLIST.FreeBSD 2013/12/17 07:07:22 1.1
+++ pkgsrc/www/yaws/PLIST.FreeBSD 2020/03/20 11:39:43 1.2
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
1@comment $NetBSD: PLIST.FreeBSD,v 1.1 2013/12/17 07:07:22 asau Exp $ 1@comment $NetBSD: PLIST.FreeBSD,v 1.2 2020/03/20 11:39:43 tnn Exp $
2lib/yaws/priv/lib/yaws_sendfile_drv.so 2lib/yaws/priv/lib/yaws_sendfile_drv.la

File Added: pkgsrc/www/yaws/PLIST.Linux
@comment $NetBSD: PLIST.Linux,v 1.1 2020/03/20 11:39:43 tnn Exp $
lib/yaws/priv/lib/yaws_sendfile_drv.la
share/examples/init.d/yaws