[4.1] 8068d72 Keep Makefile.phk working

[Lasse Karstensen]

commit 8068d724155741144999e5a5bc45eccae39dc1af
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 25 10:59:20 2015 +0000

    Keep Makefile.phk working

diff --git a/bin/varnishd/Makefile.phk b/bin/varnishd/Makefile.phk
index e849a28..fb9df6c 100644
--- a/bin/varnishd/Makefile.phk
+++ b/bin/varnishd/Makefile.phk
@@ -6,6 +6,8 @@ PROG_SRC += cache/cache_backend_cfg.c
 PROG_SRC += cache/cache_backend_tcp.c
 PROG_SRC += cache/cache_backend_probe.c
 PROG_SRC += cache/cache_ban.c
+PROG_SRC += cache/cache_ban_build.c
+PROG_SRC += cache/cache_ban_lurker.c
 PROG_SRC += cache/cache_busyobj.c
 PROG_SRC += cache/cache_cli.c
 PROG_SRC += cache/cache_director.c
@@ -110,11 +112,21 @@ MADE_FILES += builtin_vcl.h
 
 TODO_INSTALL += install_etc
 
+PARST=$(TOPDIR)/doc/sphinx/include/params.rst
+
+TODO_ALL += $(PARST)
+CLEAN_FILES += $(PARST)
+
 CFLAGS	+= -DVARNISHD_IS_NOT_A_VMOD
 
 TOPDIR  = $(CURDIR)/../..
 include $(TOPDIR)/Makefile.inc.phk
 
+$(PARST): $(PROGNAME)
+	-ls -l $(PARST) $(PROGNAME)
+	mkdir -p $(TOPDIR)/doc/sphinx/include
+	./varnishd -x dumprstparam > $(PARST)
+
 #
 # Turn the builtin.vcl file into a C-string we can include in the program.
 #
diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index 95c4454..dfb4885 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -41,6 +41,8 @@
 
 #include "config.h"
 
+#define _WITH_GETLINE
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/config.phk b/config.phk
index 906cbff..dea0eed 100644
--- a/config.phk
+++ b/config.phk
@@ -93,7 +93,6 @@ if true ; then
     #define VARNISH_VCL_DIR         "/etc/varnish"
 		#define VARNISH_STATE_DIR       "/tmp/phk/"
 		#define VARNISH_VMOD_DIR        "/usr/lib/varnish/vmods"
-		#define VCS_Branch "master"
 	' >> ${CONFIG_H}_
 	if [ ! -f ${CONFIG_H} ] ; then
 		mv ${CONFIG_H}_ ${CONFIG_H}