From 7ddf8d4ab7238dbfadd10e15c185eaf808808bb0 Mon Sep 17 00:00:00 2001 From: agc Date: Fri, 30 Jul 2004 15:57:06 +0000 Subject: Pullup ticket 84 to the pkgsrc-2004Q2 branch, requested by Grant Beattie build fix for xmlcatmgr Module Name: pkgsrc Committed By: grant Date: Sat Jul 3 14:00:28 UTC 2004 Modified Files: pkgsrc/textproc/xmlcatmgr: Makefile Log Message: test CC_VERSION instead of USE_MIPSPRO. --- doc/CHANGES-pkgsrc-2004Q2 | 4 +++- textproc/xmlcatmgr/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2 index 8ab69cfd6db..7bf0451792d 100644 --- a/doc/CHANGES-pkgsrc-2004Q2 +++ b/doc/CHANGES-pkgsrc-2004Q2 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.47 2004/07/30 15:53:21 agc Exp $ +$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.48 2004/07/30 15:57:06 agc Exp $ Changes to the packages collection and infrastructure on the pkgsrc-2004Q2 branch: @@ -90,4 +90,6 @@ Pullup ticket 82, requested by Grant Beattie [agc 2004-07-30] build fixes for aide and aide06 Pullup ticket 83, requested by Grant Beattie [agc 2004-07-30] build fixes for AiCA +Pullup ticket 84, requested by Grant Beattie [agc 2004-07-30] + build fix for xmlcatmgr diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile index 9b59d587b1c..befa7724411 100644 --- a/textproc/xmlcatmgr/Makefile +++ b/textproc/xmlcatmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/05/02 10:29:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.20.2.1 2004/07/30 15:57:06 agc Exp $ # DISTNAME= xmlcatmgr-2.1 @@ -35,9 +35,9 @@ SUPPORT_FILES+= ${EGDIR}/catalog.share.xml ${PREFIX}/share/xml/catalog BUILD_DIRS= ${WRKSRC}/work INSTALL_DIRS= ${WRKSRC}/work -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" -.if defined(USE_MIPSPRO) && !empty(USE_MIPSPRO:M[yY][eE][sS]) +.if !empty(PKGSRC_COMPILER:Mmipspro) CFLAGS+= -c99 .endif -- cgit v1.2.3