ports/60443: [MAINTAINER] mail/MailScanner: small patch

[Jan-Peter Koopmann]

>Number:         60443
>Category:       ports
>Synopsis:       [MAINTAINER] mail/MailScanner: small patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 20 14:40:11 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jan-Peter Koopmann
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD services.intern.seceidos.de 4.8-STABLE FreeBSD 4.8-STABLE #0: Mon Aug  4 11:45:56 CEST
>Description:
Old version was not depending on the tnef port as it should have. It even would have broken it. Thanks Sergei for spotting this!

Regards,
  JP

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- MailScanner-4.25.14_2.patch begins here ---
diff -ruN --exclude=CVS /server-root/ports/mail/MailScanner.orig/Makefile /server-root/ports/mail/MailScanner/Makefile
--- /server-root/ports/mail/MailScanner.orig/Makefile	Tue Dec 16 22:14:13 2003
+++ /server-root/ports/mail/MailScanner/Makefile	Sat Dec 20 16:44:09 2003
@@ -7,7 +7,7 @@
 
 PORTNAME=	MailScanner
 PORTVERSION=	4.25.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 DISTNAME=	MailScanner-${PORTVERSION:C/\.([0-9]+)$/-\1/}
@@ -27,7 +27,8 @@
 	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
 
 RUN_DEPENDS=	${BUILD_DEPENDS} \
-		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2
+		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
+		${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
 
 CONFLICTS=	MailScanner-devel-*
 
@@ -83,11 +84,7 @@
 
 do-install:
 	#
-	# Step 1: Install binaries
-	#
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/tnef.linux ${PREFIX}/bin/tnef
-	#
-	# Step 2: Install libexec files
+	# Step 1: Install libexec files
 	#
 	${MKDIR} ${PREFIX}/libexec/MailScanner
 	${CHMOD} -R ${BINMODE} ${PREFIX}/libexec/MailScanner
@@ -99,7 +96,7 @@
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_virus_scanners \
 		${PREFIX}/libexec/MailScanner/update_virus_scanners
 	#
-	# Step 3: Install etc files
+	# Step 2: Install etc files
 	#
 	${MKDIR} ${PREFIX}/etc/MailScanner
 	${CHMOD} ${BINMODE} ${PREFIX}/etc/MailScanner
@@ -114,7 +111,7 @@
 		${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules.sample
 
 	#
-	# Step 4: Install files in share
+	# Step 3: Install files in share
 	#
 	@${MKDIR} ${DATADIR}
 	cd ${WRKSRC}/etc && ${FIND} reports -type d -exec \
@@ -123,7 +120,7 @@
 		${INSTALL_DATA} '{}' ${DATADIR}'/{}'.sample \;
 	${CHMOD} -R ${BINMODE} ${DATADIR}/reports
 	#
-	# Step 5: Install lib
+	# Step 4: Install lib
 	#
 	${MKDIR} ${PREFIX}/lib/MailScanner/MailScanner
 	${INSTALL_SCRIPT} ${WRKSRC}/lib/MailScanner.pm \
@@ -131,13 +128,13 @@
 	cd ${WRKSRC}/lib/MailScanner && ${FIND} * -type f ! -name "*.orig" -exec \
 		${INSTALL_SCRIPT} '{}' ${PREFIX}'/lib/MailScanner/MailScanner/{}' \;
 	#
-	# Step 6: Install Start/Stop scripts
+	# Step 5: Install Start/Stop scripts
 	#
 	${INSTALL_SCRIPT} ${FILESDIR}/mailscanner.sh \
 		${PREFIX}/etc/rc.d/mailscanner.sh.sample
 	${INSTALL_SCRIPT} ${FILESDIR}/mta.sh ${PREFIX}/etc/rc.d/mta.sh.sample
 	#
-	# Step 7: Docs & Manpages
+	# Step 6: Docs & Manpages
 	#
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff -ruN --exclude=CVS /server-root/ports/mail/MailScanner.orig/pkg-plist /server-root/ports/mail/MailScanner/pkg-plist
--- /server-root/ports/mail/MailScanner.orig/pkg-plist	Fri Dec  5 16:34:38 2003
+++ /server-root/ports/mail/MailScanner/pkg-plist	Sat Dec 20 16:43:12 2003
@@ -1,5 +1,4 @@
- at comment $FreeBSD: ports/mail/MailScanner/pkg-plist,v 1.4 2003/12/05 15:34:38 sergei Exp $
-bin/tnef
+ at comment $FreeBSD$
 etc/MailScanner/MailScanner.conf.sample
 etc/MailScanner/filename.rules.conf.sample
 etc/MailScanner/filetype.rules.conf.sample
@@ -452,9 +451,11 @@
 %%DOCSDIR%%/support.html
 %%DOCSDIR%%/transtec.logo.gif
 %%DOCSDIR%%/users.shtml
+ at dirrm share/nls/en_US.US-ASCII
+ at dirrm share/nls/POSIX
 @dirrm %%DOCSDIR%%/man
- at dirrm %%DOCSDIR%%/install/mcp
 @dirrm %%DOCSDIR%%/install/tcp
+ at dirrm %%DOCSDIR%%/install/mcp
 @dirrm %%DOCSDIR%%/install
 @dirrm %%DOCSDIR%%/images
 @dirrm %%DOCSDIR%%
--- MailScanner-4.25.14_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: