CVS commit: pkgsrc/www/lighttpd

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Tue Apr 17 20:11:15 UTC 2018

Modified Files:
        pkgsrc/www/lighttpd: Makefile PLIST distinfo options.mk
        pkgsrc/www/lighttpd/patches: patch-doc_lighttpd.8

Log Message:
Change libmemcache dependency to libmemcached

See https://www.lighttpd.net/2017/10/21/1.4.46/


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/www/lighttpd/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/lighttpd/PLIST
cvs rdiff -u -r1.47 -r1.48 pkgsrc/www/lighttpd/distinfo
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/lighttpd/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/lighttpd/patches/patch-doc_lighttpd.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/lighttpd/Makefile
diff -u pkgsrc/www/lighttpd/Makefile:1.72 pkgsrc/www/lighttpd/Makefile:1.73
--- pkgsrc/www/lighttpd/Makefile:1.72   Tue Apr 17 11:27:11 2018
+++ pkgsrc/www/lighttpd/Makefile        Tue Apr 17 20:11:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2018/04/17 11:27:11 triaxx Exp $
+# $NetBSD: Makefile,v 1.73 2018/04/17 20:11:15 triaxx Exp $
 
 DISTNAME=      lighttpd-1.4.49
 PKGREVISION=   1
@@ -63,7 +63,7 @@ SUBST_VARS.path=      LIGHTTPD_LOGDIR LIGHTTP
                        LIGHTTPD_CACHEDIR LIGHTTPD_HOMEDIR              \
                        LIGHTTPD_GROUP PKG_SYSCONFDIR VARBASE
 
-PLIST_VARS+=           gdbm geoip gssapi ldap lua mysql ssl
+PLIST_VARS+=           gdbm geoip gssapi ldap lua memcached mysql ssl
 
 post-install:
        set -e; cd ${WRKSRC}/doc;                               \

Index: pkgsrc/www/lighttpd/PLIST
diff -u pkgsrc/www/lighttpd/PLIST:1.16 pkgsrc/www/lighttpd/PLIST:1.17
--- pkgsrc/www/lighttpd/PLIST:1.16      Mon Dec 25 15:56:29 2017
+++ pkgsrc/www/lighttpd/PLIST   Tue Apr 17 20:11:15 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2017/12/25 15:56:29 taca Exp $
+@comment $NetBSD: PLIST,v 1.17 2018/04/17 20:11:15 triaxx Exp $
 lib/lighttpd/mod_access.la
 lib/lighttpd/mod_accesslog.la
 lib/lighttpd/mod_alias.la
@@ -35,6 +35,8 @@ lib/lighttpd/mod_ssi.la
 lib/lighttpd/mod_staticfile.la
 lib/lighttpd/mod_status.la
 ${PLIST.gdbm}lib/lighttpd/mod_trigger_b4_dl.la
+${PLIST.memcached}lib/lighttpd/mod_trigger_b4_dl.la
+${PLIST.memcached}lib/lighttpd/mod_trigger_b4_dl.so
 lib/lighttpd/mod_uploadprogress.la
 lib/lighttpd/mod_userdir.la
 lib/lighttpd/mod_usertrack.la

Index: pkgsrc/www/lighttpd/distinfo
diff -u pkgsrc/www/lighttpd/distinfo:1.47 pkgsrc/www/lighttpd/distinfo:1.48
--- pkgsrc/www/lighttpd/distinfo:1.47   Tue Apr 17 12:04:03 2018
+++ pkgsrc/www/lighttpd/distinfo        Tue Apr 17 20:11:15 2018
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.47 2018/04/17 12:04:03 triaxx Exp $
+$NetBSD: distinfo,v 1.48 2018/04/17 20:11:15 triaxx Exp $
 
 SHA1 (lighttpd-1.4.49.tar.xz) = 9e13d061cbae2f377a1a5bb24e13ccd9cba0bba6
 RMD160 (lighttpd-1.4.49.tar.xz) = f7e3ff273455e1ad51f1fdc9514066f9ec3e716c
 SHA512 (lighttpd-1.4.49.tar.xz) = de766da68b4cacfb6c322210eafe819b6423334272e9fae4688c2282a66a2e55aaf580c5fdbf02676ed6f7b32d13f2f28cefd22518f77127055ec336ec5d6784
 Size (lighttpd-1.4.49.tar.xz) = 710964 bytes
 SHA1 (patch-doc_config_lighttpd.conf) = aa1ee77f3fdce7ffd6968c4b09e6977f671495d3
-SHA1 (patch-doc_lighttpd.8) = 654e22e68d6b206b9d28a8c09a1e82138fae94a3
+SHA1 (patch-doc_lighttpd.8) = 81b7606752312227b142975d4e781496442e9ed8

Index: pkgsrc/www/lighttpd/options.mk
diff -u pkgsrc/www/lighttpd/options.mk:1.18 pkgsrc/www/lighttpd/options.mk:1.19
--- pkgsrc/www/lighttpd/options.mk:1.18 Sun Oct 29 00:34:29 2017
+++ pkgsrc/www/lighttpd/options.mk      Tue Apr 17 20:11:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2017/10/29 00:34:29 schmonz Exp $
+# $NetBSD: options.mk,v 1.19 2018/04/17 20:11:15 triaxx Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.lighttpd
 PKG_SUPPORTED_OPTIONS= bzip2 fam gdbm inet6 ldap lua mysql ssl memcached geoip gssapi webdav
@@ -67,8 +67,9 @@ CONFIGURE_ARGS+=      --with-lua
 ### "trigger before download" and CML modules.
 ###
 .if !empty(PKG_OPTIONS:Mmemcached)
-.  include "../../devel/libmemcache/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-memcache
+.  include "../../devel/libmemcached/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-memcached
+PLIST.memcached=       yes
 .endif
 
 ###

Index: pkgsrc/www/lighttpd/patches/patch-doc_lighttpd.8
diff -u pkgsrc/www/lighttpd/patches/patch-doc_lighttpd.8:1.1 pkgsrc/www/lighttpd/patches/patch-doc_lighttpd.8:1.2
--- pkgsrc/www/lighttpd/patches/patch-doc_lighttpd.8:1.1        Tue Apr 17 11:27:11 2018
+++ pkgsrc/www/lighttpd/patches/patch-doc_lighttpd.8    Tue Apr 17 20:11:15 2018
@@ -1,4 +1,6 @@
-$NetBSD: patch-doc_lighttpd.8,v 1.1 2018/04/17 11:27:11 triaxx Exp $
+$NetBSD: patch-doc_lighttpd.8,v 1.2 2018/04/17 20:11:15 triaxx Exp $
+
+Fix hardcoded paths.
 
 --- doc/lighttpd.8.orig        2018-03-12 00:52:20.000000000 +0000
 +++ doc/lighttpd.8