Fri Jan 1 01:29:30 2016 UTC ()
Do not use GNU make, bump PKGREVISION
Fix circular dependency of PREFER_PKGSRC=yes case.


(ryoon)
diff -r1.29 -r1.30 pkgsrc/textproc/expat/Makefile
diff -r1.22 -r1.23 pkgsrc/textproc/expat/distinfo
diff -r0 -r1.1 pkgsrc/textproc/expat/patches/patch-Makefile.in
cvs diff -r1.29 -r1.30 pkgsrc/textproc/expat/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/expat/Makefile 2015/08/04 08:47:19 1.29
+++ pkgsrc/textproc/expat/Makefile 2016/01/01 01:29:30 1.30
@@ -1,27 +1,26 @@ @@ -1,27 +1,26 @@
1# $NetBSD: Makefile,v 1.29 2015/08/04 08:47:19 tnn Exp $ 1# $NetBSD: Makefile,v 1.30 2016/01/01 01:29:30 ryoon Exp $
2# 2#
3 3
4DISTNAME= expat-2.1.0 4DISTNAME= expat-2.1.0
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= textproc 6CATEGORIES= textproc
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=expat/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=expat/}
8 8
9MAINTAINER= drochner@NetBSD.org 9MAINTAINER= drochner@NetBSD.org
10HOMEPAGE= http://expat.sourceforge.net/ 10HOMEPAGE= http://expat.sourceforge.net/
11COMMENT= XML parser library written in C 11COMMENT= XML parser library written in C
12LICENSE= mit 12LICENSE= mit
13 13
14GNU_CONFIGURE= YES 14GNU_CONFIGURE= YES
15USE_LIBTOOL= YES 15USE_LIBTOOL= YES
16USE_TOOLS+= gmake 
17 16
18PKGCONFIG_OVERRIDE+= expat.pc.in 17PKGCONFIG_OVERRIDE+= expat.pc.in
19 18
20DOCDIR= ${PREFIX}/share/doc/html/expat 19DOCDIR= ${PREFIX}/share/doc/html/expat
21 20
22post-install: 21post-install:
23 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} 22 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
24 ${INSTALL_DATA} ${WRKSRC}/doc/reference.html ${DESTDIR}${DOCDIR} 23 ${INSTALL_DATA} ${WRKSRC}/doc/reference.html ${DESTDIR}${DOCDIR}
25 ${INSTALL_DATA} ${WRKSRC}/doc/style.css ${DESTDIR}${DOCDIR} 24 ${INSTALL_DATA} ${WRKSRC}/doc/style.css ${DESTDIR}${DOCDIR}
26 25
27.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.22 -r1.23 pkgsrc/textproc/expat/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/expat/distinfo 2015/11/04 01:59:28 1.22
+++ pkgsrc/textproc/expat/distinfo 2016/01/01 01:29:30 1.23
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.22 2015/11/04 01:59:28 agc Exp $ 1$NetBSD: distinfo,v 1.23 2016/01/01 01:29:30 ryoon Exp $
2 2
3SHA1 (expat-2.1.0.tar.gz) = b08197d146930a5543a7b99e871cba3da614f6f0 3SHA1 (expat-2.1.0.tar.gz) = b08197d146930a5543a7b99e871cba3da614f6f0
4RMD160 (expat-2.1.0.tar.gz) = bffca083d29fe7688f106a902ef9b909c3321c5d 4RMD160 (expat-2.1.0.tar.gz) = bffca083d29fe7688f106a902ef9b909c3321c5d
5SHA512 (expat-2.1.0.tar.gz) = 2a9ad2b44b87b84087979fe4114d661838df3b03dbdcb74d590cb74096bf35ce9d5a86617b0941a2655ea441a94537bcbcd78252da92342238823be36de2d09d 5SHA512 (expat-2.1.0.tar.gz) = 2a9ad2b44b87b84087979fe4114d661838df3b03dbdcb74d590cb74096bf35ce9d5a86617b0941a2655ea441a94537bcbcd78252da92342238823be36de2d09d
6Size (expat-2.1.0.tar.gz) = 562616 bytes 6Size (expat-2.1.0.tar.gz) = 562616 bytes
 7SHA1 (patch-Makefile.in) = 196837e69acda50ce813c198b730a9ba18015196
7SHA1 (patch-xmlparse.c) = e6e3697102b2f86d4a0824b1f6498e0ec435b9e4 8SHA1 (patch-xmlparse.c) = e6e3697102b2f86d4a0824b1f6498e0ec435b9e4
File Added: pkgsrc/textproc/expat/patches/Attic/patch-Makefile.in
$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