Sat Aug 25 11:10:19 2012 UTC ()
always use the iana generated source files we just got


(christos)
diff -r1.1 -r1.2 pkgsrc/net/iana-etc/distinfo
diff -r1.1 -r1.2 pkgsrc/net/iana-etc/patches/patch-Makefile
cvs diff -r1.1 -r1.2 pkgsrc/net/iana-etc/distinfo (expand / switch to unified diff)

--- pkgsrc/net/iana-etc/distinfo 2012/08/25 10:59:50 1.1
+++ pkgsrc/net/iana-etc/distinfo 2012/08/25 11:10:18 1.2
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.1 2012/08/25 10:59:50 christos Exp $ 1$NetBSD: distinfo,v 1.2 2012/08/25 11:10:18 christos Exp $
2 2
3SHA1 (iana-etc-2.30.tar.bz2) = 218593bcb9264014c4e397d838b2c218eac9df06 3SHA1 (iana-etc-2.30.tar.bz2) = 218593bcb9264014c4e397d838b2c218eac9df06
4RMD160 (iana-etc-2.30.tar.bz2) = c381a9b1a26a6a06cebf8b1789ac42b8d362256f 4RMD160 (iana-etc-2.30.tar.bz2) = c381a9b1a26a6a06cebf8b1789ac42b8d362256f
5Size (iana-etc-2.30.tar.bz2) = 205618 bytes 5Size (iana-etc-2.30.tar.bz2) = 205618 bytes
6SHA1 (patch-Makefile) = 4579e64c24c4834964915de81835111645d4e4b3 6SHA1 (patch-Makefile) = 624c86469d5f63418123730fd70f2dc230a6a3d8
7SHA1 (patch-get.gawk) = 9ee0c6f5ffc917605e10a0a17c78d317ea888a05 7SHA1 (patch-get.gawk) = 9ee0c6f5ffc917605e10a0a17c78d317ea888a05
8SHA1 (patch-services.gawk) = 49f6d44cf1a33bb5f21c4ce9693fe6b26cddfab2 8SHA1 (patch-services.gawk) = 49f6d44cf1a33bb5f21c4ce9693fe6b26cddfab2
cvs diff -r1.1 -r1.2 pkgsrc/net/iana-etc/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/net/iana-etc/patches/patch-Makefile 2012/08/25 10:59:50 1.1
+++ pkgsrc/net/iana-etc/patches/patch-Makefile 2012/08/25 11:10:19 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-Makefile,v 1.1 2012/08/25 10:59:50 christos Exp $ 1$NetBSD: patch-Makefile,v 1.2 2012/08/25 11:10:19 christos Exp $
2 2
3--- Makefile 2012-08-25 13:45:59.000000000 +0300 3--- Makefile 2012-08-25 13:45:59.000000000 +0300
4+++ Makefile 2012-08-25 13:10:09.000000000 +0300 4+++ Makefile 2012-08-25 13:10:09.000000000 +0300
5@@ -17,7 +17,7 @@ 5@@ -17,7 +17,7 @@
6 .PHONY: all files get test test-services test-protocols install clean \ 6 .PHONY: all files get test test-services test-protocols install clean \
7 protocol-numbers.iana port-numbers.iana dist 7 protocol-numbers.iana port-numbers.iana dist
8  8
9-all: files 9-all: files
10+all: get files 10+all: get files
11 files: protocols services 11 files: protocols services
12  12
13 get: protocol-numbers.iana port-numbers.iana 13 get: protocol-numbers.iana port-numbers.iana
14@@ -30,10 +30,10 @@ 14@@ -30,10 +30,10 @@
@@ -16,27 +16,50 @@ $NetBSD: patch-Makefile,v 1.1 2012/08/25 @@ -16,27 +16,50 @@ $NetBSD: patch-Makefile,v 1.1 2012/08/25
16 $(AWK) -f test-lib.gawk -f test-protocols.gawk <protocols 16 $(AWK) -f test-lib.gawk -f test-protocols.gawk <protocols
17  17
18-install: files 18-install: files
19- install -d $(DESTDIR)$(PREFIX)$(ETC_DIR) 19- install -d $(DESTDIR)$(PREFIX)$(ETC_DIR)
20- install -m 644 protocols $(DESTDIR)$(PREFIX)$(ETC_DIR) 20- install -m 644 protocols $(DESTDIR)$(PREFIX)$(ETC_DIR)
21- install -m 644 services $(DESTDIR)$(PREFIX)$(ETC_DIR) 21- install -m 644 services $(DESTDIR)$(PREFIX)$(ETC_DIR)
22+#install: files 22+#install: files
23+# install -d $(DESTDIR)$(PREFIX)$(ETC_DIR) 23+# install -d $(DESTDIR)$(PREFIX)$(ETC_DIR)
24+# install -m 644 protocols $(DESTDIR)$(PREFIX)$(ETC_DIR) 24+# install -m 644 protocols $(DESTDIR)$(PREFIX)$(ETC_DIR)
25+# install -m 644 services $(DESTDIR)$(PREFIX)$(ETC_DIR) 25+# install -m 644 services $(DESTDIR)$(PREFIX)$(ETC_DIR)
26  26
27 clean: 27 clean:
28 rm -vf \ 28 rm -vf \
29@@ -42,11 +42,11 @@ 29@@ -42,26 +42,26 @@
30 protocol-numbers.iana port-numbers.iana 30 protocol-numbers.iana port-numbers.iana
31  31
32 protocol-numbers.iana: 32 protocol-numbers.iana:
33- $(AWK) -f get.gawk -v file=protocol-numbers >protocol-numbers.iana 33- $(AWK) -f get.gawk -v file=protocol-numbers >protocol-numbers.iana
34+ $(AWK) -f get.gawk -v url=protocol-numbers file=protocol-numbers >protocol-numbers.iana 34+ $(AWK) -f get.gawk -v url=protocol-numbers file=protocol-numbers >protocol-numbers.iana
35 rm -f protocol-numbers 35 rm -f protocol-numbers
36  36
37 port-numbers.iana: 37 port-numbers.iana:
38- $(AWK) -f get.gawk -v file=port-numbers >port-numbers.iana 38- $(AWK) -f get.gawk -v file=port-numbers >port-numbers.iana
39+ $(AWK) -f get.gawk -v url=service-names-port-numbers file=port-numbers >port-numbers.iana 39+ $(AWK) -f get.gawk -v url=service-names-port-numbers file=port-numbers >port-numbers.iana
40 rm -f port-numbers 40 rm -f port-numbers
41  41
42 protocol-numbers: 42 protocol-numbers:
 43-ifeq (protocol-numbers.iana, $(wildcard protocol-numbers.iana))
 44+#ifeq (protocol-numbers.iana, $(wildcard protocol-numbers.iana))
 45 ln -f -s protocol-numbers.iana protocol-numbers
 46-else
 47- ln -f -s protocol-numbers.dist protocol-numbers
 48-endif
 49+#else
 50+# ln -f -s protocol-numbers.dist protocol-numbers
 51+#endif
 52
 53 port-numbers:
 54-ifeq (port-numbers.iana, $(wildcard port-numbers.iana))
 55+#ifeq (port-numbers.iana, $(wildcard port-numbers.iana))
 56 ln -f -s port-numbers.iana port-numbers
 57-else
 58- ln -f -s port-numbers.dist port-numbers
 59-endif
 60+#else
 61+# ln -f -s port-numbers.dist port-numbers
 62+#endif
 63
 64 protocols: protocol-numbers protocols.gawk
 65 $(AWK) --re-interval -f protocols.gawk -v strip=$(STRIP) \