Wed Aug 14 23:51:08 2013 UTC ()
Remove gmake from TOOLS, to fix build on NetBSD 6.99.23.
The symptoms and the fix are the same as in PR/47933 (which
concerned audio/nas).

Why was GNU make required in the first place?


(gsutre)
diff -r1.74 -r1.75 pkgsrc/graphics/xpaint/Makefile
cvs diff -r1.74 -r1.75 pkgsrc/graphics/xpaint/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/xpaint/Makefile 2013/04/06 21:07:33 1.74
+++ pkgsrc/graphics/xpaint/Makefile 2013/08/14 23:51:08 1.75
@@ -1,27 +1,26 @@ @@ -1,27 +1,26 @@
1# $NetBSD: Makefile,v 1.74 2013/04/06 21:07:33 rodent Exp $ 1# $NetBSD: Makefile,v 1.75 2013/08/14 23:51:08 gsutre Exp $
2 2
3DISTNAME= xpaint-2.7.8.1 3DISTNAME= xpaint-2.7.8.1
4PKGREVISION= 10 4PKGREVISION= 10
5CATEGORIES= graphics x11 5CATEGORIES= graphics x11
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sf-xpaint/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sf-xpaint/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= adam@NetBSD.org 9MAINTAINER= adam@NetBSD.org
10HOMEPAGE= http://sf-xpaint.sourceforge.net/ 10HOMEPAGE= http://sf-xpaint.sourceforge.net/
11COMMENT= Simple paint program 11COMMENT= Simple paint program
12 12
13USE_IMAKE= yes 13USE_IMAKE= yes
14USE_TOOLS+= gmake 
15MAKE_ENV+= XMKMF=${XMKMF:Q} 14MAKE_ENV+= XMKMF=${XMKMF:Q}
16MAKE_JOBS_SAFE= NO 15MAKE_JOBS_SAFE= NO
17 16
18SUBST_CLASSES+= foo 17SUBST_CLASSES+= foo
19SUBST_STAGE.foo= pre-configure 18SUBST_STAGE.foo= pre-configure
20SUBST_FILES.foo= Local.config configure 19SUBST_FILES.foo= Local.config configure
21SUBST_SED.foo= -e "s|@LOCALBASE@|${LOCALBASE}|g" 20SUBST_SED.foo= -e "s|@LOCALBASE@|${LOCALBASE}|g"
22SUBST_SED.foo+= -e "s|@PREFIX@|${PREFIX}|g" 21SUBST_SED.foo+= -e "s|@PREFIX@|${PREFIX}|g"
23SUBST_SED.foo+= -e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g" 22SUBST_SED.foo+= -e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g"
24SUBST_SED.foo+= -e "s|@XPMDIR@|${BUILDLINK_PREFIX.libXpm}|g" 23SUBST_SED.foo+= -e "s|@XPMDIR@|${BUILDLINK_PREFIX.libXpm}|g"
25 24
26INSTALLATION_DIRS+= bin lib/X11/app-defaults ${PKGMANDIR}/cat1 25INSTALLATION_DIRS+= bin lib/X11/app-defaults ${PKGMANDIR}/cat1
27INSTALLATION_DIRS+= share/xpaint 26INSTALLATION_DIRS+= share/xpaint