Fri Jan 10 21:17:17 2020 UTC ()
Replace completely broken sleep hack from MacPorts with an actual
dependency.


(joerg)
diff -r1.2 -r1.3 pkgsrc/net/daq/distinfo
diff -r1.1 -r1.2 pkgsrc/net/daq/patches/patch-sfbpf_Makefile.am
diff -r0 -r1.1 pkgsrc/net/daq/patches/patch-sfbpf_Makefile.in

cvs diff -r1.2 -r1.3 pkgsrc/net/daq/distinfo (expand / switch to unified diff)

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

cvs diff -r1.1 -r1.2 pkgsrc/net/daq/patches/patch-sfbpf_Makefile.am (expand / switch to unified diff)

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

File Added: pkgsrc/net/daq/patches/patch-sfbpf_Makefile.in
$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