Sat Nov 7 23:47:52 2015 UTC ()
Fix openbsd build failure.


(dholland)
diff -r1.5 -r1.6 pkgsrc/comms/tn3270/distinfo
diff -r1.1 -r1.2 pkgsrc/comms/tn3270/patches/patch-tools_mkmake_mkmake.y
cvs diff -r1.5 -r1.6 pkgsrc/comms/tn3270/distinfo (expand / switch to unified diff)

--- pkgsrc/comms/tn3270/distinfo 2015/11/03 01:34:58 1.5
+++ pkgsrc/comms/tn3270/distinfo 2015/11/07 23:47:52 1.6
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.5 2015/11/03 01:34:58 agc Exp $ 1$NetBSD: distinfo,v 1.6 2015/11/07 23:47:52 dholland Exp $
2 2
3SHA1 (tn3270-0.20100116.tar.gz) = b550f2c240aa3b185b935c11ed36e75c8c574503 3SHA1 (tn3270-0.20100116.tar.gz) = b550f2c240aa3b185b935c11ed36e75c8c574503
4RMD160 (tn3270-0.20100116.tar.gz) = 59ca2fcaa8f44258eb9cb0069cf17e560754f2c9 4RMD160 (tn3270-0.20100116.tar.gz) = 59ca2fcaa8f44258eb9cb0069cf17e560754f2c9
5SHA512 (tn3270-0.20100116.tar.gz) = 92b89b302b0827b6995c0b04f4642585f93021c5a5e7d30f414ba3fd9314ed019ba35e9a155f0cf7d9c1be7bad37dda44622f9245409a024113358a90005e9b1 5SHA512 (tn3270-0.20100116.tar.gz) = 92b89b302b0827b6995c0b04f4642585f93021c5a5e7d30f414ba3fd9314ed019ba35e9a155f0cf7d9c1be7bad37dda44622f9245409a024113358a90005e9b1
6Size (tn3270-0.20100116.tar.gz) = 156352 bytes 6Size (tn3270-0.20100116.tar.gz) = 156352 bytes
7SHA1 (patch-aa) = dfec3563624578dc775f4ec7d0ce813eb9431dce 7SHA1 (patch-aa) = dfec3563624578dc775f4ec7d0ce813eb9431dce
8SHA1 (patch-tools_mkmake_mkmake.y) = e72636ac31a99247b871024665c055db0706b005 8SHA1 (patch-tools_mkmake_mkmake.y) = 8e9dab56b989f1dc3cfc7a17daf6cf95d2dda886
cvs diff -r1.1 -r1.2 pkgsrc/comms/tn3270/patches/patch-tools_mkmake_mkmake.y (expand / switch to unified diff)

--- pkgsrc/comms/tn3270/patches/patch-tools_mkmake_mkmake.y 2015/01/09 14:28:42 1.1
+++ pkgsrc/comms/tn3270/patches/patch-tools_mkmake_mkmake.y 2015/11/07 23:47:52 1.2
@@ -1,12 +1,26 @@ @@ -1,12 +1,26 @@
1$NetBSD: patch-tools_mkmake_mkmake.y,v 1.1 2015/01/09 14:28:42 joerg Exp $ 1$NetBSD: patch-tools_mkmake_mkmake.y,v 1.2 2015/11/07 23:47:52 dholland Exp $
2 2
3--- tools/mkmake/mkmake.y.orig 2015-01-09 12:31:43.000000000 +0000 3- use standard headers
 4- avoid symbol name collision on OpenBSD where clock() from time.h leaks in
 5
 6--- tools/mkmake/mkmake.y.orig 2010-01-17 18:00:07.000000000 +0000
4+++ tools/mkmake/mkmake.y 7+++ tools/mkmake/mkmake.y
5@@ -40,6 +40,7 @@ __RCSID("$NetBSD: mkmake.y,v 1.1.1.1 201 8@@ -40,6 +40,7 @@ __RCSID("$NetBSD: mkmake.y,v 1.1.1.1 201
6 #endif 9 #endif
7 #endif /* not lint */ 10 #endif /* not lint */
8 #endif 11 #endif
9+#include <stdlib.h> 12+#include <stdlib.h>
10  13
11 typedef struct string { 14 typedef struct string {
12 int 15 int
 16@@ -308,6 +309,10 @@ white_space : WHITE_SPACE
 17 #include <string.h>
 18 #include <ctype.h>
 19
 20+/* work around symbol collision on OpenBSD */
 21+#undef clock
 22+#define clock Clock
 23+
 24 /* mkmake.y */
 25 void yyerror(char *);
 26 void assign(same_t *, same_t *);