Remove net/ish and enable net/ishell instead.

7 files changed, 4 insertions, 100 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 94e5cf306df..2769b75da8a 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5546 2004/04/11 23:49:34 minskim Exp $
+$NetBSD: CHANGES,v 1.5547 2004/04/12 00:00:38 minskim Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -1918,4 +1918,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated yamt to 0.5nb6 [xtraeme 2004-04-11]
 	Updated gpdf to 0.131nb1 [jmmv 2004-04-11]
 	Updated afio to 2.5 [minskim 2004-04-12]
-	Added ish-0.2 [minskim 2004-04-12]
+	Added ishell-0.2 [minskim 2004-04-12]
diff --git a/net/Makefile b/net/Makefile
index 84befde64d0..c2a0b94d306 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.464 2004/04/11 23:49:34 minskim Exp $
+# $NetBSD: Makefile,v 1.465 2004/04/12 00:00:38 minskim Exp $
 #
 
 COMMENT=	Networking tools
@@ -121,8 +121,8 @@ SUBDIR+=	iplog
 SUBDIR+=	ipv6calc
 SUBDIR+=	ipw
 SUBDIR+=	irrd
+SUBDIR+=	ishell
 SUBDIR+=	isic
-SUBDIR+=	ish
 SUBDIR+=	ispman
 SUBDIR+=	ja-samba
 SUBDIR+=	jftpgw
diff --git a/net/ish/DESCR b/net/ish/DESCR
deleted file mode 100644
index 64cff55a581..00000000000
--- a/net/ish/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-ICMP Shell is a telnet-like protocol.  It allows users to connect to a
-remote host and to open a shell using only ICMP to send and receive
-data.  ICMP Shell was written in C for the UNIX environment.
diff --git a/net/ish/Makefile b/net/ish/Makefile
deleted file mode 100644
index 63407bf14dd..00000000000
--- a/net/ish/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/11 23:48:26 minskim Exp $
-#
-
-DISTNAME=	ish-v${VERSION}
-PKGNAME=	ish-${VERSION}
-WRKSRC=		${WRKDIR}/ISHELL-v${VERSION}/
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=icmpshell/}
-
-MAINTAINER=	pancake@phreaker.net
-HOMEPAGE=	http://icmpshell.sourceforge.net/
-COMMENT=	Allow remote shell using ICMP
-
-VERSION=	0.2
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-USE_GNU_TOOLS+=	make
-USE_BUILDLINK3=	yes
-NO_CONFIGURE=	yes
-
-MAKE_ENV+=	LIBS="${LIBS}"
-LIBS.SunOS+=	-lsocket
-
-INSTALLATION_DIRS=	bin sbin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/ish/PLIST b/net/ish/PLIST
deleted file mode 100644
index 2b169e592e6..00000000000
--- a/net/ish/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/11 23:48:26 minskim Exp $
-bin/ish
-sbin/ishd
diff --git a/net/ish/distinfo b/net/ish/distinfo
deleted file mode 100644
index 09d1f684002..00000000000
--- a/net/ish/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/04/11 23:48:26 minskim Exp $
-
-SHA1 (ish-v0.2.tar.gz) = 2d5d16cdd8c097220ee885bedbefb7f41115e6b2
-Size (ish-v0.2.tar.gz) = 6531 bytes
-SHA1 (patch-aa) = 76ffb5afb5deb44ce4d48f853ebdb0d229f081b1
diff --git a/net/ish/patches/patch-aa b/net/ish/patches/patch-aa
deleted file mode 100644
index 9320a0075e5..00000000000
--- a/net/ish/patches/patch-aa
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/04/11 23:48:26 minskim Exp $
---- Makefile.orig	2002-01-31 18:35:52.000000000 +0100
-+++ Makefile	2004-01-23 03:34:45.566770000 +0100
-@@ -1,38 +1,24 @@
--CC = gcc
--CFLAGS1 = -O2 -Wall
--CFLAGS2 = -O2 -Wall -lsocket
--STRIP = strip
--
--default:
--	@echo "-------------------------------"
--	@echo "Make with the OS from the list:"
--	@echo ""
--	@echo "1.) linux"
--	@echo "2.) bsd"
--	@echo "3.) solaris"
--	@echo ""
--	@echo "ex: make bsd"
--	@echo "-------------------------------"
-+OWNCFLAGS = -O2 -Wall
- 
-+ish_OBJECTS = ish.o ish_main.o
-+ishd_OBJECTS = ishd.o ish_main.o ish_open.o
- 
--clean:
--	/bin/rm -f ish ishd
--
--linux:	clean cc1 fin
-+all: ish ishd
- 
--bsd:	clean cc1 fin
-+.c.o:
-+	$(CC) -c $(CPPFLAGS) $(OWNCFLAGS) $(CFLAGS) $<
- 
--solaris:	clean cc2 fin
-+ish: $(ish_OBJECTS)
-+	$(CC) $(ish_OBJECTS) $(LDFLAGS) $(LIBS) -o $@
- 
--cc1:
--	$(CC) $(CFLAGS1) -o ish ish.c ish_main.c
--	$(CC) $(CFLAGS1) -o ishd ishd.c ish_main.c ish_open.c
-+ishd: $(ishd_OBJECTS)
-+	$(CC) $(ishd_OBJECTS) $(LDFLAGS) $(LIBS) -o $@
- 
--cc2:
--	$(CC) $(CFLAGS2) -o ish ish.c ish_main.c
--	$(CC) $(CFLAGS2) -o ishd ishd.c ish_main.c ish_open.c
-+clean:
-+	${RM} -f ish ishd
- 
--fin:
--	$(STRIP) ish
--	$(STRIP) ishd
-+install:
-+	${BSD_INSTALL_PROGRAM} ./ish ${PREFIX}/bin/ish
-+	${BSD_INSTALL_PROGRAM} ./ish ${PREFIX}/sbin/ishd
- 
-+.PHONY: all clean install