Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Jan 2004 15:36:40 +0100 (CET)
From:      Jan-Peter Koopmann <j.koopmann@seceidos.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        sergei@FreeBSD.org
Subject:   ports/61945: [MAINTAINER] mail/MailScanner: minor changes to install procedure
Message-ID:  <200401261436.i0QEae3q036631@services.intern.seceidos.de>
Resent-Message-ID: <200401261440.i0QEeDEW099264@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         61945
>Category:       ports
>Synopsis:       [MAINTAINER] mail/MailScanner: minor changes to install procedure
>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:   Mon Jan 26 06:40:13 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jan-Peter Koopmann
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD services.intern.seceidos.de 4.9-STABLE FreeBSD 4.9-STABLE #0: Mon Jan  5 10:56:46 CET
>Description:
Minor changes to install procedure. Some more files are now patched to be more FreeBSD conform.


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

--- MailScanner-4.25.14_4.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	Sun Jan 18 22:57:53 2004
+++ /server-root/ports/mail/mailscanner/Makefile	Mon Jan 26 15:12:21 2004
@@ -7,13 +7,13 @@
 
 PORTNAME=	MailScanner
 PORTVERSION=	4.25.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 DISTNAME=	MailScanner-${PORTVERSION:C/\.([0-9]+)$/-\1/}
 
 MAINTAINER=	j.koopmann@seceidos.de
-COMMENT=	Powerful virus/spam scanning framework for Sendmail/Exim
+COMMENT=	Powerful virus/spam scanning framework for Sendmail/Exim/Postfix
 
 BUILD_DEPENDS=	\
 	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
@@ -24,7 +24,7 @@
 	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools \
 	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
 	${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
-	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR 
+	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
 
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
@@ -54,6 +54,12 @@
 ETC_FILES=	MailScanner.conf filename.rules.conf \
 		filetype.rules.conf spam.assassin.prefs.conf \
 		spam.lists.conf virus.scanners.conf
+USRLOCAL_FILES_LIB=	\
+		bitdefender-autoupdate f-prot-autoupdate \
+		f-secure-wrapper inoculan-autoupdate \
+		kavdaemonclient-wrapper mcafee-autoupdate \
+		nod32-autoupdate rav-autoupdate \
+		rav-wrapper sophos-autoupdate
 
 do-build:
 	${PERL} -pi -e \
@@ -92,6 +98,11 @@
 	${PERL} -pi -e \
 		's,/usr/bin/unzip,${LOCALBASE}/bin/unzip,g;' \
 		${WRKSRC}/lib/sophos-autoupdate
+.for FILE in ${USRLOCAL_FILES_LIB}
+	${PERL} -pi -e \
+		's,/usr/local,${LOCALBASE},g;' \
+		${WRKSRC}/lib/${FILE}
+.endfor
 
 do-install:
 	# 
@@ -161,6 +172,10 @@
 		${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
 	# Sophos install script
 	${INSTALL_SCRIPT} ${FILESDIR}/Sophos.install.freebsd ${DOCSDIR}
+	${PERL} -pi -e \
+		's,%%LOCALBASE%%,${LOCALBASE},g; \
+		s,%%PREFIX%%,${PREFIX},g;' \
+		${DOCSDIR}/Sophos.install.freebsd
 .if exists(${PREFIX}/etc/MailScanner/MailScanner.conf)
 	# Upgrading MailScanner.conf file... Please wait
 	@${WRKSRC}/bin/upgrade_MailScanner_conf \
diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/Sophos.install.freebsd /server-root/ports/mail/mailscanner/files/Sophos.install.freebsd
--- /server-root/ports/mail/mailscanner.orig/files/Sophos.install.freebsd	Sun Jan 18 22:57:53 2004
+++ /server-root/ports/mail/mailscanner/files/Sophos.install.freebsd	Mon Jan 26 14:58:26 2004
@@ -1,4 +1,4 @@
-#!/usr/local/bin/bash
+!%%LOCALBASE%%/bin/bash
 #
 # $Id: Sophos.install,v 1.13.2.3 2003/06/07 17:20:39 jkf Exp $
 #
@@ -8,8 +8,8 @@
 # and unpacked the Sophos distribution.
 # Tweaked for FreeBSD.
 
-SOPHOS=/usr/local/Sophos
-SCRIPTS=/usr/local/libexec/MailScanner
+SOPHOS=%%LOCALBASE%%/Sophos
+SCRIPTS=%%PREFIX%%/libexec/MailScanner
 COMPD=freebsd.elf.tar.Z
 DISTRIB=freebsd.elf.tar
 
@@ -20,7 +20,7 @@
 # Clear out any old libs from /usr/local/lib which is where
 # a default SAVI installation will have left them
 echo Clearing out old default Sophos installation libraries
-rm -f /usr/local/lib/libsavi.so*
+rm -f %%LOCALBASE%%/lib/libsavi.so*
 
 # Have we got to uncompress the distribution for them?
 if [ -f $COMPD ]; then
--- MailScanner-4.25.14_4.patch ends here ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401261436.i0QEae3q036631>