diff options
39 files changed, 307 insertions, 114 deletions
diff --git a/databases/p5-DBIx-Class-EncodedColumn/Makefile b/databases/p5-DBIx-Class-EncodedColumn/Makefile index 0e930bffb9fd..55ec084d5ad4 100644 --- a/databases/p5-DBIx-Class-EncodedColumn/Makefile +++ b/databases/p5-DBIx-Class-EncodedColumn/Makefile @@ -7,6 +7,7 @@ PORTNAME= DBIx-Class-EncodedColumn PORTVERSION= 0.00010 +PORTREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -38,7 +39,9 @@ OPTIONS= SHA "Digest::SHA Support" On \ .include <bsd.port.pre.mk> .if defined(WITH_SHA) +. if ${PERL_LEVEL} < 501000 RUN_DEPENDS+= p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA +. endif .endif .if defined(WITH_BLOWFISH) RUN_DEPENDS+= p5-Crypt-Eksblowfish>=0:${PORTSDIR}/security/p5-Crypt-Eksblowfish diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile index 54388757d742..1bef8592e9b9 100644 --- a/devel/bugzilla/Makefile +++ b/devel/bugzilla/Makefile @@ -7,6 +7,7 @@ PORTNAME= bugzilla PORTVERSION= 3.6.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= webtools webtools/archived @@ -39,7 +40,6 @@ RUN_DEPENDS+= \ p5-Template-Toolkit>=2.22:${PORTSDIR}/www/p5-Template-Toolkit \ p5-DateTime>=0.28:${PORTSDIR}/devel/p5-DateTime \ p5-DateTime-TimeZone>=0.71:${PORTSDIR}/devel/p5-DateTime-TimeZone \ - p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA \ p5-URI>=0:${PORTSDIR}/net/p5-URI \ p5-Email-Send>=2.00:${PORTSDIR}/mail/p5-Email-Send \ p5-Email-MIME>=1.861:${PORTSDIR}/mail/p5-Email-MIME @@ -71,6 +71,10 @@ NO_BUILD= .include <bsd.port.pre.mk> +.if ${PERL_LEVEL} < 501000 +RUN_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +.endif + .ifdef WITH_MYSQL RUN_DEPENDS+= p5-DBD-mysql>=2.9003:${PORTSDIR}/databases/p5-DBD-mysql USE_MYSQL= yes diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile index 54388757d742..1bef8592e9b9 100644 --- a/devel/bugzilla3/Makefile +++ b/devel/bugzilla3/Makefile @@ -7,6 +7,7 @@ PORTNAME= bugzilla PORTVERSION= 3.6.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= webtools webtools/archived @@ -39,7 +40,6 @@ RUN_DEPENDS+= \ p5-Template-Toolkit>=2.22:${PORTSDIR}/www/p5-Template-Toolkit \ p5-DateTime>=0.28:${PORTSDIR}/devel/p5-DateTime \ p5-DateTime-TimeZone>=0.71:${PORTSDIR}/devel/p5-DateTime-TimeZone \ - p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA \ p5-URI>=0:${PORTSDIR}/net/p5-URI \ p5-Email-Send>=2.00:${PORTSDIR}/mail/p5-Email-Send \ p5-Email-MIME>=1.861:${PORTSDIR}/mail/p5-Email-MIME @@ -71,6 +71,10 @@ NO_BUILD= .include <bsd.port.pre.mk> +.if ${PERL_LEVEL} < 501000 +RUN_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +.endif + .ifdef WITH_MYSQL RUN_DEPENDS+= p5-DBD-mysql>=2.9003:${PORTSDIR}/databases/p5-DBD-mysql USE_MYSQL= yes diff --git a/devel/cons/Makefile b/devel/cons/Makefile index 8cc488ffb019..9c7a400ddc1c 100644 --- a/devel/cons/Makefile +++ b/devel/cons/Makefile @@ -7,7 +7,7 @@ PORTNAME= cons PORTVERSION= 2.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://www.dsmit.com/cons/stable/ \ http://www.gnu.org/software/cons/stable/ \ @@ -18,8 +18,6 @@ EXTRACT_SUFX= .tgz MAINTAINER= rv@gnu.org COMMENT= A Perl-based Make Replacement -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 - USE_PERL5= yes NO_BUILD= yes PLIST_SUB= CONS_VER=${PORTVERSION} @@ -30,6 +28,12 @@ DOCS= CHANGES COPYING COPYRIGHT INSTALL MANIFEST README RELEASE \ cons.html TODO DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/cons ${PREFIX}/bin/cons ${INSTALL_MAN} ${WRKSRC}/cons.1.gz ${PREFIX}/man/man1/cons.1.gz @@ -40,4 +44,4 @@ do-install: .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/make++/Makefile b/devel/make++/Makefile index 6b2f3b3bdbb6..299bf7d34eed 100644 --- a/devel/make++/Makefile +++ b/devel/make++/Makefile @@ -8,6 +8,7 @@ PORTNAME= make++ PORTVERSION= 1.19 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= SF/makepp/makepp/${PORTVERSION} DISTNAME= ${PORTNAME:S/+/p/g}-${PORTVERSION} @@ -15,11 +16,15 @@ DISTNAME= ${PORTNAME:S/+/p/g}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A drop-in replacement for GNU make -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 - USE_PERL5= yes DATADIR= ${PREFIX}/share/makepp +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + do-build: @${PERL} -pi -e "s|\@htmldir\@|${PREFIX}/share/makepp/html|g ; \ s|\@datadir\@|${PREFIX}/share/makepp|g" ${WRKSRC}/makepp @@ -35,4 +40,4 @@ do-install: @(cd ${WRKSRC} ; \ ${FIND} . -name "*.mk" -exec ${INSTALL_SCRIPT} {} ${DATADIR} \;) -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/p5-Class-Tom/Makefile b/devel/p5-Class-Tom/Makefile index 108c73b71cda..6eb4ffc39406 100644 --- a/devel/p5-Class-Tom/Makefile +++ b/devel/p5-Class-Tom/Makefile @@ -7,6 +7,7 @@ PORTNAME= Class-Tom PORTVERSION= 3.02 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= Class @@ -15,12 +16,18 @@ PKGNAMEPREFIX= p5- MAINTAINER= tobez@FreeBSD.org COMMENT= A perl module to transport objects from one system to another -BUILD_DEPENDS= ${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -RUN_DEPENDS= ${BUILD_DEPENDS} +BUILD_DEPENDS= ${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump +RUN_DEPENDS= ${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump PERL_CONFIGURE= yes MAN3= Class::Tom.3 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +BUILD_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + +.include <bsd.port.post.mk> diff --git a/devel/p5-Data-Throttler-Memcached/Makefile b/devel/p5-Data-Throttler-Memcached/Makefile index 8f1bf9756100..38be04475f3f 100644 --- a/devel/p5-Data-Throttler-Memcached/Makefile +++ b/devel/p5-Data-Throttler-Memcached/Makefile @@ -7,6 +7,7 @@ PORTNAME= Data-Throttler-Memcached PORTVERSION= 0.00003 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -15,15 +16,20 @@ MAINTAINER= markun@onohara.to COMMENT= Memcached-Based Data::Throttler BUILD_DEPENDS= p5-Cache-Memcached-Managed>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Managed \ - p5-Data-Throttler>=0:${PORTSDIR}/devel/p5-Data-Throttler \ - p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 + p5-Data-Throttler>=0:${PORTSDIR}/devel/p5-Data-Throttler RUN_DEPENDS= p5-Cache-Memcached-Managed>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Managed \ - p5-Data-Throttler>=0:${PORTSDIR}/devel/p5-Data-Throttler \ - p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 + p5-Data-Throttler>=0:${PORTSDIR}/devel/p5-Data-Throttler PERL_CONFIGURE= yes MAN3= Data::Throttler::Memcached.3 \ Data::Throttler::BucketChain::Memcached.3 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +BUILD_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + +.include <bsd.port.post.mk> diff --git a/devel/p5-Digest-TransformPath/Makefile b/devel/p5-Digest-TransformPath/Makefile index 17e97fc33b45..57116a27e038 100644 --- a/devel/p5-Digest-TransformPath/Makefile +++ b/devel/p5-Digest-TransformPath/Makefile @@ -7,6 +7,7 @@ PORTNAME= Digest-TransformPath PORTVERSION= 1.00 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,9 +15,6 @@ PKGNAMEPREFIX= p5- MAINTAINER= coryking@mozimedia.com COMMENT= Implements the TransformPath concept -BUILD_DEPENDS= p5-Digest-MD5>=2.36:${PORTSDIR}/security/p5-Digest-MD5 -RUN_DEPENDS= p5-Digest-MD5>=2.36:${PORTSDIR}/security/p5-Digest-MD5 - PERL_CONFIGURE= yes MAN3= Digest::TransformPath.3 @@ -24,4 +22,11 @@ MAN3= Digest::TransformPath.3 test: build (@cd ${WRKSRC} && make test) -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500809 +RUN_DEPENDS+= p5-Digest-MD5>=2.36:${PORTSDIR}/security/p5-Digest-MD5 +BUILD_DEPENDS+= p5-Digest-MD5>=2.36:${PORTSDIR}/security/p5-Digest-MD5 +.endif + +.include <bsd.port.post.mk> diff --git a/devel/p5-File-HStore/Makefile b/devel/p5-File-HStore/Makefile index acdc030a666f..96ee3c8517d5 100644 --- a/devel/p5-File-HStore/Makefile +++ b/devel/p5-File-HStore/Makefile @@ -7,6 +7,7 @@ PORTNAME= File-HStore PORTVERSION= 0.10 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,10 +15,15 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Store files on a filesystem using a very simple hash-based storage -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA - PERL_CONFIGURE= yes MAN3= File::HStore.3 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 501000 +RUN_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +BUILD_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +.endif + +.include <bsd.port.post.mk> diff --git a/devel/p5-IO-Toolkit/Makefile b/devel/p5-IO-Toolkit/Makefile index f580a062e079..834fffc98ac8 100644 --- a/devel/p5-IO-Toolkit/Makefile +++ b/devel/p5-IO-Toolkit/Makefile @@ -7,6 +7,7 @@ PORTNAME= IO-Toolkit PORTVERSION= 1.008 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,12 +15,18 @@ PKGNAMEPREFIX= p5- MAINTAINER= ychsiao@ychsiao.org COMMENT= IO::Toolkit - Perl extension to create logfiles -BUILD_DEPENDS= p5-Crypt-RC6>=0:${PORTSDIR}/security/p5-Crypt-RC6 \ - p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 -RUN_DEPENDS= ${BUILD_DEPENDS} +BUILD_DEPENDS= p5-Crypt-RC6>=0:${PORTSDIR}/security/p5-Crypt-RC6 +RUN_DEPENDS= p5-Crypt-RC6>=0:${PORTSDIR}/security/p5-Crypt-RC6 PERL_CONFIGURE= 5.8.0+ MAN3= IO::Toolkit.3 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +BUILD_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + +.include <bsd.port.post.mk> diff --git a/devel/p5-PerlIO-via-MD5/Makefile b/devel/p5-PerlIO-via-MD5/Makefile index e0e894d9bdeb..777977e7f5a3 100644 --- a/devel/p5-PerlIO-via-MD5/Makefile +++ b/devel/p5-PerlIO-via-MD5/Makefile @@ -7,6 +7,7 @@ PORTNAME= PerlIO-via-MD5 PORTVERSION= 0.06 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,12 +15,16 @@ PKGNAMEPREFIX= p5- MAINTAINER= lth@FreeBSD.org COMMENT= PerlIO layer for creating an MD5 digest of a file -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -RUN_DEPENDS= ${BUILD_DEPENDS} - PERL_CONFIGURE= 5.8.0+ USE_PERL5_REASON= requires PerlIO, which was introduced in Perl 5.8.0. Install lang/perl5.8 and try again MAN3= PerlIO::via::MD5.3 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +BUILD_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + +.include <bsd.port.post.mk> diff --git a/dns/p5-Net-DNS/Makefile b/dns/p5-Net-DNS/Makefile index 042a84c9d7eb..c1bf8f2daefa 100644 --- a/dns/p5-Net-DNS/Makefile +++ b/dns/p5-Net-DNS/Makefile @@ -7,6 +7,7 @@ PORTNAME= Net-DNS PORTVERSION= 0.66 +PORTREVISION= 1 CATEGORIES= dns net perl5 ipv6 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -16,7 +17,6 @@ COMMENT= Perl5 interface to the DNS resolver, and dynamic updates # Warnings during build are harmless, the port does not need these to build RUN_DEPENDS= ipcount:${PORTSDIR}/net-mgmt/p5-Net-IP \ - ${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA \ ${SITE_PERL}/Digest/HMAC_MD5.pm:${PORTSDIR}/security/p5-Digest-HMAC MAKE_JOBS_SAFE= yes @@ -52,6 +52,10 @@ OPTIONS= IPV6 "Enable functionality over IPv6 transport" on .include <bsd.port.pre.mk> +.if ${PERL_LEVEL} < 501000 +RUN_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +.endif + .if !defined(WITHOUT_IPV6) RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-Socket-INET6 .endif diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile index b16906c5ec20..4dc9b0393b1e 100644 --- a/mail/majordomo/Makefile +++ b/mail/majordomo/Makefile @@ -7,7 +7,7 @@ PORTNAME= majordomo PORTVERSION= 1.94.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= ftp://ftp.nuug.no/pub/anders/distfiles/ \ ftp://ftp.sgi.com/other/majordomo/1.94.5/ \ @@ -19,8 +19,6 @@ COMMENT= A mailing list manager .if defined(WITH_SHA1_COOKIES) RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 -.else -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 .endif USE_PERL5= yes @@ -33,6 +31,14 @@ PKGMESSAGE= ${FILESDIR}/post-install-notes DOCSDIR= ${PREFIX}/${PORTNAME}/doc +.include <bsd.port.pre.mk> + +.if !defined(WITH_SHA1_COOKIES) +. if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 +. endif +.endif + pre-fetch: .if !defined(BATCH) && !defined(PACKAGE_BUILDING) ${DIALOG} --yesno "WARNING: Majordomo is a really old mail list manager. The last version was released in january 2000, and there does not seem to be any updates coming. You might want to consider using mailman instead. Are you sure you want to install majordomo?" 8 70 no || ${FALSE} @@ -103,4 +109,4 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/mail/mlmmj/Makefile b/mail/mlmmj/Makefile index 20be7abf8510..fd19cee054cb 100644 --- a/mail/mlmmj/Makefile +++ b/mail/mlmmj/Makefile @@ -25,8 +25,7 @@ WANT_PHP_WEB= yes .if defined(WITH_PERL_WEBINTERFACE) RUN_DEPENDS+= ${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \ ${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \ - ${SITE_PERL}/CGI/FastTemplate.pm:${PORTSDIR}/www/p5-CGI-FastTemplate \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 + ${SITE_PERL}/CGI/FastTemplate.pm:${PORTSDIR}/www/p5-CGI-FastTemplate .endif .if defined(WITH_PERL_WEBINTERFACE) @@ -55,6 +54,14 @@ MAKE_JOBS_SAFE= yes MAN1= mlmmj-bounce.1 mlmmj-list.1 mlmmj-maintd.1 mlmmj-make-ml.sh.1 mlmmj-process.1 mlmmj-recieve.1 mlmmj-send.1 mlmmj-sub.1 mlmmj-unsub.1 +.include <bsd.port.pre.mk> + +.if defined(WITH_PERL_WEBINTERFACE) +. if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +. endif +.endif + post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/mlmmj-make-ml.sh @@ -86,4 +93,4 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/contrib/web/php-admin/conf/* ${PREFIX}/www/mlmmj/php-admin/conf .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/mail/p5-FuzzyOcr/Makefile b/mail/p5-FuzzyOcr/Makefile index eb5b7ddb5e72..baec84b4d48a 100644 --- a/mail/p5-FuzzyOcr/Makefile +++ b/mail/p5-FuzzyOcr/Makefile @@ -7,7 +7,7 @@ PORTNAME= FuzzyOcr DISTVERSION= 2.3b -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= mail perl5 MASTER_SITES= http://users.own-hero.net/~decoder/${PORTNAME:L}/ @@ -22,7 +22,6 @@ RUN_DEPENDS= giftopnm:${PORTSDIR}/graphics/netpbm \ gocr:${PORTSDIR}/graphics/gocr \ gif2ps:${PORTSDIR}/graphics/libungif \ spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ ${SITE_PERL}/${PERL_ARCH}/String/Approx.pm:${PORTSDIR}/devel/p5-String-Approx CONFLICTS= p5-FuzzyOcr-devel-[0-9]* @@ -51,6 +50,12 @@ PLIST_FILES= ${SA_CONFIGDIR}/FuzzyOcr.pm \ %%EXAMPLESDIR%%/FuzzyOcr.cf %%EXAMPLESDIR%%/FuzzyOcr.words PLIST_DIRS= %%EXAMPLESDIR%% +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + post-patch: @${REINPLACE_CMD} -e 's,/usr/bin,${LOCALBASE}/bin,g' \ -e 's,/bin/grep,/usr/bin/grep,g' \ @@ -77,4 +82,4 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/mail/p5-Mail-DKIM/Makefile b/mail/p5-Mail-DKIM/Makefile index f77cc05e8e40..d31301e3bd04 100644 --- a/mail/p5-Mail-DKIM/Makefile +++ b/mail/p5-Mail-DKIM/Makefile @@ -15,7 +15,6 @@ MAINTAINER= yanagisawa@csg.is.titech.ac.jp COMMENT= Perl5 module to process and/or create DKIM email RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/RSA.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \ - ${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA \ ${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \ ${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools BUILD_DEPENDS= ${RUN_DEPENDS} @@ -44,4 +43,11 @@ MAN3= Mail::DKIM.3 \ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/dkim*.pl ${PREFIX}/bin -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 501000 +RUN_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +BUILD_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +.endif + +.include <bsd.port.post.mk> diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index 67b73244e077..42c49c183932 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -116,7 +116,9 @@ BUILD_DEPENDS+= p5-Digest-SHA1>=2.11:${PORTSDIR}/security/p5-Digest-SHA1 .if defined(WITH_DKIM) BUILD_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL +. if ${PERL_LEVEL} < 501000 BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA +. endif BUILD_DEPENDS+= p5-Mail-DKIM>=0.37:${PORTSDIR}/mail/p5-Mail-DKIM BUILD_DEPENDS+= p5-Crypt-OpenSSL-RSA>=0.24:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA .endif diff --git a/multimedia/clive/Makefile b/multimedia/clive/Makefile index 84bfd22c034c..db5746ae4d3b 100644 --- a/multimedia/clive/Makefile +++ b/multimedia/clive/Makefile @@ -13,8 +13,7 @@ MASTER_SITES= GOOGLE_CODE MAINTAINER= geekounet@poildetroll.net COMMENT= Command line video extraction tool for YouTube and others -RUN_DEPENDS= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA \ - p5-HTML-Parser>=3.59:${PORTSDIR}/www/p5-HTML-Parser \ +RUN_DEPENDS= p5-HTML-Parser>=3.59:${PORTSDIR}/www/p5-HTML-Parser \ p5-WWW-Curl>=4.05:${PORTSDIR}/www/p5-WWW-Curl \ p5-Class-Singleton>=1.4:${PORTSDIR}/devel/p5-Class-Singleton \ p5-Getopt-ArgvFile>=1.11:${PORTSDIR}/devel/p5-Getopt-ArgvFile \ @@ -36,6 +35,10 @@ USE_BZIP2= yes .include <bsd.port.pre.mk> +.if ${PERL_LEVEL} < 501000 +RUN_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +.endif + .if defined(WITH_CACHE) RUN_DEPENDS+= p5-BerkeleyDB>=0.36:${PORTSDIR}/databases/p5-BerkeleyDB .endif diff --git a/net-mgmt/netdisco/Makefile b/net-mgmt/netdisco/Makefile index c67f9bc613ff..38670d481476 100644 --- a/net-mgmt/netdisco/Makefile +++ b/net-mgmt/netdisco/Makefile @@ -22,7 +22,6 @@ RUN_DEPENDS+= ${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \ ${SITE_PERL}/DB_File/Lock.pm:${PORTSDIR}/devel/p5-DB_File-Lock \ ${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \ ${SITE_PERL}/Net/NBName.pm:${PORTSDIR}/net/p5-Net-NBName \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg \ ${SITE_PERL}/${PERL_ARCH}/Apache/Test.pm:${PORTSDIR}/www/p5-Apache-Test \ ${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \ @@ -56,6 +55,10 @@ CONFIG_FILES= netdisco.conf netdisco.crontab netdisco-topology.txt \ .include <bsd.port.pre.mk> +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + .if ${PERL_LEVEL} < 500903 RUN_DEPENDS+= p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress .endif diff --git a/net-mgmt/pftabled/Makefile b/net-mgmt/pftabled/Makefile index 4b0444cacc57..a30c725edef2 100644 --- a/net-mgmt/pftabled/Makefile +++ b/net-mgmt/pftabled/Makefile @@ -7,6 +7,7 @@ PORTNAME= pftabled PORTVERSION= 1.08 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= http://www.wolfermann.org/ @@ -26,7 +27,9 @@ OPTIONS= PERLC "A Sample Perl Client" On .include <bsd.port.pre.mk> .if !defined(WITHOUT_PERLC) -RUN_DEPEND= p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 +. if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +. endif PLIST_FILES+= bin/pftabled-client.pl bin/pftabled-client.py post-install: diff --git a/net-p2p/p5-Net-BitTorrent/Makefile b/net-p2p/p5-Net-BitTorrent/Makefile index eb60cb70da28..5f19bbfa9b6c 100644 --- a/net-p2p/p5-Net-BitTorrent/Makefile +++ b/net-p2p/p5-Net-BitTorrent/Makefile @@ -7,6 +7,7 @@ PORTNAME= Net-BitTorrent PORTVERSION= 0.052 +PORTREVISION= 1 CATEGORIES= net-p2p perl5 MASTER_SITES= CPAN/../../authors/id/S/SA/SANKO PKGNAMEPREFIX= p5- @@ -14,9 +15,8 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= BitTorrent peer-to-peer protocol class -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA \ - ${SITE_PERL}/${PERL_ARCH}/version.pm:${PORTSDIR}/devel/p5-version -BUILD_DEPENDS= ${RUN_DEPENDS} +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/version.pm:${PORTSDIR}/devel/p5-version +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/version.pm:${PORTSDIR}/devel/p5-version CONFIGURE_ARGS= </dev/null PERL_MODBUILD= yes @@ -36,4 +36,11 @@ MAN3= Net::BitTorrent.3 \ Net::BitTorrent::Util.3 \ Net::BitTorrent::Version.3 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 501000 +RUN_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +BUILD_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +.endif + +.include <bsd.port.post.mk> diff --git a/net/p5-AnyEvent-Twitter/Makefile b/net/p5-AnyEvent-Twitter/Makefile index 92aee770011b..ca0f2bfa64fb 100644 --- a/net/p5-AnyEvent-Twitter/Makefile +++ b/net/p5-AnyEvent-Twitter/Makefile @@ -7,6 +7,7 @@ PORTNAME= AnyEvent-Twitter PORTVERSION= 0.51 +PORTREVISION= 1 CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,16 +15,21 @@ PKGNAMEPREFIX= p5- MAINTAINER= sahil@FreeBSD.org COMMENT= Implementation of the Twitter API for AnyEvent -BUILD_DEPENDS= p5-AnyEvent>=3.5:${PORTSDIR}/devel/p5-AnyEvent \ +RUN_DEPENDS= p5-AnyEvent>=3.5:${PORTSDIR}/devel/p5-AnyEvent \ p5-AnyEvent-HTTP>=0:${PORTSDIR}/www/p5-AnyEvent-HTTP \ - p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA \ p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \ p5-Net-OAuth>=0:${PORTSDIR}/net/p5-Net-OAuth \ p5-Net-Twitter-Lite>=0:${PORTSDIR}/net/p5-Net-Twitter-Lite -RUN_DEPENDS= ${BUILD_DEPENDS} +BUILD_DEPENDS= ${RUN_DEPENDS} PERL_CONFIGURE= yes MAN3= AnyEvent::Twitter.3 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 501000 +RUN_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +.endif + +.include <bsd.port.post.mk> diff --git a/net/p5-Net-Amazon/Makefile b/net/p5-Net-Amazon/Makefile index e3c5b6d14db5..382fcce1c74f 100644 --- a/net/p5-Net-Amazon/Makefile +++ b/net/p5-Net-Amazon/Makefile @@ -14,12 +14,11 @@ PKGNAMEPREFIX= p5- MAINTAINER= clsung@FreeBSD.org COMMENT= Framework for accessing amazon.com via SOAP and XML/HTTP -BUILD_DEPENDS= ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \ +RUN_DEPENDS= ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \ ${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \ - ${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA \ ${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl -RUN_DEPENDS= ${BUILD_DEPENDS} +BUILD_DEPENDS= ${RUN_DEPENDS} PERL_CONFIGURE= yes @@ -28,7 +27,11 @@ PERL_CONFIGURE= yes .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500805 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes +.endif + +.if ${PERL_LEVEL} < 501000 +RUN_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA .endif .include <bsd.port.post.mk> diff --git a/net/p5-Net-GrowlClient/Makefile b/net/p5-Net-GrowlClient/Makefile index 1b85a762a39b..5a6acb014bc1 100644 --- a/net/p5-Net-GrowlClient/Makefile +++ b/net/p5-Net-GrowlClient/Makefile @@ -16,11 +16,15 @@ PKGNAMEPREFIX= p5- MAINTAINER= markun@onohara.to COMMENT= Perl implementation of Growl Network Notification Protocol -BUILD_DEPENDS= p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA -RUN_DEPENDS= p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA - PERL_CONFIGURE= yes MAN3= Net::GrowlClient.3 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 501000 +RUN_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +BUILD_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +.endif + +.include <bsd.port.post.mk> diff --git a/net/p5-Net-Twitter/Makefile b/net/p5-Net-Twitter/Makefile index 7d9e29f56f67..24abdcf96780 100644 --- a/net/p5-Net-Twitter/Makefile +++ b/net/p5-Net-Twitter/Makefile @@ -7,6 +7,7 @@ PORTNAME= Net-Twitter PORTVERSION= 3.13007 +PORTREVISION= 1 CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,8 +15,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= clsung@FreeBSD.org COMMENT= Perl interface to twitter.com -BUILD_DEPENDS= ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \ - ${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA \ +RUN_DEPENDS= ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \ ${SITE_PERL}/Data/Visitor/Callback.pm:${PORTSDIR}/devel/p5-Data-Visitor \ ${SITE_PERL}/DateTime/Format/Strptime.pm:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \ ${SITE_PERL}/MooseX/AttributeHelpers.pm:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \ @@ -24,7 +24,7 @@ BUILD_DEPENDS= ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \ ${SITE_PERL}/namespace/autoclean.pm:${PORTSDIR}/devel/p5-namespace-autoclean \ ${SITE_PERL}/Net/OAuth/Simple.pm:${PORTSDIR}/net/p5-Net-OAuth-Simple \ ${SITE_PERL}/JSON/Any.pm:${PORTSDIR}/converters/p5-JSON-Any -RUN_DEPENDS= ${BUILD_DEPENDS} +BUILD_DEPENDS= ${RUN_DEPENDS} PERL_CONFIGURE= yes @@ -43,4 +43,10 @@ MAN3= Net::Twitter.3 Net::Twitter::Search.3 Net::Identica.3 \ Net::Twitter::Role::SimulateCursors.3 \ Net::Twitter::Role::WrapError.3 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 501000 +RUN_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +.endif + +.include <bsd.port.post.mk> diff --git a/net/p5-OAuth-Lite/Makefile b/net/p5-OAuth-Lite/Makefile index 5fcd1416e7cb..ee483f44f060 100644 --- a/net/p5-OAuth-Lite/Makefile +++ b/net/p5-OAuth-Lite/Makefile @@ -7,6 +7,7 @@ PORTNAME= OAuth-Lite PORTVERSION= 1.27 +PORTREVISION= 1 CATEGORIES= net perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= ../../authors/id/L/LY/LYOKATO @@ -21,7 +22,6 @@ RUN_DEPENDS= \ p5-Class-ErrorHandler>=0.01:${PORTSDIR}/devel/p5-Class-ErrorHandler \ p5-Crypt-OpenSSL-RSA>=0.25:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \ p5-Crypt-OpenSSL-Random>=0.04:${PORTSDIR}/security/p5-Crypt-OpenSSL-Random \ - p5-Digest-SHA>=5.45:${PORTSDIR}/security/p5-Digest-SHA \ p5-libwww>0:${PORTSDIR}/www/p5-libwww \ p5-List-MoreUtils>=0.21:${PORTSDIR}/lang/p5-List-MoreUtils \ p5-UNIVERSAL-require>=0.11:${PORTSDIR}/devel/p5-UNIVERSAL-require \ @@ -46,4 +46,10 @@ MAN3= OAuth::Lite.3 \ OAuth::Lite::Token.3 \ OAuth::Lite::Util.3 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 501000 +RUN_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +.endif + +.include <bsd.port.post.mk> diff --git a/net/radiator/Makefile b/net/radiator/Makefile index 37951894127e..7ee0c058bbae 100644 --- a/net/radiator/Makefile +++ b/net/radiator/Makefile @@ -7,6 +7,7 @@ PORTNAME= Radiator PORTVERSION= 4.7 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= # fetch manually EXTRACT_SUFX= .tgz @@ -17,14 +18,17 @@ COMMENT= Radiator Radius Server by Open System Consultants OPTIONS= MYSQL "MySQL Support" off -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -RUN_DEPENDS= ${BUILD_DEPENDS} - PERL_CONFIGURE= yes RESTRICTED= "Commercial software" .include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +BUILD_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}) IGNORE= will not be automatically fetched due to licensing\ restrictions. You MUST manually fetch the UNIX version after\ diff --git a/net/v6eval/Makefile b/net/v6eval/Makefile index 4dbb1f72c5b3..721807745a4c 100644 --- a/net/v6eval/Makefile +++ b/net/v6eval/Makefile @@ -7,7 +7,7 @@ PORTNAME= v6eval PORTVERSION= 3.0.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= net ipv6 MASTER_SITES= http://www.tahi.org/release/v6eval/ @@ -15,8 +15,7 @@ MASTER_SITES= http://www.tahi.org/release/v6eval/ MAINTAINER= Yukiyo.Akisada@jp.yokogawa.com COMMENT= IPv6 Conformance Test Platform -RUN_DEPENDS= ${SITE_PERL}/Expect.pm:${PORTSDIR}/lang/p5-Expect \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 +RUN_DEPENDS= ${SITE_PERL}/Expect.pm:${PORTSDIR}/lang/p5-Expect USE_PERL5= yes USE_OPENSSL= yes @@ -30,6 +29,10 @@ SUB_FILES= pkg-message .include <bsd.port.pre.mk> +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + .if ${OSVERSION} > 900007 BROKEN= fails to build with new utmpx .endif diff --git a/security/cp2fwb/Makefile b/security/cp2fwb/Makefile index 23d8dfe7014c..1efcbc61b3d0 100644 --- a/security/cp2fwb/Makefile +++ b/security/cp2fwb/Makefile @@ -7,6 +7,7 @@ PORTNAME= cp2fwb PORTVERSION= 0.6 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}uilder/${PORTNAME}uilder/${PORTNAME}-${PORTVERSION} EXTRACT_SUFX= .tgz @@ -14,15 +15,20 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Checkpoint FW1 to Firewall Builder ruleset converter -RUN_DEPENDS= ${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 +RUN_DEPENDS= ${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer PLIST_FILES= bin/cp2fwbuilder USE_PERL5= yes NO_BUILD= yes +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/cp2fwbuilder ${PREFIX}/bin @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/security/ftimes/Makefile b/security/ftimes/Makefile index e57ac1c9ad09..0956419c7a21 100644 --- a/security/ftimes/Makefile +++ b/security/ftimes/Makefile @@ -29,7 +29,9 @@ OPTIONS= DIG_TOOLS "install dig tools" on \ .include <bsd.port.pre.mk> .if defined(WITH_DIG_TOOLS) || defined(WITH_MAP_TOOLS) +. if ${PERL_LEVEL} < 500703 RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 +. endif .endif .if defined(WITH_DIG_TOOLS) diff --git a/security/p5-Authen-Simple/Makefile b/security/p5-Authen-Simple/Makefile index eb2cc2efff56..57c434e66542 100644 --- a/security/p5-Authen-Simple/Makefile +++ b/security/p5-Authen-Simple/Makefile @@ -7,7 +7,7 @@ PORTNAME= Authen-Simple PORTVERSION= 0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -15,12 +15,11 @@ PKGNAMEPREFIX= p5- MAINTAINER= ports@FreeBSD.org COMMENT= Simple authentication framework -BUILD_DEPENDS= ${SITE_PERL}/Class/Accessor/Fast.pm:${PORTSDIR}/devel/p5-Class-Accessor \ +RUN_DEPENDS= ${SITE_PERL}/Class/Accessor/Fast.pm:${PORTSDIR}/devel/p5-Class-Accessor \ ${SITE_PERL}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable \ ${SITE_PERL}/Crypt/PasswdMD5.pm:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \ - ${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA \ p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate -RUN_DEPENDS= ${BUILD_DEPENDS} +BUILD_DEPENDS= ${RUN_DEPENDS} MAN3= Authen::Simple.3 \ Authen::Simple::Adapter.3 \ @@ -30,4 +29,10 @@ MAN3= Authen::Simple.3 \ PERL_MODBUILD= 5.8.0+ -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 501000 +RUN_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +.endif + +.include <bsd.port.post.mk> diff --git a/security/p5-Crypt-SaltedHash/Makefile b/security/p5-Crypt-SaltedHash/Makefile index 6c4ec3279713..d5c239ec9c40 100644 --- a/security/p5-Crypt-SaltedHash/Makefile +++ b/security/p5-Crypt-SaltedHash/Makefile @@ -5,6 +5,7 @@ PORTNAME= Crypt-SaltedHash PORTVERSION= 0.05 +PORTREVISION= 1 CATEGORIES= security perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,12 +13,20 @@ PKGNAMEPREFIX= p5- MAINTAINER= skreuzer@FreeBSD.org COMMENT= Perl extension to work with salted hashes -RUN_DEPENDS= ${SITE_PERL}/Digest.pm:${PORTSDIR}/security/p5-Digest -BUILD_DEPENDS= ${RUN_DEPENDS} -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 - PERL_MODBUILD= yes MAN3= Crypt::SaltedHash.3 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 501000 +RUN_DEPENDS+= p5-Digest>=1.16:${PORTSDIR}/security/p5-Digest +BUILD_DEPENDS+= p5-Digest>=1.16:${PORTSDIR}/security/p5-Digest +.endif + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +BUILD_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + +.include <bsd.port.post.mk> diff --git a/security/p5-Crypt-Simple/Makefile b/security/p5-Crypt-Simple/Makefile index 5ec0647954c1..e409e9dbe8f4 100644 --- a/security/p5-Crypt-Simple/Makefile +++ b/security/p5-Crypt-Simple/Makefile @@ -17,7 +17,6 @@ COMMENT= Perl encrypt stuff simply RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Crypt/Blowfish.pm:${PORTSDIR}/security/p5-Crypt-Blowfish \ ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ ${SITE_PERL}/FreezeThaw.pm:${PORTSDIR}/devel/p5-FreezeThaw BUILD_DEPENDS= ${RUN_DEPENDS} @@ -27,6 +26,10 @@ MAN3= Crypt::Simple.3 .include <bsd.port.pre.mk> +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + .if ${PERL_LEVEL} < 500903 RUN_DEPENDS+= p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress .endif diff --git a/security/p5-Module-Signature/Makefile b/security/p5-Module-Signature/Makefile index 1521de9e6980..99d909422924 100644 --- a/security/p5-Module-Signature/Makefile +++ b/security/p5-Module-Signature/Makefile @@ -7,6 +7,7 @@ PORTNAME= Module-Signature PORTVERSION= 0.64 +PORTREVISION= 1 CATEGORIES= security perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,14 +15,19 @@ PKGNAMEPREFIX= p5- MAINTAINER= clsung@FreeBSD.org COMMENT= Module signature file manipulation -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA \ - ${SITE_PERL}/PAR/Dist.pm:${PORTSDIR}/devel/p5-PAR-Dist \ +RUN_DEPENDS= ${SITE_PERL}/PAR/Dist.pm:${PORTSDIR}/devel/p5-PAR-Dist \ ${LOCALBASE}/bin/gpgv:${PORTSDIR}/security/gnupg1 -RUN_DEPENDS= ${BUILD_DEPENDS} +BUILD_DEPENDS= ${RUN_DEPENDS} PERL_CONFIGURE= yes MAN1= cpansign.1 MAN3= Module::Signature.3 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 501000 +RUN_DEPENDS+= p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA +.endif + +.include <bsd.port.post.mk> diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile index d525ac566eb4..47049db20b0c 100644 --- a/sysutils/munin-master/Makefile +++ b/sysutils/munin-master/Makefile @@ -7,6 +7,7 @@ PORTNAME= munin PORTVERSION= 1.4.5 +PORTREVISION= 1 CATEGORIES= sysutils perl5 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION} PKGNAMESUFFIX= -master @@ -16,7 +17,6 @@ COMMENT= Collector part of Munin BUILD_DEPENDS= ${SITE_PERL}/Module/Build.pm:${PORTSDIR}/devel/p5-Module-Build \ ${SITE_PERL}/Munin/Common/Defaults.pm:${PORTSDIR}/sysutils/munin-common \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ ${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \ ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool \ ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/converters/p5-Storable-AMF \ @@ -27,7 +27,6 @@ BUILD_DEPENDS= ${SITE_PERL}/Module/Build.pm:${PORTSDIR}/devel/p5-Module-Build \ ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced RUN_DEPENDS= ${SITE_PERL}/Munin/Common/Defaults.pm:${PORTSDIR}/sysutils/munin-common \ ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ ${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \ ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/converters/p5-Storable-AMF \ ${SITE_PERL}/DateTime/HiRes.pm:${PORTSDIR}/devel/p5-DateTime-HiRes \ @@ -67,6 +66,13 @@ MAN8= munin-cron.8 \ PLIST_SUB= DBDIR=${DBDIR} SUB_FILES= pkg-message +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +BUILD_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL @@ -88,4 +94,4 @@ post-install: ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/userneu-devel/Makefile b/sysutils/userneu-devel/Makefile index 0f5d504e6e7f..e497d7627ec6 100644 --- a/sysutils/userneu-devel/Makefile +++ b/sysutils/userneu-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= userneu PORTVERSION= 1.43 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://btw23.de/johannes/files/userneu/\ http://home.arcor.de/fehlner/fbsd_ports/\ @@ -20,8 +20,7 @@ COMMENT= Account management and creation tool RUN_DEPENDS= \ ${SITE_PERL}/Crypt/PasswdMD5.pm:${PORTSDIR}/security/p5-Crypt-PasswdMD5/ \ - ${SITE_PERL}/Crypt/RandPasswd.pm:${PORTSDIR}/security/p5-Crypt-RandPasswd/ \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5/ + ${SITE_PERL}/Crypt/RandPasswd.pm:${PORTSDIR}/security/p5-Crypt-RandPasswd/ USE_PERL5_RUN= yes NO_BUILD= yes @@ -36,6 +35,12 @@ LDOCS2= README INSTALL userneu.pod userneu.conf.pod PORTDOCS= ${LDOCS1} ${LDOCS2} EXAMPLES= userlist userneu.conf.example +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + do-install: cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN8} ${MANPREFIX}/man/man8 cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN5} ${MANPREFIX}/man/man5 @@ -49,4 +54,4 @@ do-install: cd ${WRKSRC}/doc && ${INSTALL_DATA} ${LDOCS2} ${DOCSDIR} .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/userneu/Makefile b/sysutils/userneu/Makefile index cdf8ce6f3301..e42d00f4bd83 100644 --- a/sysutils/userneu/Makefile +++ b/sysutils/userneu/Makefile @@ -7,6 +7,7 @@ PORTNAME= userneu PORTVERSION= 1.38 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://btw23.de/johannes/userneu/ \ http://home.arcor.de/fehlner/fbsd_ports/ \ @@ -18,8 +19,7 @@ COMMENT= Account management and creation tool RUN_DEPENDS= \ ${SITE_PERL}/Crypt/PasswdMD5.pm:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \ - ${SITE_PERL}/Crypt/RandPasswd.pm:${PORTSDIR}/security/p5-Crypt-RandPasswd \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 + ${SITE_PERL}/Crypt/RandPasswd.pm:${PORTSDIR}/security/p5-Crypt-RandPasswd USE_PERL5_RUN= yes NO_BUILD= yes @@ -32,6 +32,12 @@ DOCS= BUGS CHANGES CREDITS REQUIREMENTS TODO \ doc/README doc/INSTALL doc/userneu.pod doc/userquick.pod EXAMPLES= list-sample +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + do-install: cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN8} ${MANPREFIX}/man/man8 cd ${WRKSRC} && ${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/sbin @@ -42,4 +48,4 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/textproc/markdown/Makefile b/textproc/markdown/Makefile index e7cbdc601f57..06fbb26ab52e 100644 --- a/textproc/markdown/Makefile +++ b/textproc/markdown/Makefile @@ -7,6 +7,7 @@ PORTNAME= markdown PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= http://daringfireball.net/projects/downloads/ DISTNAME= Markdown_${PORTVERSION} @@ -14,9 +15,6 @@ DISTNAME= Markdown_${PORTVERSION} MAINTAINER= tobez@FreeBSD.org COMMENT= A text-to-HTML conversion tool for web writers -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -RUN_DEPENDS= ${BUILD_DEPENDS} - USE_ZIP= yes USE_PERL5= yes NO_BUILD= yes @@ -38,4 +36,11 @@ do-install: ${INSTALL_DATA} "${WRKSRC}/Markdown Readme.text" ${DOCSDIR}/Markdown-Readme.text .endif -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +BUILD_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + +.include <bsd.port.post.mk> diff --git a/www/p5-Business-PayPal/Makefile b/www/p5-Business-PayPal/Makefile index 9203aae52128..40654d09c3ee 100644 --- a/www/p5-Business-PayPal/Makefile +++ b/www/p5-Business-PayPal/Makefile @@ -7,6 +7,7 @@ PORTNAME= Business-PayPal PORTVERSION= 0.04 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,13 +15,18 @@ PKGNAMEPREFIX= p5- MAINTAINER= skreuzer@FreeBSD.org COMMENT= Perl extension for automating PayPal transactions -BUILD_DEPENDS= p5-Net-SSLeay>=1.35:${PORTSDIR}/security/p5-Net-SSLeay \ - p5-Digest-MD5>=2.38:${PORTSDIR}/security/p5-Digest-MD5 \ +RUN_DEPENDS= p5-Net-SSLeay>=1.35:${PORTSDIR}/security/p5-Net-SSLeay \ p5-CGI.pm>=3.49:${PORTSDIR}/www/p5-CGI.pm -RUN_DEPENDS= ${BUILD_DEPENDS} +BUILD_DEPENDS= ${RUN_DEPENDS} PERL_CONFIGURE= yes MAN3= Business::PayPal.3 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5 +.endif + +.include <bsd.port.post.mk> |