14 files changed, 2 insertions, 163 deletions

diff --git a/MOVED b/MOVED
index 983dcc5acdac..a655d007caca 100644
--- a/MOVED
+++ b/MOVED
@@ -3240,3 +3240,5 @@ net/iwi-firmware||2012-03-02|Removed: is already included in base system
 net/iwi-firmware-kmod||2012-03-02|Removed: is already included in base system
 devel/kdevelop||2012-03-03|Has expired
 devel/dklibs||2012-03-03|Has expired: not needed for graphics/bmeps anymore, no other users
+security/blocksshd||2012-03-03|Removed: security/sshguard is more active and a better tool.
+net/p5-Net-Subnets||2012-03-03|Has expired: Disappeared from CPAN
diff --git a/net/Makefile b/net/Makefile
index 3c274301c59d..ea88a544f7eb 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -645,7 +645,6 @@
     SUBDIR += p5-Net-Server-SS-PreFork
     SUBDIR += p5-Net-Services
     SUBDIR += p5-Net-Subnet
-    SUBDIR += p5-Net-Subnets
     SUBDIR += p5-Net-TCLink
     SUBDIR += p5-Net-TcpDumpLog
     SUBDIR += p5-Net-Telnet
diff --git a/net/p5-Net-Subnets/Makefile b/net/p5-Net-Subnets/Makefile
deleted file mode 100644
index 61960d012071..000000000000
--- a/net/p5-Net-Subnets/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	p5-Net-Subnets
-# Date created:		2006-11-29
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Net-Subnets
-PORTVERSION=	1.02
-CATEGORIES=	net perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:KRAIH
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	perl@FreeBSD.org
-COMMENT=	Computing subnets in large scale networks
-
-DEPRECATED=	Disappeared from CPAN
-EXPIRATION_DATE=	2011-11-26
-
-PERL_CONFIGURE=	yes
-
-MAN3=		Net::Subnets.3
-
-.include <bsd.port.mk>
diff --git a/net/p5-Net-Subnets/distinfo b/net/p5-Net-Subnets/distinfo
deleted file mode 100644
index 20edb9e981b6..000000000000
--- a/net/p5-Net-Subnets/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (Net-Subnets-1.02.tar.gz) = 54ea018b9c9b7a8522271ea71f3d65c8c0b4eef619cfbfa855f9bcfc7e12e28f
-SIZE (Net-Subnets-1.02.tar.gz) = 8392
diff --git a/net/p5-Net-Subnets/pkg-descr b/net/p5-Net-Subnets/pkg-descr
deleted file mode 100644
index 03e61dc6d8cb..000000000000
--- a/net/p5-Net-Subnets/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Very fast matches large lists of IP addresses against many CIDR
-subnets and calculates IP address ranges.
-
-WWW:	http://search.cpan.org/dist/Net-Subnets/
diff --git a/net/p5-Net-Subnets/pkg-plist b/net/p5-Net-Subnets/pkg-plist
deleted file mode 100644
index 587cfd01caa6..000000000000
--- a/net/p5-Net-Subnets/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Subnets/.packlist
-%%SITE_PERL%%/Net/Subnets.pm
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Subnets
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/security/Makefile b/security/Makefile
index a572726c39de..9749b951fbbb 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -42,7 +42,6 @@
     SUBDIR += binwalk
     SUBDIR += bioapi
     SUBDIR += blindelephant
-    SUBDIR += blocksshd
     SUBDIR += botan
     SUBDIR += bro
     SUBDIR += bruteblock
diff --git a/security/blocksshd/Makefile b/security/blocksshd/Makefile
deleted file mode 100644
index 6f8f46ce6749..000000000000
--- a/security/blocksshd/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# New ports collection makefile for:	blocksshd
-# Date created:		2006-07-20
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	blocksshd
-PORTVERSION=	1.3
-CATEGORIES=	security sysutils
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/BlockSSHD%20${PORTVERSION}
-
-MAINTAINER=	jadawin@FreeBSD.org
-COMMENT=	Protects computers from SSH brute force attacks
-
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DNS/Resolver.pm:${PORTSDIR}/dns/p5-Net-DNS \
-		${SITE_PERL}/File/Tail.pm:${PORTSDIR}/devel/p5-File-Tail \
-		${SITE_PERL}/Net/Subnets.pm:${PORTSDIR}/net/p5-Net-Subnets
-
-MAKE_ARGS=	PREFIX="${PREFIX}" SYSCONFDIR="${PREFIX}/etc"
-NO_BUILD=	yes
-USE_PERL5_RUN=	yes
-USE_RC_SUBR=	blocksshd
-USE_DOS2UNIX=	blocksshd blocksshd.conf
-
-DEPRECATED=	security/sshguard is more active and a better tool.
-
-MAN1=		blocksshd.1
-MANCOMPRESSED=	yes
-
-post-extract:
-	@${CHMOD} 755 ${WRKSRC}/init
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/blocksshd.conf|${PREFIX}/etc/blocksshd.conf|g' ${WRKSRC}/blocksshd
-
-post-install:
-	@if [ ! -f ${PREFIX}/etc/blocksshd.conf ]; then \
-		${CP} ${PREFIX}/etc/blocksshd.conf.sample ${PREFIX}/etc/blocksshd.conf; \
-	fi
-
-.include <bsd.port.mk>
diff --git a/security/blocksshd/distinfo b/security/blocksshd/distinfo
deleted file mode 100644
index 5b88fae5a9c0..000000000000
--- a/security/blocksshd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (blocksshd-1.3.tar.gz) = 6af625371ab4be1210e946450e777bda2cd73298034b418fc13de8e7d39cea83
-SIZE (blocksshd-1.3.tar.gz) = 11381
diff --git a/security/blocksshd/files/blocksshd.in b/security/blocksshd/files/blocksshd.in
deleted file mode 100644
index ec27ea9275ca..000000000000
--- a/security/blocksshd/files/blocksshd.in
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-
-# PROVIDE: blocksshd
-# REQUIRE: NETWORKING
-# BEFORE: securelevel
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="blocksshd"
-rcvar=blocksshd_enable
-command="%%PREFIX%%/bin/${name}"
-command_interpreter="/usr/bin/perl"
-pidfile="/var/run/${name}.pid"
-blocksshd_flags="--start"
-stop_precmd=blocksshd_stop
-
-blocksshd_stop () {
-        ${command} --stop
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/security/blocksshd/files/patch-Makefile b/security/blocksshd/files/patch-Makefile
deleted file mode 100644
index c484c456dfdd..000000000000
--- a/security/blocksshd/files/patch-Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.orig	Thu Apr 12 13:14:02 2007
-+++ Makefile	Sat Jun 16 12:25:29 2007
-@@ -11,11 +11,11 @@
- PREFIX = /usr
- EXEC_PREFIX = $(PREFIX)
- BINDIR = $(EXEC_PREFIX)/bin
--SYSCONFDIR = /etc
-+SYSCONFDIR = $(PREFIX)/etc
- MANDIR = $(PREFIX)/man
- MAN1DIR = $(MANDIR)/man1
- INIT = init/blocksshd
--INITDIR = /etc/rc.d/init.d
-+INITDIR = $(PREFIX)/etc/rc.d/init.d
- DESTDIR =
- 
- all:	$(APPNAME).1.gz
-@@ -25,7 +25,7 @@
- 	$(INSTALL) -p -m 755 -d $(DESTDIR)$(SYSCONFDIR)
- 	$(INSTALL) -p -m 755 -d $(DESTDIR)$(MAN1DIR)
- 	$(INSTALL) -p -m 755 $(APPNAME) $(DESTDIR)$(BINDIR)
--	$(INSTALL) -p -m 644 $(CONF) $(DESTDIR)$(SYSCONFDIR)
-+	$(INSTALL) -p -m 644 $(CONF) $(DESTDIR)$(SYSCONFDIR)/$(CONF).sample
- 	$(INSTALL) -p -m 644 $(APPNAME).1.gz $(DESTDIR)$(MAN1DIR)
- 
- init:
diff --git a/security/blocksshd/files/patch-blocksshd.conf b/security/blocksshd/files/patch-blocksshd.conf
deleted file mode 100644
index 5d62a31cea3d..000000000000
--- a/security/blocksshd/files/patch-blocksshd.conf
+++ /dev/null
@@ -1,23 +0,0 @@
---- blocksshd.conf.orig	Sat Jun 16 12:26:22 2007
-+++ blocksshd.conf	Sat Jun 16 12:27:19 2007
-@@ -1,9 +1,9 @@
- # vim: syntax=perl
- 
- $cfg = {
--    os              => 'linux',                       # Target OS - either linux or bsd
-+    os              => 'bsd',                       # Target OS - either linux or bsd
-     chain           => 'blocksshd',                   # Name of iptables or pf chain
--    logfile         => '/var/log/secure',             # Log file to monitor
-+    logfile         => '/var/log/auth.log',             # Log file to monitor
-     logcheck        => '10',                          # How often to check the log file
-     max_attempts    => '4',                           # Max number of failures
-     timeout         => '360',                         # Reset IP count if no activity after time out in seconds
-@@ -14,7 +14,7 @@
-     pid_file        => '/var/run/blocksshd.pid',      # Location of PID file
-     send_email      => '1',                           # Enable the sending of email notifications
-     email           => 'root',                        # Email address to send notifications
--    mail            => '/bin/mail',                   # Location of mail binary
-+    mail            => '/usr/bin/mail',                   # Location of mail binary
-     email_whois_lookup => '1',                        # enable whois lookup of the blocked ip addres in the sent email
-     whois           => '/usr/bin/whois',              # location of the whois binary
-     sed             => '/bin/sed',                # location of the sed binary
diff --git a/security/blocksshd/pkg-descr b/security/blocksshd/pkg-descr
deleted file mode 100644
index 0e4f78b55434..000000000000
--- a/security/blocksshd/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-BlockSSHD protects computers from SSH brute force attacks by
-dynamically blocking IP addresses by adding iptables rules.
-
-WWW:	http://sourceforge.net/projects/blocksshd/
diff --git a/security/blocksshd/pkg-plist b/security/blocksshd/pkg-plist
deleted file mode 100644
index b9745fa94370..000000000000
--- a/security/blocksshd/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $FreeBSD$
-bin/blocksshd
-@unexec if cmp -s %D/etc/blocksshd.conf %D/etc/blocksshd.conf.sample; then rm -f %D/etc/blocksshd.conf; fi
-etc/blocksshd.conf.sample
-@exec if [ ! -f %D/etc/blocksshd.conf ]; then cp -p %D/%F %D/etc/blocksshd.conf; fi