Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7B3C784D27 for ; Sat, 8 Jul 2023 11:42:47 +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 axRsMsNILH43 for ; Sat, 8 Jul 2023 11:42:46 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id DC4F084D14 for ; Sat, 8 Jul 2023 11:42:46 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D9C0DFBDB; Sat, 8 Jul 2023 11:42:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168881656659170" MIME-Version: 1.0 Date: Sat, 8 Jul 2023 11:42:46 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/textproc/xmlcatmgr To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20230708114246.D9C0DFBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168881656659170 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Sat Jul 8 11:42:46 UTC 2023 Modified Files: pkgsrc/textproc/xmlcatmgr: Makefile Log Message: textproc/xmlcatmgr: Tidy up a little bit. No functional change intended, other than in the console output formatting. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 pkgsrc/textproc/xmlcatmgr/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168881656659170 Content-Disposition: inline Content-Length: 1740 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/xmlcatmgr/Makefile diff -u pkgsrc/textproc/xmlcatmgr/Makefile:1.38 pkgsrc/textproc/xmlcatmgr/Makefile:1.39 --- pkgsrc/textproc/xmlcatmgr/Makefile:1.38 Tue Jun 27 10:27:36 2023 +++ pkgsrc/textproc/xmlcatmgr/Makefile Sat Jul 8 11:42:46 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2023/06/27 10:27:36 riastradh Exp $ +# $NetBSD: Makefile,v 1.39 2023/07/08 11:42:46 riastradh Exp $ # DISTNAME= xmlcatmgr-2.2 @@ -27,23 +27,23 @@ INSTALLATION_DIRS+= share/examples/xmlca .include "../../mk/bsd.prefs.mk" -.if empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +.if ${USE_CROSS_COMPILE:tl} != "yes" XMLCATMGR= ${WRKSRC}/xmlcatmgr .else -TOOL_DEPENDS+= ${PKGNAME}:../../textproc/xmlcatmgr +TOOL_DEPENDS+= ${PKGNAME}:../../${PKGPATH} XMLCATMGR= ${TOOLBASE}/bin/xmlcatmgr .endif post-build: - @${ECHO} "Creating SGML catalogs..." - @${XMLCATMGR} -sc ${WRKDIR}/catalog.etc.sgml create - @${XMLCATMGR} -sc ${WRKDIR}/catalog.sgml create - @${XMLCATMGR} -sc ${WRKDIR}/catalog.etc.sgml add \ + @${STEP_MSG} "Creating SGML catalogs..." + ${RUN}${XMLCATMGR} -sc ${WRKDIR}/catalog.etc.sgml create + ${RUN}${XMLCATMGR} -sc ${WRKDIR}/catalog.sgml create + ${RUN}${XMLCATMGR} -sc ${WRKDIR}/catalog.etc.sgml add \ CATALOG ${PREFIX}/share/sgml/catalog - @${ECHO} "Creating XML catalogs..." - @${XMLCATMGR} -c ${WRKDIR}/catalog.etc.xml create - @${XMLCATMGR} -c ${WRKDIR}/catalog.xml create - @${XMLCATMGR} -c ${WRKDIR}/catalog.etc.xml add \ + @${STEP_MSG} "Creating XML catalogs..." + ${RUN}${XMLCATMGR} -c ${WRKDIR}/catalog.etc.xml create + ${RUN}${XMLCATMGR} -c ${WRKDIR}/catalog.xml create + ${RUN}${XMLCATMGR} -c ${WRKDIR}/catalog.etc.xml add \ nextCatalog ${PREFIX}/share/xml/catalog post-install: --_----------=_168881656659170--