4 files changed, 30 insertions, 120 deletions

diff --git a/security/amavisd/Makefile b/security/amavisd/Makefile
index 59c58e76099e..d2f61def113b 100644
--- a/security/amavisd/Makefile
+++ b/security/amavisd/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	amavisd
-PORTVERSION=	20020531
-PORTREVISION=	1
+PORTVERSION=	0.1
+PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amavis
-DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The daemonized version of amavis-perl
@@ -21,17 +21,17 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/arc:${PORTSDIR}/archivers/arc \
 		${LOCALBASE}/bin/unarj:${PORTSDIR}/archivers/unarj \
 		${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \
 		${LOCALBASE}/bin/zoo:${PORTSDIR}/archivers/zoo \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Convert/UUlib.pm:${PORTSDIR}/converters/p5-Convert-UUlib \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/AtomicFile.pm:${PORTSDIR}/devel/p5-IO-stringy \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
+		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+		${SITE_PERL}/${PERL_ARCH}/Convert/UUlib.pm:${PORTSDIR}/converters/p5-Convert-UUlib \
+		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+		${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \
+		${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
+		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
+		${SITE_PERL}/IO/AtomicFile.pm:${PORTSDIR}/devel/p5-IO-stringy \
+		${SITE_PERL}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools \
+		${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
@@ -74,6 +74,7 @@ MTA?=		sendmail
 
 post-patch:
 	@${SED} 's,%%AMAVISUSER%%,${AMAVISUSER},g' ${FILESDIR}/${STARTSCRIPT} > ${WRKSRC}/${STARTSCRIPT}
+	@${PERL} -pi.orig -e 's|/etc/amavisd.conf|${PREFIX}/etc/amavisd.conf|g' ${WRKSRC}/configure ${WRKSRC}/amavis/amavisd.in ${WRKSRC}/amavis/Makefile.in
 
 pre-install:
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${AMAVISUSER} ${AMAVISGROUP}
diff --git a/security/amavisd/distinfo b/security/amavisd/distinfo
index d200c5a6335c..45930b8450c1 100644
--- a/security/amavisd/distinfo
+++ b/security/amavisd/distinfo
@@ -1 +1 @@
-MD5 (amavisd-snapshot-20020531.tar.gz) = 0d97a1c227c9934b19c0ff283ccb3561
+MD5 (amavisd-0.1.tar.gz) = 432a32bfc6d473564f49028b540f53ad
diff --git a/security/amavisd/files/patch-amavis::amavisd.in b/security/amavisd/files/patch-amavis::amavisd.in
deleted file mode 100644
index 31d34f7d18ef..000000000000
--- a/security/amavisd/files/patch-amavis::amavisd.in
+++ /dev/null
@@ -1,91 +0,0 @@
---- amavis/amavisd.in.orig	Sun Aug 25 23:45:58 2002
-+++ amavis/amavisd.in	Sun Aug 25 23:50:56 2002
-@@ -123,7 +123,7 @@
- #
- # Client/server/daemon related
- 
--my ($socketname, $parentpid, $tmppid) = ("@sockname@", 0, 0);
-+my ($socketname, $parentpid, $diedpid, $tmppid) = ("@sockname@", 0, 0, 0);
- 
- # flag to indicate compressing file format
- my $some_compression = 0;
-@@ -172,15 +172,19 @@
- #
- # SIGCHLD handler
- sub deadbabe {
--    for (;;) {
--	my $childpid = wait;
--	last if $childpid < 0;
--	$child_status{$childpid} = $?;
--	$child_etime{$childpid} = time;
--    }
-+    do {
-+      $tmppid = waitpid(-1, &WNOHANG);
-+    } while ($tmppid > 0);
-+    $diedpid = 1;
-     $SIG{CHLD} = \&deadbabe;
-+# stupid sys5 resets the signal when called - but only -after- the wait...
- }
--$SIG{CHLD} = \&deadbabe;
-+# Catch any dead child process
-+
-+# If IGNORE leaves zombies behind on your system,
-+# switch the comments between the two lines below
-+# $SIG{CHLD} = \&deadbabe;
-+$SIG{CHLD} = 'IGNORE';
- 
- # may need to do more - eg. if logging changes, close/reopen syslog/log file
- # rethink - handler should be simple
-@@ -240,15 +244,16 @@
- sub main_loop() {
-     my ($inbuff, $mpid, $a);
- 
--    for (;;) {
--	$a = accept(Client,Server);
-+    while (($a = accept(Client,Server)) || $diedpid) {
- 
- 	do_log(3,"enter accept loop");
--	report_children();
--
--	# if the accept returned purely because of a caught
--	# sigchld, then continue
--	    next unless $a;
-+        # now we start the repeating loop...
-+        if ($diedpid) {
-+            $diedpid = 0;
-+            # if the accept returned purely because of a caught sigchld
-+            # then continue
-+            next unless (defined($a));
-+        }
- 
- 	if (!defined($mpid = fork)) {
- 	    shutdown Server, 2;
-@@ -257,12 +262,12 @@
- 	}
- 
- 	# if we're the parent, just go back to the accept loop
--	if ($mpid) {   # we are the parent
--	    $child_stime{$mpid} = time;
--	    next;  # just go back to the accept loop
--	}
--	$SIG{CHLD} = undef;
--	do_log(3,"forked off -- child [$$] running...");
-+        next if ($mpid);
-+  
-+        do_log(3,"forked off -- child running...");
-+  
-+        $SIG{CHLD} = 'DEFAULT';
-+        # reset sigchild - we don't want to mess up $? for the virus scanner
- 
- 	#
- 	# Receive TEMPDIR/SENDER/RCPTS/LDA/LDAARGS from client
-@@ -1326,9 +1331,6 @@
- 	do_log(3,"removed pid file");
- 	unlink("$socketname");
- 	do_log(3,"removed socket");
--	while (wait>=0) {};  # must wait for children (if still alive)
--			     # to get their status by the $SIG{CHLD} handler
--	report_children();
-     }
- 
-     ($DO_SYSLOG eq "yes") ? closelog() : $log->close();
diff --git a/security/amavisd/pkg-plist b/security/amavisd/pkg-plist
index e3f7975d8413..95e95ecd929f 100644
--- a/security/amavisd/pkg-plist
+++ b/security/amavisd/pkg-plist
@@ -1,17 +1,17 @@
-%%PORTDOCS%%share/doc/amavisd/FAQ
-%%PORTDOCS%%share/doc/amavisd/INSTALL
-%%PORTDOCS%%share/doc/amavisd/README
-%%PORTDOCS%%share/doc/amavisd/README.exim
-%%PORTDOCS%%share/doc/amavisd/README.milter
-%%PORTDOCS%%share/doc/amavisd/README.postfix
-%%PORTDOCS%%share/doc/amavisd/README.qmail
-%%PORTDOCS%%share/doc/amavisd/README.scanners
-%%PORTDOCS%%share/doc/amavisd/README.sendmail
-%%PORTDOCS%%share/doc/amavisd/amavis.html
-%%PORTDOCS%%share/doc/amavisd/amavis.m4
-%%PORTDOCS%%share/doc/amavisd/amavis.png
-%%PORTDOCS%%share/doc/amavisd/amavis.txt
-%%PORTDOCS%%@dirrm share/doc/amavisd
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.exim
+%%PORTDOCS%%%%DOCSDIR%%/README.milter
+%%PORTDOCS%%%%DOCSDIR%%/README.postfix
+%%PORTDOCS%%%%DOCSDIR%%/README.qmail
+%%PORTDOCS%%%%DOCSDIR%%/README.scanners
+%%PORTDOCS%%%%DOCSDIR%%/README.sendmail
+%%PORTDOCS%%%%DOCSDIR%%/amavis.html
+%%PORTDOCS%%%%DOCSDIR%%/amavis.m4
+%%PORTDOCS%%%%DOCSDIR%%/amavis.png
+%%PORTDOCS%%%%DOCSDIR%%/amavis.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 etc/amavisd.conf
 etc/rc.d/amavisd.sh
 sbin/amavis