Attachment 115106 Details for Bug 156883 – file.diff

[patch] file.diff

file.diff (text/plain), 1.98 KB, created by Chris Rees on 2011-05-08 14:00:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Rees

Created: 2011-05-08 14:00:18 UTC

Size: 1.98 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /exports/cvsroot-freebsd/ports/mail/mailscanner/Makefile,v
>retrieving revision 1.94
>diff -u -r1.94 Makefile
>--- Makefile	11 Apr 2011 15:01:50 -0000	1.94
>+++ Makefile	8 May 2011 12:48:11 -0000
>@@ -34,7 +34,7 @@
> 	${SITE_PERL}/OLE/Storage_Lite.pm:${PORTSDIR}/devel/p5-OLE-Storage_Lite \
> 	${SITE_PERL}/Sys/SigAction.pm:${PORTSDIR}/devel/p5-Sys-SigAction
> 
>-RUN_DEPENDS+=	${BUILD_DEPENDS} \
>+RUN_DEPENDS:=	${BUILD_DEPENDS} \
> 		bash:${PORTSDIR}/shells/bash \
> 		tnef:${PORTSDIR}/converters/tnef \
> 		wget:${PORTSDIR}/ftp/wget
>@@ -152,19 +152,12 @@
> 	${PERL} -pi -e \
> 		's,/opt/MailScanner/lib,${PREFIX}/libexec/MailScanner,g; \
> 		s,/bin/false,/usr/bin/false,;' ${WRKSRC}/etc/virus.scanners.conf
>-	${PERL} -pi -e \
>-		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
>-		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g; \
>-		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g;' \
>-		${WRKSRC}/bin/update_virus_scanners
>-	${PERL} -pi -e \
>-		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
>-		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \
>-		s,%%RC_SUBR%%,/etc/rc.subr,g;' \
>-		${WRKSRC}/bin/cron/update_virus_scanners.cron
>-	${PERL} -pi -e \
>-		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
>-		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
>+	${REINPLACE_CMD} \
>+		-e 's,/bin/bash,${LOCALBASE}/bin/bash,g' \
>+		-e 's,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g' \
>+		-e 's,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g' \
>+		${WRKSRC}/bin/update_virus_scanners \
>+		${WRKSRC}/bin/cron/update_virus_scanners.cron \
> 		${WRKSRC}/bin/update_bad_phishing_emails
> 	${PERL} -pi -e \
> 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
>@@ -229,7 +222,7 @@
> 	# Step 1: Install bin files
> 	#
> 	${INSTALL_SCRIPT} ${WRKSRC}/bin/MailScanner ${PREFIX}/sbin/mailscanner
>-	${LN} -s ${LOCALBASE}/sbin/mailscanner ${PREFIX}/sbin/MailScanner
>+	${LN} -s ${PREFIX}/sbin/mailscanner ${PREFIX}/sbin/MailScanner
> 	#
> 	# Step 2: Install libexec files
> 	#

Actions: View | Diff

Attachments on bug 156883: 115106