Both ports zebra and zebra-devel are port of zebra-0.94. Fix: Let port-commiters and maintainer decide what to do, but my suggestion is to remove zebra-devel. Really zebra does not have two branches. It has development branch, and releases are made of it. How-To-Repeat: cd /usr/ports/net && cat zebra/distinfo zebra-devel/distinfo
Responsible Changed From-To: freebsd-ports-bugs->sumikawa Over to maintainer. http://www.freebsd.org/cgi/query-pr.cgi?pr=66831 Adding to audit trail from misfiled PR ports/66836: From: Alexandr Kovalenko <never@nevermind.kiev.ua> > >Fix: > > Let port-commiters and maintainer decide what to do, but > my suggestion is to remove zebra-devel. As maintainer of zebra-devel I agree. Adding to audit trail from misfiled PRs ports/66840, 66860, 66863, and 66864: A> As a maintainer of zebra-devel I agree. However, nice defines WITHOUT_FOO can be merged to zebra port. ----- > However, nice defines WITHOUT_FOO can be merged to zebra port. Could you please make a PR for deletion zebra-devel and inclusion of WITHOUT_XXX clauses? Unfortunately I have no time for this now :(( Thanks in advance! ----- I'm currently working on zebra-snap port. Almost finished already. It posseses much from your zebra-devel port. I suppose sumikawa can merge things from my new port into zebra port. ----- Probably you can take a maintainership for zebra-devel port to not add more confusion to users? It is well known practice to name stable and development ports like portname and portname-devel, -snap would be confusing... -----
Dear collegues, here is my port of zebra-snap. sumikawa planned to commit it into zebra-devel. It'is a unidiff against current zebra-devel port. Removed files: distinfo Added files: - Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/zebra-devel/Makefile,v retrieving revision 1.75 diff -u -r1.75 Makefile --- Makefile 16 Mar 2004 12:56:54 -0000 1.75 +++ Makefile 19 May 2004 19:18:38 -0000 @@ -1,106 +1,92 @@ -# New ports collection makefile for: zebra-devel -# Date created: Fri 20 Jun 2003 15:57:48 EEST -# Whom: Alexandr Kovalenko <never@nevermind.kiev.ua> +# New ports collection makefile for: zebra-snap +# Date created: Wed May 19 23:13:26 MSD 2004 +# Whom: Gleb Smirnoff <glebius@cell.sick.ru> # -# $FreeBSD: ports/net/zebra-devel/Makefile,v 1.75 2004/03/16 12:56:54 pav Exp $ +# $FreeBSD$ # -PORTNAME= zebra -PORTVERSION= 0.94 -PORTREVISION?= 2 -CATEGORIES= net ipv6 -MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/ \ - ftp://ftp.ripe.net/mirrors/sites/ftp.zebra.org/pub/zebra/ +PORTNAME= zebra-snap +PORTVERSION!= /bin/date +%Y%m%d +CATEGORIES= net -MAINTAINER= never@nevermind.kiev.ua -COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector) +MAINTAINER= glebius@cell.sick.ru +COMMENT= A snapshot of zebra routing suite -LATEST_LINK= ${PORTNAME}-devel +NO_CHECKSUM= yes +IS_INTERACTIVE= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -USE_SUBMAKE= yes +CONFLICTS= zebra-* GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/zebra -SCRIPTS_ENV= WRKDIRPREFIX=${WRKDIRPREFIX} +USE_SUBMAKE= yes MAN1= vtysh.1 -MAN8= bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8 +MAN8= zebra.8 bgpd.8 ospfd.8 ospf6d.8 ripd.8 ripngd.8 INFO= zebra -.if defined (WITHOUT_IPV6) -CONFIGURE_ARGS+=--disable-ipv6 -WITHOUT_OSPF6D= yes -WITHOUT_RIPNGD= yes -.endif - -.if !defined(WITHOUT_BGPD) -PLIST_SUB+= BGPD="" -.else -CONFIGURE_ARGS+=--disable-bgpd -PLIST_SUB+= BGPD="@comment " -.endif - -.if !defined(WITHOUT_OSPF6D) -PLIST_SUB+= OSPF6D="" -.else -CONFIGURE_ARGS+=--disable-ospf6d -PLIST_SUB+= OSPF6D="@comment " -.endif - -.if !defined(WITHOUT_OSPFD) -PLIST_SUB+= OSPF6D="" -PLIST_SUB+= OSPFD="" -.else -CONFIGURE_ARGS+=--disable-ospfd -PLIST_SUB+= OSPFD="@comment " -.endif +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ + CURDIR="${.CURDIR}" \ + MKDIR="${MKDIR}" -.if !defined(WITHOUT_RIPD) -PLIST_SUB+= RIPD="" -.else -CONFIGURE_ARGS+=--disable-ripd -PLIST_SUB+= RIPD="@comment " -.endif +CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/zebra -.if !defined(WITHOUT_RIPNGD) -PLIST_SUB+= RIPNGD="" -.else -CONFIGURE_ARGS+=--disable-ripngd -PLIST_SUB+= RIPNGD="@comment " -.endif - -.if !defined(WITHOUT_VTYSH) -PLIST_SUB+= VTYSH="" -CONFIGURE_ARGS+=--enable-vtysh -.else -PLIST_SUB+= VTYSH="@comment " -.endif +CVS_CMD?= cvs -z3 +CVSROOT?= :pserver:anoncvs@anoncvs.zebra.org:/cvsroot +CVSMODULE?= zebra +CVSPASS?= anoncvs + +TARBALL= ${PORTNAME}-${PORTVERSION}.tar.gz + +do-fetch: + @if [ ! -e ${DISTDIR}/${TARBALL} ]; then \ + unset CVS_RSH CVS_SERVER || ${TRUE}; \ + if [ -n "${PORTS_CVS_RSH}" ]; then \ + export CVS_RSH="${PORTS_CVS_RSH}"; \ + fi; \ + ${MKDIR} ${WRKDIR}; \ + cd ${WRKDIR}; \ + ${ECHO_MSG} "Please type \"anoncvs\" in password promt"; \ + if ! cvs -d ${CVSROOT} login; then \ + ${ECHO_MSG} ">> Couldn't login into ${CVSROOT}."; \ + exit 1; \ + fi; \ + ${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}."; \ + if ! ${CVS_CMD} -d ${CVSROOT} co ${CVSMODULE} ; then \ + ${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}."; \ + exit 1; \ + fi; \ + ${MV} zebra ${PORTNAME}-${PORTVERSION}; \ + ${TOUCH} ${TOUCH_FLAGS} ${EXTRACT_COOKIE}; \ + tar czf ${DISTDIR}/${TARBALL} ${PORTNAME}-${PORTVERSION}; \ + fi .if !defined(BATCH) -pre-configure: - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc - post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc +post-fetch: + @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure +.endif .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -.endif post-install: - @( cd ${WRKSRC}/doc; ${RM} -f zebra*info*; ${MAKE} zebra.info install ) +# @( cd ${WRKSRC}/doc; ${RM} -f zebra*info*; ${MAKE} zebra.info install ) @${ECHO} "===> installing zebra startup file..." @${SED} -e "s=!!PREFIX!!=${PREFIX}=" \ < ${FILESDIR}/zebractl.sh \ > ${PREFIX}/sbin/zebractl @${CHMOD} 555 ${PREFIX}/sbin/zebractl + @${ECHO} + @${ECHO} "##################################################" @${ECHO} "Make these entries in /etc/rc.conf to start zebra:" @${ECHO} "defaultrouter=\"NO\"" @${ECHO} "router_enable=\"YES\"" @${ECHO} "router=\"${PREFIX}/sbin/zebractl\"" @${ECHO} "router_flags=\"start\"" @${ECHO} "done." + @${ECHO} "##################################################" + @${ECHO} .include <bsd.port.mk> Index: pkg-descr =================================================================== RCS file: /home/ncvs/ports/net/zebra-devel/pkg-descr,v retrieving revision 1.2 diff -u -r1.2 pkg-descr --- pkg-descr 3 May 1999 05:26:53 -0000 1.2 +++ pkg-descr 19 May 2004 19:18:38 -0000 @@ -1,15 +1,11 @@ GNU Zebra is a free software (distributed under GNU Generic Public License) which manages TCP/IP based routing protocols. -It supports BGP-4 protocol as described in RFC1771 (A Border Gateway -Protocol 4) and RIPv1, RIPv2 and OSPFv2. +It supports BGP4, RIPv1, RIPv2, RIPng, OSPF, OSPFv2 and some their +extensions. It also acts as an SNMP server supporting MIBs for +listed above protocols. -Zebra uses multithread technology under multithread supported UNIX -kernels. However it can be run under not-multithread supported -UNIX kernels. - -Zebra is intended to be used as a Route Server and a Route Reflector. -Zebra is not a toolkit, it provides full routing power under a new -architecture. +It is configured in style of Cisco routers, which makes it easily +maintainable and inculcatble into Cisco-based infrastructure. WWW: http://www.zebra.org/ Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/zebra-devel/pkg-plist,v retrieving revision 1.24 diff -u -r1.24 pkg-plist --- pkg-plist 16 Mar 2004 12:56:54 -0000 1.24 +++ pkg-plist 19 May 2004 19:18:38 -0000 @@ -1,17 +1,15 @@ -%%BGPD%%sbin/bgpd -%%OSPF6D%%sbin/ospf6d -%%OSPFD%%sbin/ospfd -%%RIPD%%sbin/ripd -%%RIPNGD%%sbin/ripngd -sbin/zebra -sbin/zebractl -%%VTYSH%%bin/vtysh %%BGPD%%etc/zebra/bgpd.conf.sample %%BGPD%%etc/zebra/bgpd.conf.sample2 %%OSPF6D%%etc/zebra/ospf6d.conf.sample %%OSPFD%%etc/zebra/ospfd.conf.sample %%RIPD%%etc/zebra/ripd.conf.sample %%RIPNGD%%etc/zebra/ripngd.conf.sample -%%VTYSH%%etc/zebra/vtysh.conf.sample etc/zebra/zebra.conf.sample +%%BGPD%%sbin/bgpd +%%OSPF6D%%sbin/ospf6d +%%OSPFD%%sbin/ospfd +%%RIPD%%sbin/ripd +%%RIPNGD%%sbin/ripngd +sbin/zebra +sbin/zebractl @dirrm etc/zebra Index: scripts/configure =================================================================== RCS file: /home/ncvs/ports/net/zebra-devel/scripts/configure,v retrieving revision 1.5 diff -u -r1.5 configure --- scripts/configure 4 Mar 2004 19:51:26 -0000 1.5 +++ scripts/configure 19 May 2004 19:18:38 -0000 @@ -1,29 +1,37 @@ -#! /bin/sh +#!/bin/sh # $FreeBSD: ports/net/zebra-devel/scripts/configure,v 1.5 2004/03/04 19:51:26 pav Exp $ # configure - zebra compile time option configurator # by Andreas Klemm <andreas@FreeBSD.org> +# and Gleb Smirnoff <glebius@cell.sick.ru> -if [ "$BATCH" != "yes" -a "$BATCH" != "YES" ]; then +if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then + exit +fi -# -# configure - zebra compile time options -# +if [ "$BATCH" != "yes" -a "$BATCH" != "YES" ]; then /usr/bin/dialog --title "Zebra Compile Time Options" --clear \ --checklist "\n\ -Select compile time options for zebra port:" -1 -1 8 \ +Select compile time options for zebra port:" -1 -1 11 \ +NOIPV6 "disable IPv6 support" ON \ +NOBGPD "do not build bgpd" OFF \ +NOOSPF6D "do not build ospf6d" OFF \ +NOOSPFD "do not build osfd" OFF \ +NORIPD "do not build ripd" OFF \ +NORIPNGD "do not build ripngd" OFF \ +NOVTYSH "do not build vtysh" OFF \ LIBPAM "enable PAM authentication for vtysh" OFF \ OSPF_NSSA "turn on undergoing NSSA feature" OFF \ SNMP "enable SNMP support" OFF \ -TCP-ZEBRA "enable TCP/IP socket connection" OFF \ +TCPZEBRA "enable TCP/IP socket connection" OFF \ 2> /tmp/zebra-checklist.$$ retval=$? if [ -s /tmp/zebra-checklist.$$ ]; then - set `cat /tmp/zebra-checklist.$$` + set `cat /tmp/zebra-checklist.$$ | sed s/\"//g` fi rm -f /tmp/zebra-checklist.$$ @@ -37,26 +45,82 @@ ;; esac -/bin/mkdir -p ${WRKDIRPREFIX}${CURDIR} -exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - while [ "$1" ]; do - case $1 in - \"LIBPAM\") - echo CONFIGURE_ARGS+=--with-libpam - ;; - \"OSPF_NSSA\") - echo CONFIGURE_ARGS+=--enable-nssa - ;; - \"SNMP\") - echo CONFIGURE_ARGS+=--enable-snmp - echo 'LIB_DEPENDS+=snmp.4:${PORTSDIR}/net-mgmt/net-snmp4:install' - ;; - \"TCP-ZEBRA\") - echo CONFIGURE_ARGS+=--enable-tcp-zebra - ;; - esac - shift + eval $1=yes + shift done -fi # if $BATCH +echo $NOIPV6 + +mkdir -p ${WRKDIR} +exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc + +if [ "x${NOBGPD}" = "xyes" ]; then + echo CONFIGURE_ARGS+=--disable-bgpd + echo PLIST_SUB+= BGPD=\"@comment \" +else + echo PLIST_SUB+= BGPD=\"\" +fi + +if [ "x${NOOSPFD}" = "xyes" ]; then + echo CONFIGURE_ARGS+=--disable-ospfd + echo PLIST_SUB+= OSPFD=\"@comment \" +else + echo PLIST_SUB+= OSPFD=\"\" +fi + +if [ "x${NORIPD}" = "xyes" ]; then + echo CONFIGURE_ARGS+=--disable-ripd + echo PLIST_SUB+= RIPD=\"@comment \" +else + echo PLIST_SUB+= RIPD=\"\" +fi + +if [ "x${NOVTYSH}" = "xyes" ]; then + echo CONFIGURE_ARGS+=--disable-vtysh + echo PLIST_SUB+= VTYSH=\"@comment \" +else + echo PLIST_SUB+= VTYSH=\"\" +fi + +if [ "x${NOIPV6}" = "xyes" ]; then + echo CONFIGURE_ARGS+=--disable-ipv6 + echo CONFIGURE_ARGS+=--disable-ospf6d + echo CONFIGURE_ARGS+=--disable-ripngd + echo PLIST_SUB+= OSPF6D=\"@comment \" + echo PLIST_SUB+= RIPNGD=\"@comment \" +else + if [ "x${NOOSPF6D}" = "xyes" ]; then + echo CONFIGURE_ARGS+=--disable-ospf6d + echo PLIST_SUB+= OSPF6D=\"@comment \" + else + echo PLIST_SUB+= OSPF6D=\"\" + fi + + if [ "x${NORIPNGD}" = "xyes" ]; then + echo CONFIGURE_ARGS+=--disable-ripngd + echo PLIST_SUB+= RIPNGD=\"@comment \" + else + echo PLIST_SUB+= RIPNGD=\"\" + fi + +fi + +if [ "x${LIBPAM}" = "xyes" ]; then + echo CONFIGURE_ARGS+=--with-libpam +fi + +if [ "x${OSPF_NSSA}" = "xyes" ]; then + echo CONFIGURE_ARGS+=--enable-nssa +fi + +if [ "x${SNMP}" = "xyes" ]; then + echo CONFIGURE_ARGS+=--enable-snmp + echo 'LIB_DEPENDS+=snmp.4:${PORTSDIR}/net-mgmt/net-snmp4:install' +fi + +if [ "x${TCPZEBRA}" = "xyes" ]; then + echo CONFIGURE_ARGS+=--enable-tcp-zebra +fi + +fi # !BATCH -- Totus tuus, Glebius. GLEBIUS-RIPN GLEB-RIPE
Hello, Gleb Smirnoff! On Wed, May 19, 2004 at 11:22:59PM +0400, you wrote: > Dear collegues, > > here is my port of zebra-snap. sumikawa planned to commit it into > zebra-devel. It'is a unidiff against current zebra-devel port. > > Removed files: distinfo > Added files: - > > Index: Makefile > =================================================================== > RCS file: /home/ncvs/ports/net/zebra-devel/Makefile,v > retrieving revision 1.75 > diff -u -r1.75 Makefile > --- Makefile 16 Mar 2004 12:56:54 -0000 1.75 > +++ Makefile 19 May 2004 19:18:38 -0000 > @@ -1,106 +1,92 @@ > -# New ports collection makefile for: zebra-devel > -# Date created: Fri 20 Jun 2003 15:57:48 EEST > -# Whom: Alexandr Kovalenko <never@nevermind.kiev.ua> > +# New ports collection makefile for: zebra-snap ^^^^^^^^^^ Should be the same as port name. > +# Date created: Wed May 19 23:13:26 MSD 2004 > +# Whom: Gleb Smirnoff <glebius@cell.sick.ru> > # > -# $FreeBSD: ports/net/zebra-devel/Makefile,v 1.75 2004/03/16 12:56:54 pav Exp $ > +# $FreeBSD$ > # > > -PORTNAME= zebra > -PORTVERSION= 0.94 > -PORTREVISION?= 2 > -CATEGORIES= net ipv6 > -MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/ \ > - ftp://ftp.ripe.net/mirrors/sites/ftp.zebra.org/pub/zebra/ > +PORTNAME= zebra-snap > +PORTVERSION!= /bin/date +%Y%m%d > +CATEGORIES= net > > -MAINTAINER= never@nevermind.kiev.ua > -COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector) > +MAINTAINER= glebius@cell.sick.ru > +COMMENT= A snapshot of zebra routing suite Non-informative. > -LATEST_LINK= ${PORTNAME}-devel > +NO_CHECKSUM= yes > +IS_INTERACTIVE= yes > > -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} > - > -USE_SUBMAKE= yes > +CONFLICTS= zebra-* > GNU_CONFIGURE= yes > -CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/zebra > -SCRIPTS_ENV= WRKDIRPREFIX=${WRKDIRPREFIX} > +USE_SUBMAKE= yes > > MAN1= vtysh.1 > -MAN8= bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8 > +MAN8= zebra.8 bgpd.8 ospfd.8 ospf6d.8 ripd.8 ripngd.8 Why make unneccessary reordering? > INFO= zebra > > -.if defined (WITHOUT_IPV6) > -CONFIGURE_ARGS+=--disable-ipv6 > -WITHOUT_OSPF6D= yes > -WITHOUT_RIPNGD= yes > -.endif > - > -.if !defined(WITHOUT_BGPD) > -PLIST_SUB+= BGPD="" > -.else > -CONFIGURE_ARGS+=--disable-bgpd > -PLIST_SUB+= BGPD="@comment " > -.endif > - > -.if !defined(WITHOUT_OSPF6D) > -PLIST_SUB+= OSPF6D="" > -.else > -CONFIGURE_ARGS+=--disable-ospf6d > -PLIST_SUB+= OSPF6D="@comment " > -.endif > - > -.if !defined(WITHOUT_OSPFD) > -PLIST_SUB+= OSPF6D="" > -PLIST_SUB+= OSPFD="" > -.else > -CONFIGURE_ARGS+=--disable-ospfd > -PLIST_SUB+= OSPFD="@comment " > -.endif > +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} > +SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ > + CURDIR="${.CURDIR}" \ > + MKDIR="${MKDIR}" > > -.if !defined(WITHOUT_RIPD) > -PLIST_SUB+= RIPD="" > -.else > -CONFIGURE_ARGS+=--disable-ripd > -PLIST_SUB+= RIPD="@comment " > -.endif > +CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/zebra > > -.if !defined(WITHOUT_RIPNGD) > -PLIST_SUB+= RIPNGD="" > -.else > -CONFIGURE_ARGS+=--disable-ripngd > -PLIST_SUB+= RIPNGD="@comment " > -.endif > - > -.if !defined(WITHOUT_VTYSH) > -PLIST_SUB+= VTYSH="" > -CONFIGURE_ARGS+=--enable-vtysh > -.else > -PLIST_SUB+= VTYSH="@comment " > -.endif > +CVS_CMD?= cvs -z3 > +CVSROOT?= :pserver:anoncvs@anoncvs.zebra.org:/cvsroot > +CVSMODULE?= zebra > +CVSPASS?= anoncvs > + > +TARBALL= ${PORTNAME}-${PORTVERSION}.tar.gz > + > +do-fetch: > + @if [ ! -e ${DISTDIR}/${TARBALL} ]; then \ > + unset CVS_RSH CVS_SERVER || ${TRUE}; \ > + if [ -n "${PORTS_CVS_RSH}" ]; then \ > + export CVS_RSH="${PORTS_CVS_RSH}"; \ > + fi; \ > + ${MKDIR} ${WRKDIR}; \ > + cd ${WRKDIR}; \ > + ${ECHO_MSG} "Please type \"anoncvs\" in password promt"; \ > + if ! cvs -d ${CVSROOT} login; then \ > + ${ECHO_MSG} ">> Couldn't login into ${CVSROOT}."; \ > + exit 1; \ > + fi; \ > + ${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}."; \ > + if ! ${CVS_CMD} -d ${CVSROOT} co ${CVSMODULE} ; then \ > + ${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}."; \ > + exit 1; \ > + fi; \ > + ${MV} zebra ${PORTNAME}-${PORTVERSION}; \ > + ${TOUCH} ${TOUCH_FLAGS} ${EXTRACT_COOKIE}; \ > + tar czf ${DISTDIR}/${TARBALL} ${PORTNAME}-${PORTVERSION}; \ > + fi > > .if !defined(BATCH) > -pre-configure: > - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc > - > post-clean: > @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc > +post-fetch: > + @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure > +.endif > > .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) > .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" > .endif > -.endif > > post-install: > - @( cd ${WRKSRC}/doc; ${RM} -f zebra*info*; ${MAKE} zebra.info install ) > +# @( cd ${WRKSRC}/doc; ${RM} -f zebra*info*; ${MAKE} zebra.info install ) > @${ECHO} "===> installing zebra startup file..." > @${SED} -e "s=!!PREFIX!!=${PREFIX}=" \ > < ${FILESDIR}/zebractl.sh \ > > ${PREFIX}/sbin/zebractl > @${CHMOD} 555 ${PREFIX}/sbin/zebractl > + @${ECHO} > + @${ECHO} "##################################################" > @${ECHO} "Make these entries in /etc/rc.conf to start zebra:" > @${ECHO} "defaultrouter=\"NO\"" > @${ECHO} "router_enable=\"YES\"" > @${ECHO} "router=\"${PREFIX}/sbin/zebractl\"" > @${ECHO} "router_flags=\"start\"" > @${ECHO} "done." > + @${ECHO} "##################################################" > + @${ECHO} Take a look at quagga port on how to use RCng. > .include <bsd.port.mk> > Index: pkg-descr > =================================================================== > RCS file: /home/ncvs/ports/net/zebra-devel/pkg-descr,v > retrieving revision 1.2 > diff -u -r1.2 pkg-descr > --- pkg-descr 3 May 1999 05:26:53 -0000 1.2 > +++ pkg-descr 19 May 2004 19:18:38 -0000 > @@ -1,15 +1,11 @@ > GNU Zebra is a free software (distributed under GNU Generic Public > License) which manages TCP/IP based routing protocols. > > -It supports BGP-4 protocol as described in RFC1771 (A Border Gateway > -Protocol 4) and RIPv1, RIPv2 and OSPFv2. > +It supports BGP4, RIPv1, RIPv2, RIPng, OSPF, OSPFv2 and some their > +extensions. It also acts as an SNMP server supporting MIBs for > +listed above protocols. > > -Zebra uses multithread technology under multithread supported UNIX > -kernels. However it can be run under not-multithread supported > -UNIX kernels. > - > -Zebra is intended to be used as a Route Server and a Route Reflector. > -Zebra is not a toolkit, it provides full routing power under a new > -architecture. > +It is configured in style of Cisco routers, which makes it easily > +maintainable and inculcatble into Cisco-based infrastructure. > > WWW: http://www.zebra.org/ > Index: pkg-plist > =================================================================== > RCS file: /home/ncvs/ports/net/zebra-devel/pkg-plist,v > retrieving revision 1.24 > diff -u -r1.24 pkg-plist > --- pkg-plist 16 Mar 2004 12:56:54 -0000 1.24 > +++ pkg-plist 19 May 2004 19:18:38 -0000 > @@ -1,17 +1,15 @@ > -%%BGPD%%sbin/bgpd > -%%OSPF6D%%sbin/ospf6d > -%%OSPFD%%sbin/ospfd > -%%RIPD%%sbin/ripd > -%%RIPNGD%%sbin/ripngd > -sbin/zebra > -sbin/zebractl > -%%VTYSH%%bin/vtysh > %%BGPD%%etc/zebra/bgpd.conf.sample > %%BGPD%%etc/zebra/bgpd.conf.sample2 > %%OSPF6D%%etc/zebra/ospf6d.conf.sample > %%OSPFD%%etc/zebra/ospfd.conf.sample > %%RIPD%%etc/zebra/ripd.conf.sample > %%RIPNGD%%etc/zebra/ripngd.conf.sample > -%%VTYSH%%etc/zebra/vtysh.conf.sample > etc/zebra/zebra.conf.sample > +%%BGPD%%sbin/bgpd > +%%OSPF6D%%sbin/ospf6d > +%%OSPFD%%sbin/ospfd > +%%RIPD%%sbin/ripd > +%%RIPNGD%%sbin/ripngd > +sbin/zebra > +sbin/zebractl Again, why did you make this unneccessary reordering? Correct order is: binaries, libs, sharedata, conf. > @dirrm etc/zebra > Index: scripts/configure > =================================================================== > RCS file: /home/ncvs/ports/net/zebra-devel/scripts/configure,v > retrieving revision 1.5 > diff -u -r1.5 configure > --- scripts/configure 4 Mar 2004 19:51:26 -0000 1.5 > +++ scripts/configure 19 May 2004 19:18:38 -0000 > @@ -1,29 +1,37 @@ > -#! /bin/sh > +#!/bin/sh > > # $FreeBSD: ports/net/zebra-devel/scripts/configure,v 1.5 2004/03/04 19:51:26 pav Exp $ > > # configure - zebra compile time option configurator > # by Andreas Klemm <andreas@FreeBSD.org> > +# and Gleb Smirnoff <glebius@cell.sick.ru> > > -if [ "$BATCH" != "yes" -a "$BATCH" != "YES" ]; then > +if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then > + exit > +fi > > -# > -# configure - zebra compile time options > -# > +if [ "$BATCH" != "yes" -a "$BATCH" != "YES" ]; then > > /usr/bin/dialog --title "Zebra Compile Time Options" --clear \ > --checklist "\n\ > -Select compile time options for zebra port:" -1 -1 8 \ > +Select compile time options for zebra port:" -1 -1 11 \ > +NOIPV6 "disable IPv6 support" ON \ > +NOBGPD "do not build bgpd" OFF \ > +NOOSPF6D "do not build ospf6d" OFF \ > +NOOSPFD "do not build osfd" OFF \ > +NORIPD "do not build ripd" OFF \ > +NORIPNGD "do not build ripngd" OFF \ > +NOVTYSH "do not build vtysh" OFF \ > LIBPAM "enable PAM authentication for vtysh" OFF \ > OSPF_NSSA "turn on undergoing NSSA feature" OFF \ > SNMP "enable SNMP support" OFF \ > -TCP-ZEBRA "enable TCP/IP socket connection" OFF \ > +TCPZEBRA "enable TCP/IP socket connection" OFF \ > 2> /tmp/zebra-checklist.$$ > > retval=$? > > if [ -s /tmp/zebra-checklist.$$ ]; then > - set `cat /tmp/zebra-checklist.$$` > + set `cat /tmp/zebra-checklist.$$ | sed s/\"//g` > fi > rm -f /tmp/zebra-checklist.$$ > > @@ -37,26 +45,82 @@ > ;; > esac > > -/bin/mkdir -p ${WRKDIRPREFIX}${CURDIR} > -exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc > - > while [ "$1" ]; do > - case $1 in > - \"LIBPAM\") > - echo CONFIGURE_ARGS+=--with-libpam > - ;; > - \"OSPF_NSSA\") > - echo CONFIGURE_ARGS+=--enable-nssa > - ;; > - \"SNMP\") > - echo CONFIGURE_ARGS+=--enable-snmp > - echo 'LIB_DEPENDS+=snmp.4:${PORTSDIR}/net-mgmt/net-snmp4:install' > - ;; > - \"TCP-ZEBRA\") > - echo CONFIGURE_ARGS+=--enable-tcp-zebra > - ;; > - esac > - shift > + eval $1=yes > + shift > done > > -fi # if $BATCH > +echo $NOIPV6 > + > +mkdir -p ${WRKDIR} > +exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc > + > +if [ "x${NOBGPD}" = "xyes" ]; then > + echo CONFIGURE_ARGS+=--disable-bgpd > + echo PLIST_SUB+= BGPD=\"@comment \" > +else > + echo PLIST_SUB+= BGPD=\"\" > +fi > + > +if [ "x${NOOSPFD}" = "xyes" ]; then > + echo CONFIGURE_ARGS+=--disable-ospfd > + echo PLIST_SUB+= OSPFD=\"@comment \" > +else > + echo PLIST_SUB+= OSPFD=\"\" > +fi > + > +if [ "x${NORIPD}" = "xyes" ]; then > + echo CONFIGURE_ARGS+=--disable-ripd > + echo PLIST_SUB+= RIPD=\"@comment \" > +else > + echo PLIST_SUB+= RIPD=\"\" > +fi > + > +if [ "x${NOVTYSH}" = "xyes" ]; then > + echo CONFIGURE_ARGS+=--disable-vtysh > + echo PLIST_SUB+= VTYSH=\"@comment \" > +else > + echo PLIST_SUB+= VTYSH=\"\" > +fi > + > +if [ "x${NOIPV6}" = "xyes" ]; then > + echo CONFIGURE_ARGS+=--disable-ipv6 > + echo CONFIGURE_ARGS+=--disable-ospf6d > + echo CONFIGURE_ARGS+=--disable-ripngd > + echo PLIST_SUB+= OSPF6D=\"@comment \" > + echo PLIST_SUB+= RIPNGD=\"@comment \" > +else > + if [ "x${NOOSPF6D}" = "xyes" ]; then > + echo CONFIGURE_ARGS+=--disable-ospf6d > + echo PLIST_SUB+= OSPF6D=\"@comment \" > + else > + echo PLIST_SUB+= OSPF6D=\"\" > + fi > + > + if [ "x${NORIPNGD}" = "xyes" ]; then > + echo CONFIGURE_ARGS+=--disable-ripngd > + echo PLIST_SUB+= RIPNGD=\"@comment \" > + else > + echo PLIST_SUB+= RIPNGD=\"\" > + fi > + > +fi > + > +if [ "x${LIBPAM}" = "xyes" ]; then > + echo CONFIGURE_ARGS+=--with-libpam > +fi > + > +if [ "x${OSPF_NSSA}" = "xyes" ]; then > + echo CONFIGURE_ARGS+=--enable-nssa > +fi > + > +if [ "x${SNMP}" = "xyes" ]; then > + echo CONFIGURE_ARGS+=--enable-snmp > + echo 'LIB_DEPENDS+=snmp.4:${PORTSDIR}/net-mgmt/net-snmp4:install' > +fi > + > +if [ "x${TCPZEBRA}" = "xyes" ]; then > + echo CONFIGURE_ARGS+=--enable-tcp-zebra > +fi > + > +fi # !BATCH > > -- > Totus tuus, Glebius. > GLEBIUS-RIPN GLEB-RIPE -- NEVE-RIPE, will build world for food Ukrainian FreeBSD User Group http://uafug.org.ua/
Alexandr, reordering appeared because I have written a new port, and sumikawa suggested to make a diff against zebra-devel. A> > +COMMENT= A snapshot of zebra routing suite A> A> Non-informative. Informative is in ports/net/zebra A> Take a look at quagga port on how to use RCng. Agreed. I'll make an RCng script later. -- Totus tuus, Glebius. GLEBIUS-RIPN GLEB-RIPE
Responsible Changed From-To: sumikawa->osa Osa will handle this PR.
Responsible Changed From-To: osa->glebius Submitter now committer! Welcome to zoo!
Responsible Changed From-To: glebius->krion I do not have port commit bit. And Kirill promised to look at it.
Responsible Changed From-To: krion->sem I have now no time to handle it, sem wants to work with this one.
State Changed From-To: open->closed Committed, thanks!