Fri Jan 24 00:48:51 2014 UTC ()
Pullup ticket #4299 - requested by tron
Build fix for "ngrep" for GNU make 4.0.

Revisions pulled up:
- net/ngrep/distinfo                                            1.15
- net/ngrep/patches/patch-ab                                    1.7

---
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Tue Jan 14 22:43:20 UTC 2014

   Modified Files:
   	pkgsrc/net/ngrep: distinfo
   	pkgsrc/net/ngrep/patches: patch-ab

   Log Message:
   Fix build with GNU Make 4.0 and newer.


(schnoebe)
diff -r1.14 -r1.14.62.1 pkgsrc/net/ngrep/distinfo
diff -r1.6 -r1.6.62.1 pkgsrc/net/ngrep/patches/patch-ab
cvs diff -r1.14 -r1.14.62.1 pkgsrc/net/ngrep/distinfo (expand / switch to unified diff)

--- pkgsrc/net/ngrep/distinfo 2006/11/29 10:28:48 1.14
+++ pkgsrc/net/ngrep/distinfo 2014/01/24 00:48:51 1.14.62.1
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.14 2006/11/29 10:28:48 adam Exp $ 1$NetBSD: distinfo,v 1.14.62.1 2014/01/24 00:48:51 schnoebe Exp $
2 2
3SHA1 (ngrep-1.45.tar.bz2) = f26090a6ac607db66df99c6fa9aef74968f3330f 3SHA1 (ngrep-1.45.tar.bz2) = f26090a6ac607db66df99c6fa9aef74968f3330f
4RMD160 (ngrep-1.45.tar.bz2) = d4b89dfa23f6a7c65d3ccefc846362054a46605f 4RMD160 (ngrep-1.45.tar.bz2) = d4b89dfa23f6a7c65d3ccefc846362054a46605f
5Size (ngrep-1.45.tar.bz2) = 463361 bytes 5Size (ngrep-1.45.tar.bz2) = 463361 bytes
6SHA1 (patch-aa) = 7185b12af40ce9581e59c28086e4c0bfa481c804 6SHA1 (patch-aa) = 7185b12af40ce9581e59c28086e4c0bfa481c804
7SHA1 (patch-ab) = c2ff90264a29fc18e16d2b43e7403d784a4ef584 7SHA1 (patch-ab) = 011df9c7bcd9c1f3d6a40309a443a68607a66afd
8SHA1 (patch-ac) = 4b070c7f0e577cd5e9cbff17ee9bac1be7860581 8SHA1 (patch-ac) = 4b070c7f0e577cd5e9cbff17ee9bac1be7860581
9SHA1 (patch-ad) = d36cbf882976bbe6af98aa02fa0d0386741e0f87 9SHA1 (patch-ad) = d36cbf882976bbe6af98aa02fa0d0386741e0f87
cvs diff -r1.6 -r1.6.62.1 pkgsrc/net/ngrep/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/ngrep/patches/patch-ab 2006/10/07 07:24:49 1.6
+++ pkgsrc/net/ngrep/patches/patch-ab 2014/01/24 00:48:51 1.6.62.1
@@ -1,15 +1,25 @@ @@ -1,15 +1,25 @@
1$NetBSD: patch-ab,v 1.6 2006/10/07 07:24:49 rillig Exp $ 1$NetBSD: patch-ab,v 1.6.62.1 2014/01/24 00:48:51 schnoebe Exp $
2 2
3Tags: not-for-upstream 31.) Install manual pages in correct directory.
 42.) Fix build with version 4.0 of GNU make.
4 5
5--- Makefile.in.orig 2005-02-25 10:20:17.000000000 +0000 6--- Makefile.in.orig 2006-11-28 13:35:37.000000000 +0000
6+++ Makefile.in 7+++ Makefile.in 2014-01-14 22:40:38.000000000 +0000
7@@ -25,7 +25,7 @@ exec_prefix = @exec_prefix@ 8@@ -25,7 +25,7 @@
8  9
9 bindir = $(prefix)/bin 10 bindir = $(prefix)/bin
10 datadir = $(prefix)/share 11 datadir = $(prefix)/share
11-mandir = $(datadir)/man 12-mandir = $(datadir)/man
12+mandir = $(prefix)/$(PKGMANDIR) 13+mandir = $(prefix)/$(PKGMANDIR)
13  14
14 BINDIR_INSTALL = $(prefix)/bin 15 BINDIR_INSTALL = $(prefix)/bin
15 MANDIR_INSTALL = $(mandir)/man8 16 MANDIR_INSTALL = $(mandir)/man8
 17@@ -63,7 +63,7 @@
 18 rm -f config.status config.cache config.log config.h Makefile
 19
 20 $(REGEX_OBJS): $(REGEX_OBJS:.o=.c) $(REGEX_DIR)/*.h
 21- $(MAKE) $(MAKEFLAGS) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
 22+ $(MAKE) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
 23
 24 $(OBJS): Makefile ngrep.c ngrep.h
 25