CVS commit: pkgsrc/net/quagga

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Feb  1 20:51:25 UTC 2021

Modified Files:
        pkgsrc/net/quagga: DESCR Makefile distinfo options.mk
        pkgsrc/net/quagga/patches: patch-configure

Log Message:
net/quagga: miscellaneous cleanups (no real changes)

This commit addresses a lot of minor pkglint things, with no resulting
real changes, I think.e


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/quagga/DESCR
cvs rdiff -u -r1.66 -r1.67 pkgsrc/net/quagga/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/quagga/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/quagga/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/quagga/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/quagga/DESCR
diff -u pkgsrc/net/quagga/DESCR:1.6 pkgsrc/net/quagga/DESCR:1.7
--- pkgsrc/net/quagga/DESCR:1.6 Sat Jan 30 17:52:37 2021
+++ pkgsrc/net/quagga/DESCR     Mon Feb  1 20:51:24 2021
@@ -6,4 +6,3 @@ Ishiguro. The Quagga tree aims to build 
 around Quagga than the current centralised model of GNU Zebra.
 
 Note that quagga is no longer actively maintained.
-

Index: pkgsrc/net/quagga/Makefile
diff -u pkgsrc/net/quagga/Makefile:1.66 pkgsrc/net/quagga/Makefile:1.67
--- pkgsrc/net/quagga/Makefile:1.66     Thu Dec 10 17:09:56 2020
+++ pkgsrc/net/quagga/Makefile  Mon Feb  1 20:51:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2020/12/10 17:09:56 kardel Exp $
+# $NetBSD: Makefile,v 1.67 2021/02/01 20:51:24 gdt Exp $
 #
 DISTNAME=      quagga-1.2.4
 PKGREVISION=   4
@@ -26,6 +26,8 @@ CONFIGURE_ARGS+=      --enable-exampledir=${P
 #CONFIGURE_ARGS+=      --enable-pkgsrcrcdir=${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}/run/zebra
 
+BUILD_DEFS+=           VARBASE
+
 CONFLICTS+=            zebra-[0-9]*
 
 PLIST_SRC=             ${WRKDIR}/PLIST
@@ -39,9 +41,9 @@ PKG_USERS=            quagga:quagga
 
 PKG_SYSCONFDIR_PERMS=  quagga quagga 750
 # log_syslog.conf is used as a template for each config file
-.for _file_ in vtysh.conf zebra.conf bgpd.conf ospfd.conf ripd.conf
+.for file in vtysh.conf zebra.conf bgpd.conf ospfd.conf ripd.conf
 CONF_FILES_PERMS+=     ${PREFIX}/share/examples/quagga/log_syslog.conf \
-                       ${PKG_SYSCONFDIR}/${_file_} quagga quagga 0600
+                       ${PKG_SYSCONFDIR}/${file} quagga quagga 0600
 .endfor
 
 .include "options.mk"
@@ -58,15 +60,16 @@ PLIST_CAT+=         ${PKGDIR}/PLIST
 
 LIBS+=                 ${LDFLAGS}
 
-.for _script_ in ${RCD_SCRIPTS}
-RCD_SCRIPT_SRC.${_script_}?=   ${WRKSRC}/pkgsrc/${_script_}.sh
+.for script in ${RCD_SCRIPTS}
+RCD_SCRIPT_SRC.${script}?=     ${WRKSRC}/pkgsrc/${script}.sh
 .endfor
 
+INSTALLATION_DIRS+=    share/doc/quagga
+INSTALLATION_DIRS+=    share/doc/quagga/mpls
+
 post-install:
-       @${CHMOD} a+r ${DESTDIR}${PREFIX}/share/examples/quagga/*
+       ${CHMOD} a+r ${DESTDIR}${PREFIX}/share/examples/quagga/*
        ${INSTALL_DATA} ${FILESDIR}/log_syslog.conf ${DESTDIR}${PREFIX}/share/examples/quagga
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/quagga
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/quagga/mpls
        ${INSTALL_DATA} ${WRKSRC}/doc/BGP-TypeCode ${DESTDIR}${PREFIX}/share/doc/quagga
        ${INSTALL_DATA} ${WRKSRC}/doc/draft-zebra-00.txt ${DESTDIR}${PREFIX}/share/doc/quagga
        ${INSTALL_DATA} ${WRKSRC}/doc/mpls/* ${DESTDIR}${PREFIX}/share/doc/quagga/mpls

Index: pkgsrc/net/quagga/distinfo
diff -u pkgsrc/net/quagga/distinfo:1.33 pkgsrc/net/quagga/distinfo:1.34
--- pkgsrc/net/quagga/distinfo:1.33     Thu Dec 10 17:08:17 2020
+++ pkgsrc/net/quagga/distinfo  Mon Feb  1 20:51:24 2021
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.33 2020/12/10 17:08:17 kardel Exp $
+$NetBSD: distinfo,v 1.34 2021/02/01 20:51:24 gdt Exp $
 
 SHA1 (quagga-1.2.4.tar.gz) = 8e1471624f5baf54b53be6636e451824d3ef15f6
 RMD160 (quagga-1.2.4.tar.gz) = 9d4b807ce150db9d3cec1f6bf9a3f836d4973428
 SHA512 (quagga-1.2.4.tar.gz) = 3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909c5c2128a24735bc034ea8b0811827293b480a2584a3a4c8ae36be9cf1fcd
 Size (quagga-1.2.4.tar.gz) = 2925847 bytes
-SHA1 (patch-configure) = d3289b94f9aa871678398ccd78f655944277f03f
+SHA1 (patch-configure) = 928aff3c22d9c8d63276d6e787dc503fadcc048a
 SHA1 (patch-lib_thread.c) = 8e3cf21225a1ec5e94ac526b0b5a4e9e66ca4c93
 SHA1 (patch-lib_thread.h) = 1afcc4c4a30dfa2f0e182310568b5e31acec21fb
 SHA1 (patch-solaris_quagga.init.in) = 47569aaffe2713809e21ebbb76164cf50b7f983f

Index: pkgsrc/net/quagga/options.mk
diff -u pkgsrc/net/quagga/options.mk:1.9 pkgsrc/net/quagga/options.mk:1.10
--- pkgsrc/net/quagga/options.mk:1.9    Mon Mar 21 13:40:28 2016
+++ pkgsrc/net/quagga/options.mk        Mon Feb  1 20:51:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2016/03/21 13:40:28 gdt Exp $
+# $NetBSD: options.mk,v 1.10 2021/02/01 20:51:24 gdt Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.quagga
 PKG_SUPPORTED_OPTIONS= inet6
@@ -14,9 +14,9 @@ PKG_SUGGESTED_OPTIONS+=       quagga-vtysh
 .if !empty(PKG_OPTIONS:Minet6)
 PLIST_CAT+=            ${PKGDIR}/PLIST.v6
 RCD_SCRIPTS+=          ospf6d ripngd
-.  for _file_ in ospf6d.conf ripngd.conf
+.  for file in ospf6d.conf ripngd.conf
 CONF_FILES_PERMS+=     ${PREFIX}/share/examples/quagga/log_syslog.conf \
-                       ${PKG_SYSCONFDIR}/${_file_} quagga quagga 0600
+                       ${PKG_SYSCONFDIR}/${file} quagga quagga 0600
 .  endfor
 .else
 CONFIGURE_ARGS+=       --disable-ospf6d
@@ -28,7 +28,6 @@ CONFIGURE_ARGS+=      --disable-ripngd
 ###
 .if !empty(PKG_OPTIONS:Mquagga-vtysh)
 # uses rl_pending_input
-USE_GNU_READLINE=      yes
 .  include "../../devel/readline/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-vtysh
 PLIST_CAT+=            ${PKGDIR}/PLIST.vtysh

Index: pkgsrc/net/quagga/patches/patch-configure
diff -u pkgsrc/net/quagga/patches/patch-configure:1.7 pkgsrc/net/quagga/patches/patch-configure:1.8
--- pkgsrc/net/quagga/patches/patch-configure:1.7       Thu Mar  1 00:48:04 2018
+++ pkgsrc/net/quagga/patches/patch-configure   Mon Feb  1 20:51:24 2021
@@ -1,4 +1,5 @@
-$NetBSD: patch-configure,v 1.7 2018/03/01 00:48:04 maya Exp $
+$NetBSD: patch-configure,v 1.8 2021/02/01 20:51:24 gdt Exp $
+
 HAVE_BSD_STRUCT_IP_MREQ_HACK does not work on SunOS
 Results in: can't setsockopt IP_MULTICAST_IF(...): No route to host