Received: by mail.netbsd.org (Postfix, from userid 605) id 7E3A184EEC; Tue, 2 Jan 2018 21:11:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0AB4884DB0 for ; Tue, 2 Jan 2018 21:11:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id e2dijkcsRlbc for ; Tue, 2 Jan 2018 21:11:10 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7B1C084C2E for ; Tue, 2 Jan 2018 21:11:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 759D9FB40; Tue, 2 Jan 2018 21:11:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1514927470105200" MIME-Version: 1.0 Date: Tue, 2 Jan 2018 21:11:10 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/x11/Xbae To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20180102211110.759D9FB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1514927470105200 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Tue Jan 2 21:11:10 UTC 2018 Modified Files: pkgsrc/x11/Xbae: Makefile distinfo pkgsrc/x11/Xbae/patches: patch-ab Removed Files: pkgsrc/x11/Xbae/patches: patch-aa patch-ac patch-ad patch-ae Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/Xbae/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/Xbae/distinfo cvs rdiff -u -r1.6 -r0 pkgsrc/x11/Xbae/patches/patch-aa cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/Xbae/patches/patch-ab cvs rdiff -u -r1.4 -r0 pkgsrc/x11/Xbae/patches/patch-ac cvs rdiff -u -r1.2 -r0 pkgsrc/x11/Xbae/patches/patch-ad \ pkgsrc/x11/Xbae/patches/patch-ae Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1514927470105200 Content-Disposition: inline Content-Length: 2726 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/Xbae/Makefile diff -u pkgsrc/x11/Xbae/Makefile:1.29 pkgsrc/x11/Xbae/Makefile:1.30 --- pkgsrc/x11/Xbae/Makefile:1.29 Mon Oct 29 05:06:06 2012 +++ pkgsrc/x11/Xbae/Makefile Tue Jan 2 21:11:10 2018 @@ -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 @@ CONFIGURE_ARGS+= --with-motif-libraries= 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 Index: pkgsrc/x11/Xbae/distinfo diff -u pkgsrc/x11/Xbae/distinfo:1.9 pkgsrc/x11/Xbae/distinfo:1.10 --- pkgsrc/x11/Xbae/distinfo:1.9 Wed Nov 4 03:28:25 2015 +++ pkgsrc/x11/Xbae/distinfo Tue Jan 2 21:11:10 2018 @@ -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 Index: pkgsrc/x11/Xbae/patches/patch-ab diff -u pkgsrc/x11/Xbae/patches/patch-ab:1.3 pkgsrc/x11/Xbae/patches/patch-ab:1.4 --- pkgsrc/x11/Xbae/patches/patch-ab:1.3 Sun Feb 20 13:53:02 2005 +++ pkgsrc/x11/Xbae/patches/patch-ab Tue Jan 2 21:11:10 2018 @@ -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 --_----------=_1514927470105200--