- Update to 1.1.2-1 in order to fix fetching. [1]

  According to the changelog beside a OpenBSD-specific fix the only relevant
  change since 1.1.1-9 was:
  o The log file (syslog too) shows the file name (argv[0]) in its logs.

- No longer override FETCH_CMD so the distfiles survey keeps track of this
  port again. Overriding FETCH_CMD became redundant when the name of the
  distfile was changed to be a versioned one.

Prodded by:	stephen <vk3heg@iinet.net.au> [1]
Approved by:	netchild

5 files changed, 135 insertions, 74 deletions

diff --git a/security/antivir-milter/Makefile b/security/antivir-milter/Makefile
index 55de295a334e..5d63d1ddbc8a 100644
--- a/security/antivir-milter/Makefile
+++ b/security/antivir-milter/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	antivir-milter
-PORTVERSION=	1.1.1p9
+PORTVERSION=	1.1.2p1
 DISTVERSIONPREFIX=	prof-
 DISTVERSION=	${PORTVERSION:C/p/-/}
 CATEGORIES=	security mail
@@ -21,8 +21,6 @@ NO_CDROM=	${RESTRICTED}
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
 USE_REINPLACE=	yes
-# Auto re-fetch sucks!
-FETCH_CMD=	/usr/bin/fetch -A
 # When the avmilter binary is stripped its self-check fails.
 STRIP=
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -50,8 +48,8 @@ post-extract:
 	@${CP} ${FILESDIR}/avq.sh ${WRKSRC}/script/avq
 
 post-patch:
-.for i in doc/MANUAL etc/antivir.conf etc/avmilter.conf script/avq \
-	script/avupdater script/rc.avmilter
+.for i in doc/MANUAL doc/RELEASE_NOTES etc/antivir.conf etc/avmilter.conf \
+	pgp/README script/avq script/avupdater script/rc.avmilter
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \
 		s|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/${i}
 .endfor
@@ -70,12 +68,14 @@ do-install:
 	@${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 ${BINSRC}/antivir \
 		${PREFIX}/AntiVir
 .endif
-	@${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${WRKSRC}/vdf/antivir.vdf \
-		${PREFIX}/AntiVir/antivir.vdf-dist_avmilter
-.if !exists(${PREFIX}/AntiVir/antivir.vdf)
-	@${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${WRKSRC}/vdf/antivir.vdf \
+.for i in antivir0.vdf antivir1.vdf antivir2.vdf antivir3.vdf
+	@${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${WRKSRC}/vdf/${i} \
+		${PREFIX}/AntiVir/${i}-dist_avmilter
+.if !exists(${PREFIX}/AntiVir/${i})
+	@${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${WRKSRC}/vdf/${i} \
 		${PREFIX}/AntiVir
 .endif
+.endfor
 	@${INSTALL_SCRIPT} ${WRKSRC}/script/avq ${PREFIX}/bin
 	@${INSTALL} -d ${PREFIX}/etc/avmilter
 .for i in avmilter.conf avmilter.ignore avmilter.scan avmilter.warn
@@ -113,12 +113,14 @@ do-install:
 .endfor
 .if !defined(NOPORTDOCS)
 	@${INSTALL} -d ${DOCSDIR}
-.for i in ChangeLog LICENSE LICENSE.DE
+.for i in LICENSE LICENSE.DE
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
-.for i in MANUAL RELEASE_NOTES avmilter_de.pdf avmilter_en.pdf
+.for i in CHANGELOG MANUAL RELEASE_NOTES avmilter_de.pdf avmilter_en.pdf
 	@${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
+	@${INSTALL_DATA} ${WRKSRC}/pgp/README ${DOCSDIR}/README.gpg
+	@${INSTALL_DATA} ${WRKSRC}/pgp/antivir.gpg ${DOCSDIR}
 .endif
 
 post-install:
diff --git a/security/antivir-milter/distinfo b/security/antivir-milter/distinfo
index bff27c0070e1..af9aafbae47f 100644
--- a/security/antivir-milter/distinfo
+++ b/security/antivir-milter/distinfo
@@ -1,2 +1,3 @@
-MD5 (antivir-milter-prof-1.1.1-9.tar.gz) = 7373ee9d2b6ca808c4ca6fe629ae612e
-SIZE (antivir-milter-prof-1.1.1-9.tar.gz) = 11219085
+MD5 (antivir-milter-prof-1.1.2-1.tar.gz) = e5fd31d676717ea1e2420cb402c53f7f
+SHA256 (antivir-milter-prof-1.1.2-1.tar.gz) = 543f268f66dbf06ffdf823ed8f4b8c5e162855ad5fac454ba394d47b19e999e5
+SIZE (antivir-milter-prof-1.1.2-1.tar.gz) = 12693370
diff --git a/security/antivir-milter/files/patch-doc::RELEASE_NOTES b/security/antivir-milter/files/patch-doc::RELEASE_NOTES
new file mode 100644
index 000000000000..4567d9774145
--- /dev/null
+++ b/security/antivir-milter/files/patch-doc::RELEASE_NOTES
@@ -0,0 +1,11 @@
+--- doc/RELEASE_NOTES.orig	Fri Dec  2 15:49:46 2005
++++ doc/RELEASE_NOTES	Sat Dec 17 13:40:42 2005
+@@ -14,7 +14,7 @@
+   updates or will even fetch an archive with the new software to your
+   local disk for your convenience. The newly introduced "UpdateStoreDir"
+   config item allows you to specify where the software archives should
+-  be stored, by default the directory "/usr/lib/AntiVir/updcomp/" is
++  be stored, by default the directory "%%PREFIX%%/AntiVir/updcomp/" is
+   used. Available updates for the "webgate" component will not be
+   applied automatically to your local installation.
+ 
diff --git a/security/antivir-milter/files/patch-script::avupdater b/security/antivir-milter/files/patch-script::avupdater
index e614c6b26496..ba303ab79b86 100644
--- a/security/antivir-milter/files/patch-script::avupdater
+++ b/security/antivir-milter/files/patch-script::avupdater
@@ -1,7 +1,7 @@
 --- script/avupdater.orig	Nov 25 10:29:31 2004
 +++ script/avupdater	Wed Dec  8 15:23:09 2004
-@@ -5,10 +5,8 @@
- # Copyright (c) 2002-2005 H+BEDV Datentechnik GmbH
+@@ -5,13 +5,11 @@
+ # Copyright 2002-2005 H+BEDV Datentechnik GmbH
  #
  
 -PATH="/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin"
@@ -10,79 +10,114 @@
 -AVDIR="/usr/lib/AntiVir"
 +AVDIR="%%PREFIX%%/AntiVir"
  
- DAEMON="$AVDIR/$DAEMONNAME"
+ DAEMON="${AVDIR}/${DAEMONNAME}"
+-DAEMONPARAMS="--updater-daemon"
++DAEMONPARAMS="--updater-daemon -q -C %%PREFIX%%/etc/antivir.conf"
+ SERVICENAME="avupdater"
+ OS=`uname | tr "[:upper:]" "[:lower:]"`
+ PROCCMD=""
+@@ -35,23 +33,22 @@
+ {
+ 	if [ $1 -eq 0 ]
+ 	then
+-		${ECHO} "."
++		${ECHO} -n " ${SERVICENAME}"
+ 	fi
+ 	exit $1
+ }
  
-@@ -71,63 +69,41 @@
+ stopEXIT()
+ {
+-	if [ $1 -ne 1 ]
++	if [ $1 -eq 0 ]
+ 	then
+-		${ECHO} "."
++		${ECHO} -n " ${SERVICENAME}"
+ 	fi
+ 	exit $1
+ }
+ 
+ statusEXIT()
+ {
+-	${ECHO} "."
+ 	exit $1
+ }
+ 
+@@ -104,7 +101,7 @@
+ 		fi
+ 	fi
+ 
+-	for PROC in `$PROCCMD | grep ${DAEMONNAME}.*${DAEMONPARAMS} | grep -v grep`
++	for PROC in `$PROCCMD | grep "${DAEMONNAME}.*${DAEMONPARAMS}" | grep -v grep`
+ 	do
+ 		if [ -z "`$ECHO ${PROC} | sed -e s/[0-9]//g`" ]
+ 		then
+@@ -115,16 +112,9 @@
  
  case "$1" in
  	start)
--		$ECHO -n "Starting AntiVir: avupdater"
+-		${ECHO} -n "Starting AntiVir: ${SERVICENAME}"
 -
--		if [ ! -x "$DAEMON" ]
--		then
--			$ECHO " (FAILED)"
--			$ECHO " "
--			$ECHO "error: $DAEMON is missing"
--			$ECHO " "
--			exit 1
--		fi
--
--		$DAEMON --updater-daemon -q
+ 		if [ ! -x "${DAEMON}" ]
+ 		then
+ 			# daemon missing
 -
--		if [ $? -ne 0 ]
--		then
--			$ECHO " (FAILED)"
--			$ECHO " "
--			$ECHO "error: $DAEMONNAME failed to start"
--			$ECHO "See log files for details."
--			$ECHO " "
--			exit 1
-+		if [ -x "$DAEMON" ]; then
-+			$DAEMON --updater-daemon -q \
-+				-C %%PREFIX%%/etc/antivir.conf
-+			if [ $? -eq 0 ]; then
-+				$ECHO -n " avupdater"
-+			fi
+-			${ECHO} " (FAILED)"
+-			${ECHO} " "
+-			${ECHO} "error: ${DAEMON} missing"
+-			${ECHO} " "
+ 			startEXIT 5
  		fi
+ 
+@@ -144,20 +134,12 @@
+ 		if [ ${ERROR} -ne 0 -o -z "${PROCESSLIST}" ]
+ 		then
+ 			# daemon failed to start, there is a problem
 -
--		$ECHO "."
+-			${ECHO} " (FAILED)"
+-			${ECHO} " "
+-			${ECHO} "error: ${DAEMON} failed"
+-			${ECHO} "See log files for details."
+-			${ECHO} " "
+ 			startEXIT 1
+ 		fi
+ 
+ 		startEXIT 0
  		;;
  	stop)
--		$ECHO -n "Stopping AntiVir: avupdater"
+-		${ECHO} -n "Stopping AntiVir: ${SERVICENAME}"
 -
  		getPROCESSLIST
- 		for PROC in $PROCESSLIST
- 		do
- 			kill -TERM $PROC > /dev/null 2>&1
- 		done
+ 		if [ -z "${PROCESSLIST}" ]
+ 		then
+@@ -194,28 +176,21 @@
+ 		if [ ! -z "${PROCESSLIST}" ]
+ 		then
+ 			# there are still processes running? this may be a problem
+-
+-			${ECHO} " (FAILED)"
+-			${ECHO} " "
+-			${ECHO} "There may be processes still running."
+-			${ECHO} " "
+ 			stopEXIT 1
+ 		fi
  
--		$ECHO "."
-+		$ECHO -n " avupdater"
- 		;;
- 	restart)
- 		$0 stop
- 		$0 start
+ 		stopEXIT 0
  		;;
  	status)
--		$ECHO -n "AntiVir Status: avupdater "
+-		${ECHO} -n "AntiVir Status: ${SERVICENAME} "
 -
  		getPROCESSLIST
- 		if [ ! -z "$PROCESSLIST" ]
+ 
+ 		# display the results of what we found
+ 		if [ -z "${PROCESSLIST}" ]
  		then
--			$ECHO -n "(running)"
-+			$ECHO "OK avupdater is running!"
- 			RC=0
+-			${ECHO} -n "not running"
++			${ECHO} "FAILED ${SERVICENAME} not running"
+ 			statusEXIT 3
  		else
--			$ECHO -n "(not running)"
-+			$ECHO "FAILED avupdater is not running!"
- 			RC=3
+-			${ECHO} -n "running"
++			${ECHO} "OK ${SERVICENAME} running"
+ 			statusEXIT 0
  		fi
--		$ECHO "."
- 		exit $RC
- 		;;
- 	*)
--		$ECHO "usage: $0 {start|stop|restart|status}"
-+		$ECHO "Usage: `basename $0` {start|stop|restart|status}" >&2
- 		exit 1
  		;;
- esac
diff --git a/security/antivir-milter/pkg-plist b/security/antivir-milter/pkg-plist
index 0e32b7f4b4ff..e373ba7b628b 100644
--- a/security/antivir-milter/pkg-plist
+++ b/security/antivir-milter/pkg-plist
@@ -1,9 +1,19 @@
 @unexec if cmp -s %D/AntiVir/antivir-dist_avmilter %D/AntiVir/antivir; then rm -f %D/AntiVir/antivir; fi
 AntiVir/antivir-dist_avmilter
 @exec [ -f %B/antivir ] || cp -p %B/%f %B/antivir
-@unexec if cmp -s %D/AntiVir/antivir.vdf-dist_avmilter %D/AntiVir/antivir.vdf; then rm -f %D/AntiVir/antivir.vdf; fi
-AntiVir/antivir.vdf-dist_avmilter
-@exec [ -f %B/antivir.vdf ] || cp -p %B/%f %B/antivir.vdf
+@unexec if cmp -s %D/AntiVir/antivir0.vdf-dist_avmilter %D/AntiVir/antivir0.vdf; then rm -f %D/AntiVir/antivir0.vdf; fi
+AntiVir/antivir0.vdf-dist_avmilter
+@exec [ -f %B/antivir0.vdf ] || cp -p %B/%f %B/antivir0.vdf
+@unexec if cmp -s %D/AntiVir/antivir1.vdf-dist_avmilter %D/AntiVir/antivir1.vdf; then rm -f %D/AntiVir/antivir1.vdf; fi
+AntiVir/antivir1.vdf-dist_avmilter
+@exec [ -f %B/antivir1.vdf ] || cp -p %B/%f %B/antivir1.vdf
+@unexec if cmp -s %D/AntiVir/antivir2.vdf-dist_avmilter %D/AntiVir/antivir2.vdf; then rm -f %D/AntiVir/antivir2.vdf; fi
+AntiVir/antivir2.vdf-dist_avmilter
+@exec [ -f %B/antivir2.vdf ] || cp -p %B/%f %B/antivir2.vdf
+@unexec if cmp -s %D/AntiVir/antivir3.vdf-dist_avmilter %D/AntiVir/antivir3.vdf; then rm -f %D/AntiVir/antivir3.vdf; fi
+AntiVir/antivir3.vdf-dist_avmilter
+@exec [ -f %B/antivir3.vdf ] || cp -p %B/%f %B/antivir3.vdf
+@unexec rmdir %D/AntiVir/updcomp 2> /dev/null || true
 @unexec rmdir %D/AntiVir 2> /dev/null || echo "If permanently deleting this package, %D/AntiVir and its contents must be removed manually."
 bin/avq
 bin/avqrm
@@ -84,11 +94,13 @@ sbin/avmilter.bin
 @dirrm %%EXAMPLESDIR%%/templates/nl
 @dirrm %%EXAMPLESDIR%%/templates
 @dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.DE
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL
+%%PORTDOCS%%%%DOCSDIR%%/README.gpg
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/antivir.gpg
 %%PORTDOCS%%%%DOCSDIR%%/avmilter_de.pdf
 %%PORTDOCS%%%%DOCSDIR%%/avmilter_en.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%