Replace hardcoded paths with variables

3 files changed, 32 insertions, 9 deletions

diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 38ae200e189..17953ca8041 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2018/04/14 07:34:44 adam Exp $
+# $NetBSD: Makefile,v 1.71 2018/04/17 10:22:00 triaxx Exp $
 
 DISTNAME=	lighttpd-1.4.49
 PKGREVISION=	1
@@ -33,10 +33,13 @@ CONF_FILES+=		${EGDIR}/${file:Q} ${PKG_SYSCONFDIR}/${file:Q}
 .endfor
 
 BUILD_DEFS+=		VARBASE LIGHTTPD_LOGDIR LIGHTTPD_STATEDIR
+BUILD_DEFS+=		LIGHTTPD_CACHEDIR LIGHTTPD_HOMEDIR
 BUILD_DEFS+=		LIGHTTPD_USER LIGHTTPD_GROUP
 
 .include "../../mk/bsd.prefs.mk"
 
+LIGHTTPD_CACHEDIR?=	${VARBASE}/cache/lighttpd
+LIGHTTPD_HOMEDIR?=	${VARBASE}/lib/lighttpd
 LIGHTTPD_LOGDIR?=	${VARBASE}/log/lighttpd
 LIGHTTPD_STATEDIR?=	${VARBASE}/run
 LIGHTTPD_USER?=		lighttpd
@@ -57,7 +60,8 @@ SUBST_MESSAGE.path=	Fixing config file paths
 SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	doc/config/lighttpd.conf
 SUBST_VARS.path=	LIGHTTPD_LOGDIR LIGHTTPD_STATEDIR LIGHTTPD_USER \
-			LIGHTTPD_GROUP PKG_SYSCONFDIR
+			LIGHTTPD_CACHEDIR LIGHTTPD_HOMEDIR              \
+			LIGHTTPD_GROUP PKG_SYSCONFDIR VARBASE
 
 PLIST_VARS+=		gdbm geoip gssapi ldap lua mysql ssl
 
diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo
index da2730e06bd..80760e80a55 100644
--- a/www/lighttpd/distinfo
+++ b/www/lighttpd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.44 2018/03/12 09:03:03 wiz Exp $
+$NetBSD: distinfo,v 1.45 2018/04/17 10:22:00 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) = de14fd0aa0ed2cac5846d810b5c89af4036f1b70
+SHA1 (patch-doc_config_lighttpd.conf) = aa1ee77f3fdce7ffd6968c4b09e6977f671495d3
diff --git a/www/lighttpd/patches/patch-doc_config_lighttpd.conf b/www/lighttpd/patches/patch-doc_config_lighttpd.conf
index a60ac54ca56..b0b3a2283a3 100644
--- a/www/lighttpd/patches/patch-doc_config_lighttpd.conf
+++ b/www/lighttpd/patches/patch-doc_config_lighttpd.conf
@@ -1,9 +1,9 @@
-$NetBSD: patch-doc_config_lighttpd.conf,v 1.3 2015/09/01 11:54:30 mef Exp $
+$NetBSD: patch-doc_config_lighttpd.conf,v 1.4 2018/04/17 10:22:00 triaxx Exp $
 
 Sane defaults.
 
---- doc/config/lighttpd.conf.orig	2015-08-22 21:40:23.000000000 +0900
-+++ doc/config/lighttpd.conf	2015-09-01 20:27:59.000000000 +0900
+--- doc/config/lighttpd.conf.orig	2018-03-12 00:52:20.000000000 +0000
++++ doc/config/lighttpd.conf
 @@ -13,11 +13,11 @@
  ## if you add a variable here. Add the corresponding variable in the
  ## chroot example aswell.
@@ -12,13 +12,23 @@ Sane defaults.
 +var.log_root    = "@LIGHTTPD_LOGDIR@"
  var.server_root = "/srv/www"
 -var.state_dir   = "/var/run"
-+var.state_dir   = "@LIGHTTPD_STATEDIR@"
- var.home_dir    = "/var/lib/lighttpd"
+-var.home_dir    = "/var/lib/lighttpd"
 -var.conf_dir    = "/etc/lighttpd"
++var.state_dir   = "@LIGHTTPD_STATEDIR@"
++var.home_dir    = "@LIGHTTPD_HOMEDIR@"
 +var.conf_dir    = "@PKG_SYSCONFDIR@"
  
  ## 
  ## run the server chrooted.
+@@ -58,7 +58,7 @@ var.vhosts_dir  = server_root + "/vhosts
+ ## used in:
+ ## conf.d/compress.conf
+ ##
+-var.cache_dir   = "/var/cache/lighttpd"
++var.cache_dir   = "@LIGHTTPD_CACHEDIR@"
+ 
+ ##
+ ## Base directory for sockets.
 @@ -101,8 +101,8 @@ server.use-ipv6 = "enable"
  ## Run as a different username/groupname.
  ## This requires root permissions during startup. 
@@ -48,3 +58,12 @@ Sane defaults.
  
  ##
  ## As lighttpd is a single-threaded server, its main resource limit is
+@@ -405,7 +405,7 @@ server.follow-symlink = "enable"
+ ##
+ ## defaults to /var/tmp as we assume it is a local harddisk
+ ##
+-server.upload-dirs = ( "/var/tmp" )
++server.upload-dirs = ( "@VARBASE@/tmp" )
+ 
+ ##
+ #######################################################################