www/wml: Install manpages into ${PKGMANDIR}.

Modify Makefile.in so that the GNU configure scirpt can replace
@mandir@ with the correct location for the installed manpages under
${PKGMANDIR}.

4 files changed, 50 insertions, 9 deletions

diff --git a/www/wml/patches/patch-ae b/www/wml/patches/patch-ae
index 3c4d715c820..ecec136c8e5 100644
--- a/www/wml/patches/patch-ae
+++ b/www/wml/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2011/09/29 11:12:53 dholland Exp $
+$NetBSD: patch-ae,v 1.3 2017/08/19 00:27:01 jlam Exp $
 
 - Don't try to suppress building docs of the various subdirs by
 clearing the man installation directories; it croaks with recent Perl.
@@ -6,9 +6,17 @@ Do it in the individual subdirs instead.
 
 - Don't install File::PathConvert. (why?)
 
---- wml_common/Makefile.in.orig	2001-02-06 23:02:12.000000000 +0000
+- Substitute for @mandir@ to install manpages under ${PKGMANDIR}.
+
+--- wml_common/Makefile.in.orig	2005-12-01 17:50:13.000000000 +0000
 +++ wml_common/Makefile.in
-@@ -27,11 +27,7 @@ mandir          = $(prefix)/man
+@@ -22,16 +22,12 @@ exec_prefix     = $(prefix)
+ bindir          = $(prefix)/bin
+ libsubdir       = @libsubdir@
+ libdir          = $(prefix)/lib$(libsubdir)
+-mandir          = $(prefix)/man
++mandir          = @mandir@
+ 
  PATH_PERL       = @PATH_PERL@
  MM_INSTALL_OPTS = PREFIX=$(libdir)/perl \
                    INSTALLPRIVLIB=@INSTALLPRIVLIB@ \
diff --git a/www/wml/patches/patch-ag b/www/wml/patches/patch-ag
index f1f36a89c55..ac63c25436c 100644
--- a/www/wml/patches/patch-ag
+++ b/www/wml/patches/patch-ag
@@ -1,9 +1,20 @@
-$NetBSD: patch-ag,v 1.2 2012/04/07 13:14:25 joerg Exp $
+$NetBSD: patch-ag,v 1.3 2017/08/19 00:27:01 jlam Exp $
 
  DESTDIR support
 
---- Makefile.in.orig	2002-10-18 21:15:15.000000000 +0000
+ Substitute for @mandir@ to install manpages under ${PKGMANDIR}.
+
+--- Makefile.in.orig	2005-12-01 17:50:13.000000000 +0000
 +++ Makefile.in
+@@ -28,7 +28,7 @@ exec_prefix     = $(prefix)
+ bindir          = $(prefix)/bin
+ libsubdir       = @libsubdir@
+ libdir          = $(prefix)/lib$(libsubdir)
+-mandir          = $(prefix)/man
++mandir          = @mandir@
+ catdir          = @catdir@
+ tmpdir          = @tmpdir@
+ 
 @@ -98,118 +98,103 @@ install: install-dirs install-core insta
  install-dirs:
  	@[ -f .build-ok ] || $(MAKE) all
diff --git a/www/wml/patches/patch-ah b/www/wml/patches/patch-ah
index efe0009f1d3..3a5acbc4e83 100644
--- a/www/wml/patches/patch-ah
+++ b/www/wml/patches/patch-ah
@@ -1,9 +1,20 @@
-$NetBSD: patch-ah,v 1.1 2007/09/29 21:23:13 heinz Exp $
+$NetBSD: patch-ah,v 1.2 2017/08/19 00:27:01 jlam Exp $
 
  DESTDIR support
 
---- wml_misc/Makefile.in.orig	2002-10-17 22:55:19.000000000 +0200
+ Substitute for @mandir@ to install manpages under ${PKGMANDIR}.
+
+--- wml_misc/Makefile.in.orig	2005-12-01 17:50:13.000000000 +0000
 +++ wml_misc/Makefile.in
+@@ -24,7 +24,7 @@ exec_prefix     = $(prefix)
+ bindir          = $(prefix)/bin
+ libsubdir       = @libsubdir@
+ libdir          = $(prefix)/lib$(libsubdir)
+-mandir          = $(prefix)/man
++mandir          = @mandir@
+ 
+ # ------------------------------------------------
+ #   TARGETS
 @@ -33,12 +33,12 @@ mandir          = $(prefix)/man
  all: 
  
diff --git a/www/wml/patches/patch-ai b/www/wml/patches/patch-ai
index 51b4cbaa9ce..b0978ae3ed5 100644
--- a/www/wml/patches/patch-ai
+++ b/www/wml/patches/patch-ai
@@ -1,9 +1,20 @@
-$NetBSD: patch-ai,v 1.1 2007/09/29 21:23:13 heinz Exp $
+$NetBSD: patch-ai,v 1.2 2017/08/19 00:27:01 jlam Exp $
 
  DESTDIR support
 
---- wml_include/Makefile.in.orig	2002-10-18 22:48:56.000000000 +0200
+ Substitute for @mandir@ to install manpages under ${PKGMANDIR}.
+
+--- wml_include/Makefile.in.orig	2005-12-01 17:50:13.000000000 +0000
 +++ wml_include/Makefile.in
+@@ -24,7 +24,7 @@ exec_prefix     = $(prefix)
+ bindir          = $(prefix)/bin
+ libsubdir       = @libsubdir@
+ libdir          = $(prefix)/lib$(libsubdir)
+-mandir          = $(prefix)/man
++mandir          = @mandir@
+ 
+ INSTALLPRIVLIB  = @INSTALLPRIVLIB@
+ INSTALLARCHLIB  = @INSTALLARCHLIB@
 @@ -69,15 +69,15 @@ install:
  	    base=`echo $$file | sed -e 's/\.wml$$//g'`; \
  	    dir=`echo $$file | sed -e 's/[a-zA-Z0-9_]*.wml$$//g'`; \