CVS commit: pkgsrc/www/wml

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Sat Aug 19 00:27:01 UTC 2017

Modified Files:
        pkgsrc/www/wml: distinfo
        pkgsrc/www/wml/patches: patch-ae patch-ag patch-ah patch-ai

Log Message:
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}.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/wml/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/wml/patches/patch-ae \
    pkgsrc/www/wml/patches/patch-ag
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/wml/patches/patch-ah \
    pkgsrc/www/wml/patches/patch-ai

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/wml/distinfo
diff -u pkgsrc/www/wml/distinfo:1.20 pkgsrc/www/wml/distinfo:1.21
--- pkgsrc/www/wml/distinfo:1.20        Wed Nov  4 02:47:42 2015
+++ pkgsrc/www/wml/distinfo     Sat Aug 19 00:27:01 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2015/11/04 02:47:42 agc Exp $
+$NetBSD: distinfo,v 1.21 2017/08/19 00:27:01 jlam Exp $
 
 SHA1 (wml-2.0.11.tar.gz) = 14dd7c23461716171a66b65676bca6e19a593007
 RMD160 (wml-2.0.11.tar.gz) = fead82a35d116447b860d7b1c506c6de187355e8
@@ -8,10 +8,10 @@ SHA1 (patch-aa) = f05d0f06f94a0d26b987a8
 SHA1 (patch-ab) = dbd30a0a23189963aa60b06c319342fac4408a6b
 SHA1 (patch-ac) = 80863037faadf220ba1d01ef2133cdc42e08f0fa
 SHA1 (patch-ad) = 2955f349aa737f1758493897d1989a0b96220268
-SHA1 (patch-ae) = d52b117c67e9d521d4ffdd1a2ba03a512fcc315b
-SHA1 (patch-ag) = da74f75377e42bb15ccf213cde8fd0db43ea451e
-SHA1 (patch-ah) = 8195a53d0a514b9ed1bd8e9460c8c3e77a1d0d8d
-SHA1 (patch-ai) = c376fe6308bd9defb66719a53a0e0da3953e2016
+SHA1 (patch-ae) = cad0bf9d70ba0e2661327dbc6817324df7ad0cfa
+SHA1 (patch-ag) = 97dc7aac298709119b19cc52b65e4d49d2be459c
+SHA1 (patch-ah) = 9fae17c18d721365365f0b2e240927c3e42d7f80
+SHA1 (patch-ai) = d4d1898dbf47eb8799aae957736e49bbb50ca45e
 SHA1 (patch-aj) = eea40cf13d883656dc0db5d4de11df4a27bdc70f
 SHA1 (patch-ak) = 3b81025819f259d7ebb185de4d4890c9892aba87
 SHA1 (patch-al) = 9bdf732aad8520b89bc5925ae6eb0e2cce937f6b

Index: pkgsrc/www/wml/patches/patch-ae
diff -u pkgsrc/www/wml/patches/patch-ae:1.2 pkgsrc/www/wml/patches/patch-ae:1.3
--- pkgsrc/www/wml/patches/patch-ae:1.2 Thu Sep 29 11:12:53 2011
+++ pkgsrc/www/wml/patches/patch-ae     Sat Aug 19 00:27:01 2017
@@ -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@ \
Index: pkgsrc/www/wml/patches/patch-ag
diff -u pkgsrc/www/wml/patches/patch-ag:1.2 pkgsrc/www/wml/patches/patch-ag:1.3
--- pkgsrc/www/wml/patches/patch-ag:1.2 Sat Apr  7 13:14:25 2012
+++ pkgsrc/www/wml/patches/patch-ag     Sat Aug 19 00:27:01 2017
@@ -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

Index: pkgsrc/www/wml/patches/patch-ah
diff -u pkgsrc/www/wml/patches/patch-ah:1.1 pkgsrc/www/wml/patches/patch-ah:1.2
--- pkgsrc/www/wml/patches/patch-ah:1.1 Sat Sep 29 21:23:13 2007
+++ pkgsrc/www/wml/patches/patch-ah     Sat Aug 19 00:27:01 2017
@@ -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: 
  
Index: pkgsrc/www/wml/patches/patch-ai
diff -u pkgsrc/www/wml/patches/patch-ai:1.1 pkgsrc/www/wml/patches/patch-ai:1.2
--- pkgsrc/www/wml/patches/patch-ai:1.1 Sat Sep 29 21:23:13 2007
+++ pkgsrc/www/wml/patches/patch-ai     Sat Aug 19 00:27:01 2017
@@ -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'`; \