remove gated. discussed with itojun@ and others.

net/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.269 2003/05/13 08:59:22 margarida Exp $
+# $OpenBSD: Makefile,v 1.270 2003/05/14 00:24:47 jakob Exp $
 # $FreeBSD: Makefile,v 1.129 1997/11/20 13:47:40 itojun Exp $
 #
 
@@ -60,7 +60,6 @@
      SUBDIR += gabber
      SUBDIR += gaim
      SUBDIR += gaim,audio
-     SUBDIR += gated
      SUBDIR += gkrellm-wireless
      SUBDIR += gnomeicu
      SUBDIR += gnut

net/gated/Makefile

@@ -1,49 +0,0 @@
-# $OpenBSD: Makefile,v 1.16 2002/12/29 21:14:11 fgsch Exp $
-# Original from: Ejovi Nuwere <ejovi@ejovi.net>
-
-COMMENT=	"routing protocol daemon"
-
-DISTNAME=	gated-3-6
-PKGNAME=	gated-3.6
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.gated.merit.edu/net-research/gated/ \
-   		ftp://ftp.funet.fi/pub/mirrors/ftp.gated.merit.edu/research.and.development/gated/
-
-HOMEPAGE=	http://www.gated.org/
-
-MAINTAINER=	Jakob Schlyter <jakob@openbsd.org>
-
-PERMIT_PACKAGE_CDROM=	"commercial software"
-PERMIT_PACKAGE_FTP=	"commercial software"
-PERMIT_DISTFILES_CDROM=	"commercial software"
-PERMIT_DISTFILES_FTP=	Yes
-
-WRKDIST=		${WRKDIR}/gated-public-3_6
-
-FLAVORS=snmp gii
-FLAVOR?=
-
-.if ${FLAVOR:L:Msnmp}
-CONFIGURE_ARGS+=	--enable-smux
-.else
-CONFIGURE_ARGS+=	--disable-smux
-.endif
-
-.if ${FLAVOR:L:Mgii}
-CONFIGURE_ARGS+=	--enable-gii
-.else
-CONFIGURE_ARGS+=	--disable-gii
-.endif
-
-CONFIGURE_STYLE=	autoconf
-SEPARATE_BUILD=		Yes
-
-pre-build:
-	@cd ${WRKBUILD} && ${MAKE_PROGRAM} depend
-
-post-install:
-	${INSTALL_PROGRAM} ${WRKBUILD}/src/gdc/gdc ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKBUILD}/src/ospf_monitor/ospf_monitor ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKBUILD}/src/ripquery/ripquery ${PREFIX}/bin
-
-.include <bsd.port.mk>

net/gated/distinfo

@@ -1,3 +0,0 @@
-MD5 (gated-3-6.tar.gz) = 7435b61dfc7a3c15577459ad5ca4f9f5
-RMD160 (gated-3-6.tar.gz) = ae5ed443e50dc6edad8e08060be42ba975ba3313
-SHA1 (gated-3-6.tar.gz) = de96b3f4423f924e61fc0dd5d0957100dd3433ae

net/gated/patches/patch-configure.in

@@ -1,77 +0,0 @@
-        $OpenBSD: patch-configure.in,v 1.2 2002/11/19 07:56:50 pvalchev Exp $
-1. Make configure detect mkdep properly.
-2. Avoid compiler warnings "CMSG_XXX previosly defined at sys/socket.h"
-   CMSG_SPACE is macros so we must use AC_EGREP_CPP to properly detect it's
-   presence. 
---- configure.in.orig	Tue Mar 28 12:56:08 2000
-+++ configure.in	Sun Nov 17 13:35:50 2002
-@@ -413,35 +413,33 @@ dnl
- dnl Check for a way to calculate dependencies.
- dnl
- MKDEP_FILE="$srcdir/util/make-depend"
--AC_MSG_CHECKING(how to calculate deps)
--if test $ac_cv_prog_CC = gcc; then
--	dnl
--	dnl use gcc if it's there
--	dnl
--	MKDEP="\$(top_srcdir)/util/mkdep"
--elif $CC -V 2>&1 | grep WorkShop > /dev/null; then
--	dnl 
--	dnl checking for sunworkshop
--	dnl
--	MKDEP="\$(top_srcdir)/util/mkdep -flag -xM"
--else
--	dnl
--	dnl use makedepend, mkdep, or canned
--	dnl
--	AC_CHECK_FILE(makedepend,has_makedepend=yes,has_makedepend=no)
--	if test $has_makedepend = yes; then
--		MKDEP="makedepend"
-+AC_CHECK_PROG(MKDEP, mkdep, mkdep, notfound)
-+if test $MKDEP = notfound; then 
-+	AC_CHECK_PROG(have_makedepend, makedepend, yes, no)
-+	AC_MSG_CHECKING(how to calculate deps)
-+	if test $ac_cv_prog_gcc = yes; then
-+		dnl
-+		dnl use gcc if it's there
-+		dnl
-+		MKDEP="\$(top_srcdir)/util/mkdep"
-+	elif $CC -V 2>&1 | grep WorkShop > /dev/null; then
-+		dnl 
-+		dnl checking for sunworkshop
-+		dnl
-+		MKDEP="\$(top_srcdir)/util/mkdep -flag -xM"
- 	else
--		AC_CHECK_FILE(mkdep, has_mkdep=yes,has_mkdep=no)
--		if test $has_mkdep = yes; then
--			MKDEP="mkdep"
-+		dnl
-+		dnl use makedepend, mkdep, or canned
-+		dnl
-+		if test $have_makedepend = yes; then
-+			MKDEP="makedepend"
- 		else
- 			MKDEP=""
- 			MKDEP_FILE="/dev/null"
- 		fi
- 	fi
-+	AC_MSG_RESULT($MKDEP)
- fi
--AC_MSG_RESULT($MKDEP)
- AC_SUBST(MKDEP)
- AC_SUBST_FILE(MKDEP_FILE)
- 
-@@ -651,7 +649,12 @@ AC_EGREP_HEADER(setlinebuf, stdio.h, AC_
- AC_EGREP_HEADER(if_multiaddrs, net/if_var.h, AC_DEFINE(MULTIADDRS_ON_IFNET))
- AC_EGREP_HEADER(ia_subnetmask, netinet/in_var.h, AC_DEFINE(USE_IA_SUBNETMASK))
- AC_EGREP_HEADER(icmp6_mld, netinet/icmp6.h, AC_DEFINE(HAVE_ICMP6_MLD))
--AC_EGREP_HEADER(CMSG_SPACE, sys/socket.h, AC_DEFINE(HAVE_CMSG_SPACE))
-+AC_EGREP_CPP(yes,
-+[#include <sys/socket.h>
-+#ifdef CMSG_SPACE
-+yes
-+#endif
-+], AC_DEFINE(HAVE_CMSG_SPACE))
- AC_EGREP_HEADER(ICMPV6_PACKET_TOOBIG, netinet/icmp6.h, AC_DEFINE(HAVE_ICMPV6_DEST_UNREACH))
- AC_EGREP_HEADER(redirect_destination, netinet/icmp6.h, AC_DEFINE(HAVE_REDIRECT_DESTINATION))
- AC_EGREP_HEADER(ifm_data, net/if.h, AC_DEFINE(HAVE_IFM_DATA))

net/gated/patches/patch-if.c

@@ -1,14 +0,0 @@
---- src/gated/if.c.orig	Fri Mar 17 00:54:51 2000
-+++ src/gated/if.c	Sun Nov 17 13:35:50 2002
-@@ -2863,9 +2863,10 @@ if_rtup(if_addr *ifap)
- 	    case IFS_LOOPBACK:
- 	        /* Add a host route to the loopback interface */
- 
--	        BIT_SET(int_rtparms.rtp_state, RTS_NOADVISE);
- 	        int_rtparms.rtp_dest = ifap->ifa_addr_local;
- 	        int_rtparms.rtp_dest_mask = sockhostmask(ifap->ifa_addr_local);
-+		if (sock2ip(ifap->ifa_addr_local) == htonl(INADDR_LOOPBACK))
-+		    BIT_SET(int_rtparms.rtp_state, RTS_NOADVISE);
- 
- 	    	ifap->ifa_rt = rt_add(&int_rtparms);
- 	    	break;

net/gated/patches/patch-src_gated_paths_h_in

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_gated_paths_h_in,v 1.1 2003/04/26 15:02:31 sturm Exp $
---- src/gated/paths.h.in.orig	Sat Apr 26 16:23:52 2003
-+++ src/gated/paths.h.in	Sat Apr 26 16:24:03 2003
-@@ -35,7 +35,7 @@
-  * __END_OF_COPYRIGHT__
-  */
- 
--#define	_PATH_CONFIG	"/etc/%s.conf"
-+#define	_PATH_CONFIG	"@sysconfdir@/%s.conf"
- #define	_PATH_DEFS	"/usr/include/isode"
- #define	_PATH_DUMP	"@DUMPDIR@/%s_dump"
- #define	_PATH_DUMPDIR	"@DUMPDIR@"

net/gated/patches/patch-src_gated_str_c

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_gated_str_c,v 1.1 2002/11/19 08:05:38 pvalchev Exp $
---- src/gated/str.c.orig	Wed Jan 12 15:26:48 2000
-+++ src/gated/str.c	Tue Nov 19 00:56:32 2002
-@@ -191,7 +191,7 @@ static char sccsid[] = "@(#)doprnt.c	5.3
- 
- #define	ARG() \
- 	_ulong = flags&LONGINT ? va_arg(ap, long) : \
--	    flags&SHORTINT ? va_arg(ap, short) : va_arg(ap, int);
-+	    va_arg(ap, int);
- 
- #define	todigit(c)	((c) - '0')
- #define	tochar(n)	((n) + '0')

net/gated/pkg/DEINSTALL

@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-#	$OpenBSD: DEINSTALL,v 1.2 2003/04/26 15:02:31 sturm Exp $
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-
-if id gii >/dev/null 2>&1 ; then
-	HAVE_USER=YES
-fi
-GII_LINE=`grep ^gii /etc/services`
-
-if [ -n "$GII_LINE" -o -f ${SYSCONFDIR}/gated.conf -o "x$HAVE_USER" = "xYES" ]; then
-
-     echo
-     echo "+---------------"
-     echo "| To completely deinstall the $1 package you need to perform"
-     echo "| these steps:"
-     echo "|"
-     if [ "x$HAVE_USER" = "xYES" ] ; then
-          echo "| - delete user gii"
-          echo "|		userdel gii"
-          echo "|"
-     fi
-     if [ -n "$GII_LINE" ]; then
-          echo "| - remove from /etc/services line:"
-          echo "| $GII_LINE"
-          echo "|"
-     fi
-     if [ -f ${SYSCONFDIR}/gated.conf ]; then
-          echo "| - remove gated configuration file"
-          echo "|		rm ${SYSCONFDIR}/gated.conf"
-          echo "|"
-     fi
-     echo "| Do not do this if you plan on re-installing $1"
-     echo "| at some future time."
-     echo "+---------------"
-     echo
-fi
-
-exit 0

net/gated/pkg/DESCR

@@ -1,6 +0,0 @@
-GateD routing protocol daemon
-
-This program implements various routing protocols such as OSPF, RIP,
-BGP, ISIS, et al.
-
-WWW: ${HOMEPAGE}

net/gated/pkg/INSTALL

@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-#	$OpenBSD: INSTALL,v 1.1 2000/08/15 17:12:37 jakob Exp $
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-
-do_post_install_gii()
-{
-    echo
-    echo "+---------------"
-    echo "| You may wish to add the next line into /etc/services:"
-    echo "| gii           616/tcp         gii    # gated interactive interface"
-    echo "|"
-    echo "| To be able use gated interactive interface your must"
-    echo "| create user 'gii' and set his password:"
-    echo "|	useradd -d / -p '*' -s /sbin/nologin -c 'gii pseudo user' gii"
-    echo "|	passwd gii"
-    echo "+---------------"
-}
-
-if [ $# -ne 2 ]; then
-        echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-        exit 1
-fi
-
-case $2 in
-    PRE-INSTALL)
-	;;
-    POST-INSTALL)
-	if echo $1 |grep gii >/dev/null ; then
-		do_post_install_gii
-	fi
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0

net/gated/pkg/PLIST

@@ -1,5 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.5 2000/08/15 17:12:37 jakob Exp $
-bin/gdc
-bin/ospf_monitor
-bin/ripquery
-sbin/gated