Place machine-specific config files in /etc/zebra, and

install sample configs in ${PREFIX}/share/examples/zebra.

10 files changed, 232 insertions, 24 deletions

diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 4ef6f31ceb9..e9fd38df5b4 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/08/18 02:42:05 itojun Exp $
+# $NetBSD: Makefile,v 1.24 2000/08/24 01:25:36 kim Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
@@ -8,11 +8,13 @@ MASTER_SITES=	ftp://ftp.zebra.org/pub/zebra/
 # you might need debugging, it's a developer release !
 #CFLAGS+=	-g
 
+BUILD_DEPENDS+=	automake:../../devel/automake
+
 MAINTAINER=	itojun@itojun.org
 HOMEPAGE=	http://www.zebra.org/
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/zebra
+CONFIGURE_ARGS+=--sysconfdir=/etc/zebra
 USE_GTEXINFO=	yes
 
 BUILD_DEFS+=	USE_INET6
@@ -31,9 +33,15 @@ post-patch:
 		${CAT} ${PKGDIR}/PLIST.v6 ${PKGDIR}/PLIST > ${PLIST_SRC}
 .endif
 
+#pre-configure:
+#		cd ${WRKSRC} && automake
+
 #post-build:
 #		cd ${WRKSRC}/doc ; \
 #		${TOUCH} zebra.texi ; \
 #		makeinfo --no-split zebra.texi
 
+post-install:
+		@${CHMOD} a+r ${PREFIX}/share/examples/zebra/*
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/zebra/files/patch-sum b/net/zebra/files/patch-sum
index 6cf92fc5541..f38a376fb1f 100644
--- a/net/zebra/files/patch-sum
+++ b/net/zebra/files/patch-sum
@@ -1,6 +1,8 @@
-$NetBSD: patch-sum,v 1.3 2000/02/05 19:56:12 wiz Exp $
+$NetBSD: patch-sum,v 1.4 2000/08/24 01:25:37 kim Exp $
 
-This placeholder file is generated by the ``makepatchsum'' target
-whenever the patches directory is empty or missing. Its purpose
-is to ensure that the presence of any obsolete patches will cause
-the proper error to be emitted at build time.
+MD5 (patch-aa) = 60249b54ad575e635365d27d4b1dc422
+MD5 (patch-ab) = 5ef249301cffb83c38d3e3c5f3bd6ddf
+MD5 (patch-ac) = 961be716df1d9495c1782859f1af783d
+MD5 (patch-ad) = 9a390dc0a8b8d8864eb7d2b219796742
+MD5 (patch-ae) = 50fc4fa9b9758a14e873080b015fc935
+MD5 (patch-af) = 1cda9baf2b79130ad73ad6e1ead070bb
diff --git a/net/zebra/patches/patch-aa b/net/zebra/patches/patch-aa
new file mode 100644
index 00000000000..edcdfc43e5f
--- /dev/null
+++ b/net/zebra/patches/patch-aa
@@ -0,0 +1,33 @@
+$NetBSD: patch-aa,v 1.5 2000/08/24 01:25:38 kim Exp $
+
+--- bgpd/Makefile.am.orig	Thu Aug 17 04:27:58 2000
++++ bgpd/Makefile.am	Wed Aug 23 16:19:15 2000
+@@ -4,6 +4,8 @@
+ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
+ INSTALL_SDATA=@INSTALL@ -m 600
+ 
++sysconfdatadir=$(datadir)/examples/zebra
++
+ noinst_LIBRARIES = libbgp.a
+ sbin_PROGRAMS = bgpd
+ #noinst_PROGRAMS = bgp_btoa
+@@ -36,14 +38,14 @@
+ 
+ install-sysconfDATA: $(sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
++	$(mkinstalldirs) $(DESTDIR)$(sysconfdatadir)
+ 	@list='$(sysconf_DATA)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
+-	    $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
++	    echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p; \
+ 	  else if test -f $$p; then \
+-	    echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
+-	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
++	    echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
+ 	  fi; fi; \
+ 	done
+ 
diff --git a/net/zebra/patches/patch-ab b/net/zebra/patches/patch-ab
new file mode 100644
index 00000000000..28c972e950d
--- /dev/null
+++ b/net/zebra/patches/patch-ab
@@ -0,0 +1,33 @@
+$NetBSD: patch-ab,v 1.3 2000/08/24 01:25:42 kim Exp $
+
+--- ospf6d/Makefile.am.orig	Thu Aug 17 04:27:37 2000
++++ ospf6d/Makefile.am	Wed Aug 23 16:21:19 2000
+@@ -4,6 +4,8 @@
+ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
+ INSTALL_SDATA=@INSTALL@ -m 600
+ 
++sysconfdatadir=$(datadir)/examples/zebra
++
+ noinst_LIBRARIES = libospf6.a
+ sbin_PROGRAMS = ospf6d
+ 
+@@ -33,14 +35,14 @@
+ 
+ install-sysconfDATA: $(sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
++	$(mkinstalldirs) $(DESTDIR)$(sysconfdatadir)
+ 	@list='$(sysconf_DATA)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
+-	    $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
++	    echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p; \
+ 	  else if test -f $$p; then \
+-	    echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
+-	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
++	    echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
+ 	  fi; fi; \
+ 	done
+ 
diff --git a/net/zebra/patches/patch-ac b/net/zebra/patches/patch-ac
new file mode 100644
index 00000000000..05d0735c369
--- /dev/null
+++ b/net/zebra/patches/patch-ac
@@ -0,0 +1,33 @@
+$NetBSD: patch-ac,v 1.1 2000/08/24 01:25:44 kim Exp $
+
+--- ospfd/Makefile.am.orig	Thu Aug 17 04:27:22 2000
++++ ospfd/Makefile.am	Wed Aug 23 16:22:52 2000
+@@ -4,6 +4,8 @@
+ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
+ INSTALL_SDATA=@INSTALL@ -m 600
+ 
++sysconfdatadir=$(datadir)/examples/zebra
++
+ noinst_LIBRARIES = libospf.a
+ sbin_PROGRAMS = ospfd
+ 
+@@ -30,14 +32,14 @@
+ 
+ install-sysconfDATA: $(sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
++	$(mkinstalldirs) $(DESTDIR)$(sysconfdatadir)
+ 	@list='$(sysconf_DATA)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
+-	    $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
++	    echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p; \
+ 	  else if test -f $$p; then \
+-	    echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
+-	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
++	    echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
+ 	  fi; fi; \
+ 	done
+ 
diff --git a/net/zebra/patches/patch-ad b/net/zebra/patches/patch-ad
new file mode 100644
index 00000000000..e70ec8d7424
--- /dev/null
+++ b/net/zebra/patches/patch-ad
@@ -0,0 +1,33 @@
+$NetBSD: patch-ad,v 1.1 2000/08/24 01:25:45 kim Exp $
+
+--- ripd/Makefile.am.orig	Thu Aug 17 04:26:57 2000
++++ ripd/Makefile.am	Wed Aug 23 16:23:48 2000
+@@ -4,6 +4,8 @@
+ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
+ INSTALL_SDATA=@INSTALL@ -m 600
+ 
++sysconfdatadir=$(datadir)/examples/zebra
++
+ noinst_LIBRARIES = librip.a
+ sbin_PROGRAMS = ripd
+ 
+@@ -25,14 +27,14 @@
+ 
+ install-sysconfDATA: $(sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
++	$(mkinstalldirs) $(DESTDIR)$(sysconfdatadir)
+ 	@list='$(sysconf_DATA)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
+-	    $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
++	    echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p; \
+ 	  else if test -f $$p; then \
+-	    echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
+-	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
++	    echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
+ 	  fi; fi; \
+ 	done
+ 
diff --git a/net/zebra/patches/patch-ae b/net/zebra/patches/patch-ae
new file mode 100644
index 00000000000..fef09c4fde5
--- /dev/null
+++ b/net/zebra/patches/patch-ae
@@ -0,0 +1,33 @@
+$NetBSD: patch-ae,v 1.1 2000/08/24 01:25:46 kim Exp $
+
+--- ripngd/Makefile.am.orig	Thu Aug 17 04:27:11 2000
++++ ripngd/Makefile.am	Wed Aug 23 16:24:39 2000
+@@ -4,6 +4,8 @@
+ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
+ INSTALL_SDATA=@INSTALL@ -m 600
+ 
++sysconfdatadir=$(datadir)/examples/zebra
++
+ noinst_LIBRARIES = libripng.a
+ sbin_PROGRAMS = ripngd
+ 
+@@ -25,14 +27,14 @@
+ 
+ install-sysconfDATA: $(sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
++	$(mkinstalldirs) $(DESTDIR)$(sysconfdatadir)
+ 	@list='$(sysconf_DATA)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
+-	    $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
++	    echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p; \
+ 	  else if test -f $$p; then \
+-	    echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
+-	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
++	    echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
+ 	  fi; fi; \
+ 	done
+ 
diff --git a/net/zebra/patches/patch-af b/net/zebra/patches/patch-af
new file mode 100644
index 00000000000..56884d6e5db
--- /dev/null
+++ b/net/zebra/patches/patch-af
@@ -0,0 +1,33 @@
+$NetBSD: patch-af,v 1.1 2000/08/24 01:25:47 kim Exp $
+
+--- zebra/Makefile.am.orig	Thu Aug 17 04:28:47 2000
++++ zebra/Makefile.am	Wed Aug 23 16:25:31 2000
+@@ -4,6 +4,8 @@
+ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
+ INSTALL_SDATA=@INSTALL@ -m 600
+ 
++sysconfdatadir=$(datadir)/examples/zebra
++
+ LIB_IPV6 = @LIB_IPV6@
+ 
+ ipforward = @IPFORWARD@
+@@ -50,14 +52,14 @@
+ 
+ install-sysconfDATA: $(sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
++	$(mkinstalldirs) $(DESTDIR)$(sysconfdatadir)
+ 	@list='$(sysconf_DATA)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
+-	    $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
++	    echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p; \
+ 	  else if test -f $$p; then \
+-	    echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
+-	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
++	    echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
+ 	  fi; fi; \
+ 	done
+ 
diff --git a/net/zebra/pkg/PLIST b/net/zebra/pkg/PLIST
index 7fb1900ba7a..db76b9fbe5d 100644
--- a/net/zebra/pkg/PLIST
+++ b/net/zebra/pkg/PLIST
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST,v 1.7 2000/08/18 02:42:07 itojun Exp $
-sbin/bgpd
-sbin/ospfd
-sbin/ripd
-sbin/zebra
-etc/zebra/bgpd.conf.sample
-etc/zebra/bgpd.conf.sample2
-etc/zebra/README.mbgp
-etc/zebra/ripd.conf.sample
-etc/zebra/zebra.conf.sample
-etc/zebra/ospfd.conf.sample
+@comment $NetBSD: PLIST,v 1.8 2000/08/24 01:25:48 kim Exp $
 @unexec install-info --delete %D/info/zebra.info %D/info/dir
 info/zebra.info
 info/zebra.info-1
 info/zebra.info-2
 info/zebra.info-3
 @exec   install-info          %D/info/zebra.info %D/info/dir
-@dirrm etc/zebra
 man/man1/vtysh.1
 man/man8/bgpd.8
 man/man8/ospfd.8
 man/man8/ripd.8
 man/man8/zebra.8
+sbin/bgpd
+sbin/ospfd
+sbin/ripd
+sbin/zebra
+share/examples/zebra/README.mbgp
+share/examples/zebra/bgpd.conf.sample
+share/examples/zebra/bgpd.conf.sample2
+share/examples/zebra/ospfd.conf.sample
+share/examples/zebra/ripd.conf.sample
+share/examples/zebra/zebra.conf.sample
+@dirrm share/examples/zebra
diff --git a/net/zebra/pkg/PLIST.v6 b/net/zebra/pkg/PLIST.v6
index 5cf72ca8f89..47071df2259 100644
--- a/net/zebra/pkg/PLIST.v6
+++ b/net/zebra/pkg/PLIST.v6
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST.v6,v 1.5 2000/08/18 02:42:07 itojun Exp $
-sbin/ospf6d
-sbin/ripngd
-etc/zebra/ripngd.conf.sample
-etc/zebra/ospf6d.conf.sample
+@comment $NetBSD: PLIST.v6,v 1.6 2000/08/24 01:25:48 kim Exp $
 man/man8/ospf6d.8
 man/man8/ripngd.8
+sbin/ospf6d
+sbin/ripngd
+share/examples/zebra/ospf6d.conf.sample
+share/examples/zebra/ripngd.conf.sample