net/pppd: Install manpages into ${PKGMANDIR}.

Patch the project makefiles to set MANDIR to the point to the
correct location for installed manpages under ${PKGMANDIR}.

14 files changed, 48 insertions, 44 deletions

diff --git a/net/pppd/distinfo b/net/pppd/distinfo
index a555860c1b0..e9ad63da00a 100644
--- a/net/pppd/distinfo
+++ b/net/pppd/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.12 2015/12/25 00:44:37 dholland Exp $
+$NetBSD: distinfo,v 1.13 2017/08/19 00:24:36 jlam Exp $
 
 SHA1 (ppp-2.4.3.tar.gz) = 5e2789f4dedc81943fa9f94c840cccc2407056f7
 RMD160 (ppp-2.4.3.tar.gz) = 845821496bacb07d93bb7572a171854853ef722b
 SHA512 (ppp-2.4.3.tar.gz) = 221f0925ec8bb73df740cd563a34f387ce8bf2417d2797e7f360563d8de6524e1cdf058c185eaefc9cb3703828d32c6f1b74595916683e08168ce792c5f8333e
 Size (ppp-2.4.3.tar.gz) = 688092 bytes
-SHA1 (patch-aa) = 8814f0f389971d07368bef95fbadbb5d7562d0a9
-SHA1 (patch-ab) = 1cd0d99dac316b1c5a48c9a41104c2c25e9bb920
+SHA1 (patch-aa) = 33ee975ce578eab0fb281dbf8553f4e5775723a7
+SHA1 (patch-ab) = 60602535f54e71af432b6001be25c49c258db2d3
 SHA1 (patch-ac) = 9bc88cfcd7b1a09e92aaa919f35e39afb3b45803
 SHA1 (patch-ad) = a3140bc6cfa9fe8d4548b118e9918308f7673e24
 SHA1 (patch-ae) = dc6b96fa25e2eaa002d8c6499b979e7737714dcf
 SHA1 (patch-af) = 178a2a2a716d6ff8e9bd0cc36ff72d8a138f6989
-SHA1 (patch-ag) = f989f71dbb164e53157ba2677f29737862e137f2
-SHA1 (patch-ah) = 6bca5470590c5a9c9aa9de64abf21e44c770d1b5
-SHA1 (patch-ai) = a0e5fcd766980e20ee3737273833e743dee58bf5
-SHA1 (patch-aj) = 9c7ff13e0a0b7e577ccfb86e474594118d2cadc2
+SHA1 (patch-ag) = 65cfe651e641bb177d09a316685b1fe094747c82
+SHA1 (patch-ah) = 1d9b5e9d56ca5532dc422e8edf92b583ca549e3b
+SHA1 (patch-ai) = ded7998128a2076fe93d2a1920cf7f89f80f7d2b
+SHA1 (patch-aj) = df4f17f7bc8deeba57c1d15b385bb26b17b9052f
 SHA1 (patch-ak) = d38d646fad05418d1271918af53569bb40f12812
 SHA1 (patch-al) = 1c76f6c2fa6a9a3ea4d79e23d4ecf449c5260d8d
 SHA1 (patch-am) = 4d017c416611ca3bc91f1292d7fad2bffffa638d
@@ -25,7 +25,7 @@ SHA1 (patch-ar) = 5070283e0b66c5e085770451c8a0f82b764f0be2
 SHA1 (patch-as) = b6774585d995d5871bc13a6430ce99192d0405ab
 SHA1 (patch-at) = ab5d74511ff1b83953f3595b6d71b0c130bdc966
 SHA1 (patch-au) = b74e19ee4f9e09bfbb0f8be15b1baa80a7e11ce4
-SHA1 (patch-av) = 6ae49e8f2d5d74fa437e100b27a021451feb8f28
+SHA1 (patch-av) = 673fe65fec3d57f39df5705745da242615b1b5ac
 SHA1 (patch-aw) = 7fb53f72216ffe34720b76fc122e87f4762a6696
 SHA1 (patch-ax) = 0b9583346009b94f29084bd69963ad2d2e80ed5d
 SHA1 (patch-ay) = 93ccd90f6efa58bfe31105526499308ed35b9522
@@ -33,17 +33,17 @@ SHA1 (patch-az) = 9c7d9294325f84cb6fc2c6d17fdbc038d27d9a2a
 SHA1 (patch-ba) = 4293edb8b490fe31e07268a6d7001e1c9db8f323
 SHA1 (patch-bb) = 9b17b12b45d9857eea42c2a6dc3704392c4df7c0
 SHA1 (patch-bc) = 1d51e2c44a5cdbe8609e1e9fccd6c41561b5a940
-SHA1 (patch-bd) = 142545e81f05f5efbc35629bf6cf1e791f3dc4f9
-SHA1 (patch-be) = e216f70f5fd2d6f5ad44a3c3ebc6146557a2deb9
+SHA1 (patch-bd) = c029446488c642b4e32847bd5f8ff158e72c0b4d
+SHA1 (patch-be) = 40b04205e3b403524ca00771c2af1673968bde14
 SHA1 (patch-bf) = 16788a1508cd981ff8967915a86a1fb02e55330c
 SHA1 (patch-bg) = 66b7d5a1ac2816f36a656c7c16a4862f313633f0
 SHA1 (patch-bh) = 8136e968fadbc2cc08006651772b943313cb6641
 SHA1 (patch-bi) = b7580e06651386da79b2c0eedc8a1b7c25e96cde
 SHA1 (patch-bj) = ad5618b6243414ce2649b200096a53194f48c735
-SHA1 (patch-bk) = 2ebb4e4133c22775e374990a6e05390f826d3e91
-SHA1 (patch-bl) = 31525cf95919a534804c95121f7e69289c4220cb
+SHA1 (patch-bk) = ed4d374d1978128df5b593fd9ec9f4264de7af15
+SHA1 (patch-bl) = 6af3f0e85a11b71c7e151fd652f2b919edaf1c93
 SHA1 (patch-bm) = 27743760f1a5c385b5b17c0568e0736d5c3b08bb
-SHA1 (patch-bn) = 2527e7f82874ad3ffaa2585bb7939fbd62ee291a
-SHA1 (patch-bo) = 58edaa6a2a9d542da32f2fab678a01132235a9e0
+SHA1 (patch-bn) = fb37e4c519a8bf25262956986806a2ee1abe37b9
+SHA1 (patch-bo) = b3974e84dddade31ce1dad75bdf48b8d84e02d15
 SHA1 (patch-bp) = 34b533ae19a9006f5d09fdbe299ac30e693c20d0
 SHA1 (patch-bq) = bd0db5b52214b29ac858ae96018fc2d96cd4a82b
diff --git a/net/pppd/patches/patch-aa b/net/pppd/patches/patch-aa
index 1566cdbe912..af82bc1fce7 100644
--- a/net/pppd/patches/patch-aa
+++ b/net/pppd/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/01/02 02:51:41 cube Exp $
+$NetBSD: patch-aa,v 1.2 2017/08/19 00:24:36 jlam Exp $
 
 --- chat/Makefile.linux.orig	2004-11-03 12:51:47.000000000 +0100
 +++ chat/Makefile.linux
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/01/02 02:51:41 cube Exp $
  DESTDIR = @DESTDIR@
  BINDIR = $(DESTDIR)/sbin
 -MANDIR = $(DESTDIR)/share/man/man8
-+MANDIR = $(DESTDIR)/man/man8
++MANDIR = $(DESTDIR)/$(PKGMANDIR)/man8
  
  CDEF1=	-DTERMIOS			# Use the termios structure
  CDEF2=	-DSIGTYPE=void			# Standard definition
diff --git a/net/pppd/patches/patch-ab b/net/pppd/patches/patch-ab
index 1e0f5a62092..a0dbcd8f8dd 100644
--- a/net/pppd/patches/patch-ab
+++ b/net/pppd/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/01/02 02:51:41 cube Exp $
+$NetBSD: patch-ab,v 1.2 2017/08/19 00:24:36 jlam Exp $
 
 --- chat/Makefile.netbsd.orig	2004-12-31 23:50:59.000000000 +0100
 +++ chat/Makefile.netbsd
 @@ -0,0 +1,29 @@
 +DESTDIR = @DESTDIR@
 +BINDIR = $(DESTDIR)/sbin
-+MANDIR = $(DESTDIR)/man/man8
++MANDIR = $(DESTDIR)/$(PKGMANDIR)/man8
 +
 +CDEF1=	-DTERMIOS			# Use the termios structure
 +CDEF2=	-DSIGTYPE=void			# Standard definition
diff --git a/net/pppd/patches/patch-ag b/net/pppd/patches/patch-ag
index f91760aa012..9d6d0a59055 100644
--- a/net/pppd/patches/patch-ag
+++ b/net/pppd/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2005/01/02 02:51:42 cube Exp $
+$NetBSD: patch-ag,v 1.2 2017/08/19 00:24:36 jlam Exp $
 
 --- linux/Makefile.top.orig	2004-10-31 23:25:16.000000000 +0100
 +++ linux/Makefile.top
@@ -8,7 +8,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2005/01/02 02:51:42 cube Exp $
  INCDIR = $(DESTDIR)/include
 -MANDIR = $(DESTDIR)/share/man
 -ETCDIR = @SYSCONF@/ppp
-+MANDIR = $(DESTDIR)/man
++MANDIR = $(DESTDIR)/$(PKGMANDIR)
 +ETCDIR = @SYSCONF@
  
  # uid 0 = root
diff --git a/net/pppd/patches/patch-ah b/net/pppd/patches/patch-ah
index 2c12ea0db2b..275a39ab856 100644
--- a/net/pppd/patches/patch-ah
+++ b/net/pppd/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1.1.1 2005/01/02 02:51:42 cube Exp $
+$NetBSD: patch-ah,v 1.2 2017/08/19 00:24:36 jlam Exp $
 
 --- netbsd/Makefile.top.orig	2004-12-31 23:50:59.000000000 +0100
 +++ netbsd/Makefile.top
@@ -8,7 +8,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2005/01/02 02:51:42 cube Exp $
 +DESTDIR = @DESTDIR@
 +BINDIR = $(DESTDIR)/sbin
 +INCDIR = $(DESTDIR)/include
-+MANDIR = $(DESTDIR)/man
++MANDIR = $(DESTDIR)/$(PKGMANDIR)
 +ETCDIR = @SYSCONF@
 +
 +# uid 0 = root
diff --git a/net/pppd/patches/patch-ai b/net/pppd/patches/patch-ai
index 23936d2bf60..6c1f2ad8526 100644
--- a/net/pppd/patches/patch-ai
+++ b/net/pppd/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2005/01/02 02:51:42 cube Exp $
+$NetBSD: patch-ai,v 1.2 2017/08/19 00:24:36 jlam Exp $
 
 --- pppd/Makefile.linux.orig	2004-11-13 13:02:22.000000000 +0100
 +++ pppd/Makefile.linux
@@ -7,7 +7,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2005/01/02 02:51:42 cube Exp $
  DESTDIR = @DESTDIR@
  BINDIR = $(DESTDIR)/sbin
 -MANDIR = $(DESTDIR)/share/man/man8
-+MANDIR = $(DESTDIR)/man/man8
++MANDIR = $(DESTDIR)/$(PKGMANDIR)/man8
  INCDIR = $(DESTDIR)/include
  
  TARGETS = pppd
diff --git a/net/pppd/patches/patch-aj b/net/pppd/patches/patch-aj
index ea8e7522592..4f14e579548 100644
--- a/net/pppd/patches/patch-aj
+++ b/net/pppd/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.2 2008/12/26 21:41:40 hasso Exp $
+$NetBSD: patch-aj,v 1.3 2017/08/19 00:24:36 jlam Exp $
 
 --- pppd/Makefile.netbsd.orig	2008-12-19 11:48:24 +0200
 +++ pppd/Makefile.netbsd	2008-12-19 12:14:52 +0200
@@ -10,7 +10,7 @@ $NetBSD: patch-aj,v 1.2 2008/12/26 21:41:40 hasso Exp $
 +# Default installation locations
 +DESTDIR = @DESTDIR@
 +BINDIR = $(DESTDIR)/sbin
-+MANDIR = $(DESTDIR)/man/man8
++MANDIR = $(DESTDIR)/$(PKGMANDIR)/man8
 +INCDIR = $(DESTDIR)/include
 +
 +TARGETS = pppd
diff --git a/net/pppd/patches/patch-av b/net/pppd/patches/patch-av
index 4fadf26fc76..1174a516eef 100644
--- a/net/pppd/patches/patch-av
+++ b/net/pppd/patches/patch-av
@@ -1,4 +1,4 @@
-$NetBSD: patch-av,v 1.1.1.1 2005/01/02 02:51:42 cube Exp $
+$NetBSD: patch-av,v 1.2 2017/08/19 00:24:36 jlam Exp $
 
 --- pppd/plugins/radius/Makefile.linux.orig	2004-11-14 08:02:31.000000000 +0100
 +++ pppd/plugins/radius/Makefile.linux
@@ -7,7 +7,7 @@ $NetBSD: patch-av,v 1.1.1.1 2005/01/02 02:51:42 cube Exp $
  
  DESTDIR = @DESTDIR@
 -MANDIR = $(DESTDIR)/share/man/man8
-+MANDIR = $(DESTDIR)/man/man8
++MANDIR = $(DESTDIR)/$(PKGMANDIR)/man8
  LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
  
  VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
diff --git a/net/pppd/patches/patch-bd b/net/pppd/patches/patch-bd
index ba33e414832..e90d36dbcbc 100644
--- a/net/pppd/patches/patch-bd
+++ b/net/pppd/patches/patch-bd
@@ -1,4 +1,4 @@
-$NetBSD: patch-bd,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $
+$NetBSD: patch-bd,v 1.2 2017/08/19 00:24:36 jlam Exp $
 
 --- pppdump/Makefile.linux.orig	2004-10-31 02:36:52.000000000 +0200
 +++ pppdump/Makefile.linux
@@ -6,7 +6,7 @@ $NetBSD: patch-bd,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $
  DESTDIR = @DESTDIR@
  BINDIR = $(DESTDIR)/sbin
 -MANDIR = $(DESTDIR)/share/man/man8
-+MANDIR = $(DESTDIR)/man/man8
++MANDIR = $(DESTDIR)/$(PKGMANDIR)/man8
  
  CFLAGS= -O -I../include/net
  OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
diff --git a/net/pppd/patches/patch-be b/net/pppd/patches/patch-be
index a94e3f40815..50dbfc2bd5a 100644
--- a/net/pppd/patches/patch-be
+++ b/net/pppd/patches/patch-be
@@ -1,11 +1,11 @@
-$NetBSD: patch-be,v 1.2 2008/07/29 21:02:23 tnn Exp $
+$NetBSD: patch-be,v 1.3 2017/08/19 00:24:36 jlam Exp $
 
 --- pppdump/Makefile.netbsd.orig	2008-07-29 22:51:39.000000000 +0200
 +++ pppdump/Makefile.netbsd
 @@ -0,0 +1,21 @@
 +DESTDIR = @DESTDIR@
 +BINDIR = $(DESTDIR)/sbin
-+MANDIR = $(DESTDIR)/man/man8
++MANDIR = $(DESTDIR)/$(PKGMANDIR)/man8
 +
 +CFLAGS= -O -I../include/net
 +OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
diff --git a/net/pppd/patches/patch-bk b/net/pppd/patches/patch-bk
index bb36e7bbce1..30e1a6f1acc 100644
--- a/net/pppd/patches/patch-bk
+++ b/net/pppd/patches/patch-bk
@@ -1,4 +1,4 @@
-$NetBSD: patch-bk,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $
+$NetBSD: patch-bk,v 1.2 2017/08/19 00:24:36 jlam Exp $
 
 --- pppstats/Makefile.linux.orig	2004-10-31 23:09:03.000000000 +0100
 +++ pppstats/Makefile.linux
@@ -7,7 +7,7 @@ $NetBSD: patch-bk,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $
  DESTDIR = @DESTDIR@
  BINDIR = $(DESTDIR)/sbin
 -MANDIR = $(DESTDIR)/share/man/man8
-+MANDIR = $(DESTDIR)/man/man8
++MANDIR = $(DESTDIR)/$(PKGMANDIR)/man8
  
  PPPSTATSRCS = pppstats.c
  PPPSTATOBJS = pppstats.o
diff --git a/net/pppd/patches/patch-bl b/net/pppd/patches/patch-bl
index 0e6294ab600..ebc984565eb 100644
--- a/net/pppd/patches/patch-bl
+++ b/net/pppd/patches/patch-bl
@@ -1,4 +1,4 @@
-$NetBSD: patch-bl,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $
+$NetBSD: patch-bl,v 1.2 2017/08/19 00:24:36 jlam Exp $
 
 --- pppstats/Makefile.netbsd.orig	2004-12-31 23:51:00.000000000 +0100
 +++ pppstats/Makefile.netbsd
@@ -8,7 +8,7 @@ $NetBSD: patch-bl,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $
 +#
 +DESTDIR = @DESTDIR@
 +BINDIR = $(DESTDIR)/sbin
-+MANDIR = $(DESTDIR)/man/man8
++MANDIR = $(DESTDIR)/$(PKGMANDIR)/man8
 +
 +PPPSTATSRCS = pppstats.c
 +PPPSTATOBJS = pppstats.o
diff --git a/net/pppd/patches/patch-bn b/net/pppd/patches/patch-bn
index a0e37dfbe30..5847b177d91 100644
--- a/net/pppd/patches/patch-bn
+++ b/net/pppd/patches/patch-bn
@@ -1,12 +1,14 @@
-$NetBSD: patch-bn,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $
+$NetBSD: patch-bn,v 1.2 2017/08/19 00:24:36 jlam Exp $
 
---- solaris/Makedefs.gcc.orig	2004-10-30 06:13:29.000000000 +0200
+--- solaris/Makedefs.gcc.orig	2004-10-30 04:13:29.000000000 +0000
 +++ solaris/Makedefs.gcc
-@@ -6,7 +6,7 @@ INSTALL= /usr/sbin/install
+@@ -5,8 +5,8 @@
+ INSTALL= /usr/sbin/install
  
  BINDIR = @DESTDIR@/bin
- MANDIR = @DESTDIR@/man
+-MANDIR = @DESTDIR@/man
 -ETCDIR = @SYSCONF@/ppp
++MANDIR = @DESTDIR@/$(PKGMANDIR)
 +ETCDIR = @SYSCONF@
  
  CC = gcc
diff --git a/net/pppd/patches/patch-bo b/net/pppd/patches/patch-bo
index d3076da914f..f654cd4a157 100644
--- a/net/pppd/patches/patch-bo
+++ b/net/pppd/patches/patch-bo
@@ -1,12 +1,14 @@
-$NetBSD: patch-bo,v 1.1.1.1 2005/01/02 02:51:44 cube Exp $
+$NetBSD: patch-bo,v 1.2 2017/08/19 00:24:36 jlam Exp $
 
---- solaris/Makedefs.orig	2004-10-30 05:44:06.000000000 +0200
+--- solaris/Makedefs.orig	2004-10-30 03:44:06.000000000 +0000
 +++ solaris/Makedefs
-@@ -6,7 +6,7 @@ INSTALL= /usr/sbin/install
+@@ -5,8 +5,8 @@
+ INSTALL= /usr/sbin/install
  
  BINDIR = @DESTDIR@/bin
- MANDIR = @DESTDIR@/man
+-MANDIR = @DESTDIR@/man
 -ETCDIR = @SYSCONF@/ppp
++MANDIR = @DESTDIR@/$(PKGMANDIR)
 +ETCDIR = @SYSCONF@
  
  CC = /opt/SUNWspro/bin/cc