From 4e47e9ecdb155b8763141b3d5f1f05b15f3d8586 Mon Sep 17 00:00:00 2001
From: ryoon <ryoon@pkgsrc.org>
Date: Fri, 1 Jan 2016 01:29:30 +0000
Subject: Do not use GNU make, bump PKGREVISION Fix circular dependency of
 PREFER_PKGSRC=yes case.

---
 textproc/expat/Makefile                  |  5 ++---
 textproc/expat/distinfo                  |  3 ++-
 textproc/expat/patches/patch-Makefile.in | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 textproc/expat/patches/patch-Makefile.in

(limited to 'textproc/expat')

diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index 1fcf69f2408..e0dbb1c1e42 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2015/08/04 08:47:19 tnn Exp $
+# $NetBSD: Makefile,v 1.30 2016/01/01 01:29:30 ryoon Exp $
 #
 
 DISTNAME=	expat-2.1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=expat/}
 
@@ -13,7 +13,6 @@ LICENSE=	mit
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_TOOLS+=		gmake
 
 PKGCONFIG_OVERRIDE+=	expat.pc.in
 
diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo
index 13f3ec1b125..020955e6577 100644
--- a/textproc/expat/distinfo
+++ b/textproc/expat/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.22 2015/11/04 01:59:28 agc Exp $
+$NetBSD: distinfo,v 1.23 2016/01/01 01:29:30 ryoon Exp $
 
 SHA1 (expat-2.1.0.tar.gz) = b08197d146930a5543a7b99e871cba3da614f6f0
 RMD160 (expat-2.1.0.tar.gz) = bffca083d29fe7688f106a902ef9b909c3321c5d
 SHA512 (expat-2.1.0.tar.gz) = 2a9ad2b44b87b84087979fe4114d661838df3b03dbdcb74d590cb74096bf35ce9d5a86617b0941a2655ea441a94537bcbcd78252da92342238823be36de2d09d
 Size (expat-2.1.0.tar.gz) = 562616 bytes
+SHA1 (patch-Makefile.in) = 196837e69acda50ce813c198b730a9ba18015196
 SHA1 (patch-xmlparse.c) = e6e3697102b2f86d4a0824b1f6498e0ec435b9e4
diff --git a/textproc/expat/patches/patch-Makefile.in b/textproc/expat/patches/patch-Makefile.in
new file mode 100644
index 00000000000..e48674cd864
--- /dev/null
+++ b/textproc/expat/patches/patch-Makefile.in
@@ -0,0 +1,20 @@
+$NetBSD: patch-Makefile.in,v 1.1 2016/01/01 01:29:30 ryoon Exp $
+
+* Do not use GNU make extension
+
+--- Makefile.in.orig	2012-03-18 22:18:10.000000000 +0000
++++ Makefile.in
+@@ -154,11 +154,11 @@ xmlwf/xmlwf@EXEEXT@: $(XMLWF_OBJS) $(LIB
+ 
+ examples/elements.@OBJEXT@: examples/elements.c
+ examples/elements: examples/elements.@OBJEXT@ $(LIBRARY)
+-	$(LINK_EXE) $< $(LIBRARY)
++	$(LINK_EXE) examples/elements.@OBJEXT@ $(LIBRARY)
+ 
+ examples/outline.@OBJEXT@: examples/outline.c
+ examples/outline: examples/outline.@OBJEXT@ $(LIBRARY)
+-	$(LINK_EXE) $< $(LIBRARY)
++	$(LINK_EXE) examples/outline.@OBJEXT@ $(LIBRARY)
+ 
+ tests/chardata.@OBJEXT@: tests/chardata.c tests/chardata.h
+ tests/minicheck.@OBJEXT@: tests/minicheck.c tests/minicheck.h
-- 
cgit v1.2.3