CVS commit: pkgsrc/net/daq

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Jan 10 21:17:17 UTC 2020

Modified Files:
        pkgsrc/net/daq: distinfo
        pkgsrc/net/daq/patches: patch-sfbpf_Makefile.am
Added Files:
        pkgsrc/net/daq/patches: patch-sfbpf_Makefile.in

Log Message:
Replace completely broken sleep hack from MacPorts with an actual
dependency.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/daq/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/daq/patches/patch-sfbpf_Makefile.am
cvs rdiff -u -r0 -r1.1 pkgsrc/net/daq/patches/patch-sfbpf_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/daq/distinfo
diff -u pkgsrc/net/daq/distinfo:1.2 pkgsrc/net/daq/distinfo:1.3
--- pkgsrc/net/daq/distinfo:1.2 Sat Apr 27 11:33:03 2019
+++ pkgsrc/net/daq/distinfo     Fri Jan 10 21:17:17 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2019/04/27 11:33:03 wiz Exp $
+$NetBSD: distinfo,v 1.3 2020/01/10 21:17:17 joerg Exp $
 
 SHA1 (daq-2.0.6.tar.gz) = ec0ebfcd4568a3e4e58c774982c808c414dd71bc
 RMD160 (daq-2.0.6.tar.gz) = cf3a9df96829f63324a44dae5f2248d835e6ac4d
 SHA512 (daq-2.0.6.tar.gz) = 65d779651e6b193309159113f620dc843be4b5e142455a3b530b88ce7ca12c318935affa45f54e56427c9d5eb1239a47dc7a323325ccb394d1a888619c580f9e
 Size (daq-2.0.6.tar.gz) = 514687 bytes
-SHA1 (patch-sfbpf_Makefile.am) = 200e15424d2a6e8b5ec4f78b92c2203ae63726b6
+SHA1 (patch-sfbpf_Makefile.am) = 3697692267c3ff8e104103065a382e60089c641b
+SHA1 (patch-sfbpf_Makefile.in) = 93286e8b417dfc40e40a64544eaf6b443a9aaaaf

Index: pkgsrc/net/daq/patches/patch-sfbpf_Makefile.am
diff -u pkgsrc/net/daq/patches/patch-sfbpf_Makefile.am:1.1 pkgsrc/net/daq/patches/patch-sfbpf_Makefile.am:1.2
--- pkgsrc/net/daq/patches/patch-sfbpf_Makefile.am:1.1  Thu May 18 18:57:21 2017
+++ pkgsrc/net/daq/patches/patch-sfbpf_Makefile.am      Fri Jan 10 21:17:17 2020
@@ -1,16 +1,13 @@
-$NetBSD: patch-sfbpf_Makefile.am,v 1.1 2017/05/18 18:57:21 nils Exp $
-
-tokdefs.h is created but after checkinf of this file existence.
-Patch from MacPorts waiting to get upstream :
-https://trac.macports.org/ticket/45159
+$NetBSD: patch-sfbpf_Makefile.am,v 1.2 2020/01/10 21:17:17 joerg Exp $
 
 --- sfbpf/Makefile.am.orig     2015-04-01 18:56:48.000000000 +0000
 +++ sfbpf/Makefile.am
-@@ -51,6 +51,7 @@ sf_scanner.o: sf_scanner.c tokdefs.h
+@@ -47,7 +47,7 @@ sf_scanner.c: $(srcdir)/scanner.l
+       @rm -f $(srcdir)/sf_scanner.c
+       $(srcdir)/runlex.sh $(V_LEX) -osf_scanner.c $(srcdir)/scanner.l
+ 
+-sf_scanner.o: sf_scanner.c tokdefs.h
++libsfbpf_la-sf_scanner.lo: sf_scanner.c tokdefs.h
  
  tokdefs.h: sf_grammar.c
  sf_grammar.c: $(srcdir)/grammar.y
-+      sleep 5
-       @rm -f sf_grammar.c tokdefs.h
-       $(V_YACC) -d $(srcdir)/grammar.y
-       mv y.tab.c sf_grammar.c

Added files:

Index: pkgsrc/net/daq/patches/patch-sfbpf_Makefile.in
diff -u /dev/null pkgsrc/net/daq/patches/patch-sfbpf_Makefile.in:1.1
--- /dev/null   Fri Jan 10 21:17:17 2020
+++ pkgsrc/net/daq/patches/patch-sfbpf_Makefile.in      Fri Jan 10 21:17:17 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-sfbpf_Makefile.in,v 1.1 2020/01/10 21:17:17 joerg Exp $
+
+--- sfbpf/Makefile.in.orig     2020-01-10 00:23:05.893226310 +0000
++++ sfbpf/Makefile.in
+@@ -780,7 +780,7 @@ sf_scanner.c: $(srcdir)/scanner.l
+       @rm -f $(srcdir)/sf_scanner.c
+       $(srcdir)/runlex.sh $(V_LEX) -osf_scanner.c $(srcdir)/scanner.l
+ 
+-sf_scanner.o: sf_scanner.c tokdefs.h
++libsfbpf_la-sf_scanner.lo: sf_scanner.c tokdefs.h
+ 
+ tokdefs.h: sf_grammar.c
+ sf_grammar.c: $(srcdir)/grammar.y