6 files changed, 87 insertions, 24 deletions

diff --git a/net/zebra-devel/Makefile b/net/zebra-devel/Makefile
index b05feb461b64..08e4bb216951 100644
--- a/net/zebra-devel/Makefile
+++ b/net/zebra-devel/Makefile
@@ -6,12 +6,9 @@
 #
 
 PORTNAME=	zebra
-PORTVERSION=	0.89a
-PORTREVISION=	1
+PORTVERSION=	0.90
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.zebra.org/pub/zebra/
-# you might need debugging, it's a developer release !
-#CFLAGS+=	-g
 
 MAINTAINER=	andreas@FreeBSD.org
 
@@ -21,6 +18,18 @@ CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/zebra
 MAN1=		vtysh.1
 MAN8=		bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
 
+.if !defined(BATCH)
+pre-configure:
+	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
+post-clean:
+	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.endif
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 400014
diff --git a/net/zebra-devel/distinfo b/net/zebra-devel/distinfo
index 540e979e9ba9..44417bcf680d 100644
--- a/net/zebra-devel/distinfo
+++ b/net/zebra-devel/distinfo
@@ -1 +1 @@
-MD5 (zebra-0.89a.tar.gz) = a132708d41c460a8cd54577b3b0cff27
+MD5 (zebra-0.90.tar.gz) = 47267d23dd90eaa089f66771ed167069
diff --git a/net/zebra-devel/files/patch-001_vty_memory_leak b/net/zebra-devel/files/patch-001_vty_memory_leak
deleted file mode 100644
index c857fedf984f..000000000000
--- a/net/zebra-devel/files/patch-001_vty_memory_leak
+++ /dev/null
@@ -1,18 +0,0 @@
---- lib/vty.c.orig	Tue Sep 26 23:03:12 2000
-+++ lib/vty.c	Tue Dec 26 23:18:00 2000
-@@ -1850,10 +1849,13 @@
-   printf ("line: %s\n", buf);
- #endif /* VTYSH_DEBUG */
- 
-+  vty_ensure (vty, nbytes);
-+  memcpy (vty->buf, buf, nbytes);
-+  
-   /* Pass this line to parser. */
--  vty->buf = buf;
-   ret = vty_execute (vty);
--  vty->buf = NULL;
-+
-+  vty_clear_buf (vty);
- 
-   /* Return result. */
- #ifdef VTYSH_DEBUG
diff --git a/net/zebra-devel/files/patch-zebra_Makefile.in b/net/zebra-devel/files/patch-zebra_Makefile.in
new file mode 100644
index 000000000000..47c586510848
--- /dev/null
+++ b/net/zebra-devel/files/patch-zebra_Makefile.in
@@ -0,0 +1,15 @@
+--- zebra/Makefile.in.orig	Thu Jan 11 11:22:36 2001
++++ zebra/Makefile.in	Thu Jan 11 11:23:00 2001
+@@ -331,10 +331,10 @@
+ 
+ 
+ zebra : $(zebra_OBJECTS) $(otherobj) ../lib/libzebra.a
+-	$(CC) -g -o zebra $(zebra_OBJECTS) $(otherobj) ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
++	$(CC) -o zebra $(zebra_OBJECTS) $(otherobj) ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
+ 
+ client : client_main.o ../lib/libzebra.a
+-	$(CC) -g -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
++	$(CC) -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
+ 
+ install-sysconfDATA: $(sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
diff --git a/net/zebra-devel/pkg-comment b/net/zebra-devel/pkg-comment
index 2394a0df46d2..df7c38434b5c 100644
--- a/net/zebra-devel/pkg-comment
+++ b/net/zebra-devel/pkg-comment
@@ -1 +1 @@
-Free multithreaded RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector)
+Free RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector)
diff --git a/net/zebra-devel/scripts/configure b/net/zebra-devel/scripts/configure
new file mode 100644
index 000000000000..68629d4f44f0
--- /dev/null
+++ b/net/zebra-devel/scripts/configure
@@ -0,0 +1,57 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+# configure - zebra compile time option configurator
+# by Andreas Klemm <andreas@FreeBSD.org>
+
+if [ "$BATCH" != "yes" -o "$BATCH" != "YES" ]; then
+
+#
+# configure - zebra compile time options
+#
+
+/usr/bin/dialog --title "Zebra Compile Time Options" --clear \
+	--checklist "\n\
+Select compile time options for zebra port:" -1 -1 8	\
+LIBPAM		"enable PAM authentication for vtysh"	OFF \
+OSPF_NSSA	"turn on undergoing NSSA feature"	OFF \
+SNMP		"enable SNMP support"			OFF \
+2> /tmp/zebra-checklist.$$
+
+retval=$?
+
+if [ -s /tmp/zebra-checklist.$$ ]; then
+	set `cat /tmp/zebra-checklist.$$`
+fi
+rm -f /tmp/zebra-checklist.$$
+
+case $retval in
+	0)	if [ -z "$*" ]; then
+			echo "Nothing selected"
+		fi
+		;;
+	1)	echo "Cancel pressed."
+		exit 1
+		;;
+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
+		;;
+    esac
+    shift
+done
+
+fi # if $BATCH