Change libmemcache dependency to libmemcached

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

5 files changed, 14 insertions, 9 deletions

diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 46d2aa0eb5a..39e576cbaae 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -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 LIGHTTPD_STATEDIR LIGHTTPD_USER \
 			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;				\
diff --git a/www/lighttpd/PLIST b/www/lighttpd/PLIST
index 84eee5cbf20..49f03664b78 100644
--- a/www/lighttpd/PLIST
+++ b/www/lighttpd/PLIST
@@ -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
diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo
index 5f74743c6fa..47a0da77cba 100644
--- a/www/lighttpd/distinfo
+++ b/www/lighttpd/distinfo
@@ -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
diff --git a/www/lighttpd/options.mk b/www/lighttpd/options.mk
index 0c33e2450f5..0c8a2c84036 100644
--- a/www/lighttpd/options.mk
+++ b/www/lighttpd/options.mk
@@ -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
 
 ###
diff --git a/www/lighttpd/patches/patch-doc_lighttpd.8 b/www/lighttpd/patches/patch-doc_lighttpd.8
index 1e4da5e3ad3..a9d4aa34a97 100644
--- a/www/lighttpd/patches/patch-doc_lighttpd.8
+++ b/www/lighttpd/patches/patch-doc_lighttpd.8
@@ -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