svn commit: r403913 - in head: Mk archivers/rpm2cpio benchmarks/dbs converters/nomyso devel/p5-Sys-Virt dns/ddclient dns/ddclient/files german/BBBike graphics/ImageMagick graphics/ImageMagick7 grap...

Thu Dec 17 17:19:52 UTC 2015

Author: mat
Date: Thu Dec 17 17:19:48 2015
New Revision: 403913
URL: https://svnweb.freebsd.org/changeset/ports/403913

Log:
  Fix usage of ${PERL5}.
  
  ${PERL5} points to a specific version of perl, say, perl5.22.1, it is
  fine to use it in a ports Makefile to do Perly things, but ports using
  it must use ${PERL}, that points to /usr/local/bin/perl so that if the
  minor version is updated, the shebang keep working.
  
  While there, make some ports use shebangfix, regen a few patches, and
  bump PORTREVISION where a shebang went from PERL5 to PERL.
  
  PR:		205367
  With hat:	portmgr
  Sponsored by:	Absolight

Modified:
  head/Mk/bsd.gecko.mk
  head/archivers/rpm2cpio/Makefile
  head/benchmarks/dbs/Makefile
  head/converters/nomyso/Makefile
  head/devel/p5-Sys-Virt/Makefile
  head/dns/ddclient/Makefile
  head/dns/ddclient/files/patch-ddclient
  head/german/BBBike/Makefile
  head/graphics/ImageMagick/Makefile
  head/graphics/ImageMagick7/Makefile
  head/graphics/cadubi/Makefile
  head/graphics/cbview/Makefile
  head/graphics/p5-ming/Makefile
  head/irc/pisg/Makefile
  head/irc/xchat-mircryption/Makefile
  head/mail/adcomplain/Makefile
  head/mail/adcomplain/files/patch-adcomplain.pl
  head/mail/assp/Makefile
  head/mail/bogofilter/Makefile
  head/mail/cyrus-imapd23/Makefile
  head/mail/cyrus-imapd24/Makefile
  head/mail/cyrus-imapd25/Makefile
  head/mail/cyrus2dovecot/Makefile
  head/mail/dkimproxy/Makefile
  head/mail/elmo-devel/Makefile
  head/mail/exipick/Makefile
  head/mail/imapsync/Makefile
  head/mail/mailagent/Makefile
  head/mail/pflogstats/Makefile
  head/mail/qmhandle/Makefile
  head/mail/rlytest/Makefile
  head/mail/sqlgrey/Makefile
  head/mail/swaks/Makefile
  head/math/abacus/Makefile
  head/math/p5-NetCDF/Makefile
  head/misc/biblical-curse/Makefile
  head/misc/kenny/Makefile
  head/misc/rfc/Makefile
  head/multimedia/ffmpeg/Makefile
  head/multimedia/ffmpeg0/Makefile
  head/net-im/jabberd/Makefile
  head/net-im/ttytter/Makefile
  head/net-mgmt/mrtg-ping-probe/Makefile
  head/net-mgmt/mrtg-ping-probe/files/patch-mrtg-ping-probe
  head/news/ubh/Makefile
  head/ports-mgmt/pkg_cutleaves/Makefile
  head/ports-mgmt/pkg_tree/Makefile
  head/ports-mgmt/portlint/Makefile
  head/print/cdlabelgen/Makefile
  head/security/amavisd-new/Makefile
  head/security/ipfcount/Makefile
  head/security/ipfwcount/Makefile
  head/security/nikto/Makefile
  head/security/oinkmaster/Makefile
  head/security/p5-App-Genpass/Makefile
  head/security/racoon2/Makefile
  head/security/regripper/Makefile
  head/security/smtpscan/Makefile
  head/security/sshblock/Makefile
  head/security/sshit/Makefile
  head/textproc/cdif/Makefile
  head/textproc/man2html/Makefile
  head/textproc/man2html/files/patch-man.cgi
  head/textproc/sarep/Makefile
  head/www/adzap/Makefile
  head/www/jspacker/Makefile
  head/www/p5-Net-eBay/Makefile
  head/www/p5-libapreq2/Makefile
  head/x11-fm/gprename/Makefile
  head/x11/xkbset/Makefile

Modified: head/Mk/bsd.gecko.mk
==============================================================================

--- head/Mk/bsd.gecko.mk	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/Mk/bsd.gecko.mk	Thu Dec 17 17:19:48 2015	(r403913)
@@ -448,14 +448,14 @@ MOZ_SED_ARGS+=	-e's|@CPPFLAGS@|${CPPFLAG
 		-e 's|@LDFLAGS@|${LDFLAGS}|g'		\
 		-e 's|@LIBS@|${LIBS}|g'			\
 		-e 's|@LOCALBASE@|${LOCALBASE}|g'	\
-		-e 's|@PERL@|${PERL5}|g'			\
+		-e 's|@PERL@|${PERL}|g'			\
 		-e 's|@MOZDIR@|${PREFIX}/lib/${MOZILLA}|g'	\
 		-e 's|%%PREFIX%%|${PREFIX}|g'		\
 		-e 's|%%CFLAGS%%|${CFLAGS}|g'		\
 		-e 's|%%LDFLAGS%%|${LDFLAGS}|g'		\
 		-e 's|%%LIBS%%|${LIBS}|g'		\
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g'	\
-		-e 's|%%PERL%%|${PERL5}|g'		\
+		-e 's|%%PERL%%|${PERL}|g'		\
 		-e 's|%%MOZILLA%%|${MOZILLA}|g'		\
 		-e 's|%%MOZILLA_BIN%%|${MOZILLA_BIN}|g'	\
 		-e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g'

Modified: head/archivers/rpm2cpio/Makefile
==============================================================================
--- head/archivers/rpm2cpio/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/archivers/rpm2cpio/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -13,7 +13,8 @@ COMMENT=	Convert .rpm files for extracti
 
 NO_WRKSUBDIR=	yes
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
 REINPLACE_ARGS=
@@ -22,7 +23,7 @@ PLIST_FILES=	bin/rpm2cpio.pl
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
-	@${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!${PERL}|' ${FILESDIR}/${PORTNAME} >${WRKDIR}/${PORTNAME}
+	@${CP} ${FILESDIR}/${PORTNAME} ${WRKDIR}/${PORTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}.pl

Modified: head/benchmarks/dbs/Makefile
==============================================================================
--- head/benchmarks/dbs/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/benchmarks/dbs/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -26,10 +26,6 @@ PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|/usr/local/bin/perl|${PERL}|' ${WRKSRC}/script/dbs_view
-
 pre-build:
 	cd ${WRKSRC}/src; ${MAKE} dir
 

Modified: head/converters/nomyso/Makefile
==============================================================================
--- head/converters/nomyso/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/converters/nomyso/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -10,19 +10,14 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/.//
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Convert MASM/TASM files to NASM compatible sources
 
-USES=		perl5 zip
+USES=		perl5 zip dos2unix shebangfix
+SHEBANG_FILES=	nomyso.pl
 USE_PERL5=	run
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/${PORTNAME}.pl
 
-post-patch:
-	@${REINPLACE_CMD} -E \
-		-e 's|[[:cntrl:]]$$||' \
-		-e 's|/usr/bin/perl|${PERL}|' \
-		${WRKSRC}/${PORTNAME}.pl
-
 do-install:
 	@${INSTALL_SCRIPT} \
 		${WRKSRC}/${PORTNAME}.pl \

Modified: head/devel/p5-Sys-Virt/Makefile
==============================================================================
--- head/devel/p5-Sys-Virt/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/devel/p5-Sys-Virt/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -21,7 +21,8 @@ TEST_DEPENDS=	p5-CPAN-Changes>=0:${PORTS
 		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
 		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
 
-USES=		perl5 pkgconfig
+USES=		perl5 pkgconfig shebangfix
+SHEBANG_FILES=	examples/*.pl
 USE_PERL5=	configure
 MAKE_JOBS_UNSAFE=	yes
 
@@ -29,11 +30,6 @@ OPTIONS_DEFINE=	EXAMPLES
 
 PORTEXAMPLES=	*
 
-.include <bsd.port.options.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e '1 s|/usr/bin/perl|${PERL}|' ${WRKSRC}/examples/*.pl
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Sys/Virt/Virt.so
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}

Modified: head/dns/ddclient/Makefile
==============================================================================
--- head/dns/ddclient/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/dns/ddclient/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -36,9 +36,7 @@ PLIST_FILES=	etc/ddclient.conf.sample et
 post-patch:
 	@${GREP} -lR '/usr' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/usr|${PREFIX}|g'
-	@${REINPLACE_CMD} -e \
-		's|%%PERL%%|${PERL}| ; \
-		 s|%%ETCDIR%%|${PREFIX}/etc| ; \
+	@${REINPLACE_CMD} -e 's|%%ETCDIR%%|${PREFIX}/etc| ; \
 		 s|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/ddclient
 
 do-install:

Modified: head/dns/ddclient/files/patch-ddclient
==============================================================================
--- head/dns/ddclient/files/patch-ddclient	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/dns/ddclient/files/patch-ddclient	Thu Dec 17 17:19:48 2015	(r403913)
@@ -1,12 +1,5 @@
 --- ./ddclient.orig	2011-07-25 19:41:39.000000000 -0700
 +++ ./ddclient	2011-07-25 19:41:48.000000000 -0700
-@@ -1,5 +1,4 @@
--#!/usr/bin/perl -w
--#!/usr/local/bin/perl -w
-+#!%%PERL%% -w
- ######################################################################
- # $Id: ddclient 157 2013-12-26 09:02:05Z wimpunk $
- #
 @@ -19,6 +18,7 @@
  use Getopt::Long;
  use Sys::Hostname;

Modified: head/german/BBBike/Makefile
==============================================================================
--- head/german/BBBike/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/german/BBBike/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -66,8 +66,8 @@ post-patch:
 	@${RM} ${WRKSRC}/tmp/.keep_me
 
 do-build:
-	cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL5} all install
-	cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL5} clean
+	cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL} all install
+	cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL} clean
 	${FIND} ${WRKSRC}/lib -name "*.so" | ${XARGS} ${CHMOD} u+w
 	${FIND} ${WRKSRC}/lib -name "*.so" | ${XARGS} ${STRIP_CMD}
 	${FIND} ${WRKSRC}/lib -name "*.so" | ${XARGS} ${CHMOD} u-w

Modified: head/graphics/ImageMagick/Makefile
==============================================================================
--- head/graphics/ImageMagick/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/graphics/ImageMagick/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ImageMagick
 DISTVERSION=	6.9.2-8
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
@@ -106,7 +107,7 @@ _IMAGEMAGICK_THREADS_IGNORE_MSG=. Define
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-CONFIGURE_ARGS+=	--with-perl=${PERL5} \
+CONFIGURE_ARGS+=	--with-perl=${PERL} \
 			--with-perl-options="MAKE=${MAKE_CMD}"
 PLIST_SUB+=		WITH_PERL=''
 # PerlMagick does not work with threads, if perl is not threaded, and vice versa

Modified: head/graphics/ImageMagick7/Makefile
==============================================================================
--- head/graphics/ImageMagick7/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/graphics/ImageMagick7/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ImageMagick
 DISTVERSION=	7.0.0-0~beta${DATE}
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
 		http://www.imagemagick.org/download/beta/ \
@@ -112,7 +113,7 @@ _IMAGEMAGICK_THREADS_IGNORE_MSG=. Define
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-CONFIGURE_ARGS+=	--with-perl=${PERL5} \
+CONFIGURE_ARGS+=	--with-perl=${PERL} \
 			--with-perl-options="MAKE=${MAKE_CMD}"
 PLIST_SUB+=		WITH_PERL=''
 # PerlMagick does not work with threads, if perl is not threaded, and vice versa

Modified: head/graphics/cadubi/Makefile
==============================================================================
--- head/graphics/cadubi/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/graphics/cadubi/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -28,10 +28,8 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-do-configure:
-	@${REINPLACE_CMD} -e \
-		's|/usr/local/stow/perl-5.8.x/bin/perl|${PERL}|; \
-		s|$$Bin/help|${DATADIR}/help|' \
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$Bin/help|${DATADIR}/help|' \
 		${WRKSRC}/cadubi
 
 do-install:

Modified: head/graphics/cbview/Makefile
==============================================================================
--- head/graphics/cbview/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/graphics/cbview/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -19,17 +19,14 @@ RUN_DEPENDS=	unrar:${PORTSDIR}/archivers
 		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote
 
 NO_BUILD=	yes
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 
 PORTDOCS=	Changes README TODO
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl -w|${PERL}|' \
-		${WRKSRC}/${PORTNAME}
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 

Modified: head/graphics/p5-ming/Makefile
==============================================================================
--- head/graphics/p5-ming/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/graphics/p5-ming/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -24,7 +24,8 @@ OPTIONS_DEFINE=	EXAMPLES
 
 CONFIGURE_ARGS=	--enable-perl
 GNU_CONFIGURE=	yes
-USES=		autoreconf bison gmake libtool localbase perl5
+USES=		autoreconf bison gmake libtool localbase perl5 shebangfix
+SHEBANG_FILES=	examples/*.cgi
 
 PORTEXAMPLES=	*
 
@@ -39,7 +40,6 @@ post-patch:
 	@${REINPLACE_CMD} -e '/ming_is_compiled()/ s|^|#|; /LIBS/d' ${WRKSRC}/Makefile.PL
 	@${REINPLACE_CMD} -e 's|\.3pm|.3|g' ${WRKSRC}/Makefile.PL ${WRKSRC}/mkdoc
 	@${REINPLACE_CMD} -e 's|GvCV(\(.*\)) = \(.*\);|GvCV_set(\1, \2);|' ${WRKSRC}/Exports.c
-	@${REINPLACE_CMD} -e '1 s|/usr/bin/perl|${PERL}|' ${WRKSRC}/examples/*.cgi
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SWF/SWF.so

Modified: head/irc/pisg/Makefile
==============================================================================
--- head/irc/pisg/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/irc/pisg/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -10,7 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Perl IRC Statistics Generator
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	pisg
 NO_BUILD=	YES
 
 OPTIONS_DEFINE=	LOGCHARSET DOCS
@@ -28,7 +29,6 @@ pre-patch:
 	@${REINPLACE_CMD} -e 's|lang.txt|${PREFIX}/share/pisg/lang.txt|; \
 		s|layout/|${PREFIX}/share/pisg/layout/|' \
 		${WRKSRC}/modules/Pisg.pm
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/pisg
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/pisg

Modified: head/irc/xchat-mircryption/Makefile
==============================================================================
--- head/irc/xchat-mircryption/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/irc/xchat-mircryption/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -4,7 +4,7 @@
 
 PORTNAME=	mircryption
 DISTVERSION=	0.3.3
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	irc security
 MASTER_SITES=	http://mircryption.sourceforge.net/Downloads/
@@ -16,7 +16,8 @@ COMMENT=	Free encryption add-on for the 
 
 RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat
 
-USES=		zip dos2unix
+USES=		zip dos2unix shebangfix
+SHEBANG_FILES=	extras/mcps_masterkey_on_start.pl
 ALL_TARGET=	freebsd
 CFLAGS+=	-fPIC
 USE_LDCONFIG=	yes
@@ -40,9 +41,6 @@ post-patch:
 		-e 's|^(LDFLAGS.+)"$$|\1 ${LDFLAGS}"|' \
 		-e 's|^(LOAD).*$$|LOAD=${CXX}|' \
 		${WRKSRC}/${MAKEFILE}
-	${REINPLACE_CMD} -E \
-		-e 's|/usr/bin/perl|${PERL5}|' \
-		${WRKSRC}/extras/mcps_masterkey_on_start.pl
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xchat/plugins

Modified: head/mail/adcomplain/Makefile
==============================================================================
--- head/mail/adcomplain/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/mail/adcomplain/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -11,7 +11,8 @@ EXTRACT_SUFX=	.uu
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Complain about inappropriate commercial use (f.e. SPAM) of usenet/e-mail
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	adcomplain.pl
 
 EXTRACT_CMD=	/usr/bin/uudecode
 EXTRACT_BEFORE_ARGS=	<
@@ -20,10 +21,9 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 PLIST_FILES=	bin/adcomplain
 
-post-patch:
-	cd ${WRKSRC}; \
-	${CP} adcomplain.pl adcomplain.pl.old; \
-	${SED} 's=%PERL5%=${PERL}=' < adcomplain.pl.old > adcomplain.pl
+# fix-shebang normally runs before the patches in ${FILESDIR} are applied.  In
+# this case, we need it to run after, so that it can fix the right shebang.
+TARGET_ORDER_OVERRIDE= 750:fix-shebang
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/adcomplain.pl \

Modified: head/mail/adcomplain/files/patch-adcomplain.pl
==============================================================================
--- head/mail/adcomplain/files/patch-adcomplain.pl	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/mail/adcomplain/files/patch-adcomplain.pl	Thu Dec 17 17:19:48 2015	(r403913)
@@ -1,326 +1,302 @@
-*** adcomplain.pl.orig	Mon Feb 21 03:23:03 2000
---- adcomplain.pl	Mon Feb 21 03:24:27 2000
-***************
-*** 1,3 ****
---- 1,4 ----
-+ #!%PERL5%
-  #! /bin/sh -- # -*- perl -*-
-  # first line invokes sh.  Some systems may need to refer to perl directly, i.e.:
-  
-***************
-*** 7,14 ****
-  # allows perl to be _anywhere_ in the user's path.  The intent is to reduce
-  # the need to edit this file.
-  
-! eval 'exec perl $0 ${1+"$@"}'
-! if 0;  # tee hee! This is on a separate line, so /bin/sh never sees it.
-  
-  # use strict;
-  
---- 8,15 ----
-  # allows perl to be _anywhere_ in the user's path.  The intent is to reduce
-  # the need to edit this file.
-  
-! #eval 'exec perl $0 ${1+"$@"}'
-! #if 0;  # tee hee! This is on a separate line, so /bin/sh never sees it.
-  
-  # use strict;
-  
-***************
-*** 533,538 ****
---- 534,540 ----
-    $quiet, 		# control flag, limits interaction and output
-    %rematch_aliases,	# heuristic list, resets priority of another header
-    $response, 		# text of letter we will send
-+   @rusu_3level,         # 3rd level .RU/.SU exceptions
-    $site, 		# site we will send the complaint to
-    @site_exceptions,	# sites that have irregular syntactic form
-    $subject, 		# subject header of the ad
-***************
-*** 2520,2526 ****
-    ($site2 = $host) =~ s/.*\.(.*\..*)/$1/;
-    ($site3 = $host) =~ s/.*\.(.*\..*\..*)/$1/;
-    ($junk = $host) =~ s/.*\.(.*)/$1/;
-!   if (length($junk) >= 3) {
-      ($junk = $site3) =~ s/(\W)/\\$1/g;	# remove special characters
-  
-      if (grep(/^$junk$/, @site_exceptions) != 0) {
---- 2522,2538 ----
-    ($site2 = $host) =~ s/.*\.(.*\..*)/$1/;
-    ($site3 = $host) =~ s/.*\.(.*\..*\..*)/$1/;
-    ($junk = $host) =~ s/.*\.(.*)/$1/;
-!   if ($junk eq "ru" || $junk eq "su") {
-!     ($junk = $site2) =~ s/(\W)/\\$1/g;	# remove special characters
-! 
-!     if (grep(/^$junk$/, @rusu_3level) != 0) {
-!       $site = $site3;
-!       }
-!     else {
-!       $site = $site2;
-!       }
-!   }
-!   elsif (length($junk) >= 3) {
-      ($junk = $site3) =~ s/(\W)/\\$1/g;	# remove special characters
-  
-      if (grep(/^$junk$/, @site_exceptions) != 0) {
-***************
-*** 2618,2623 ****
---- 2630,2636 ----
-    # Pick the alias with the _most_ dots
-    local($alias);
-    foreach $alias (split(' ', $aliases)) {
-+     $alias =~ s/\.$//;    # this adcomplain cannot deal with "foo.bar.com."
-      $cd = ($alias =~ tr/././);
-      if ($cd > $nd) {
-        $result = $alias;
-***************
-*** 3077,3082 ****
---- 3090,3337 ----
-  	'xs4all.nl',
-  	);
-      @site_exceptions = sort @site_exceptions; # needed for bsearch to work
-+ 
-+     @rusu_3level = (
-+ 	'abkhazia.su',
-+ 	'adygeya.ru',
-+ 	'adygeya.su',
-+ 	'aktyubinsk.su',
-+ 	'alma-ata.su',
-+ 	'altai.ru',
-+ 	'altai.su',
-+ 	'amur.ru',
-+ 	'amur.su',
-+ 	'amursk.ru',
-+ 	'arkhangelsk.ru',
-+ 	'arkhangelsk.su',
-+ 	'armenia.su',
-+ 	'ashgabad.su',
-+ 	'astrakhan.ru',
-+ 	'astrakhan.su',
-+ 	'azerbaijan.su',
-+ 	'baikal.ru',
-+ 	'balashov.su',
-+ 	'bashkiria.ru',
-+ 	'bashkiria.su',
-+ 	'belgorod.ru',
-+ 	'belgorod.su',
-+ 	'bir.ru',
-+ 	'bishkek.su',
-+ 	'bryansk.ru',
-+ 	'bryansk.su',
-+ 	'bukhara.su',
-+ 	'buriatia.su',
-+ 	'buryatia.ru',
-+ 	'cbg.ru',
-+ 	'chel.ru',
-+ 	'chel.su',
-+ 	'chelyabinsk.ru',
-+ 	'chimkent.su',
-+ 	'chita.ru',
-+ 	'chita.su',
-+ 	'chukotka.ru',
-+ 	'chuvashia.ru',
-+ 	'chuvashia.su',
-+ 	'cmw.ru',
-+ 	'com.ru',
-+ 	'dagestan.ru',
-+ 	'dagestan.su',
-+ 	'dubna.su',
-+ 	'dudinka.ru',
-+ 	'e-burg.ru',
-+ 	'e-burg.su',
-+ 	'east-kazakhstan.su',
-+ 	'engels.su',
-+ 	'fareast.ru',
-+ 	'georgia.su',
-+ 	'grozny.ru',
-+ 	'grozny.su',
-+ 	'irkutsk.ru',
-+ 	'irkutsk.su',
-+ 	'ivanovo.ru',
-+ 	'ivanovo.su',
-+ 	'izhevsk.ru',
-+ 	'jamal.ru',
-+ 	'jambyl.su',
-+ 	'jar.ru',
-+ 	'joshkar-ola.ru',
-+ 	'k-uralsk.ru',
-+ 	'kalmykia.ru',
-+ 	'kalmykia.su',
-+ 	'kaluga.ru',
-+ 	'kaluga.su',
-+ 	'kamchatka.ru',
-+ 	'kamchatka.su',
-+ 	'karacol.su',
-+ 	'karaganda.su',
-+ 	'karakol.su',
-+ 	'karelia.ru',
-+ 	'karelia.su',
-+ 	'kazan.ru',
-+ 	'kazan.su',
-+ 	'kchr.ru',
-+ 	'kemerovo.ru',
-+ 	'kemerovo.su',
-+ 	'khabarovsk.ru',
-+ 	'khabarovsk.su',
-+ 	'khakassia.ru',
-+ 	'khakassia.su',
-+ 	'khv.ru',
-+ 	'kirov.ru',
-+ 	'kms.ru',
-+ 	'koenig.ru',
-+ 	'koenig.su',
-+ 	'komi.ru',
-+ 	'komi.su',
-+ 	'kostroma.ru',
-+ 	'kostroma.su',
-+ 	'krasnodar.su',
-+ 	'krasnoyarsk.ru',
-+ 	'krasnoyarsk.su',
-+ 	'kuban.ru',
-+ 	'kuban.su',
-+ 	'kurgan.ru',
-+ 	'kurgan.su',
-+ 	'kursk.ru',
-+ 	'kursk.su',
-+ 	'kustanai.ru',
-+ 	'kustanai.su',
-+ 	'kuzbass.ru',
-+ 	'lipetsk.ru',
-+ 	'lipetsk.su',
-+ 	'magadan.ru',
-+ 	'magadan.su',
-+ 	'magnitka.ru',
-+ 	'mangyshlak.su',
-+ 	'mari-el.ru',
-+ 	'mari.ru',
-+ 	'mari.su',
-+ 	'marine.ru',
-+ 	'marine.su',
-+ 	'moldova.su',
-+ 	'mordovia.ru',
-+ 	'mordovia.su',
-+ 	'mosreg.ru',
-+ 	'msk.ru',
-+ 	'msk.su',
-+ 	'murmansk.ru',
-+ 	'murmansk.su',
-+ 	'mytis.ru',
-+ 	'nakhodka.ru',
-+ 	'nalchik.ru',
-+ 	'nalchik.su',
-+ 	'naryn.su',
-+ 	'navoi.su',
-+ 	'net.ru',
-+ 	'nkz.ru',
-+ 	'nnov.ru',
-+ 	'nnov.su',
-+ 	'norilsk.ru',
-+ 	'north-kazakhstan.su',
-+ 	'nov.ru',
-+ 	'nov.su',
-+ 	'novosibirsk.ru',
-+ 	'nsk.ru',
-+ 	'nsk.su',
-+ 	'obninsk.su',
-+ 	'omsk.ru',
-+ 	'omsk.su',
-+ 	'orenburg.ru',
-+ 	'orenburg.su',
-+ 	'org.ru',
-+ 	'oryol.ru',
-+ 	'oryol.su',
-+ 	'osh.su',
-+ 	'oskol.ru',
-+ 	'palana.ru',
-+ 	'pavlodar.su',
-+ 	'penza.ru',
-+ 	'penza.su',
-+ 	'perm.ru',
-+ 	'perm.su',
-+ 	'pokrovsk.su',
-+ 	'pp.ru',
-+ 	'pskov.ru',
-+ 	'pskov.su',
-+ 	'ptz.ru',
-+ 	'pyatigorsk.ru',
-+ 	'pyatigorsk.su',
-+ 	'rnd.ru',
-+ 	'rostov-na-donu.su',
-+ 	'rubtsovsk.ru',
-+ 	'ryazan.ru',
-+ 	'ryazan.su',
-+ 	'sakhalin.ru',
-+ 	'sakhalin.su',
-+ 	'samara.ru',
-+ 	'samara.su',
-+ 	'saratov.ru',
-+ 	'saratov.su',
-+ 	'semsk.su',
-+ 	'serpukhov.su',
-+ 	'simbirsk.ru',
-+ 	'simbirsk.su',
-+ 	'smolensk.ru',
-+ 	'smolensk.su',
-+ 	'sochi.su',
-+ 	'spb.ru',
-+ 	'spb.su',
-+ 	'stavropol.ru',
-+ 	'stavropol.su',
-+ 	'stv.ru',
-+ 	'surgut.ru',
-+ 	'surgut.su',
-+ 	'syzran.ru',
-+ 	'tambov.ru',
-+ 	'tambov.su',
-+ 	'tashkent.su',
-+ 	'tatarstan.ru',
-+ 	'termez.su',
-+ 	'togliatti.su',
-+ 	'tom.ru',
-+ 	'tomsk.ru',
-+ 	'tomsk.su',
-+ 	'troitsk.su',
-+ 	'tsaritsyn.ru',
-+ 	'tsaritsyn.su',
-+ 	'tselinograd.su',
-+ 	'tsk.ru',
-+ 	'tula.ru',
-+ 	'tula.su',
-+ 	'tuva.ru',
-+ 	'tuva.su',
-+ 	'tver.ru',
-+ 	'tver.su',
-+ 	'tyumen.ru',
-+ 	'tyumen.su',
-+ 	'udm.ru',
-+ 	'udmurtia.ru',
-+ 	'udmurtia.su',
-+ 	'ulan-ude.ru',
-+ 	'vdonsk.ru',
-+ 	'vladikavkaz.ru',
-+ 	'vladikavkaz.su',
-+ 	'vladimir.ru',
-+ 	'vladimir.su',
-+ 	'vladivostok.ru',
-+ 	'volgograd.ru',
-+ 	'vologda.ru',
-+ 	'vologda.su',
-+ 	'voronezh.ru',
-+ 	'voronezh.su',
-+ 	'vrn.ru',
-+ 	'vyatka.ru',
-+ 	'vyatka.su',
-+ 	'yakutia.ru',
-+ 	'yakutia.su',
-+ 	'yamal.ru',
-+ 	'yaroslavl.ru',
-+ 	'yaroslavl.su',
-+ 	'yekaterinburg.ru',
-+ 	'yuzhno-sakhalinsk.ru',
-+ 	'zgrad.ru',
-+ 	'zgrad.su',
-+     );
-  
-      %rematch_aliases = (
-      'nonexistent.com',  'X-NNTP-Posting-Host:',
+--- adcomplain.pl.orig	2015-12-17 16:02:13 UTC
++++ adcomplain.pl
+@@ -1,15 +1,5 @@
+-#! /bin/sh -- # -*- perl -*-
+-# first line invokes sh.  Some systems may need to refer to perl directly, i.e.:
+-
+ #! /bin/perl
+ 
+-# But the first way is preferable, because we have a trick (below) that
+-# allows perl to be _anywhere_ in the user's path.  The intent is to reduce
+-# the need to edit this file.
+-
+-eval 'exec perl $0 ${1+"$@"}'
+-if 0;  # tee hee! This is on a separate line, so /bin/sh never sees it.
+-
+ # use strict;
+ 
+ #-----------------------------------------------
+@@ -533,6 +523,7 @@ local(
+   $quiet, 		# control flag, limits interaction and output
+   %rematch_aliases,	# heuristic list, resets priority of another header
+   $response, 		# text of letter we will send
++  @rusu_3level,         # 3rd level .RU/.SU exceptions
+   $site, 		# site we will send the complaint to
+   @site_exceptions,	# sites that have irregular syntactic form
+   $subject, 		# subject header of the ad
+@@ -2520,7 +2511,17 @@ sub find_site {
+   ($site2 = $host) =~ s/.*\.(.*\..*)/$1/;
+   ($site3 = $host) =~ s/.*\.(.*\..*\..*)/$1/;
+   ($junk = $host) =~ s/.*\.(.*)/$1/;
+-  if (length($junk) >= 3) {
++  if ($junk eq "ru" || $junk eq "su") {
++    ($junk = $site2) =~ s/(\W)/\\$1/g;	# remove special characters
++
++    if (grep(/^$junk$/, @rusu_3level) != 0) {
++      $site = $site3;
++      }
++    else {
++      $site = $site2;
++      }
++  }
++  elsif (length($junk) >= 3) {
+     ($junk = $site3) =~ s/(\W)/\\$1/g;	# remove special characters
+ 
+     if (grep(/^$junk$/, @site_exceptions) != 0) {
+@@ -2618,6 +2619,7 @@ sub fqdn_name {
+   # Pick the alias with the _most_ dots
+   local($alias);
+   foreach $alias (split(' ', $aliases)) {
++    $alias =~ s/\.$//;    # this adcomplain cannot deal with "foo.bar.com."
+     $cd = ($alias =~ tr/././);
+     if ($cd > $nd) {
+       $result = $alias;
+@@ -3078,6 +3080,248 @@ sub get_constants_and_environment {
+ 	);
+     @site_exceptions = sort @site_exceptions; # needed for bsearch to work
+ 
++    @rusu_3level = (
++	'abkhazia.su',
++	'adygeya.ru',
++	'adygeya.su',
++	'aktyubinsk.su',
++	'alma-ata.su',
++	'altai.ru',
++	'altai.su',
++	'amur.ru',
++	'amur.su',
++	'amursk.ru',
++	'arkhangelsk.ru',
++	'arkhangelsk.su',
++	'armenia.su',
++	'ashgabad.su',
++	'astrakhan.ru',
++	'astrakhan.su',
++	'azerbaijan.su',
++	'baikal.ru',
++	'balashov.su',
++	'bashkiria.ru',
++	'bashkiria.su',
++	'belgorod.ru',
++	'belgorod.su',
++	'bir.ru',
++	'bishkek.su',
++	'bryansk.ru',
++	'bryansk.su',
++	'bukhara.su',
++	'buriatia.su',
++	'buryatia.ru',
++	'cbg.ru',
++	'chel.ru',
++	'chel.su',
++	'chelyabinsk.ru',
++	'chimkent.su',
++	'chita.ru',
++	'chita.su',
++	'chukotka.ru',
++	'chuvashia.ru',
++	'chuvashia.su',
++	'cmw.ru',
++	'com.ru',
++	'dagestan.ru',
++	'dagestan.su',
++	'dubna.su',
++	'dudinka.ru',
++	'e-burg.ru',
++	'e-burg.su',
++	'east-kazakhstan.su',
++	'engels.su',
++	'fareast.ru',
++	'georgia.su',
++	'grozny.ru',
++	'grozny.su',
++	'irkutsk.ru',
++	'irkutsk.su',
++	'ivanovo.ru',
++	'ivanovo.su',
++	'izhevsk.ru',
++	'jamal.ru',
++	'jambyl.su',
++	'jar.ru',
++	'joshkar-ola.ru',
++	'k-uralsk.ru',
++	'kalmykia.ru',
++	'kalmykia.su',
++	'kaluga.ru',
++	'kaluga.su',
++	'kamchatka.ru',
++	'kamchatka.su',
++	'karacol.su',
++	'karaganda.su',
++	'karakol.su',
++	'karelia.ru',
++	'karelia.su',
++	'kazan.ru',
++	'kazan.su',
++	'kchr.ru',
++	'kemerovo.ru',
++	'kemerovo.su',
++	'khabarovsk.ru',
++	'khabarovsk.su',
++	'khakassia.ru',
++	'khakassia.su',
++	'khv.ru',
++	'kirov.ru',
++	'kms.ru',
++	'koenig.ru',
++	'koenig.su',
++	'komi.ru',
++	'komi.su',
++	'kostroma.ru',
++	'kostroma.su',
++	'krasnodar.su',
++	'krasnoyarsk.ru',
++	'krasnoyarsk.su',
++	'kuban.ru',
++	'kuban.su',
++	'kurgan.ru',
++	'kurgan.su',
++	'kursk.ru',
++	'kursk.su',
++	'kustanai.ru',
++	'kustanai.su',
++	'kuzbass.ru',
++	'lipetsk.ru',
++	'lipetsk.su',
++	'magadan.ru',
++	'magadan.su',
++	'magnitka.ru',
++	'mangyshlak.su',
++	'mari-el.ru',
++	'mari.ru',
++	'mari.su',
++	'marine.ru',
++	'marine.su',
++	'moldova.su',
++	'mordovia.ru',
++	'mordovia.su',
++	'mosreg.ru',
++	'msk.ru',
++	'msk.su',
++	'murmansk.ru',
++	'murmansk.su',
++	'mytis.ru',
++	'nakhodka.ru',
++	'nalchik.ru',
++	'nalchik.su',
++	'naryn.su',
++	'navoi.su',
++	'net.ru',
++	'nkz.ru',
++	'nnov.ru',
++	'nnov.su',
++	'norilsk.ru',
++	'north-kazakhstan.su',
++	'nov.ru',
++	'nov.su',
++	'novosibirsk.ru',
++	'nsk.ru',
++	'nsk.su',
++	'obninsk.su',
++	'omsk.ru',
++	'omsk.su',
++	'orenburg.ru',
++	'orenburg.su',
++	'org.ru',
++	'oryol.ru',
++	'oryol.su',
++	'osh.su',
++	'oskol.ru',
++	'palana.ru',
++	'pavlodar.su',
++	'penza.ru',
++	'penza.su',
++	'perm.ru',
++	'perm.su',
++	'pokrovsk.su',
++	'pp.ru',
++	'pskov.ru',
++	'pskov.su',
++	'ptz.ru',
++	'pyatigorsk.ru',
++	'pyatigorsk.su',
++	'rnd.ru',
++	'rostov-na-donu.su',
++	'rubtsovsk.ru',
++	'ryazan.ru',
++	'ryazan.su',
++	'sakhalin.ru',
++	'sakhalin.su',
++	'samara.ru',
++	'samara.su',
++	'saratov.ru',
++	'saratov.su',
++	'semsk.su',
++	'serpukhov.su',
++	'simbirsk.ru',
++	'simbirsk.su',
++	'smolensk.ru',
++	'smolensk.su',
++	'sochi.su',
++	'spb.ru',
++	'spb.su',
++	'stavropol.ru',
++	'stavropol.su',
++	'stv.ru',
++	'surgut.ru',
++	'surgut.su',
++	'syzran.ru',
++	'tambov.ru',
++	'tambov.su',
++	'tashkent.su',
++	'tatarstan.ru',
++	'termez.su',
++	'togliatti.su',
++	'tom.ru',
++	'tomsk.ru',
++	'tomsk.su',
++	'troitsk.su',
++	'tsaritsyn.ru',
++	'tsaritsyn.su',
++	'tselinograd.su',
++	'tsk.ru',
++	'tula.ru',
++	'tula.su',
++	'tuva.ru',
++	'tuva.su',
++	'tver.ru',
++	'tver.su',
++	'tyumen.ru',
++	'tyumen.su',
++	'udm.ru',
++	'udmurtia.ru',
++	'udmurtia.su',
++	'ulan-ude.ru',
++	'vdonsk.ru',
++	'vladikavkaz.ru',
++	'vladikavkaz.su',
++	'vladimir.ru',
++	'vladimir.su',
++	'vladivostok.ru',
++	'volgograd.ru',
++	'vologda.ru',
++	'vologda.su',
++	'voronezh.ru',
++	'voronezh.su',
++	'vrn.ru',
++	'vyatka.ru',
++	'vyatka.su',
++	'yakutia.ru',
++	'yakutia.su',
++	'yamal.ru',
++	'yaroslavl.ru',
++	'yaroslavl.su',
++	'yekaterinburg.ru',
++	'yuzhno-sakhalinsk.ru',
++	'zgrad.ru',
++	'zgrad.su',
++    );
++
+     %rematch_aliases = (
+     'nonexistent.com',  'X-NNTP-Posting-Host:',
+     'nym.alias.net', 'Message-Id:',

Modified: head/mail/assp/Makefile
==============================================================================
--- head/mail/assp/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/mail/assp/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -15,7 +15,8 @@ RUN_DEPENDS=	p5-Net-DNS>=0.68:${PORTSDIR
 		p5-libwww>=6.04:${PORTSDIR}/www/p5-libwww \
 		p5-HTML-Parser>=3.69:${PORTSDIR}/www/p5-HTML-Parser
 
-USES=		perl5 zip:infozip
+USES=		perl5 zip:infozip shebangfix
+SHEBANG_FILES=	*.pl
 NO_BUILD=	yes
 USE_PERL5=	run
 
@@ -122,9 +123,6 @@ RUN_DEPENDS+=	p5-IO-Socket-INET6>=2.69:$
 
 EXTRACT_AFTER_ARGS=	-d ${PORTNAME}-${PORTVERSION}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/*.pl
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/images \
 		${STAGEDIR}${DATADIR}/logs ${STAGEDIR}${DATADIR}/reports

Modified: head/mail/bogofilter/Makefile
==============================================================================
--- head/mail/bogofilter/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/mail/bogofilter/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -23,8 +23,8 @@ UNICODE_DESC=		Normalize tokens to Unico
 CONFLICTS_INSTALL?=	bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
 
 USES=		cpe perl5 shebangfix tar:bzip2
-SHEBANG_FILES=	contrib/randomtrain.sh \
-		contrib/scramble.sh
+SHEBANG_FILES=	contrib/randomtrain.sh contrib/scramble.sh \
+		src/tests/unsort.pl contrib/*.pl
 USE_PERL5=	run
 GNU_CONFIGURE=	yes
 
@@ -55,9 +55,6 @@ CONFIGURE_ENV+=	PERL="${PERL}"
 INSTALL_TARGET=	install-strip prefix=${PREFIX} mandir=${MANPREFIX}/man
 
 post-patch:
-	${REINPLACE_CMD} -e 's|^#!.*perl|#! ${PERL}|' \
-		${WRKSRC}/src/tests/unsort.pl \
-		${WRKSRC}/contrib/*.pl
 	${REINPLACE_CMD} -e 's/INTEGRITY_TESTS = t.lock1 t.lock3 t.valgrind/INTEGRITY_TESTS = t.lock1/' \
 		-e 's/ENVIRON_TESTS = t.abort/ENVIRON_TESTS =/' \
 		${WRKSRC}/src/tests/Makefile.am

Modified: head/mail/cyrus-imapd23/Makefile
==============================================================================
--- head/mail/cyrus-imapd23/Makefile	Thu Dec 17 17:19:28 2015	(r403912)
+++ head/mail/cyrus-imapd23/Makefile	Thu Dec 17 17:19:48 2015	(r403913)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.3.19
-#PORTREVISION=	10
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
