7 files changed, 17 insertions, 141 deletions

diff --git a/security/swatch/Makefile b/security/swatch/Makefile
index 2e6740bd5771..2433212ce68e 100644
--- a/security/swatch/Makefile
+++ b/security/swatch/Makefile
@@ -6,18 +6,22 @@
 #
 
 PORTNAME=	swatch
-PORTVERSION=	2.2
+PORTVERSION=	3.0.1
 CATEGORIES=	security sysutils
-MASTER_SITES=	ftp://ftp.stanford.edu/general/security-tools/swatch/OLD/
+MASTER_SITES=	ftp://ftp.stanford.edu/general/security-tools/swatch/
 
 MAINTAINER=	joseph@randomnetworks.com
 
-NO_BUILD=	YES
+BUILD_DEPENDS=	${site_perl}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
+	${site_perl}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \
+	${site_perl}/File/Tail.pm:${PORTSDIR}/devel/p5-File-Tail
 
-MAN5=		swatch.conf.5
-MAN8=		swatch.8
+site_perl=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-do-install:
-		@cd ${WRKSRC}; sh ${WRKSRC}/install.sh
+USE_PERL5=	yes
+PERL_CONFIGURE=	yes
+CONFIGURE_ARGS+=	INSTALLMAN1DIR=${PREFIX}/man/man1
+
+MAN1=	swatch.1 swatch_oldrc2newrc.1
 
 .include <bsd.port.mk>
diff --git a/security/swatch/distinfo b/security/swatch/distinfo
index 00c29c6eac73..9e5918d50977 100644
--- a/security/swatch/distinfo
+++ b/security/swatch/distinfo
@@ -1 +1 @@
-MD5 (swatch-2.2.tar.gz) = 0d787edd73d358eefcf9e7a601fb7cb7
+MD5 (swatch-3.0.1.tar.gz) = 7426301fe6fb621dd67481ef3f2abad3
diff --git a/security/swatch/files/patch-aa b/security/swatch/files/patch-aa
deleted file mode 100644
index c23ce775902b..000000000000
--- a/security/swatch/files/patch-aa
+++ /dev/null
@@ -1,75 +0,0 @@
---- install.pl.orig	Thu Dec 14 17:17:23 1995
-+++ install.pl	Fri May  2 20:13:32 1997
-@@ -12,7 +12,7 @@
- 
- # usage: install.pl [full_path_to_perl]
- #
--$ENV{'PATH'} = '/usr/ucb:/usr/bin:/bin:/usr/local/bin' ;
-+$ENV{'PATH'} = '/usr/bin:/bin:/usr/local/bin' ;
- $ENV{'IFS'} = '' if $ENV{'IFS'} ne '' ;
- 
- 
-@@ -21,8 +21,9 @@
- ##
-        $PERL_LIB_DIR = "/usr/local/lib/perl" ;
-        $PERL_BIN_DIR = "/usr/local/bin" ;
--     $SWATCH_BIN_DIR = "/usr/local/etc" ;
-+     $SWATCH_BIN_DIR = "/usr/local/bin" ;
-      $SWATCH_MAN_DIR = "/usr/local/man" ;
-+     $SWATCH_LIB_DIR = "/usr/local/lib" ;
- $SWATCH_PROG_MAN_EXT = "8" ;
- $SWATCH_CONF_MAN_EXT = "5" ;
-    $SWATCH_DATA_MODE = 444 ;
-@@ -30,14 +31,15 @@
-               $OWNER = "root" ;
-               $GROUP = "wheel" ;
-    $SWATCH_PROG_NAME = "swatch" ;
-+   $SWATCH_CONF_NAME = "swatch.conf" ;
-     $SWATCH_PROG_MAN = "swatch.prog.man" ;
-     $SWATCH_CONF_MAN = "swatch.conf.man" ;
-   $SWATCH_ACTION_LIB = "sw_actions.pl" ;
-     $SWATCH_HIST_LIB = "sw_history.pl" ;
- 
-                 $SED = "/usr/bin/sed" ; 
--               $COPY = "/usr/bin/cp" ;
--	      $CHMOD = "/usr/bin/chmod" ;
-+               $COPY = "/bin/cp" ;
-+	      $CHMOD = "/bin/chmod" ;
- 
- if ( ! -f $SED ) {
-     $SED = `which sed` ;
-@@ -60,7 +62,7 @@
- }
- $PERL_BIN_DIR = substr($PERL_BIN_DIR, 0, rindex($PERL_BIN_DIR, '/')) ;
- 
--$ready = 0 ;
-+$ready = 1 ;
- while (!$ready) {
-     &get_some_answers() ;
-     &print_values() ;
-@@ -69,14 +71,13 @@
-     $ready = 1 if ($ans eq 'y' || $ans eq 'Y') ;
- }
- 
--print "\nAre you ready for me to start the installation (y or n)? " ;
--$ans = <STDIN> ; chop $ans ;
--&do_the_install() if ($ans eq 'y' || $ans eq 'Y') ;
-+&do_the_install();
- 
- 
- ##
- ##
- ##
-+
- sub get_some_answers {
-     local($question) ;
- 
-@@ -139,7 +140,7 @@
-     &install_it($swatch_uid, $swatch_gid, $SWATCH_DATA_MODE,
- 		$SWATCH_PROG_MAN, "$SWATCH_MAN_DIR/man$SWATCH_PROG_MAN_EXT/$SWATCH_PROG_NAME.$SWATCH_PROG_MAN_EXT") ;
-     &install_it($swatch_uid, $swatch_gid, $SWATCH_DATA_MODE,
--		$SWATCH_CONF_MAN, "$SWATCH_MAN_DIR/man$SWATCH_CONF_MAN_EXT/$SWATCH_PROG_NAME.$SWATCH_CONF_MAN_EXT") ;
-+		$SWATCH_CONF_MAN, "$SWATCH_MAN_DIR/man$SWATCH_CONF_MAN_EXT/$SWATCH_CONF_NAME.$SWATCH_CONF_MAN_EXT") ;
- }
- 
- 
diff --git a/security/swatch/files/patch-ab b/security/swatch/files/patch-ab
deleted file mode 100644
index 656daa3bd7f0..000000000000
--- a/security/swatch/files/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
---- swatch.pl.orig	Thu Dec 14 21:01:08 1995
-+++ swatch.pl	Sun Jul  6 19:22:13 1997
-@@ -29,7 +29,7 @@
- eval 'PERL_BIN_DIR/perl -S $0 ${1+"$@"}'
-     if 0;
- #
--$ENV{'PATH'} = '/usr/ucb:/usr/bin:/bin:PERL_BIN_DIR';
-+$ENV{'PATH'} = '/usr/bin:/bin:PERL_BIN_DIR';
- $ENV{'IFS'} = '' if $ENV{'IFS'} ne '';
- $0 = rindex($0, "/") > -1 ? substr($0, rindex($0, "/")+1) : $0;
- 
-@@ -44,8 +44,8 @@
- 
- # Some defaults
- $PERL                   = 'PERL_BIN_DIR/perl';
--$TAIL			= '/usr/ucb/tail -f';
--$DEF_INPUT		= "$TAIL /var/log/syslog";
-+$TAIL			= '/usr/bin/tail -f';
-+$DEF_INPUT		= "$TAIL /var/log/messages";
- $Pipe			= 1;
- $ConfigFile		= "$ENV{'HOME'}/.swatchrc";
- $PatternSeparator	= ',';
-
diff --git a/security/swatch/files/patch-ac b/security/swatch/files/patch-ac
deleted file mode 100644
index e418fbe31a6c..000000000000
--- a/security/swatch/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- sw_actions.pl.orig	Thu Dec 14 04:32:19 1995
-+++ sw_actions.pl	Sun Jul  6 19:23:20 1997
-@@ -22,8 +22,8 @@
- #
- 
- $BELL 	= "\007";
--$MAILER = "/usr/lib/sendmail";
--$WRITE 	= "/bin/write";
-+$MAILER = "/usr/sbin/sendmail";
-+$WRITE 	= "/usr/bin/write";
- 
- #
- # do_bell -- send BELL(s) to the output.
diff --git a/security/swatch/pkg-descr b/security/swatch/pkg-descr
index a0c27599b3ae..2835e733c9ac 100644
--- a/security/swatch/pkg-descr
+++ b/security/swatch/pkg-descr
@@ -1,23 +1,7 @@
 SWATCH - The Simple WATCHer and filter
 
-       Swatch is designed to  monitor  system  activity.   Swatch
-       requires a configuration file which contains pattern(s) to
-       look for and action(s) to do when each pattern is found.
+Swatch is designed to  monitor  system  activity.   Swatch
+requires a configuration file which contains pattern(s) to
+look for and action(s) to do when each pattern is found.
 
-      The file contains four TAB separated fields:
-
-/pattern/[,/pattern/,...] action[,action,...] [[HH:]MM:]SS start:length
-
-       A pattern must be a regular expression which perl(1)  will
-       accept,  which  is very similar to the regular expressions
-       which egrep(1) accepts.
-
-       The following actions are acceptable:
-
-       echo[=mode]
-       bell[=N]
-       exec=command
-       ignore
-       mail[=address:address:...]
-       pipe=command
-       write[=user:user:...]
+WWW: http://www.stanford.edu/~atkins/swatch/
diff --git a/security/swatch/pkg-plist b/security/swatch/pkg-plist
index 73436fc5c874..defa7bc1e967 100644
--- a/security/swatch/pkg-plist
+++ b/security/swatch/pkg-plist
@@ -1,3 +1,2 @@
 bin/swatch
-lib/sw_actions.pl
-lib/sw_history.pl
+bin/swatch_oldrc2newrc