Teach named where its pid file should be by default, to be consistent

with the default configuration, rc script, man pages...

PR:		225687
Reported by:	John W. O'Brien
Sponsored by:	Absolight

10 files changed, 70 insertions, 5 deletions

diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index bb03645765f0..ce4f33ebcda0 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -8,7 +8,7 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 PORTREVISION=	0
 .else
 # dns/bind9xx here
-PORTREVISION=	1
+PORTREVISION=	2
 .endif
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	LOCAL/mat/bind
diff --git a/dns/bind9-devel/files/patch-bin_named_include_named_globals.h b/dns/bind9-devel/files/patch-bin_named_include_named_globals.h
new file mode 100644
index 000000000000..1a44c78534a6
--- /dev/null
+++ b/dns/bind9-devel/files/patch-bin_named_include_named_globals.h
@@ -0,0 +1,13 @@
+We reference the pid file as being run/named/pid everywere else.
+
+--- bin/named/include/named/globals.h.orig	2018-01-17 06:56:09 UTC
++++ bin/named/include/named/globals.h
+@@ -125,7 +125,7 @@ EXTERN isc_boolean_t		named_g_forcelock	
+ #if NAMED_RUN_PID_DIR
+ EXTERN const char *		named_g_defaultpidfile 	INIT(NAMED_LOCALSTATEDIR
+ 							     "/run/named/"
+-							     "named.pid");
++							     "pid");
+ #else
+ EXTERN const char *		named_g_defaultpidfile 	INIT(NAMED_LOCALSTATEDIR
+ 							     "/run/named.pid");
diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile
index 75f118cd2fef..f58448a22e86 100644
--- a/dns/bind910/Makefile
+++ b/dns/bind910/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	910
diff --git a/dns/bind910/files/patch-bin_named_include_named_globals.h b/dns/bind910/files/patch-bin_named_include_named_globals.h
new file mode 100644
index 000000000000..b7e069c02bd3
--- /dev/null
+++ b/dns/bind910/files/patch-bin_named_include_named_globals.h
@@ -0,0 +1,13 @@
+We reference the pid file as being run/named/pid everywere else.
+
+--- bin/named/include/named/globals.h.orig	2018-01-04 05:35:08 UTC
++++ bin/named/include/named/globals.h
+@@ -136,7 +136,7 @@ EXTERN const char *		ns_g_defaultsession
+ #if NS_RUN_PID_DIR
+ EXTERN const char *		ns_g_defaultpidfile 	INIT(NS_LOCALSTATEDIR
+ 							     "/run/named/"
+-							     "named.pid");
++							     "pid");
+ EXTERN const char *		lwresd_g_defaultpidfile INIT(NS_LOCALSTATEDIR
+ 							     "/run/lwresd/"
+ 							     "lwresd.pid");
diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index 0faad9b9b8a0..8d423ce45adf 100644
--- a/dns/bind911/Makefile
+++ b/dns/bind911/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	911
diff --git a/dns/bind911/files/patch-bin_named_include_named_globals.h b/dns/bind911/files/patch-bin_named_include_named_globals.h
new file mode 100644
index 000000000000..6a11fb802a11
--- /dev/null
+++ b/dns/bind911/files/patch-bin_named_include_named_globals.h
@@ -0,0 +1,13 @@
+We reference the pid file as being run/named/pid everywere else.
+
+--- bin/named/include/named/globals.h.orig	2018-01-04 05:28:11 UTC
++++ bin/named/include/named/globals.h
+@@ -135,7 +135,7 @@ EXTERN isc_boolean_t		ns_g_forcelock		IN
+ #if NS_RUN_PID_DIR
+ EXTERN const char *		ns_g_defaultpidfile 	INIT(NS_LOCALSTATEDIR
+ 							     "/run/named/"
+-							     "named.pid");
++							     "pid");
+ EXTERN const char *		lwresd_g_defaultpidfile INIT(NS_LOCALSTATEDIR
+ 							     "/run/lwresd/"
+ 							     "lwresd.pid");
diff --git a/dns/bind912/Makefile b/dns/bind912/Makefile
index 46c5c2dc48ac..ce4d3476be42 100644
--- a/dns/bind912/Makefile
+++ b/dns/bind912/Makefile
@@ -8,7 +8,7 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 PORTREVISION=	0
 .else
 # dns/bind912 here
-PORTREVISION=	2
+PORTREVISION=	3
 .endif
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
diff --git a/dns/bind912/files/patch-bin_named_include_named_globals.h b/dns/bind912/files/patch-bin_named_include_named_globals.h
new file mode 100644
index 000000000000..1a44c78534a6
--- /dev/null
+++ b/dns/bind912/files/patch-bin_named_include_named_globals.h
@@ -0,0 +1,13 @@
+We reference the pid file as being run/named/pid everywere else.
+
+--- bin/named/include/named/globals.h.orig	2018-01-17 06:56:09 UTC
++++ bin/named/include/named/globals.h
+@@ -125,7 +125,7 @@ EXTERN isc_boolean_t		named_g_forcelock	
+ #if NAMED_RUN_PID_DIR
+ EXTERN const char *		named_g_defaultpidfile 	INIT(NAMED_LOCALSTATEDIR
+ 							     "/run/named/"
+-							     "named.pid");
++							     "pid");
+ #else
+ EXTERN const char *		named_g_defaultpidfile 	INIT(NAMED_LOCALSTATEDIR
+ 							     "/run/named.pid");
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index 0786e2711053..0f002dbf466a 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	99
diff --git a/dns/bind99/files/patch-bin_named_include_named_globals.h b/dns/bind99/files/patch-bin_named_include_named_globals.h
new file mode 100644
index 000000000000..d7b6517e3423
--- /dev/null
+++ b/dns/bind99/files/patch-bin_named_include_named_globals.h
@@ -0,0 +1,13 @@
+We reference the pid file as being run/named/pid everywere else.
+
+--- bin/named/include/named/globals.h.orig	2018-01-04 05:41:15 UTC
++++ bin/named/include/named/globals.h
+@@ -134,7 +134,7 @@ EXTERN const char *		ns_g_defaultsession
+ #if NS_RUN_PID_DIR
+ EXTERN const char *		ns_g_defaultpidfile 	INIT(NS_LOCALSTATEDIR
+ 							     "/run/named/"
+-							     "named.pid");
++							     "pid");
+ EXTERN const char *		lwresd_g_defaultpidfile INIT(NS_LOCALSTATEDIR
+ 							     "/run/lwresd/"
+ 							     "lwresd.pid");