diff options
| author | pettai <pettai> | 2014-07-01 13:33:40 +0000 |
|---|---|---|
| committer | pettai <pettai> | 2014-07-01 13:33:40 +0000 |
| commit | 58aadb5681dd120a7992b82373c25095155570cf (patch) | |
| tree | 047ff2c05adf34c3c41afb134f9253cc0226c901 | |
| parent | 7d77394008a3d35c545bc106b9d1c9be60d11585 (diff) | |
| download | pkgsrc-58aadb5681dd120a7992b82373c25095155570cf.tar.gz | |
Remove the installation of rancid.types.base for good
| -rw-r--r-- | net/rancid/distinfo | 4 | ||||
| -rw-r--r-- | net/rancid/patches/patch-etc_Makefile.in | 25 |
2 files changed, 18 insertions, 11 deletions
diff --git a/net/rancid/distinfo b/net/rancid/distinfo index 636dcce8a38..a852548f171 100644 --- a/net/rancid/distinfo +++ b/net/rancid/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2014/06/14 23:43:29 markd Exp $ +$NetBSD: distinfo,v 1.8 2014/07/01 13:33:40 pettai Exp $ SHA1 (rancid-3.1.tar.gz) = 5e5bdf84634c958ad4cd413c3e31c348340ebd05 RMD160 (rancid-3.1.tar.gz) = e0f74b5886f876abe48b6d14cf3c8d4b10a6576e Size (rancid-3.1.tar.gz) = 435045 bytes -SHA1 (patch-etc_Makefile.in) = 57d775a1623b919d85fd6c29ecb1dc13ca502a99 +SHA1 (patch-etc_Makefile.in) = 1d081adce582389e3779f1b004856ca32c6c1e69 diff --git a/net/rancid/patches/patch-etc_Makefile.in b/net/rancid/patches/patch-etc_Makefile.in index 187c6f7e564..50b9204b74e 100644 --- a/net/rancid/patches/patch-etc_Makefile.in +++ b/net/rancid/patches/patch-etc_Makefile.in @@ -1,18 +1,25 @@ -$NetBSD: patch-etc_Makefile.in,v 1.1 2014/06/14 23:43:29 markd Exp $ +$NetBSD: patch-etc_Makefile.in,v 1.2 2014/07/01 13:33:40 pettai Exp $ -Make rancid.types.base install conditional as we will install it -in example dir (in package Makefile) +Don't install rancid.types.base as we will install it in example dir +(in package Makefile) ---- etc/Makefile.in.orig 2014-04-01 22:47:39.000000000 +0000 +--- etc/Makefile.in.orig 2014-05-19 20:54:02.000000000 +0000 +++ etc/Makefile.in -@@ -541,8 +541,8 @@ install-data-local: all - else \ +@@ -354,7 +354,7 @@ install-sysconfDATA: $(sysconf_DATA) + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ ++ #$(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ + done + + uninstall-sysconfDATA: +@@ -543,7 +543,7 @@ install-data-local: all $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \ fi; \ -- fi; \ + fi; \ - $(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir)/rancid.types.base -+ $(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir)/rancid.types.base; \ -+ fi ++ #$(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir)/rancid.types.base lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in rm -f lg.conf.sample lg.conf.sample.tmp; \ |