diff options
| author | markd <markd@pkgsrc.org> | 2014-06-14 23:43:29 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2014-06-14 23:43:29 +0000 |
| commit | 76b98a060652e92c39049a259995b0c64a668455 (patch) | |
| tree | 9f4291ef4c9de4a7897df9b574bede00ec9f7e63 | |
| parent | 7e1ca7dfe311c21aa91136cdf005ef5395f4e017 (diff) | |
| download | pkgsrc-76b98a060652e92c39049a259995b0c64a668455.tar.gz | |
Fix PKG_SYSCONFDIR handling for rancid.types.base. Bump PKGREVISION.
| -rw-r--r-- | net/rancid/Makefile | 6 | ||||
| -rw-r--r-- | net/rancid/PLIST | 4 | ||||
| -rw-r--r-- | net/rancid/distinfo | 3 | ||||
| -rw-r--r-- | net/rancid/patches/patch-etc_Makefile.in | 18 |
4 files changed, 27 insertions, 4 deletions
diff --git a/net/rancid/Makefile b/net/rancid/Makefile index 354fcb22662..5a24eca274e 100644 --- a/net/rancid/Makefile +++ b/net/rancid/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2014/06/13 21:14:55 pettai Exp $ +# $NetBSD: Makefile,v 1.13 2014/06/14 23:43:29 markd Exp $ # DISTNAME= rancid-3.1 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ @@ -44,6 +45,8 @@ CONF_FILES_PERMS= ${EGDIR}/lg.conf.sample ${PKG_SYSCONFDIR}/lg.conf \ ${ROOT_USER} ${ROOT_GROUP} 0644 CONF_FILES_PERMS+= ${EGDIR}/rancid.conf.sample ${PKG_SYSCONFDIR}/rancid.conf \ ${ROOT_USER} ${ROOT_GROUP} 0644 +CONF_FILES_PERMS+= ${EGDIR}/rancid.types.base ${PKG_SYSCONFDIR}/rancid.types.base \ + ${ROOT_USER} ${ROOT_GROUP} 0644 MESSAGE_SUBST+= PREFIX=${PREFIX} MESSAGE_SUBST+= RC_USER=${RC_USER} @@ -69,5 +72,6 @@ CONFIGURE_ARGS+= ac_cv_PING_PATH=/sbin/ping post-install: ${INSTALL_DATA} ${WRKSRC}/etc/lg.conf.sample ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${WRKSRC}/etc/rancid.conf.sample ${DESTDIR}${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/etc/rancid.types.base ${DESTDIR}${EGDIR} .include "../../mk/bsd.pkg.mk" diff --git a/net/rancid/PLIST b/net/rancid/PLIST index 0acfa334c46..a99cac48804 100644 --- a/net/rancid/PLIST +++ b/net/rancid/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2014/04/02 09:11:11 pettai Exp $ +@comment $NetBSD: PLIST,v 1.7 2014/06/14 23:43:29 markd Exp $ bin/agmrancid bin/alogin bin/anlogin @@ -58,7 +58,6 @@ bin/xilogin bin/xirancid bin/xrancid bin/zrancid -etc/rancid/rancid.types.base lib/rancid/arbor.pm lib/rancid/dell.pm lib/rancid/eos.pm @@ -153,3 +152,4 @@ share/doc/rancid/rancid.conf.sample share/doc/rancid/rtrfilter share/examples/rancid/lg.conf.sample share/examples/rancid/rancid.conf.sample +share/examples/rancid/rancid.types.base diff --git a/net/rancid/distinfo b/net/rancid/distinfo index 84e0c2e3d2f..636dcce8a38 100644 --- a/net/rancid/distinfo +++ b/net/rancid/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.6 2014/06/13 21:14:55 pettai Exp $ +$NetBSD: distinfo,v 1.7 2014/06/14 23:43:29 markd 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 diff --git a/net/rancid/patches/patch-etc_Makefile.in b/net/rancid/patches/patch-etc_Makefile.in new file mode 100644 index 00000000000..187c6f7e564 --- /dev/null +++ b/net/rancid/patches/patch-etc_Makefile.in @@ -0,0 +1,18 @@ +$NetBSD: patch-etc_Makefile.in,v 1.1 2014/06/14 23:43:29 markd Exp $ + +Make rancid.types.base install conditional 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 +@@ -541,8 +541,8 @@ install-data-local: all + else \ + $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \ + fi; \ +- fi; \ +- $(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir)/rancid.types.base ++ $(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir)/rancid.types.base; \ ++ fi + + lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in + rm -f lg.conf.sample lg.conf.sample.tmp; \ |