[pkgsrc/trunk]: pkgsrc/x11/Xbae Replaced pkgsrc-specific patches with a SUBST...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e71f0d93d0be
branches:  trunk
changeset: 373478:e71f0d93d0be
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Jan 02 21:11:10 2018 +0000

description:
Replaced pkgsrc-specific patches with a SUBST block.

This reduces the number of pkglint errors for this package, since all
remaining patches are properly commented now.

No functional change, except for a smaller binary package.

diffstat:

 x11/Xbae/Makefile         |  11 ++++++++++-
 x11/Xbae/distinfo         |   8 ++------
 x11/Xbae/patches/patch-aa |  22 ----------------------
 x11/Xbae/patches/patch-ab |   7 ++++++-
 x11/Xbae/patches/patch-ac |  20 --------------------
 x11/Xbae/patches/patch-ad |  13 -------------
 x11/Xbae/patches/patch-ae |  13 -------------
 7 files changed, 18 insertions(+), 76 deletions(-)

diffs (140 lines):

diff -r cad43771ab87 -r e71f0d93d0be x11/Xbae/Makefile
--- a/x11/Xbae/Makefile Tue Jan 02 15:55:25 2018 +0000
+++ b/x11/Xbae/Makefile Tue Jan 02 21:11:10 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2012/10/29 05:06:06 asau Exp $
+# $NetBSD: Makefile,v 1.30 2018/01/02 21:11:10 rillig Exp $
 #
 
 DISTNAME=      xbae-4.51.01
@@ -19,6 +19,15 @@
 
 INSTALLATION_DIRS=     share/aclocal
 
+SUBST_CLASSES+=                dirs
+SUBST_STAGE.dirs=      post-patch
+SUBST_FILES.dirs=      Makefile.in doc/Makefile.in doc/images/Makefile.in src/Makefile.in
+SUBST_SED.dirs=                -e '/^mandir =/         s,=.*,= @mandir@,'
+SUBST_SED.dirs+=       -e '/^SUBDIRS =/        s,examples,,'
+SUBST_SED.dirs+=       -e '/^docdir =/         s,=.*,= $$(datadir)/doc/Xbae,'
+SUBST_SED.dirs+=       -e '/^imagedir =/       s,=.*,= $$(datadir)/doc/Xbae/images,'
+SUBST_SED.dirs+=       -e '/^install-data-am:/ s,install-htmlDATA,,'
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/ac_find_xbae.m4 ${DESTDIR}${PREFIX}/share/aclocal
 
diff -r cad43771ab87 -r e71f0d93d0be x11/Xbae/distinfo
--- a/x11/Xbae/distinfo Tue Jan 02 15:55:25 2018 +0000
+++ b/x11/Xbae/distinfo Tue Jan 02 21:11:10 2018 +0000
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 03:28:25 agc Exp $
+$NetBSD: distinfo,v 1.10 2018/01/02 21:11:10 rillig Exp $
 
 SHA1 (xbae-4.51.01.tar.gz) = 0eb1434fa33b5da112331937114cfd48b0878a31
 RMD160 (xbae-4.51.01.tar.gz) = 23044dc4010f5ea8e2c87c80a25e8d5dde325b6d
 SHA512 (xbae-4.51.01.tar.gz) = 24b356b42e64844bf661e2fb27dc275cc4cdf5b18a989d4e37aa89f23b2029d95e38977738add85213fe30e55580b835682c232f61ee3dfd76326569235f0efd
 Size (xbae-4.51.01.tar.gz) = 1746914 bytes
-SHA1 (patch-aa) = b9ee8540470f4d280a856efd00f5b9925e5e1af5
-SHA1 (patch-ab) = 26dfa1fdd60df5e892677a83e4e548481451c010
-SHA1 (patch-ac) = 87246a832469d25b838194609bc3fafbb0437f46
-SHA1 (patch-ad) = 0edfc40dd6dc6dd1da17d4190501b32ce6c2f938
-SHA1 (patch-ae) = 2720252fd02bac06e3e2086f0e1f2fc0cca8cacc
+SHA1 (patch-ab) = 25da24b6197bda1df4844e4ca2982a249b53b263
diff -r cad43771ab87 -r e71f0d93d0be x11/Xbae/patches/patch-aa
--- a/x11/Xbae/patches/patch-aa Tue Jan 02 15:55:25 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2009/10/31 15:02:40 tnn Exp $
-
---- src/Makefile.in.orig       2004-12-08 21:48:30.000000000 +0100
-+++ src/Makefile.in
-@@ -221,7 +221,7 @@ libexecdir = @libexecdir@
- link_motif = @link_motif@
- localstatedir = @localstatedir@
- man2html_cmd = @man2html_cmd@
--mandir = $(prefix)/man
-+mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
-@@ -540,7 +540,7 @@ info: info-am
- 
- info-am:
- 
--install-data-am: install-htmlDATA install-man
-+install-data-am: install-man
- 
- install-exec-am: install-libLTLIBRARIES
- 
diff -r cad43771ab87 -r e71f0d93d0be x11/Xbae/patches/patch-ab
--- a/x11/Xbae/patches/patch-ab Tue Jan 02 15:55:25 2018 +0000
+++ b/x11/Xbae/patches/patch-ab Tue Jan 02 21:11:10 2018 +0000
@@ -1,4 +1,9 @@
-$NetBSD: patch-ab,v 1.3 2005/02/20 13:53:02 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2018/01/02 21:11:10 rillig Exp $
+
+C90 compilers do not accept declarations after the first statement.
+
+Xbae-4.60.4 doesn't need this patch anymore since the code looks entirely
+different.
 
 --- src/Matrix.c.orig  Wed Dec  8 20:11:39 2004
 +++ src/Matrix.c
diff -r cad43771ab87 -r e71f0d93d0be x11/Xbae/patches/patch-ac
--- a/x11/Xbae/patches/patch-ac Tue Jan 02 15:55:25 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2004/11/23 17:04:15 wiz Exp $
-
---- Makefile.in.orig   2004-10-29 22:08:38.000000000 +0200
-+++ Makefile.in
-@@ -230,13 +230,13 @@ target_alias = @target_alias@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
- MAINTAINERCLEANFILES = Makefile.in configure libtool config.guess config.sub ltconfig ltmain.sh aclocal.m4 config.h.in install-sh missing mkinstalldirs
--SUBDIRS = include src examples doc scripts
-+SUBDIRS = include src doc scripts
- EXTRA_DIST = configure ac_find_xbae.m4 Imakefile Xbae.tmpl Xbae.rules \
-       CVSMake
- 
- aclocaldir = @ACLOCALDIR@
- @Aclocal_TRUE@aclocal_DATA = ac_find_xbae.m4
--docdir = $(prefix)/Xbae
-+docdir = $(datadir)/doc/Xbae
- doc_DATA = NEWS README
- 
- #
diff -r cad43771ab87 -r e71f0d93d0be x11/Xbae/patches/patch-ad
--- a/x11/Xbae/patches/patch-ad Tue Jan 02 15:55:25 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/11/23 17:04:15 wiz Exp $
-
---- doc/Makefile.in.orig       2004-10-29 22:08:32.000000000 +0200
-+++ doc/Makefile.in
-@@ -224,7 +224,7 @@ SUBDIRS = images
- # Lets put the informational stuff in a sub directory to avoid 
- # polluting /usr/local for default installs.
- #
--docdir = $(datadir)/Xbae
-+docdir = $(datadir)/doc/Xbae
- doc_DATA = \
-       contents.html coverplus.html difffonts.html \
-       index.html main.html morelines.html \
diff -r cad43771ab87 -r e71f0d93d0be x11/Xbae/patches/patch-ae
--- a/x11/Xbae/patches/patch-ae Tue Jan 02 15:55:25 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2004/11/23 17:04:15 wiz Exp $
-
---- doc/images/Makefile.in.orig        2004-10-29 22:08:32.000000000 +0200
-+++ doc/images/Makefile.in
-@@ -213,7 +213,7 @@ x_libraries = @x_libraries@
- # Lets put the informational stuff in a sub directory to avoid 
- # polluting /usr/local for default installs.
- #
--imagedir = $(datadir)/Xbae/images
-+imagedir = $(datadir)/doc/Xbae/images
- 
- #
- # Cut the distribution size, don't distribute these in a source