Fri Sep 19 08:31:26 2014 UTC ()
Don't use comments in the middle of a multiline statements.


(joerg)
diff -r1.8 -r1.9 pkgsrc/net/rancid/distinfo
diff -r1.2 -r1.3 pkgsrc/net/rancid/patches/patch-etc_Makefile.in
cvs diff -r1.8 -r1.9 pkgsrc/net/rancid/distinfo (expand / switch to unified diff)

--- pkgsrc/net/rancid/distinfo 2014/07/01 13:33:40 1.8
+++ pkgsrc/net/rancid/distinfo 2014/09/19 08:31:26 1.9
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.8 2014/07/01 13:33:40 pettai Exp $ 1$NetBSD: distinfo,v 1.9 2014/09/19 08:31:26 joerg Exp $
2 2
3SHA1 (rancid-3.1.tar.gz) = 5e5bdf84634c958ad4cd413c3e31c348340ebd05 3SHA1 (rancid-3.1.tar.gz) = 5e5bdf84634c958ad4cd413c3e31c348340ebd05
4RMD160 (rancid-3.1.tar.gz) = e0f74b5886f876abe48b6d14cf3c8d4b10a6576e 4RMD160 (rancid-3.1.tar.gz) = e0f74b5886f876abe48b6d14cf3c8d4b10a6576e
5Size (rancid-3.1.tar.gz) = 435045 bytes 5Size (rancid-3.1.tar.gz) = 435045 bytes
6SHA1 (patch-etc_Makefile.in) = 1d081adce582389e3779f1b004856ca32c6c1e69 6SHA1 (patch-etc_Makefile.in) = 5400aa7c2a55ecb09577984e86e9f4dbc117f00d
cvs diff -r1.2 -r1.3 pkgsrc/net/rancid/patches/patch-etc_Makefile.in (expand / switch to unified diff)

--- pkgsrc/net/rancid/patches/patch-etc_Makefile.in 2014/07/01 13:33:40 1.2
+++ pkgsrc/net/rancid/patches/patch-etc_Makefile.in 2014/09/19 08:31:26 1.3
@@ -1,25 +1,24 @@ @@ -1,25 +1,24 @@
1$NetBSD: patch-etc_Makefile.in,v 1.2 2014/07/01 13:33:40 pettai Exp $ 1$NetBSD: patch-etc_Makefile.in,v 1.3 2014/09/19 08:31:26 joerg Exp $
2 2
3Don't install rancid.types.base as we will install it in example dir 3Don't install rancid.types.base as we will install it in example dir
4(in package Makefile) 4(in package Makefile)
5 5
6--- etc/Makefile.in.orig 2014-05-19 20:54:02.000000000 +0000 6--- etc/Makefile.in.orig 2014-05-19 20:54:02.000000000 +0000
7+++ etc/Makefile.in 7+++ etc/Makefile.in
8@@ -354,7 +354,7 @@ install-sysconfDATA: $(sysconf_DATA) 8@@ -354,7 +354,6 @@ install-sysconfDATA: $(sysconf_DATA)
9 done | $(am__base_list) | \ 9 done | $(am__base_list) | \
10 while read files; do \ 10 while read files; do \
11 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ 11 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
12- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ 12- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
13+ #$(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ 
14 done 13 done
15  14
16 uninstall-sysconfDATA: 15 uninstall-sysconfDATA:
17@@ -543,7 +543,7 @@ install-data-local: all 16@@ -543,7 +543,7 @@ install-data-local: all
18 $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \ 17 $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \
19 fi; \ 18 fi; \
20 fi; \ 19 fi; \
21- $(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir)/rancid.types.base 20- $(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir)/rancid.types.base
22+ #$(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir)/rancid.types.base 21+ #$(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir)/rancid.types.base
23  22
24 lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in 23 lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in
25 rm -f lg.conf.sample lg.conf.sample.tmp; \ 24 rm -f lg.conf.sample lg.conf.sample.tmp; \