Don't list possibly nonexistent headers like /usr/include/sys/signal.h

in makefile dependency lists.

3 files changed, 13 insertions, 16 deletions

diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index 67f64c6d7ab..2709cec8256 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2015/11/07 19:20:16 dholland Exp $
+# $NetBSD: Makefile,v 1.38 2016/03/09 21:20:51 tnn Exp $
 
 DISTNAME=	zoo-2.10pl1
 PKGNAME=	zoo-2.10.1
@@ -16,6 +16,12 @@ NO_CONFIGURE=	yes
 BUILD_TARGET=	bsdansi
 MAKE_FILE=	makefile
 
+SUBST_CLASSES+=		fix-deps
+SUBST_STAGE.fix-deps=	pre-build
+SUBST_MESSAGE.fix-deps=	remove system headers from dependency list
+SUBST_FILES.fix-deps=	makefile
+SUBST_SED.fix-deps=	-e 's,/usr/include/[a-z/]*\.h,,g'
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 # without this installing ploughs on case-insensitive fses
diff --git a/archivers/zoo/distinfo b/archivers/zoo/distinfo
index 67eb621308f..c62d1dff667 100644
--- a/archivers/zoo/distinfo
+++ b/archivers/zoo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2015/11/03 00:56:27 agc Exp $
+$NetBSD: distinfo,v 1.17 2016/03/09 21:20:51 tnn Exp $
 
 SHA1 (zoo-2.10pl1.tar.gz) = c02d96148ee57df01596d0c8d07a3e327b821600
 RMD160 (zoo-2.10pl1.tar.gz) = 971d388b8cb29def1e4e31011463563e91c3d700
@@ -6,7 +6,7 @@ SHA512 (zoo-2.10pl1.tar.gz) = cf69b15020ebcbd10bda19967a52ac6f8fe09dc598e8034b82
 Size (zoo-2.10pl1.tar.gz) = 172096 bytes
 SHA1 (patch-aa) = 22faf3fdc38c7d75867327718d23db50fb6013d3
 SHA1 (patch-ab) = bea792c43b50c14d0be25c886c148cd6ce392234
-SHA1 (patch-ac) = e5c9e18461b86fbfba4526f685fb65a507bb6f97
+SHA1 (patch-ac) = 4afc3296937f94c1d6be581cd8abf4b85d4a6f56
 SHA1 (patch-ad) = d8992d565f48aab10521ecbd346d233a1e717790
 SHA1 (patch-ae) = d1e60cea71bb1c56e76a6ffc9923341664283a0c
 SHA1 (patch-af) = 2a1b67cf50fed58e5caf83a8ca4c8529d8e22c24
diff --git a/archivers/zoo/patches/patch-ac b/archivers/zoo/patches/patch-ac
index eae1e921bf0..d4dac8da124 100644
--- a/archivers/zoo/patches/patch-ac
+++ b/archivers/zoo/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.6 2009/04/25 23:46:47 gdt Exp $
+$NetBSD: patch-ac,v 1.7 2016/03/09 21:20:51 tnn Exp $
 
---- makefile.orig	1991-07-16 17:52:08.000000000 +0200
+--- makefile.orig	1991-07-16 15:52:08.000000000 +0000
 +++ makefile
 @@ -18,13 +18,12 @@
  
@@ -19,7 +19,7 @@ $NetBSD: patch-ac,v 1.6 2009/04/25 23:46:47 gdt Exp $
  
  #List of all object files created for Zoo
  ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \
-@@ -67,7 +67,7 @@ help :
+@@ -67,7 +66,7 @@ help :
  	@echo "lint_turboc:  Run lint under **IX for checking Turbo C/MSDOS code"
  
  # install alpha zoo as "tzoo"
@@ -28,7 +28,7 @@ $NetBSD: patch-ac,v 1.6 2009/04/25 23:46:47 gdt Exp $
  	mv zoo $(DESTDIR)/tzoo
  
  # install beta zoo as "bzoo"
-@@ -75,8 +75,9 @@ inst_beta:
+@@ -75,8 +74,9 @@ inst_beta:
  	mv zoo $(DESTDIR)/bzoo
  
  # install production zoo as "zoo"
@@ -40,12 +40,3 @@ $NetBSD: patch-ac,v 1.6 2009/04/25 23:46:47 gdt Exp $
  
  # executable targets
  TARGETS = zoo fiz
-@@ -235,7 +236,7 @@ parse.o: /usr/include/stdio.h assert.h o
- parse.o: zoofns.h zooio.h
- portable.o: /usr/include/stdio.h assert.h debug.h machine.h options.h
- portable.o: portable.h various.h zoo.h zoofns.h zooio.h
--prterror.o: /usr/include/stdio.h /usr/include/varargs.h options.h various.h
-+prterror.o: /usr/include/stdio.h options.h various.h
- prterror.o: zoofns.h zooio.h
- sysv.o: /usr/include/sys/stat.h /usr/include/sys/types.h /usr/include/time.h
- sysv.o: nixmode.i nixtime.i