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 context 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 @@
-$NetBSD: distinfo,v 1.14 2006/11/29 10:28:48 adam Exp $
+$NetBSD: distinfo,v 1.14.62.1 2014/01/24 00:48:51 schnoebe Exp $
 
 SHA1 (ngrep-1.45.tar.bz2) = f26090a6ac607db66df99c6fa9aef74968f3330f
 RMD160 (ngrep-1.45.tar.bz2) = d4b89dfa23f6a7c65d3ccefc846362054a46605f
 Size (ngrep-1.45.tar.bz2) = 463361 bytes
 SHA1 (patch-aa) = 7185b12af40ce9581e59c28086e4c0bfa481c804
-SHA1 (patch-ab) = c2ff90264a29fc18e16d2b43e7403d784a4ef584
+SHA1 (patch-ab) = 011df9c7bcd9c1f3d6a40309a443a68607a66afd
 SHA1 (patch-ac) = 4b070c7f0e577cd5e9cbff17ee9bac1be7860581
 SHA1 (patch-ad) = d36cbf882976bbe6af98aa02fa0d0386741e0f87
cvs diff -r1.6 -r1.6.62.1 pkgsrc/net/ngrep/patches/patch-ab (expand / switch to context 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,10 +1,11 @@
-$NetBSD: patch-ab,v 1.6 2006/10/07 07:24:49 rillig Exp $
+$NetBSD: patch-ab,v 1.6.62.1 2014/01/24 00:48:51 schnoebe Exp $
 
-Tags: not-for-upstream
+1.) Install manual pages in correct directory.
+2.) Fix build with version 4.0 of GNU make.
 
---- Makefile.in.orig	2005-02-25 10:20:17.000000000 +0000
-+++ Makefile.in
-@@ -25,7 +25,7 @@ exec_prefix = @exec_prefix@
+--- Makefile.in.orig	2006-11-28 13:35:37.000000000 +0000
++++ Makefile.in	2014-01-14 22:40:38.000000000 +0000
+@@ -25,7 +25,7 @@
  
  bindir      = $(prefix)/bin
  datadir     = $(prefix)/share
@@ -13,3 +14,12 @@
  
  BINDIR_INSTALL = $(prefix)/bin
  MANDIR_INSTALL = $(mandir)/man8
+@@ -63,7 +63,7 @@
+ 	rm -f config.status config.cache config.log config.h Makefile 
+ 
+ $(REGEX_OBJS): $(REGEX_OBJS:.o=.c) $(REGEX_DIR)/*.h
+-	$(MAKE) $(MAKEFLAGS) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
++	$(MAKE) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
+ 
+ $(OBJS): Makefile ngrep.c ngrep.h
+