diff options
author | jlam <jlam@pkgsrc.org> | 2017-08-19 00:27:01 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2017-08-19 00:27:01 +0000 |
commit | 43b1ea8ca85cd9af95335ebe6e71ca4b6294b3db (patch) | |
tree | 481adf7677877e23a46d885e192f8b865bcd1cc2 /www | |
parent | e639935afd687886e8be32cf88b6eea7dfa79b29 (diff) | |
download | pkgsrc-43b1ea8ca85cd9af95335ebe6e71ca4b6294b3db.tar.gz |
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}.
Diffstat (limited to 'www')
-rw-r--r-- | www/wml/distinfo | 10 | ||||
-rw-r--r-- | www/wml/patches/patch-ae | 14 | ||||
-rw-r--r-- | www/wml/patches/patch-ag | 15 | ||||
-rw-r--r-- | www/wml/patches/patch-ah | 15 | ||||
-rw-r--r-- | www/wml/patches/patch-ai | 15 |
5 files changed, 55 insertions, 14 deletions
diff --git a/www/wml/distinfo b/www/wml/distinfo index 93c1f497a8b..7f1db6479f2 100644 --- a/www/wml/distinfo +++ b/www/wml/distinfo @@ -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) = f05d0f06f94a0d26b987a820b924fb94fad3bfb6 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 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'`; \ |