diff options
264 files changed, 278 insertions, 2019 deletions
diff --git a/archivers/p5-Compress-Zlib/Makefile b/archivers/p5-Compress-Zlib/Makefile index 1d5a60a2d452..6677440e35cf 100644 --- a/archivers/p5-Compress-Zlib/Makefile +++ b/archivers/p5-Compress-Zlib/Makefile @@ -22,13 +22,7 @@ PERL_CONFIGURE= YES MAN3= Compress::Zlib.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - post-patch: @${REINPLACE_CMD} -e 's/5.009/5.666/' ${WRKSRC}/Makefile.PL -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/archivers/p5-IO-Compress-Base/Makefile b/archivers/p5-IO-Compress-Base/Makefile index c430cf0cbc4d..e5ddfa3cae37 100644 --- a/archivers/p5-IO-Compress-Base/Makefile +++ b/archivers/p5-IO-Compress-Base/Makefile @@ -19,13 +19,7 @@ PERL_CONFIGURE= YES MAN3= IO::Uncompress::AnyUncompress.3 IO::Uncompress::Base.3 \ File::GlobMapper.3 IO::Compress::Base.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - post-patch: @${REINPLACE_CMD} -e 's/5.009/5.666/' ${WRKSRC}/Makefile.PL -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/archivers/p5-IO-Zlib/Makefile b/archivers/p5-IO-Zlib/Makefile index c3ea2ae31ea2..a85f3f14a33b 100644 --- a/archivers/p5-IO-Zlib/Makefile +++ b/archivers/p5-IO-Zlib/Makefile @@ -21,10 +21,4 @@ RUN_DEPENDS= p5-Compress-Zlib>=2:${PORTSDIR}/archivers/p5-Compress-Zlib PERL_CONFIGURE= yes MAN3= IO::Zlib.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500702 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/p5-Audio-WMA/Makefile b/audio/p5-Audio-WMA/Makefile index 02c6eececa00..aa316f146065 100644 --- a/audio/p5-Audio-WMA/Makefile +++ b/audio/p5-Audio-WMA/Makefile @@ -18,12 +18,4 @@ PERL_CONFIGURE= yes MAN3= Audio::WMA.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -post-patch: - @${PERL} -pi -e '$$_ = "" if /use 5.008/g;' \ - ${WRKSRC}/Makefile.PL -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/p5-MP3-Find/Makefile b/audio/p5-MP3-Find/Makefile index 2cceb25368b2..1180523a26f4 100644 --- a/audio/p5-MP3-Find/Makefile +++ b/audio/p5-MP3-Find/Makefile @@ -22,10 +22,4 @@ MAN3= MP3::Find::DB.3 MP3::Find::Filesystem.3 MP3::Find.3 MP3::Find::Base.3 PERL_CONFIGURE= yes -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/pacpl/Makefile b/audio/pacpl/Makefile index 15b15d3cfaa8..599b9819bc97 100644 --- a/audio/pacpl/Makefile +++ b/audio/pacpl/Makefile @@ -75,10 +75,6 @@ PLIST_SUB+= AMAROK="@comment " .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500701 -RUN_DEPENDS+= p5-Switch>0:${PORTSDIR}/lang/p5-Switch -.endif - .if defined(WITH_BLADEENC) RUN_DEPENDS+= bladeenc:${PORTSDIR}/audio/bladeenc .endif diff --git a/benchmarks/p5-Benchmark-Stopwatch/Makefile b/benchmarks/p5-Benchmark-Stopwatch/Makefile index 9a1d5b4436a9..e5be38ff7e27 100644 --- a/benchmarks/p5-Benchmark-Stopwatch/Makefile +++ b/benchmarks/p5-Benchmark-Stopwatch/Makefile @@ -23,11 +23,4 @@ PERL_CONFIGURE= yes MAN3= Benchmark::Stopwatch.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= ${SITE_PERL}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/biology/p5-Bio-Das/Makefile b/biology/p5-Bio-Das/Makefile index efb719c3434f..51ff577439ad 100644 --- a/biology/p5-Bio-Das/Makefile +++ b/biology/p5-Bio-Das/Makefile @@ -39,8 +39,4 @@ MAN3= Bio::Das.3 Bio::Das::AGPServer::Config.3 Bio::Das::AGPServer::Daemon.3 \ RUN_DEPENDS+= p5-Compress-Zlib>=1:${PORTSDIR}/archivers/p5-Compress-Zlib .endif -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-MIME-Base64>=2.12:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - .include <bsd.port.post.mk> diff --git a/biology/p5-bioperl/Makefile b/biology/p5-bioperl/Makefile index 4af9856771c8..927f1a507fdc 100644 --- a/biology/p5-bioperl/Makefile +++ b/biology/p5-bioperl/Makefile @@ -978,15 +978,6 @@ MAN3= Bio::Align::AlignI.3 \ Bio::Variation::VariantI.3 \ Bio::WebAgent.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.if ${PERL_LEVEL} < 500600 -IGNORE= requires Perl 5.6 or better -.endif -.endif - # now install all extra stuff (docs, examples, scripts, models) post-install: ${MKDIR} ${DATADIR} @@ -1001,4 +992,4 @@ post-install: ${CP} -R ${WRKSRC}/doc ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/converters/convmv/Makefile b/converters/convmv/Makefile index 54312fc4d7ee..d3362f35477a 100644 --- a/converters/convmv/Makefile +++ b/converters/convmv/Makefile @@ -19,10 +19,4 @@ PLIST_FILES= bin/convmv MAN1= convmv.1 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500701 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Encode.pm:${PORTSDIR}/converters/p5-Encode -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/converters/p5-Encode-Detect/Makefile b/converters/p5-Encode-Detect/Makefile index 4866df4744ca..2f7bb62c9aa9 100644 --- a/converters/p5-Encode-Detect/Makefile +++ b/converters/p5-Encode-Detect/Makefile @@ -21,11 +21,4 @@ PERL_MODBUILD= yes MAN3= Encode::Detect.3 Encode::Detect::Detector.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Encode.pm:${PORTSDIR}/converters/p5-Encode -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Encode.pm:${PORTSDIR}/converters/p5-Encode -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/converters/p5-Encode/Makefile b/converters/p5-Encode/Makefile index 6e1ccbdfe27c..4c12c50e1406 100644 --- a/converters/p5-Encode/Makefile +++ b/converters/p5-Encode/Makefile @@ -35,12 +35,8 @@ MAN3= Encode.3 \ Encode::Unicode::UTF7.3 \ encoding.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} > 500800 post-patch: ${PERL} -pi -e '$$_="" if $$.>=24 && $$.<=26; $$_="my \@exe_files=();\n" if $$.==25' ${WRKSRC}/Makefile.PL -.endif post-configure: @${FIND} ${WRKSRC}/ -name Makefile -exec \ @@ -49,4 +45,4 @@ post-configure: regression-test: cd ${WRKSRC} && ${MAKE} test -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/converters/p5-JSON1/Makefile b/converters/p5-JSON1/Makefile index b618991b13eb..1ef5e9d4ceba 100644 --- a/converters/p5-JSON1/Makefile +++ b/converters/p5-JSON1/Makefile @@ -24,10 +24,4 @@ MAN3= Apache::JSONRPC.3 JSON.3 JSON::Converter.3 \ JSON::PP.3 JSON::PP5005.3 JSON::PP56.3 JSON::Parser.3 \ JSONRPC.3 JSONRPC::Transport::HTTP.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/converters/p5-Unicode-MapUTF8/Makefile b/converters/p5-Unicode-MapUTF8/Makefile index 4931287abee3..e1b2efa155c0 100644 --- a/converters/p5-Unicode-MapUTF8/Makefile +++ b/converters/p5-Unicode-MapUTF8/Makefile @@ -23,12 +23,6 @@ PERL_CONFIGURE= yes MAN3= Unicode::MapUTF8.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500801 -JCODE= ${SITE_PERL}/${PERL_ARCH}/Jcode.pm -.else JCODE= ${SITE_PERL}/Jcode.pm -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/p5-Cache-BDB/Makefile b/databases/p5-Cache-BDB/Makefile index eac23cf2e448..a46b5af844b6 100644 --- a/databases/p5-Cache-BDB/Makefile +++ b/databases/p5-Cache-BDB/Makefile @@ -20,10 +20,4 @@ PERL_CONFIGURE= yes MAN3= Cache::BDB.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500700 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/p5-Cache-Memcached/Makefile b/databases/p5-Cache-Memcached/Makefile index e226d58f35df..5f9fa66cec7e 100644 --- a/databases/p5-Cache-Memcached/Makefile +++ b/databases/p5-Cache-Memcached/Makefile @@ -21,11 +21,4 @@ PERL_CONFIGURE= yes MAN3= Cache::Memcached.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ - ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile index c9a17f9a7bc6..50faa04f823d 100644 --- a/databases/p5-DBI/Makefile +++ b/databases/p5-DBI/Makefile @@ -87,13 +87,4 @@ post-install: @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -EXTRA_DEPENDS= p5-Time-HiRes>0:${PORTSDIR}/devel/p5-Time-HiRes \ - p5-Scalar-List-Utils>0:${PORTSDIR}/lang/p5-Scalar-List-Utils -BUILD_DEPENDS+= ${EXTRA_DEPENDS} -RUN_DEPENDS+= ${EXTRA_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/p5-DBIx-ContextualFetch/Makefile b/databases/p5-DBIx-ContextualFetch/Makefile index cd9563cc5bea..1f6fa5127d20 100644 --- a/databases/p5-DBIx-ContextualFetch/Makefile +++ b/databases/p5-DBIx-ContextualFetch/Makefile @@ -21,10 +21,4 @@ PERL_CONFIGURE= yes MAN3= DBIx::ContextualFetch.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500702 -BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/p5-DBIx-DBSchema/Makefile b/databases/p5-DBIx-DBSchema/Makefile index 7f95d1e04b33..601912cbcd6d 100644 --- a/databases/p5-DBIx-DBSchema/Makefile +++ b/databases/p5-DBIx-DBSchema/Makefile @@ -37,10 +37,4 @@ post-install: @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/p5-DBM-Deep/Makefile b/databases/p5-DBM-Deep/Makefile index 30804323eef4..51f660acd0b1 100644 --- a/databases/p5-DBM-Deep/Makefile +++ b/databases/p5-DBM-Deep/Makefile @@ -22,13 +22,4 @@ MAN3= DBM::Deep.3 DBM::Deep::Cookbook.3 DBM::Deep::Internals.3 PERL_CONFIGURE= yes -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/p5-Ima-DBI/Makefile b/databases/p5-Ima-DBI/Makefile index 6091acbeace2..9816a458ecc0 100644 --- a/databases/p5-Ima-DBI/Makefile +++ b/databases/p5-Ima-DBI/Makefile @@ -24,10 +24,4 @@ PERL_CONFIGURE= yes MAN3= Ima::DBI.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500702 -BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/p5-MLDBM-Sync/Makefile b/databases/p5-MLDBM-Sync/Makefile index fb427f68cbcd..0e0024ac5ca9 100644 --- a/databases/p5-MLDBM-Sync/Makefile +++ b/databases/p5-MLDBM-Sync/Makefile @@ -21,11 +21,4 @@ PERL_CONFIGURE= yes MAN3= MLDBM::Sync.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/p5-MLDBM/Makefile b/databases/p5-MLDBM/Makefile index c9f41b26baaa..fceb5c2ba871 100644 --- a/databases/p5-MLDBM/Makefile +++ b/databases/p5-MLDBM/Makefile @@ -21,11 +21,4 @@ PERL_CONFIGURE= yes MAN3= MLDBM.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/p5-SQLite-Work/Makefile b/databases/p5-SQLite-Work/Makefile index f1d0e18e557f..1a8aebd1249b 100644 --- a/databases/p5-SQLite-Work/Makefile +++ b/databases/p5-SQLite-Work/Makefile @@ -37,10 +37,6 @@ post-patch: .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500801 -RUN_DEPENDS+= p5-Getopt-Long>=2.34:${PORTSDIR}/devel/p5-Getopt-Long -.endif - .if ${PERL_LEVEL} < 500807 RUN_DEPENDS+= p5-CGI.pm>=3.10:${PORTSDIR}/www/p5-CGI.pm .endif diff --git a/deskutils/p5-Data-ICal/Makefile b/deskutils/p5-Data-ICal/Makefile index c5e75cd7d2eb..b005d5100298 100644 --- a/deskutils/p5-Data-ICal/Makefile +++ b/deskutils/p5-Data-ICal/Makefile @@ -39,10 +39,4 @@ MAN3= Data::ICal.3 \ Data::ICal::Entry::Todo.3 \ Data::ICal::Property.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/cpan-upload/Makefile b/devel/cpan-upload/Makefile index 2e8007ba16b6..f1ccc85d2dc5 100644 --- a/devel/cpan-upload/Makefile +++ b/devel/cpan-upload/Makefile @@ -24,10 +24,4 @@ PERL_CONFIGURE= yes MAN1= cpan-upload.1 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Net>=2.28:${PORTSDIR}/net/p5-Net -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/cvsmonitor/Makefile b/devel/cvsmonitor/Makefile index 16c6036a04d5..5aeb972662ab 100644 --- a/devel/cvsmonitor/Makefile +++ b/devel/cvsmonitor/Makefile @@ -94,10 +94,4 @@ do-install: .endfor @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile index 4c6655719b91..a018f2616f63 100644 --- a/devel/cvsweb3/Makefile +++ b/devel/cvsweb3/Makefile @@ -37,12 +37,6 @@ CONFLICTS= cvsweb-2.* NO_BUILD= yes USE_PERL5= yes -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - # Specify where your repository belongs. # (You can reconfigure it after installation anyway) .if defined(PACKAGE_BUILDING) || !defined(CVSROOT) || empty(CVSROOT) @@ -121,4 +115,4 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Algorithm-Dependency/Makefile b/devel/p5-Algorithm-Dependency/Makefile index e94ff8a28ade..b4afe19ded09 100644 --- a/devel/p5-Algorithm-Dependency/Makefile +++ b/devel/p5-Algorithm-Dependency/Makefile @@ -29,10 +29,4 @@ MAN3= Algorithm::Dependency.3 \ PERL_CONFIGURE= yes -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500801 -RUN_DEPENDS+= p5-Scalar-List-Utils>=1.11:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Algorithm-Evolutionary/Makefile b/devel/p5-Algorithm-Evolutionary/Makefile index 07d2e640a190..90677812ac2e 100644 --- a/devel/p5-Algorithm-Evolutionary/Makefile +++ b/devel/p5-Algorithm-Evolutionary/Makefile @@ -89,11 +89,4 @@ MAN3= Algorithm::Evolutionary.3 \ post-patch: ${PERL} -pi -e 's/(.*?(\S+::Wheel).*)/use \2;\1/' ${WRKSRC}/lib/Algorithm/Evolutionary/Op/GeneralGeneration.pm -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Memoize>=0:${PORTSDIR}/devel/p5-Memoize \ - p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Algorithm-NaiveBayes/Makefile b/devel/p5-Algorithm-NaiveBayes/Makefile index d85eb07c066b..ea98668481ac 100644 --- a/devel/p5-Algorithm-NaiveBayes/Makefile +++ b/devel/p5-Algorithm-NaiveBayes/Makefile @@ -18,11 +18,4 @@ PERL_MODBUILD= yes MAN3= Algorithm::NaiveBayes.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/List/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/List/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Alzabo/Makefile b/devel/p5-Alzabo/Makefile index 93b991a6ec98..b66504594154 100644 --- a/devel/p5-Alzabo/Makefile +++ b/devel/p5-Alzabo/Makefile @@ -98,13 +98,4 @@ post-install: ${SED} -ne 's,^${PREFIX}/,@dirrm ,p' >> ${TMPPLIST} .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ - ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils \ - ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-App-Cache/Makefile b/devel/p5-App-Cache/Makefile index 4cdb6dba752e..377d3e463130 100644 --- a/devel/p5-App-Cache/Makefile +++ b/devel/p5-App-Cache/Makefile @@ -25,10 +25,4 @@ PERL_CONFIGURE= yes MAN3= App::Cache.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Storable>=0:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-CPAN-Mini/Makefile b/devel/p5-CPAN-Mini/Makefile index 2952888ac34f..9df95050ba52 100644 --- a/devel/p5-CPAN-Mini/Makefile +++ b/devel/p5-CPAN-Mini/Makefile @@ -26,11 +26,4 @@ PERL_CONFIGURE= yes MAN1= minicpan.1 MAN3= CPAN::Mini.3 CPAN::Mini::App.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= p5-Scalar-List-Utils>0:${PORTSDIR}/lang/p5-Scalar-List-Utils -BUILD_DEPENDS+= p5-Scalar-List-Utils>0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Cache-Cache/Makefile b/devel/p5-Cache-Cache/Makefile index 36f18e2096a6..53d6019e94c9 100644 --- a/devel/p5-Cache-Cache/Makefile +++ b/devel/p5-Cache-Cache/Makefile @@ -42,10 +42,4 @@ MAN3= Cache::BaseCache.3 \ Cache::SizeAwareMemoryCache.3 \ Cache::SizeAwareSharedMemoryCache.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Storable>=1.014:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Cache-Mmap/Makefile b/devel/p5-Cache-Mmap/Makefile index c17569553d58..1e5f914a384b 100644 --- a/devel/p5-Cache-Mmap/Makefile +++ b/devel/p5-Cache-Mmap/Makefile @@ -19,13 +19,4 @@ PERL_CONFIGURE= yes MAN3= Cache::Mmap.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ - ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ - ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Cache/Makefile b/devel/p5-Cache/Makefile index 8d9e7f39c077..1a80b1dc4276 100644 --- a/devel/p5-Cache/Makefile +++ b/devel/p5-Cache/Makefile @@ -40,10 +40,4 @@ MAN3= Cache.3 \ Cache::RemovalStrategy::LRU.3 \ Cache::Tester.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Storable>=1:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Carp-Assert-More/Makefile b/devel/p5-Carp-Assert-More/Makefile index a735fa149a05..10d66d6aef19 100644 --- a/devel/p5-Carp-Assert-More/Makefile +++ b/devel/p5-Carp-Assert-More/Makefile @@ -22,10 +22,4 @@ MAN3= Carp::Assert::More.3 PERL_CONFIGURE= yes -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Carp-Assert/Makefile b/devel/p5-Carp-Assert/Makefile index f914cf13cad3..bdf5375cf62c 100644 --- a/devel/p5-Carp-Assert/Makefile +++ b/devel/p5-Carp-Assert/Makefile @@ -20,11 +20,4 @@ PERL_CONFIGURE= yes MAN3= Carp::Assert.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -RUN_DEPENDS= ${BUILD_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Class-Adapter/Makefile b/devel/p5-Class-Adapter/Makefile index 2686beaf847c..eeb92262ccd9 100644 --- a/devel/p5-Class-Adapter/Makefile +++ b/devel/p5-Class-Adapter/Makefile @@ -20,10 +20,4 @@ MAN3= Class::Adapter.3 \ Class::Adapter::Builder.3 \ Class::Adapter::Clear.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Class-AutoClass/Makefile b/devel/p5-Class-AutoClass/Makefile index fdad9f9b97f1..92a47b12d8ed 100644 --- a/devel/p5-Class-AutoClass/Makefile +++ b/devel/p5-Class-AutoClass/Makefile @@ -26,11 +26,4 @@ WRKSRC= ${WRKDIR}/AutoClass MAN3= Class::AutoClass::Root.3 Class::AutoClass.3 Class::AutoClass::Args.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Class-Autouse/Makefile b/devel/p5-Class-Autouse/Makefile index be488ece6044..a86a28247beb 100644 --- a/devel/p5-Class-Autouse/Makefile +++ b/devel/p5-Class-Autouse/Makefile @@ -21,10 +21,4 @@ PERL_CONFIGURE= yes MAN3= Class::Autouse.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/List/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Class-Constant/Makefile b/devel/p5-Class-Constant/Makefile index 4dac54436a72..f6ca268bc375 100644 --- a/devel/p5-Class-Constant/Makefile +++ b/devel/p5-Class-Constant/Makefile @@ -18,11 +18,4 @@ PERL_MODBUILD= yes MAN3= Class::Constant.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -BUILD_DEPENDS= ${RUN_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Class-Container/Makefile b/devel/p5-Class-Container/Makefile index b3b1c63eed2e..a76bce0db2cc 100644 --- a/devel/p5-Class-Container/Makefile +++ b/devel/p5-Class-Container/Makefile @@ -21,10 +21,4 @@ PERL_CONFIGURE= yes MAN3= Class::Container.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Class-Field/Makefile b/devel/p5-Class-Field/Makefile index 17f999530b7e..5270565d4a9d 100644 --- a/devel/p5-Class-Field/Makefile +++ b/devel/p5-Class-Field/Makefile @@ -18,11 +18,4 @@ PERL_CONFIGURE= YES MAN3= Class::Field.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -BUILD_DEPENDS+= p5-Encode>=0:${PORTSDIR}/converters/p5-Encode -RUN_DEPENDS+= p5-Encode>=0:${PORTSDIR}/converters/p5-Encode -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Class-Hook/Makefile b/devel/p5-Class-Hook/Makefile index 5d0243e16e2f..ce7ddd1ddf9c 100644 --- a/devel/p5-Class-Hook/Makefile +++ b/devel/p5-Class-Hook/Makefile @@ -18,10 +18,4 @@ PERL_CONFIGURE= yes MAN3= Class::Hook.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Time-HiRes>=0.01:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Class-InsideOut/Makefile b/devel/p5-Class-InsideOut/Makefile index 6593f8d1c02e..8f7fb3d20313 100644 --- a/devel/p5-Class-InsideOut/Makefile +++ b/devel/p5-Class-InsideOut/Makefile @@ -19,11 +19,4 @@ PERL_CONFIGURE= yes MAN3= Class::InsideOut::Manual::About.3 Class::InsideOut.3 \ Class::InsideOut::Manual::Advanced.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= ${SITE_PERL}/Class/ISA.pm:${PORTSDIR}/devel/p5-Class-ISA \ - ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Class-Std/Makefile b/devel/p5-Class-Std/Makefile index 4ff5b01487a8..d99938676989 100644 --- a/devel/p5-Class-Std/Makefile +++ b/devel/p5-Class-Std/Makefile @@ -21,10 +21,4 @@ PERL_CONFIGURE= YES MAN3= Class::Std.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500702 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Clone/Makefile b/devel/p5-Clone/Makefile index 653beeac8047..35b8ed121a87 100644 --- a/devel/p5-Clone/Makefile +++ b/devel/p5-Clone/Makefile @@ -21,11 +21,4 @@ MAN3= Clone.3 post-patch: ${PERL} -pi -e 'm.OPTIMIZE.&&s,.,,sg' ${WRKSRC}/Makefile.PL -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= p5-Scalar-List-Utils>0:${PORTSDIR}/lang/p5-Scalar-List-Utils -BUILD_DEPENDS+= p5-Scalar-List-Utils>0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Config-IniFiles/Makefile b/devel/p5-Config-IniFiles/Makefile index 40a3ce171aaa..5c5f65f259d7 100644 --- a/devel/p5-Config-IniFiles/Makefile +++ b/devel/p5-Config-IniFiles/Makefile @@ -18,10 +18,4 @@ MAN3= Config::IniFiles.3 PERL_MODBUILD= yes -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -BUILD_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Cvs/Makefile b/devel/p5-Cvs/Makefile index 0f9a8f0e796f..3265c1d59f13 100644 --- a/devel/p5-Cvs/Makefile +++ b/devel/p5-Cvs/Makefile @@ -34,18 +34,9 @@ MAN3= Cvs.3 Cvs::Command::Base.3 Cvs::Command::Checkout.3 \ Cvs::Result::Tag.3 Cvs::Result::Update.3 \ Cvs::Command::Rtag.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500601 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/IO/Handle.pm:${PORTSDIR}/devel/p5-IO -.endif - -.if ${PERL_LEVEL} >= 500800 RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/IO/Tty.pm:${PORTSDIR}/devel/p5-IO-Tty -.endif - RUN_DEPENDS+= ${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor RUN_DEPENDS+= ${SITE_PERL}/IPC/Run.pm:${PORTSDIR}/devel/p5-IPC-Run RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Danga-Socket/Makefile b/devel/p5-Danga-Socket/Makefile index b33ed4363a8e..8f2a2e6a5837 100644 --- a/devel/p5-Danga-Socket/Makefile +++ b/devel/p5-Danga-Socket/Makefile @@ -21,10 +21,4 @@ PERL_CONFIGURE= yes MAN3= Danga::Socket.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Data-Dump-Streamer/Makefile b/devel/p5-Data-Dump-Streamer/Makefile index 2f256034255e..0bc64b120cfd 100644 --- a/devel/p5-Data-Dump-Streamer/Makefile +++ b/devel/p5-Data-Dump-Streamer/Makefile @@ -14,19 +14,14 @@ PKGNAMEPREFIX= p5- MAINTAINER= mat@FreeBSD.org COMMENT= Stream a highly accurate breadth first data dump in Perl code -RUN_DEPENDS= ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \ - ${SITE_PERL}/${PERL_ARCH}/B/Utils.pm:${PORTSDIR}/devel/p5-B-Utils -BUILD_DEPENDS= ${RUN_DEPENDS} +BUILD_DEPENDS= ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \ + ${SITE_PERL}/${PERL_ARCH}/B/Utils.pm:${PORTSDIR}/devel/p5-B-Utils \ + ${SITE_PERL}/${PERL_ARCH}/PadWalker.pm:${PORTSDIR}/devel/p5-PadWalker +RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes CONFIGURE_ARGS= DDS MAN3= DDS.3 Data::Dump::Streamer.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} >= 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/PadWalker.pm:${PORTSDIR}/devel/p5-PadWalker -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Data-Hierarchy/Makefile b/devel/p5-Data-Hierarchy/Makefile index ef1f3ab2f9a7..319bded19a8a 100644 --- a/devel/p5-Data-Hierarchy/Makefile +++ b/devel/p5-Data-Hierarchy/Makefile @@ -18,10 +18,4 @@ PERL_CONFIGURE= yes MAN3= Data::Hierarchy.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500700 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Data-OptList/Makefile b/devel/p5-Data-OptList/Makefile index 3cb88e11dde8..c62a89e07035 100644 --- a/devel/p5-Data-OptList/Makefile +++ b/devel/p5-Data-OptList/Makefile @@ -22,10 +22,4 @@ PERL_CONFIGURE= yes MAN3= Data::OptList.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Data-TemporaryBag/Makefile b/devel/p5-Data-TemporaryBag/Makefile index 66ccc8e7b672..f4b8ea4a3c8f 100644 --- a/devel/p5-Data-TemporaryBag/Makefile +++ b/devel/p5-Data-TemporaryBag/Makefile @@ -18,11 +18,4 @@ PERL_CONFIGURE= yes MAN3= Data::TemporaryBag.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-DateTime-Locale/Makefile b/devel/p5-DateTime-Locale/Makefile index 099748d0e347..e631f1738121 100644 --- a/devel/p5-DateTime-Locale/Makefile +++ b/devel/p5-DateTime-Locale/Makefile @@ -482,10 +482,4 @@ post-install: @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-DateTime/Makefile b/devel/p5-DateTime/Makefile index 634d554fb3e3..b8fe40f560d1 100644 --- a/devel/p5-DateTime/Makefile +++ b/devel/p5-DateTime/Makefile @@ -33,11 +33,4 @@ post-install: @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \ - p5-Time-Local>=1.04:${PORTSDIR}/devel/p5-Time-Local -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Devel-LeakTrace/Makefile b/devel/p5-Devel-LeakTrace/Makefile index e9e3565911b0..57cb6a43144f 100644 --- a/devel/p5-Devel-LeakTrace/Makefile +++ b/devel/p5-Devel-LeakTrace/Makefile @@ -20,10 +20,4 @@ USE_GNOME= glib12 MAN3= Devel::LeakTrace.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500702 -BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Event/Makefile b/devel/p5-Event/Makefile index 0ffd550b9cc9..b0faa64977ab 100644 --- a/devel/p5-Event/Makefile +++ b/devel/p5-Event/Makefile @@ -26,10 +26,4 @@ post-install: @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Every/Makefile b/devel/p5-Every/Makefile index 3ae553887e40..9966db2ee3dc 100644 --- a/devel/p5-Every/Makefile +++ b/devel/p5-Every/Makefile @@ -22,11 +22,4 @@ PERL_CONFIGURE= yes MAN3= Every.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= p5-Scalar-List-Utils>0:${PORTSDIR}/lang/p5-Scalar-List-Utils -RUN_DEPENDS+= p5-Scalar-List-Utils>0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile index bf801802214f..92a229d23e4c 100644 --- a/devel/p5-ExtUtils-MakeMaker/Makefile +++ b/devel/p5-ExtUtils-MakeMaker/Makefile @@ -30,18 +30,9 @@ MAN3= ExtUtils::Installed.3 ExtUtils::MM_OS2.3 ExtUtils::MakeMaker.3 \ ExtUtils::MM_QNX.3 ExtUtils::MM_AIX.3 ExtUtils::MakeMaker::Config.3 \ ExtUtils::Command.3 ExtUtils::MM_Darwin.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} >= 500800 PLIST_SUB+= EXE_FILES="@comment " -.else -MAN1+= instmodsh.1 -PLIST_SUB+= EXE_FILES="" -.endif post-patch: -.if ${PERL_LEVEL} >= 500800 @${REINPLACE_CMD} -e '/EXE_FILES/d' ${WRKSRC}/Makefile.PL -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-ExtUtils-PkgConfig/Makefile b/devel/p5-ExtUtils-PkgConfig/Makefile index 1f41e70f8068..a0db05427a92 100644 --- a/devel/p5-ExtUtils-PkgConfig/Makefile +++ b/devel/p5-ExtUtils-PkgConfig/Makefile @@ -22,10 +22,4 @@ MAN3= ExtUtils::PkgConfig.3 post-patch: @${PERL} -pi -e '$$_="" if $$.==1' ${WRKSRC}/Makefile.PL -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -EXTRA_PATCHES= ${PATCHDIR}/500600-Makefile.PL -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-FSA-Rules/Makefile b/devel/p5-FSA-Rules/Makefile index de0b9ae67c58..eb7a86afb8fe 100644 --- a/devel/p5-FSA-Rules/Makefile +++ b/devel/p5-FSA-Rules/Makefile @@ -24,10 +24,4 @@ PERL_MODBUILD= yes MAN3= FSA::Rules.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-File-Cache/Makefile b/devel/p5-File-Cache/Makefile index b7dc58bceda3..19c6655c77d2 100644 --- a/devel/p5-File-Cache/Makefile +++ b/devel/p5-File-Cache/Makefile @@ -18,12 +18,4 @@ PERL_CONFIGURE= yes MAN3= File::Cache.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -RUN_DEPENDS= ${BUILD_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-File-Flat/Makefile b/devel/p5-File-Flat/Makefile index e22be00e2706..d08f8bc60902 100644 --- a/devel/p5-File-Flat/Makefile +++ b/devel/p5-File-Flat/Makefile @@ -43,10 +43,4 @@ MAN3= File::Flat.3 post-patch: @${PERL} -pi -e 's/^auto_install.*$$//' ${WRKSRC}/Makefile.PL -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-File-Modified/Makefile b/devel/p5-File-Modified/Makefile index 9e7f90f58eaf..20eea7734e8d 100644 --- a/devel/p5-File-Modified/Makefile +++ b/devel/p5-File-Modified/Makefile @@ -32,11 +32,4 @@ post-install: @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}." .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-File-Tail/Makefile b/devel/p5-File-Tail/Makefile index f55198f14dd5..9c2f08e3d34c 100644 --- a/devel/p5-File-Tail/Makefile +++ b/devel/p5-File-Tail/Makefile @@ -17,11 +17,4 @@ PERL_CONFIGURE= YES MAN3= File::Tail.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -RUN_DEPENDS= ${BUILD_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-IO-KQueue/Makefile b/devel/p5-IO-KQueue/Makefile index 1399e1be1db3..3a99bc79e78f 100644 --- a/devel/p5-IO-KQueue/Makefile +++ b/devel/p5-IO-KQueue/Makefile @@ -18,13 +18,6 @@ PERL_CONFIGURE= yes MAN3= IO::KQueue.3 -.include <bsd.port.pre.mk> - -post-patch: -.if ${PERL_LEVEL} < 500800 - ${REINPLACE_CMD} -e 's/const //' ${WRKSRC}/KQueue.xs -.endif - .if !defined(NOPORTDOCS) post-install: @${MKDIR} ${EXAMPLESDIR} @@ -32,4 +25,4 @@ post-install: @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}." .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-IO-Prompt/Makefile b/devel/p5-IO-Prompt/Makefile index 14506f0aaf9a..4cc1fa10065a 100644 --- a/devel/p5-IO-Prompt/Makefile +++ b/devel/p5-IO-Prompt/Makefile @@ -28,10 +28,4 @@ MAN3= IO::Prompt.3 post-patch: @${FIND} ${WRKSRC} -name "*.orig" -delete -.include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500800 -post-patch: - @${PERL} -pi -e '$$_ = "" if m|use 5.008;|' \ - ${WRKSRC}/lib/IO/Prompt.pm -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-IO-YAML/Makefile b/devel/p5-IO-YAML/Makefile index a7e86cb67b2f..5c0b7a98141c 100644 --- a/devel/p5-IO-YAML/Makefile +++ b/devel/p5-IO-YAML/Makefile @@ -23,11 +23,4 @@ PERL_MODBUILD= yes MAN3= IO::YAML.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500801 -BUILD_DEPENDS+= ${SITE_PERL}/Errno.pm:${PORTSDIR}/devel/p5-Errno -RUN_DEPENDS+= ${SITE_PERL}/Errno.pm:${PORTSDIR}/devel/p5-Errno -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-IPC-Cache/Makefile b/devel/p5-IPC-Cache/Makefile index 018f9960b7fd..7d2fb5ce1b65 100644 --- a/devel/p5-IPC-Cache/Makefile +++ b/devel/p5-IPC-Cache/Makefile @@ -21,11 +21,4 @@ PERL_CONFIGURE= yes MAN3= IPC::Cache.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-IPC-Locker/Makefile b/devel/p5-IPC-Locker/Makefile index c4faeebbcd7e..dd9b75a388b7 100644 --- a/devel/p5-IPC-Locker/Makefile +++ b/devel/p5-IPC-Locker/Makefile @@ -21,11 +21,4 @@ MAN1= lockerd.1 lockersh.1 pidstat.1 pidstatd.1 pidwatch.1 \ MAN3= IPC::Locker.3 IPC::Locker::Server.3 \ IPC::PidStat.3 IPC::PidStat::PidServer.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Net>=0:${PORTSDIR}/net/p5-Net \ - p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-IPC-PubSub/Makefile b/devel/p5-IPC-PubSub/Makefile index 0a0bf21ffb53..e14eb060d11d 100644 --- a/devel/p5-IPC-PubSub/Makefile +++ b/devel/p5-IPC-PubSub/Makefile @@ -24,11 +24,4 @@ PERL_CONFIGURE= yes MAN3= IPC::PubSub.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= p5-Storable>0:${PORTSDIR}/devel/p5-Storable -RUN_DEPENDS+= p5-Storable>0:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-IPC-Run3/Makefile b/devel/p5-IPC-Run3/Makefile index d2b5622b89d0..fb96992984f6 100644 --- a/devel/p5-IPC-Run3/Makefile +++ b/devel/p5-IPC-Run3/Makefile @@ -22,11 +22,4 @@ MAN3= IPC::Run3.3 \ IPC::Run3::ProfPP.3 \ IPC::Run3::ProfReporter.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -BUILD_DEPENDS+= p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes -RUN_DEPENDS+= p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-IPC-Shareable/Makefile b/devel/p5-IPC-Shareable/Makefile index b3e01d9c2f10..01ff5f7ac77b 100644 --- a/devel/p5-IPC-Shareable/Makefile +++ b/devel/p5-IPC-Shareable/Makefile @@ -19,10 +19,4 @@ PERL_CONFIGURE= yes MAN3= IPC::Shareable.3 IPC::Shareable::SharedMem.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Include/Makefile b/devel/p5-Include/Makefile index 6bcf14afb3b6..1de6b5915e93 100644 --- a/devel/p5-Include/Makefile +++ b/devel/p5-Include/Makefile @@ -18,13 +18,9 @@ PERL_CONFIGURE= YES MAN3= Include.3 -.include <bsd.port.pre.mk> - post-build: -.if ${PERL_LEVEL} > 500800 @${CP} ${WRKSRC}/Include.pm ${WRKSRC}/blib/lib @${MKDIR} ${WRKSRC}/blib/man3 @pod2man ${WRKSRC}/Include.pm > ${WRKSRC}/blib/man3/Include.3 -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Inline-Files/Makefile b/devel/p5-Inline-Files/Makefile index 24382c629450..53f89ef99329 100644 --- a/devel/p5-Inline-Files/Makefile +++ b/devel/p5-Inline-Files/Makefile @@ -20,11 +20,4 @@ PERL_CONFIGURE= yes MAN3= Inline::Files.3 \ Inline::Files::Virtual.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -BUILD_DEPENDS+= p5-Filter>=0:${PORTSDIR}/devel/p5-Filter -RUN_DEPENDS+= p5-Filter>=0:${PORTSDIR}/devel/p5-Filter -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Inline/Makefile b/devel/p5-Inline/Makefile index 4f1ea9b230f5..664cabd1ade2 100644 --- a/devel/p5-Inline/Makefile +++ b/devel/p5-Inline/Makefile @@ -23,10 +23,4 @@ MAN3= Inline-API.3 Inline-FAQ.3 Inline-Support.3 Inline.3 \ Inline::C-Cookbook.3 Inline::C.3 \ Inline::C::ParseRecDescent.3 Inline::C::ParseRegExp.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Digest-MD5>=2.09:${PORTSDIR}/security/p5-Digest-MD5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Luka/Makefile b/devel/p5-Luka/Makefile index 74aa44c1a6f1..9b8e97677ceb 100644 --- a/devel/p5-Luka/Makefile +++ b/devel/p5-Luka/Makefile @@ -30,10 +30,4 @@ PERL_CONFIGURE= yes MAN3= Luka.3 Luka::Conf.3 Luka::Exceptions.3 Luka::Mailer.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500702 -BUILD_DEPENDS+= ${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Make-Cache/Makefile b/devel/p5-Make-Cache/Makefile index a09ce8716c67..8ae4afd51bdf 100644 --- a/devel/p5-Make-Cache/Makefile +++ b/devel/p5-Make-Cache/Makefile @@ -25,11 +25,4 @@ MAN3= Make::Cache.3 \ Make::Cache::Obj.3 \ Make::Cache::Runtime.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Digest-MD5>=1:${PORTSDIR}/security/p5-Digest-MD5 \ - p5-Storable>=1:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Object-Array/Makefile b/devel/p5-Object-Array/Makefile index de8866b5d397..a62666c8bc70 100644 --- a/devel/p5-Object-Array/Makefile +++ b/devel/p5-Object-Array/Makefile @@ -25,10 +25,4 @@ PERL_CONFIGURE= yes MAN3= Object::Array.3 Object::Array::Plugin::Builtins.3 \ Object::Array::Plugin::ListMoreUtils.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Object-Realize-Later/Makefile b/devel/p5-Object-Realize-Later/Makefile index 5d8fa16ef751..ff84019fc112 100644 --- a/devel/p5-Object-Realize-Later/Makefile +++ b/devel/p5-Object-Realize-Later/Makefile @@ -19,10 +19,4 @@ PERL_CONFIGURE= yes MAN3= Object::Realize::Later.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-PAR-Packer/Makefile b/devel/p5-PAR-Packer/Makefile index 09fdc81d485e..fc6bfd7ed79e 100644 --- a/devel/p5-PAR-Packer/Makefile +++ b/devel/p5-PAR-Packer/Makefile @@ -43,10 +43,4 @@ MAN3= pp.3 \ PAR::StrippedPARL::Dynamic.3 \ PAR::StrippedPARL::Static.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-PAR/Makefile b/devel/p5-PAR/Makefile index 040c2843edd3..ec3c695c1ae9 100644 --- a/devel/p5-PAR/Makefile +++ b/devel/p5-PAR/Makefile @@ -30,13 +30,7 @@ MAN3= PAR.3 \ PAR::SetupProgname.3 \ PAR::SetupTemp.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - regression-test: cd ${WRKSRC} && ${MAKE} test -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-PHP-Serialization/Makefile b/devel/p5-PHP-Serialization/Makefile index 01e8c767feb1..5607a135167e 100644 --- a/devel/p5-PHP-Serialization/Makefile +++ b/devel/p5-PHP-Serialization/Makefile @@ -19,10 +19,4 @@ PERL_CONFIGURE= yes MAN3= PHP::Serialization.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Params-Classify/Makefile b/devel/p5-Params-Classify/Makefile index 4c3aed2c2b50..5387c884f3e9 100644 --- a/devel/p5-Params-Classify/Makefile +++ b/devel/p5-Params-Classify/Makefile @@ -21,10 +21,4 @@ PERL_MODBUILD= yes MAN3= Params::Classify.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= p5-Scalar-List-Utils>=1.01:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Params-Validate/Makefile b/devel/p5-Params-Validate/Makefile index 3824181da643..1ccb064392b9 100644 --- a/devel/p5-Params-Validate/Makefile +++ b/devel/p5-Params-Validate/Makefile @@ -19,11 +19,4 @@ PERL_CONFIGURE= yes MAN3= Attribute::Params::Validate.3 Params::ValidateXS.3 \ Params::ValidatePP.3 Params::Validate.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/Attribute/Handlers.pm:${PORTSDIR}/devel/p5-Attribute-Handlers -RUN_DEPENDS+= ${SITE_PERL}/Attribute/Handlers.pm:${PORTSDIR}/devel/p5-Attribute-Handlers -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Parse-RecDescent/Makefile b/devel/p5-Parse-RecDescent/Makefile index 1a76379a5c62..9d8527ce057b 100644 --- a/devel/p5-Parse-RecDescent/Makefile +++ b/devel/p5-Parse-RecDescent/Makefile @@ -34,8 +34,4 @@ post-install: RUN_DEPENDS+= p5-version>=0:${PORTSDIR}/devel/p5-version .endif -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced -.endif - .include <bsd.port.post.mk> diff --git a/devel/p5-PatchReader/Makefile b/devel/p5-PatchReader/Makefile index 3ff90378da96..6a09a6416ef6 100644 --- a/devel/p5-PatchReader/Makefile +++ b/devel/p5-PatchReader/Makefile @@ -19,11 +19,4 @@ PERL_CONFIGURE= yes MAN3= PatchReader.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Pipeline/Makefile b/devel/p5-Pipeline/Makefile index 7cd77b838bdf..3f1711d12c66 100644 --- a/devel/p5-Pipeline/Makefile +++ b/devel/p5-Pipeline/Makefile @@ -37,10 +37,4 @@ MAN3= Pipeline::Segment.3 Pipeline::Store::ISA.3 Pipeline.3 \ Pipeline::Error::AsyncResults.3 Pipeline::Segment::Tester.3 \ Pipeline::Segment::Async::IThreads.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Rcs-Agent/Makefile b/devel/p5-Rcs-Agent/Makefile index b246f1bb842d..c60a13aea999 100644 --- a/devel/p5-Rcs-Agent/Makefile +++ b/devel/p5-Rcs-Agent/Makefile @@ -21,11 +21,4 @@ PERL_CONFIGURE= yes MAN3= Rcs::Agent.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-ResourcePool/Makefile b/devel/p5-ResourcePool/Makefile index dbc84df75eaa..2dc296cd7d81 100644 --- a/devel/p5-ResourcePool/Makefile +++ b/devel/p5-ResourcePool/Makefile @@ -35,11 +35,4 @@ MAN3= ResourcePool.3 \ post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile index 540092ed7b68..6b047e702fd4 100644 --- a/devel/p5-SDL/Makefile +++ b/devel/p5-SDL/Makefile @@ -50,11 +50,6 @@ USE_SDL+= image USE_SDL+= mixer .endif -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -RUN_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -.endif - USE_LDCONFIG= yes MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} diff --git a/devel/p5-SVN-Notify/Makefile b/devel/p5-SVN-Notify/Makefile index b5459502c3a0..d4a9e0b63056 100644 --- a/devel/p5-SVN-Notify/Makefile +++ b/devel/p5-SVN-Notify/Makefile @@ -26,10 +26,4 @@ MAN1= svnnotify.1 MAN3= SVN::Notify.3 SVN::Notify::Alternative.3 SVN::Notify::HTML.3 \ SVN::Notify::HTML::ColorDiff.3 SVN::Notify::Filter.3 SVN::Notify::Filter::Trac.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500801 -RUN_DEPENDS+= p5-Getopt-Long>=2.34:${PORTSDIR}/devel/p5-Getopt-Long -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-SVN-Web/Makefile b/devel/p5-SVN-Web/Makefile index b233154570da..a1086b83d9d1 100644 --- a/devel/p5-SVN-Web/Makefile +++ b/devel/p5-SVN-Web/Makefile @@ -61,17 +61,10 @@ MAN3= SVN::Web.3 \ SVN::Web::X.3 \ SVN::Web::action.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -BUILD_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - post-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/svnweb-install ${PREFIX}/bin @${ECHO} @${CAT} ${PKGMESSAGE} @${ECHO} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Spiffy/Makefile b/devel/p5-Spiffy/Makefile index 71cd6d848640..00ac3afebe57 100644 --- a/devel/p5-Spiffy/Makefile +++ b/devel/p5-Spiffy/Makefile @@ -28,12 +28,4 @@ post-install: @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter \ - ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -RUN_DEPENDS+= ${BUILD_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Spoon/Makefile b/devel/p5-Spoon/Makefile index 378b8641d57c..c77c2273c347 100644 --- a/devel/p5-Spoon/Makefile +++ b/devel/p5-Spoon/Makefile @@ -38,7 +38,8 @@ MAN3= Spoon.3 \ Spoon::Registry.3 \ Spoon::Template.3 \ Spoon::Template::TT2.3 \ - Spoon::Utils.3 + Spoon::Utils.3 \ + Spoon::Config.3 .if !defined(NOPORTDOCS) PORTDOCS= Changes README @@ -49,16 +50,4 @@ post-install: @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ - ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -post-patch: - @${PERL} -i -pe '$$_ = "" if $$. == 3' \ - ${WRKSRC}/lib/Spoon/Base.pm -.else -MAN3+= Spoon::Config.3 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Sub-Install/Makefile b/devel/p5-Sub-Install/Makefile index 99b8ce7a7331..b27c845f2c47 100644 --- a/devel/p5-Sub-Install/Makefile +++ b/devel/p5-Sub-Install/Makefile @@ -18,11 +18,4 @@ PERL_CONFIGURE= yes MAN3= Sub::Install.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Test-Base/Makefile b/devel/p5-Test-Base/Makefile index 6d8a30d58a2f..6538c5c222f3 100644 --- a/devel/p5-Test-Base/Makefile +++ b/devel/p5-Test-Base/Makefile @@ -26,11 +26,6 @@ MAN3= Test::Base.3 \ .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Filter>=0:${PORTSDIR}/devel/p5-Filter \ - p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - .if ${PERL_LEVEL} < 500808 RUN_DEPENDS+= p5-Test-Simple>=0.62:${PORTSDIR}/devel/p5-Test-Simple .endif diff --git a/devel/p5-Test-Benchmark/Makefile b/devel/p5-Test-Benchmark/Makefile index 13f8752afda6..78fddb070d97 100644 --- a/devel/p5-Test-Benchmark/Makefile +++ b/devel/p5-Test-Benchmark/Makefile @@ -22,10 +22,4 @@ PERL_CONFIGURE= yes MAN3= Test::Benchmark.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 && ${PERL_LEVEL} != 500602 -BUILD_DEPENDS+= ${SITE_PERL}/Test/Builder.pm:${PORTSDIR}/devel/p5-Test-Simple -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Test-Class/Makefile b/devel/p5-Test-Class/Makefile index 9e831a928121..d2dbb7334ecf 100644 --- a/devel/p5-Test-Class/Makefile +++ b/devel/p5-Test-Class/Makefile @@ -23,16 +23,4 @@ MAN3= Test::Class.3 \ Test::Class::Load.3 \ Test::Class::MethodInfo.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500702 -RUN_DEPENDS+= p5-Attribute-Handlers>=0.77:${PORTSDIR}/devel/p5-Attribute-Handlers -.if ${PERL_LEVEL} < 500701 -RUN_DEPENDS+= p5-Class-ISA>=0.32:${PORTSDIR}/devel/p5-Class-ISA -.if ${PERL_LEVEL} < 500700 -RUN_DEPENDS+= p5-Storable>=2.04:${PORTSDIR}/devel/p5-Storable -.endif -.endif -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Test-Deep/Makefile b/devel/p5-Test-Deep/Makefile index 020a60f6af4d..e59516e0720a 100644 --- a/devel/p5-Test-Deep/Makefile +++ b/devel/p5-Test-Deep/Makefile @@ -20,13 +20,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - MAN3= Test::Deep.3 Test::Deep::NoTest.3 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Test-Differences/Makefile b/devel/p5-Test-Differences/Makefile index 56b1d354736e..31343de72ab4 100644 --- a/devel/p5-Test-Differences/Makefile +++ b/devel/p5-Test-Differences/Makefile @@ -21,11 +21,4 @@ PERL_CONFIGURE= yes MAN3= Test::Differences.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -RUN_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Test-Harness/Makefile b/devel/p5-Test-Harness/Makefile index 83ddccbc24ca..ea0ed886efde 100644 --- a/devel/p5-Test-Harness/Makefile +++ b/devel/p5-Test-Harness/Makefile @@ -60,21 +60,15 @@ MAN3= App::Prove.3 \ Test::HACKING.3 \ Test::Harness.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} >= 500800 PLIST_SUB= P5_PREFIX="p5" MAN1= p5prove.1 + pre-patch: @${MV} ${WRKSRC}/bin/prove ${WRKSRC}/bin/p5prove @${PERL} -pi -e "s,^bin/prove$$,bin/p5prove," ${WRKSRC}/MANIFEST @${PERL} -pi -e "s,'bin/prove','bin/p5prove'," ${WRKSRC}/Makefile.PL -.else -MAN1= prove.1 -PLIST_SUB= P5_PREFIX="" -.endif post-patch: @${REINPLACE_CMD} -e '/INSTALLDIRS/d' ${WRKSRC}/${CONFIGURE_SCRIPT} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Test-Inline/Makefile b/devel/p5-Test-Inline/Makefile index 1212bcd0984a..5b2c100a17e6 100644 --- a/devel/p5-Test-Inline/Makefile +++ b/devel/p5-Test-Inline/Makefile @@ -43,10 +43,6 @@ MAN3= Test::Inline.3 \ .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500801 -RUN_DEPENDS+= p5-Getopt-Long>=2.34:${PORTSDIR}/devel/p5-Getopt-Long -.endif - .if ${PERL_LEVEL} < 501000 BUILD_DEPENDS+= p5-ExtUtils-MakeMaker>=6.42:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker .endif diff --git a/devel/p5-Test-LectroTest/Makefile b/devel/p5-Test-LectroTest/Makefile index 93e42999e8fa..570d55c5e951 100644 --- a/devel/p5-Test-LectroTest/Makefile +++ b/devel/p5-Test-LectroTest/Makefile @@ -25,10 +25,4 @@ MAN3= Test::LectroTest.3 \ Test::LectroTest::TestRunner.3 \ Test::LectroTest::Tutorial.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Test-Log4perl/Makefile b/devel/p5-Test-Log4perl/Makefile index c7e395e18675..69f94f2a5794 100644 --- a/devel/p5-Test-Log4perl/Makefile +++ b/devel/p5-Test-Log4perl/Makefile @@ -24,10 +24,4 @@ PERL_CONFIGURE= yes MAN3= Test::Log4perl.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500702 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Test-Tester/Makefile b/devel/p5-Test-Tester/Makefile index 167c1b8b9f51..e80511c1a582 100644 --- a/devel/p5-Test-Tester/Makefile +++ b/devel/p5-Test-Tester/Makefile @@ -30,11 +30,4 @@ post-install: @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/Test/Builder.pm:${PORTSDIR}/devel/p5-Test-Simple -RUN_DEPENDS+= ${BUILD_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Thread-Cancel/Makefile b/devel/p5-Thread-Cancel/Makefile index cf0669990910..1eb788de93de 100644 --- a/devel/p5-Thread-Cancel/Makefile +++ b/devel/p5-Thread-Cancel/Makefile @@ -22,16 +22,10 @@ PERL_CONFIGURE= yes MAN3= Thread::Cancel.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -IGNORE= requires perl 5.8.0 or later. Install lang/perl5.8 then try again -.endif - pre-everything:: @${ECHO_MSG} "--------------------------------------------------------" @${ECHO_MSG} "This module requires a threaded perl. If your install" @${ECHO_MSG} "is not threaded please install lang/perl5.8 with threads" @${ECHO_MSG} "--------------------------------------------------------" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Thread-Suspend/Makefile b/devel/p5-Thread-Suspend/Makefile index 456da2e12f4e..052bc857d1e9 100644 --- a/devel/p5-Thread-Suspend/Makefile +++ b/devel/p5-Thread-Suspend/Makefile @@ -23,16 +23,10 @@ PERL_CONFIGURE= yes MAN3= Thread::Suspend.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -IGNORE= requires perl 5.8.0 or later. Install lang/perl5.8 then try again -.endif - pre-everything:: @${ECHO_MSG} "--------------------------------------------------------" @${ECHO_MSG} "This module requires a threaded perl. If your install" @${ECHO_MSG} "is not threaded please install lang/perl5.8 with threads" @${ECHO_MSG} "--------------------------------------------------------" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Tie-FileLRUCache/Makefile b/devel/p5-Tie-FileLRUCache/Makefile index e452343535be..799f35e7402b 100644 --- a/devel/p5-Tie-FileLRUCache/Makefile +++ b/devel/p5-Tie-FileLRUCache/Makefile @@ -23,13 +23,4 @@ PERL_CONFIGURE= yes MAN3= Tie::FileLRUCache.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \ - ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \ - ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Tie-ToObject/Makefile b/devel/p5-Tie-ToObject/Makefile index 9e32ecfff5c7..4358e8acee3a 100644 --- a/devel/p5-Tie-ToObject/Makefile +++ b/devel/p5-Tie-ToObject/Makefile @@ -22,11 +22,4 @@ MAN3= Tie::ToObject.3 post-extract: @${REINPLACE_CMD} -e '/Test::/d' ${WRKSRC}/Makefile.PL -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Tree-Simple/Makefile b/devel/p5-Tree-Simple/Makefile index 2ac8a3d65ad1..f483c20366f3 100644 --- a/devel/p5-Tree-Simple/Makefile +++ b/devel/p5-Tree-Simple/Makefile @@ -18,11 +18,4 @@ PERL_CONFIGURE= yes MAN3= Tree::Simple.3 Tree::Simple::Visitor.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -RUN_DEPENDS+= ${BUILD_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-VCP-autrijus/Makefile b/devel/p5-VCP-autrijus/Makefile index ec7246171459..24e0092dfe1c 100644 --- a/devel/p5-VCP-autrijus/Makefile +++ b/devel/p5-VCP-autrijus/Makefile @@ -33,13 +33,6 @@ USE_PERL5= yes PERL_CONFIGURE= yes -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - MAN1= vcp.1 MAN3= RevML::Doctype.3 \ RevML::Writer.3 \ @@ -116,4 +109,4 @@ MAN3= RevML::Doctype.3 \ post-patch: ${FIND} ${WRKSRC} -name "*.orig" -a -exec ${RM} -f {} \; -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-forks/Makefile b/devel/p5-forks/Makefile index f13cefec728b..2c59087be773 100644 --- a/devel/p5-forks/Makefile +++ b/devel/p5-forks/Makefile @@ -30,10 +30,4 @@ MAN3= forks.3 forks::signals.3 \ threads::shared::hash.3 \ threads::shared::scalar.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500702 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/dns/p5-DNS-ZoneParse/Makefile b/dns/p5-DNS-ZoneParse/Makefile index 761a9ad6f065..fb197e13de1a 100644 --- a/dns/p5-DNS-ZoneParse/Makefile +++ b/dns/p5-DNS-ZoneParse/Makefile @@ -18,11 +18,4 @@ PERL_CONFIGURE= yes MAN3= DNS::ZoneParse.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/dns/p5-Net-DNS-SEC/Makefile b/dns/p5-Net-DNS-SEC/Makefile index 0d01d1af291f..2128ffad1265 100644 --- a/dns/p5-Net-DNS-SEC/Makefile +++ b/dns/p5-Net-DNS-SEC/Makefile @@ -40,8 +40,4 @@ MAN3= Net::DNS::Keyset.3 Net::DNS::RR::DS.3 Net::DNS::RR::KEY.3 \ RUN_DEPENDS+= p5-Digest-SHA>=5.23:${PORTSDIR}/security/p5-Digest-SHA .endif -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - .include <bsd.port.post.mk> diff --git a/dns/p5-Net-DNS-ZoneFile-Fast/Makefile b/dns/p5-Net-DNS-ZoneFile-Fast/Makefile index e7643d810764..e66f4487cc62 100644 --- a/dns/p5-Net-DNS-ZoneFile-Fast/Makefile +++ b/dns/p5-Net-DNS-ZoneFile-Fast/Makefile @@ -21,10 +21,4 @@ PERL_CONFIGURE= yes MAN3= Net::DNS::ZoneFile::Fast.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/dns/p5-Net-Domain-TLD/Makefile b/dns/p5-Net-Domain-TLD/Makefile index a0d214ec7f1f..d8ab89e891ed 100644 --- a/dns/p5-Net-Domain-TLD/Makefile +++ b/dns/p5-Net-Domain-TLD/Makefile @@ -20,10 +20,4 @@ PERL_CONFIGURE= yes MAN3= Net::Domain::TLD.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Storable>=0:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/finance/p5-Finance-QuoteHist/Makefile b/finance/p5-Finance-QuoteHist/Makefile index 765069721b29..c2223cfdc402 100644 --- a/finance/p5-Finance-QuoteHist/Makefile +++ b/finance/p5-Finance-QuoteHist/Makefile @@ -32,10 +32,4 @@ MAN3= Finance::QuoteHist.3 \ Finance::QuoteHist::Google.3 \ Finance::QuoteHist::BusinessWeek.3 \ -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/ftp/p5-Net-FTPServer/Makefile b/ftp/p5-Net-FTPServer/Makefile index 0e6fdc0a8030..2afd9218e9db 100644 --- a/ftp/p5-Net-FTPServer/Makefile +++ b/ftp/p5-Net-FTPServer/Makefile @@ -77,11 +77,4 @@ post-install: @${PERL} -p -e 's,PREFIX,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \ - p5-Net>=0:${PORTSDIR}/net/p5-Net -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 6f89580b4d1d..645058bd1dcf 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -60,13 +60,6 @@ PLIST_SUB+= DEVEL="" PLIST_SUB+= DEVEL="@comment " .endif -.include <bsd.port.pre.mk> - -.if ${ARCH} == "sparc64" -# -O causes an ICE in converter/other/exif.c with gcc 3.3.3 on sparc64. -CFLAGS+= -O0 -.endif - pre-configure: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ @@ -88,8 +81,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/USERDOC ${DOCSDIR}/ .endif -.if !defined(WITHOUT_PERL) && ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/p5-Geo-Proj4/Makefile b/graphics/p5-Geo-Proj4/Makefile index 17e746487257..2c41e186da98 100644 --- a/graphics/p5-Geo-Proj4/Makefile +++ b/graphics/p5-Geo-Proj4/Makefile @@ -21,10 +21,4 @@ CONFIGURE_ENV= GEOPROJ_FWTOOLS_DIR=${LOCALBASE} MAKE_ENV= INC=-I${LOCALBASE}/include PERL_CONFIGURE= yes -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/p5-GraphViz/Makefile b/graphics/p5-GraphViz/Makefile index a6525dbe20a2..e80f08d60518 100644 --- a/graphics/p5-GraphViz/Makefile +++ b/graphics/p5-GraphViz/Makefile @@ -33,10 +33,4 @@ MAN3= Devel::GraphVizProf.3 \ GraphViz::Small.3 \ GraphViz::XML.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/another-htmllint/Makefile b/japanese/another-htmllint/Makefile index ea38fb459eeb..ec6e62ceada5 100644 --- a/japanese/another-htmllint/Makefile +++ b/japanese/another-htmllint/Makefile @@ -51,12 +51,6 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500801 -JCODE= ${SITE_PERL}/${PERL_ARCH}/Jcode.pm -.else JCODE= ${SITE_PERL}/Jcode.pm -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/eijiro-fpw/Makefile b/japanese/eijiro-fpw/Makefile index 59b5d080f99e..bd4c46dafb1a 100644 --- a/japanese/eijiro-fpw/Makefile +++ b/japanese/eijiro-fpw/Makefile @@ -29,13 +29,10 @@ SRCFILE?= eijiro52.txt # For eijiro included in a book sold by ALC Inc. # (http://www.alc.co.jp/alcshop/eng/eijiro/) -.include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500801 -JCODE= ${SITE_PERL}/${PERL_ARCH}/Jcode.pm -.else JCODE= ${SITE_PERL}/Jcode.pm -.endif + +.include <bsd.port.pre.mk> DICT_ARCHIVE!= ${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE} .if exists(${DICT_ARCHIVE}) diff --git a/japanese/kcode/Makefile b/japanese/kcode/Makefile index cb94ca119966..3c3c029e9f1e 100644 --- a/japanese/kcode/Makefile +++ b/japanese/kcode/Makefile @@ -24,13 +24,7 @@ MANLANG= ja MAN1= kcode.1 MANCOMPRESSED= no -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode -.else RUN_DEPENDS= ${SITE_PERL}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode -.endif do-extract: ${MKDIR} ${WRKSRC} @@ -41,4 +35,4 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/kcode ${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/kcode.1 ${MAN1PREFIX}/man/ja/man1/ -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/mypaedia-fpw/Makefile b/japanese/mypaedia-fpw/Makefile index b6c96442a4c7..a1317be5b45c 100644 --- a/japanese/mypaedia-fpw/Makefile +++ b/japanese/mypaedia-fpw/Makefile @@ -56,12 +56,6 @@ do-install: .endfor .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500801 -JCODE= ${SITE_PERL}/${PERL_ARCH}/Jcode.pm -.else JCODE= ${SITE_PERL}/Jcode.pm -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/otojiro-fpw/Makefile b/japanese/otojiro-fpw/Makefile index 9360acb7c246..4365800a6afd 100644 --- a/japanese/otojiro-fpw/Makefile +++ b/japanese/otojiro-fpw/Makefile @@ -32,11 +32,7 @@ SRCFILE?= otojiro.txt # (http://www.alc.co.jp/alcshop/eng/eijiro/) .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500801 -JCODE= ${SITE_PERL}/${PERL_ARCH}/Jcode.pm -.else JCODE= ${SITE_PERL}/Jcode.pm -.endif DICT_ARCHIVE!= ${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE} .if exists(${DICT_ARCHIVE}) diff --git a/japanese/p5-Encode-EUCJPMS/Makefile b/japanese/p5-Encode-EUCJPMS/Makefile index 333eb82b8d19..d5761eee1810 100644 --- a/japanese/p5-Encode-EUCJPMS/Makefile +++ b/japanese/p5-Encode-EUCJPMS/Makefile @@ -10,6 +10,7 @@ PORTVERSION= 0.07 PORTREVISION= 1 CATEGORIES= japanese converters perl5 MASTER_SITES= CPAN +PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- MAINTAINER= knu@FreeBSD.org COMMENT= A Perl5 module defining Microsoft compatible encodings for Japanese @@ -19,13 +20,4 @@ PERL_CONFIGURE= yes post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> - -PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Encode.pm:${PORTSDIR}/converters/p5-Encode -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Encode.pm:${PORTSDIR}/converters/p5-Encode -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/p5-Jcode/Makefile b/japanese/p5-Jcode/Makefile index c3a9eabeace5..3a4b632ca58e 100644 --- a/japanese/p5-Jcode/Makefile +++ b/japanese/p5-Jcode/Makefile @@ -17,17 +17,5 @@ PERL_CONFIGURE= yes MAN3= Jcode.3 Jcode::Nihongo.3 .include <bsd.port.pre.mk> - PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- - -.if ${PERL_LEVEL} < 500801 -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 -MAN3+= Jcode::Unicode.3 Jcode::Unicode::Constants.3 \ - Jcode::Unicode::NoXS.3 -PLIST_SUB+= WRAPPER="@comment " REALMOD="" -.else -PLIST_SUB+= WRAPPER="" REALMOD="@comment " -.endif - .include <bsd.port.post.mk> diff --git a/japanese/p5-Jcode/pkg-plist b/japanese/p5-Jcode/pkg-plist index 34d9641de759..d6876492fc15 100644 --- a/japanese/p5-Jcode/pkg-plist +++ b/japanese/p5-Jcode/pkg-plist @@ -1,19 +1,5 @@ -%%WRAPPER%%%%SITE_PERL%%/Jcode.pm -%%WRAPPER%%%%SITE_PERL%%/Jcode/Nihongo.pod -%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode.pm -%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Constants.pm -%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/H2Z.pm -%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Nihongo.pod -%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Tr.pm -%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode.pm -%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode/Constants.pm -%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode/NoXS.pm -%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/_Classic.pm +%%SITE_PERL%%/Jcode.pm +%%SITE_PERL%%/Jcode/Nihongo.pod %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/.packlist -%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/Unicode/Unicode.bs -%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/Unicode/Unicode.so -%%REALMOD%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode -%%REALMOD%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Jcode -%%REALMOD%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/Unicode -%%WRAPPER%%@dirrm %%SITE_PERL%%/Jcode +@dirrm %%SITE_PERL%%/Jcode @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode diff --git a/japanese/p5-Lingua-JA-Regular-Unicode/Makefile b/japanese/p5-Lingua-JA-Regular-Unicode/Makefile index 7439837bc493..de6d38dd37f6 100644 --- a/japanese/p5-Lingua-JA-Regular-Unicode/Makefile +++ b/japanese/p5-Lingua-JA-Regular-Unicode/Makefile @@ -9,23 +9,15 @@ PORTNAME= Lingua-JA-Regular-Unicode PORTVERSION= 0.03 CATEGORIES= japanese perl5 MASTER_SITES= CPAN +PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- MAINTAINER= kuriyama@FreeBSD.org COMMENT= Perl extension to convert Japanese chars -#RUN_DEPENDS= BUILD_DEPENDS= p5-YAML>0:${PORTSDIR}/textproc/p5-YAML PERL_CONFIGURE= yes MAN3= Lingua::JA::Regular::Unicode.3 -.include <bsd.port.pre.mk> - -PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- - -.if ${PERL_LEVEL} < 500801 -IGNORE= older perl not supported -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/p5-Mail-SpamAssassin/Makefile b/japanese/p5-Mail-SpamAssassin/Makefile index 3297d65d5a84..71c2ec32f44b 100644 --- a/japanese/p5-Mail-SpamAssassin/Makefile +++ b/japanese/p5-Mail-SpamAssassin/Makefile @@ -292,9 +292,4 @@ post-install: .endif @${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE} -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \ - ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - .include <bsd.port.post.mk> diff --git a/japanese/srd-fpw/Makefile b/japanese/srd-fpw/Makefile index c6b5f979ec9f..86d33263310c 100644 --- a/japanese/srd-fpw/Makefile +++ b/japanese/srd-fpw/Makefile @@ -60,12 +60,6 @@ do-install: .endfor .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500801 -JCODE= ${SITE_PERL}/${PERL_ARCH}/Jcode.pm -.else JCODE= ${SITE_PERL}/Jcode.pm -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/waeijiro-fpw/Makefile b/japanese/waeijiro-fpw/Makefile index 277f1b5c33f6..a48c0beb77c0 100644 --- a/japanese/waeijiro-fpw/Makefile +++ b/japanese/waeijiro-fpw/Makefile @@ -29,14 +29,9 @@ SRCFILE?= waeiji52.txt # For eijiro included in a book sold by ALC Inc. # (http://www.alc.co.jp/alcshop/eng/eijiro/) -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500801 -JCODE= ${SITE_PERL}/${PERL_ARCH}/Jcode.pm -.else JCODE= ${SITE_PERL}/Jcode.pm -.endif +.include <bsd.port.pre.mk> DICT_ARCHIVE!= ${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE} .if exists(${DICT_ARCHIVE}) EXTRACT_DEPENDS+= lha:${PORTSDIR}/archivers/lha diff --git a/japanese/wikicker/Makefile b/japanese/wikicker/Makefile index df02c4978e59..876384d82515 100644 --- a/japanese/wikicker/Makefile +++ b/japanese/wikicker/Makefile @@ -34,13 +34,6 @@ RUN_DEPENDS+= ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \ ${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext \ - ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -.endif - .if defined(WITH_WIKICKER_RECENTLOG) RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/IPC/ShareLite.pm:${PORTSDIR}/devel/p5-IPC-ShareLite .endif @@ -52,11 +45,7 @@ RUN_DEPENDS+= ${SITE_PERL}/DB_File/Lock.pm:${PORTSDIR}/devel/p5-DB_File-Lock RUN_DEPENDS+= ${SITE_PERL}/Cache/Memcached.pm:${PORTSDIR}/databases/p5-Cache-Memcached .endif -.if ${PERL_LEVEL} < 500801 -JCODE= ${SITE_PERL}/${PERL_ARCH}/Jcode.pm -.else JCODE= ${SITE_PERL}/Jcode.pm -.endif PKGMESSAGE= ${WRKDIR}/pkg-message WIKIAUTO= ${SITE_PERL}/auto/${PORTNAME} @@ -106,4 +95,4 @@ post-install: -e 's|%%HostName%%|${HOST}|' < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/p5-Error/Makefile b/lang/p5-Error/Makefile index ee33c0c19b53..db4050f0fc54 100644 --- a/lang/p5-Error/Makefile +++ b/lang/p5-Error/Makefile @@ -14,16 +14,10 @@ PKGNAMEPREFIX= p5- MAINTAINER= pgollucci@FreeBSD.org COMMENT= Perl module to provide Error/exception support for perl: Error +MAKE_JOBS_SAFE= yes + PERL_CONFIGURE= YES MAN3= Error.3 Error::Simple.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils - -MAKE_JOBS_SAFE= yes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/p5-Switch/Makefile b/lang/p5-Switch/Makefile index ae08931ed9bb..39d0441def1f 100644 --- a/lang/p5-Switch/Makefile +++ b/lang/p5-Switch/Makefile @@ -23,11 +23,4 @@ PERL_CONFIGURE= yes MAN3= Switch.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -BUILD_DEPENDS+= p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced -RUN_DEPENDS+= p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/fetchyahoo/Makefile b/mail/fetchyahoo/Makefile index 4a007e9a6865..916de293a96f 100644 --- a/mail/fetchyahoo/Makefile +++ b/mail/fetchyahoo/Makefile @@ -31,12 +31,6 @@ PORTDOCS= COPYING ChangeLog Credits INSTALL TODO index.html NO_BUILD= yes USE_PERL5= yes -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/Net/Cmd.pm:${PORTSDIR}/net/p5-Net -.endif - do-install: @${INSTALL_SCRIPT} ${WRKSRC}/fetchyahoo ${PREFIX}/bin @${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1 @@ -49,4 +43,4 @@ do-install: .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/openwebmail/Makefile b/mail/openwebmail/Makefile index c06c377a13ef..4577256b54f3 100644 --- a/mail/openwebmail/Makefile +++ b/mail/openwebmail/Makefile @@ -62,12 +62,6 @@ WITH_SPEEDYCGI= yes .endif # exists(${PERL}) .endif # perl5.8 -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net -.endif - .if defined(WITH_LEARNSPAM) || defined(WITH_SPAMCHECK_ALL) WITH_SPAMCHECK= true .endif diff --git a/mail/p5-Email-MIME/Makefile b/mail/p5-Email-MIME/Makefile index d4c30879edf1..e5f8dbef915c 100644 --- a/mail/p5-Email-MIME/Makefile +++ b/mail/p5-Email-MIME/Makefile @@ -14,23 +14,16 @@ PKGNAMEPREFIX= p5- MAINTAINER= lth@FreeBSD.org COMMENT= Easy MIME message parsing -RUN_DEPENDS= p5-Email-Simple>=2.00.4:${PORTSDIR}/mail/p5-Email-Simple \ +BUILD_DEPENDS= p5-Email-Simple>=2.00.4:${PORTSDIR}/mail/p5-Email-Simple \ p5-Email-MIME-Encodings>=1.3:${PORTSDIR}/mail/p5-Email-MIME-Encodings \ p5-Email-MIME-ContentType>=1.01.1:${PORTSDIR}/mail/p5-Email-MIME-ContentType \ - p5-MIME-Types>=1.13:${PORTSDIR}/mail/p5-MIME-Types -BUILD_DEPENDS= ${RUN_DEPENDS} + p5-MIME-Types>=1.13:${PORTSDIR}/mail/p5-MIME-Types \ + p5-Encode>=1.98.1:${PORTSDIR}/converters/p5-Encode +RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes MAN3= Email::MIME.3 \ Email::MIME::Header.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-MIME-Tools>=5.404:${PORTSDIR}/mail/p5-MIME-Tools -.else -RUN_DEPENDS+= p5-Encode>=1.98.1:${PORTSDIR}/converters/p5-Encode -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/p5-IMAP-Client/Makefile b/mail/p5-IMAP-Client/Makefile index a2bd353efdd4..16e40ccb8def 100644 --- a/mail/p5-IMAP-Client/Makefile +++ b/mail/p5-IMAP-Client/Makefile @@ -22,10 +22,4 @@ PERL_CONFIGURE= yes MAN3= IMAP::Client.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/p5-MIME-EncWords/Makefile b/mail/p5-MIME-EncWords/Makefile index 916b65a1249d..c16d907547ad 100644 --- a/mail/p5-MIME-EncWords/Makefile +++ b/mail/p5-MIME-EncWords/Makefile @@ -21,10 +21,4 @@ PERL_CONFIGURE= yes MAN3= MIME::EncWords.3 MIME::EncWords::JA_JP.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500801 -RUN_DEPENDS+= p5-MIME-Base64>=2.13:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/p5-MIME-Lite/Makefile b/mail/p5-MIME-Lite/Makefile index 83e335a5799f..d74ed3ee8496 100644 --- a/mail/p5-MIME-Lite/Makefile +++ b/mail/p5-MIME-Lite/Makefile @@ -24,13 +24,7 @@ PERL_CONFIGURE= YES MAN3= MIME::Lite.3 MIME::changes.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - post-extract: @${PERL} -i -ne 'print unless m,^#-, .. m,;$$, or m,^if, .. m,^},' ${WRKSRC}/Makefile.PL -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/p5-MIME-Tools/Makefile b/mail/p5-MIME-Tools/Makefile index 4871d8d40ec3..b1f71d5cebab 100644 --- a/mail/p5-MIME-Tools/Makefile +++ b/mail/p5-MIME-Tools/Makefile @@ -58,14 +58,6 @@ post-install: .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500801 -RUN_DEPENDS+= p5-MIME-Base64>=2.2:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.if ${PERL_LEVEL} < 500703 -BUILD_DEPENDS+= p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 -.endif - .if ${PERL_LEVEL} < 500905 RUN_DEPENDS+= p5-File-Temp>=0.18:${PORTSDIR}/devel/p5-File-Temp .endif diff --git a/mail/p5-Mail-DKIM/Makefile b/mail/p5-Mail-DKIM/Makefile index d90a15f7bd98..ada60e7693c2 100644 --- a/mail/p5-Mail-DKIM/Makefile +++ b/mail/p5-Mail-DKIM/Makefile @@ -44,10 +44,4 @@ MAN3= Mail::DKIM.3 \ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/dkim*.pl ${PREFIX}/bin -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/p5-Mail-DomainKeys/Makefile b/mail/p5-Mail-DomainKeys/Makefile index c0affec5af6a..18c681e83a9d 100644 --- a/mail/p5-Mail-DomainKeys/Makefile +++ b/mail/p5-Mail-DomainKeys/Makefile @@ -23,13 +23,7 @@ PERL_CONFIGURE= yes MAN3= Mail::DomainKeys.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - post-patch: @${PERL} -pi -e '$$_="" if $$.>=6 && $$.<=38' ${WRKSRC}/Makefile.PL -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/p5-Mail-IMAPClient/Makefile b/mail/p5-Mail-IMAPClient/Makefile index 991304c29ce6..c759d8c92956 100644 --- a/mail/p5-Mail-IMAPClient/Makefile +++ b/mail/p5-Mail-IMAPClient/Makefile @@ -26,13 +26,4 @@ MAN3= Mail::IMAPClient.3 \ Mail::IMAPClient::MessageSet.3 \ Mail::IMAPClient::Thread.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \ - p5-IO>=1.26:${PORTSDIR}/devel/p5-IO \ - p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \ - p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/p5-Mail-Sender/Makefile b/mail/p5-Mail-Sender/Makefile index b7d92e7b1642..40dced262ed4 100644 --- a/mail/p5-Mail-Sender/Makefile +++ b/mail/p5-Mail-Sender/Makefile @@ -18,16 +18,9 @@ PERL_CONFIGURE= yes MAN3= Mail::Sender.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 -RUN_DEPENDS= ${BUILD_DEPENDS} -.endif - post-patch: .if defined(BATCH) @${PERL} -pi -e 's/res = <STDIN>;/res = "N";/' ${WRKSRC}/Config.PL .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index 5812f2861e4f..b587d900fe4d 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -273,9 +273,4 @@ post-install: .endif @${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE} -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \ - ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - .include <bsd.port.post.mk> diff --git a/mail/p5-Net-SMTP-Server/Makefile b/mail/p5-Net-SMTP-Server/Makefile index 61cb9191cd1b..506358605bc8 100644 --- a/mail/p5-Net-SMTP-Server/Makefile +++ b/mail/p5-Net-SMTP-Server/Makefile @@ -26,11 +26,4 @@ MAN3= Net::SMTP::Server.3 \ Net::SMTP::Server::Client.3 \ Net::SMTP::Server::Relay.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net -RUN_DEPENDS+= ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/p5-Net-SMTP-TLS/Makefile b/mail/p5-Net-SMTP-TLS/Makefile index 7807df8a5ec1..9c30f5ed1712 100644 --- a/mail/p5-Net-SMTP-TLS/Makefile +++ b/mail/p5-Net-SMTP-TLS/Makefile @@ -23,10 +23,4 @@ PERL_CONFIGURE= yes MAN3= Net::SMTP::TLS.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/p5-Net-SMTP_auth/Makefile b/mail/p5-Net-SMTP_auth/Makefile index 22f82ff44919..c3efc9faed75 100644 --- a/mail/p5-Net-SMTP_auth/Makefile +++ b/mail/p5-Net-SMTP_auth/Makefile @@ -22,11 +22,4 @@ PERL_CONFIGURE= yes MAN3= Net::SMTP_auth.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net -RUN_DEPENDS+= ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/razor-agents/Makefile b/mail/razor-agents/Makefile index 61c0594198c4..3924c33b1048 100644 --- a/mail/razor-agents/Makefile +++ b/mail/razor-agents/Makefile @@ -34,10 +34,4 @@ post-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e 's|/etc/razor|${PREFIX}/etc|g' @${PERL} -pi -e 's,share/man,man,g' ${WRKSRC}/${CONFIGURE_SCRIPT} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/mc/Makefile b/misc/mc/Makefile index 5de6b43ea0a1..e6fa1291aeef 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -103,12 +103,6 @@ CONFIGURE_ARGS+=--with-screen=mcslang CONFIGURE_ARGS+=--without-subshell .endif -.if defined(WITH_PERL_MODULES) || !(defined(WITHOUT_PERL_MODULES) || defined(MINIMAL)) -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif -.endif - MAN1= mc.1 mcedit.1 mcview.1 _MAN1= mc.1 .for lang in ${_MANLANG} diff --git a/misc/p5-Acme-ButFirst/Makefile b/misc/p5-Acme-ButFirst/Makefile index 493ab8f72282..0558fefa6ede 100644 --- a/misc/p5-Acme-ButFirst/Makefile +++ b/misc/p5-Acme-ButFirst/Makefile @@ -18,10 +18,4 @@ MAN3= Acme::ButFirst.3 PERL_CONFIGURE= yes -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/Filter/Simple.pm:${PORTSDIR}/textproc/p5-Filter-Simple -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/p5-Geo-Coder-Google/Makefile b/misc/p5-Geo-Coder-Google/Makefile index 582e9bb7efc9..ee476d90afaa 100644 --- a/misc/p5-Geo-Coder-Google/Makefile +++ b/misc/p5-Geo-Coder-Google/Makefile @@ -26,10 +26,4 @@ MAN3= Geo::Coder::Google.3 post-patch: @${REINPLACE_CMD} -e 's/-122.397323/-122.397711/' ${WRKSRC}/t/01_live.t -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Encode>=0:${PORTSDIR}/converters/p5-Encode -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile index 41880ba2a158..a228bafe382c 100644 --- a/net-im/libpurple/Makefile +++ b/net-im/libpurple/Makefile @@ -183,7 +183,7 @@ CONFIGURE_ARGS+= --disable-dbus PLIST_SUB+= DBUS="@comment not installed: " .endif -.if defined(WITH_PERL) && ${PERL_LEVEL} >= 500800 +.if defined(WITH_PERL) USE_PERL5= yes CONFIGURE_ARGS+= --with-perl-lib=site PLIST_SUB+= PERL:="" @@ -293,9 +293,6 @@ PLIST_SUB+= ZEPHYR="@comment not installed: " .endif pre-everything:: -.if defined(WITH_PERL) && ${PERL_LEVEL} < 500800 - @${ECHO_MSG} "WARNING: Perl scripting disabled (Perl 5.8 requirement not met)." -.endif .if defined(WITHOUT_GNUTLS) && defined(WITHOUT_NSS) @${ECHO_MSG} "WARNING: In order to use MSN, you must enable the GNUTLS and/or NSS options." .endif diff --git a/net-im/p5-Jabber-Lite/Makefile b/net-im/p5-Jabber-Lite/Makefile index b7dc53ea7b18..bcaac5501ce2 100644 --- a/net-im/p5-Jabber-Lite/Makefile +++ b/net-im/p5-Jabber-Lite/Makefile @@ -23,11 +23,4 @@ PERL_CONFIGURE= yes MAN3= Jabber::Lite.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \ - ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/p5-Net-OSCAR/Makefile b/net-im/p5-Net-OSCAR/Makefile index ca17c68da648..706925e60a09 100644 --- a/net-im/p5-Net-OSCAR/Makefile +++ b/net-im/p5-Net-OSCAR/Makefile @@ -33,13 +33,4 @@ MAN3= Net::OSCAR.3 \ Net::OSCAR::XML.3 \ Net::OSCAR::_BLInternal.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/p5-Net-XMPP2/Makefile b/net-im/p5-Net-XMPP2/Makefile index a7a1c0d3fdb8..fe8203efdb05 100644 --- a/net-im/p5-Net-XMPP2/Makefile +++ b/net-im/p5-Net-XMPP2/Makefile @@ -76,10 +76,4 @@ MAN3= Net::XMPP2.3 \ Net::XMPP2::Util.3 \ Net::XMPP2::Writer.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/vicq/Makefile b/net-im/vicq/Makefile index 3137b191d01c..7f7383ba757b 100644 --- a/net-im/vicq/Makefile +++ b/net-im/vicq/Makefile @@ -21,23 +21,19 @@ WRKSRC= ${WRKDIR}/${PORTNAME} PERL_CONFIGURE= yes +SIGNAL_PATCH=p5.8-patch-sigalrm post-extract: ${MV} ${WRKSRC}/Net/vICQ/* ${WRKSRC} ${RM} ${WRKSRC}/install.pl +post-patch: + @${ECHO_MSG} "===> Applying patch ${SIGNAL_PATCH} for ${PKGNAME}" + @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/${SIGNAL_PATCH} + post-install: ${INSTALL_SCRIPT} ${WRKSRC}/vicq ${PREFIX}/bin ${MKDIR} ${PREFIX}/share/examples/vicq ${INSTALL_DATA} ${WRKSRC}/vicqrc.example ${PREFIX}/share/examples/vicq -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} >= 500800 -SIGNAL_PATCH=p5.8-patch-sigalrm -post-patch: - @${ECHO_MSG} "===> Applying patch ${SIGNAL_PATCH} for ${PKGNAME}" - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/${SIGNAL_PATCH} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/nagiostat/Makefile b/net-mgmt/nagiostat/Makefile index 8354cec128d0..0b184a78738d 100644 --- a/net-mgmt/nagiostat/Makefile +++ b/net-mgmt/nagiostat/Makefile @@ -54,10 +54,4 @@ post-install: .endfor .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/p5-Cisco-Reconfig/Makefile b/net-mgmt/p5-Cisco-Reconfig/Makefile index 85349b7eca7c..062476ed330a 100644 --- a/net-mgmt/p5-Cisco-Reconfig/Makefile +++ b/net-mgmt/p5-Cisco-Reconfig/Makefile @@ -21,10 +21,4 @@ PERL_CONFIGURE= yes MAN3= Cisco::Reconfig.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500702 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/p5-Net-ACL/Makefile b/net-mgmt/p5-Net-ACL/Makefile index 23b73712f41c..6fd399b3e1b8 100644 --- a/net-mgmt/p5-Net-ACL/Makefile +++ b/net-mgmt/p5-Net-ACL/Makefile @@ -32,10 +32,4 @@ MAN3= Net::ACL.3 Net::ACL::Bootstrap.3 Net::ACL::File.3 \ Net::ACL::Rule.3 Net::ACL::Set.3 Net::ACL::Set::Add.3 \ Net::ACL::Set::Scalar.3 Net::ACL::Set::Union.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/List/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/p5-Net-SNMP/Makefile b/net-mgmt/p5-Net-SNMP/Makefile index 397e3d256141..493f272b61d1 100644 --- a/net-mgmt/p5-Net-SNMP/Makefile +++ b/net-mgmt/p5-Net-SNMP/Makefile @@ -26,10 +26,4 @@ CONFLICTS= p5-Net-SNMP3-[0-9]* MAN1= snmpkey.1 MAN3= Net::SNMP.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${ARCH_PERL}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/p5-NetAddr-IP/Makefile b/net-mgmt/p5-NetAddr-IP/Makefile index 0b5cd1301bff..ae46157546cb 100644 --- a/net-mgmt/p5-NetAddr-IP/Makefile +++ b/net-mgmt/p5-NetAddr-IP/Makefile @@ -22,14 +22,7 @@ MAN3= NetAddr::IP.3 \ NetAddr::IP::Util.3 \ NetAddr::IP::UtilPP.3 -.include <bsd.port.pre.mk> - post-patch: ${PERL} -ni -e 'print unless /^=head1/../^=cut/' ${WRKSRC}/Lite/Util/Makefile.PL -.if ${PERL_LEVEL} < 500700 -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -RUN_DEPENDS= ${BUILD_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-p2p/p5-Net-BitTorrent/Makefile b/net-p2p/p5-Net-BitTorrent/Makefile index 7c955d21780d..15efdbaf6c42 100644 --- a/net-p2p/p5-Net-BitTorrent/Makefile +++ b/net-p2p/p5-Net-BitTorrent/Makefile @@ -37,10 +37,4 @@ MAN3= Net::BitTorrent.3 \ Net::BitTorrent::Util.3 \ Net::BitTorrent::Version.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/lam/Makefile b/net/lam/Makefile index b9756cb09b5e..9421eb6e8629 100644 --- a/net/lam/Makefile +++ b/net/lam/Makefile @@ -372,11 +372,6 @@ MAN7= LAM.7 \ .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - .if ${ARCH} == "i386" PLIST_SUB+= I386="" .else diff --git a/net/p5-Amazon-SQS-Simple/Makefile b/net/p5-Amazon-SQS-Simple/Makefile index 414a338a49a4..8718fd7b3ea2 100644 --- a/net/p5-Amazon-SQS-Simple/Makefile +++ b/net/p5-Amazon-SQS-Simple/Makefile @@ -31,13 +31,7 @@ MAN3= Amazon::SQS::Simple::Message.3 \ SUB_FILES= pkg-message -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-File-Rsync/Makefile b/net/p5-File-Rsync/Makefile index de116a32c950..2a9303da12d8 100644 --- a/net/p5-File-Rsync/Makefile +++ b/net/p5-File-Rsync/Makefile @@ -25,8 +25,4 @@ MAN3= File::Rsync.3 post-patch: @${REINPLACE_CMD} -e "s,<STDIN>,'${LOCALBASE}/bin/rsync'," ${WRKSRC}/makepm.PL -.include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-Net-Address-Ethernet/Makefile b/net/p5-Net-Address-Ethernet/Makefile index 55fd2f4c8855..10888848accc 100644 --- a/net/p5-Net-Address-Ethernet/Makefile +++ b/net/p5-Net-Address-Ethernet/Makefile @@ -21,10 +21,4 @@ PERL_CONFIGURE= yes MAN3= Net::Address::Ethernet.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500702 -RUN_DEPENDS+= ${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-Net-Amazon-S3/Makefile b/net/p5-Net-Amazon-S3/Makefile index 304cfff5e717..23c2df79823b 100644 --- a/net/p5-Net-Amazon-S3/Makefile +++ b/net/p5-Net-Amazon-S3/Makefile @@ -52,11 +52,6 @@ MAN3= Net::Amazon::S3.3 Net::Amazon::S3::Bucket.3 \ .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \ - p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - .if ${PERL_LEVEL} < 500904 RUN_DEPENDS+= p5-IO>=1.14:${PORTSDIR}/devel/p5-IO .endif diff --git a/net/p5-Net-CSTA/Makefile b/net/p5-Net-CSTA/Makefile index 6723d6b4499b..381656d0654b 100644 --- a/net/p5-Net-CSTA/Makefile +++ b/net/p5-Net-CSTA/Makefile @@ -21,10 +21,4 @@ PERL_CONFIGURE= yes MAN3= Net::CSTA.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= ${SITE_PERL}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-Net-DAV-Server/Makefile b/net/p5-Net-DAV-Server/Makefile index 07c94da6e541..d9b87cf9855c 100644 --- a/net/p5-Net-DAV-Server/Makefile +++ b/net/p5-Net-DAV-Server/Makefile @@ -29,14 +29,4 @@ PERL_CONFIGURE= yes MAN3= Net::DAV::Server.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} == 500701 -RUN_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -.endif - -.if ${PERL_LEVEL} < 500701 -RUN_DEPENDS+= ${SITE_PERL}/Encode.pm:${PORTSDIR}/converters/p5-Encode -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-Net-FTP-File/Makefile b/net/p5-Net-FTP-File/Makefile index 2eb4f4001a4d..a821af696cec 100644 --- a/net/p5-Net-FTP-File/Makefile +++ b/net/p5-Net-FTP-File/Makefile @@ -19,11 +19,4 @@ MAN3= Net::FTP::File.3 PERL_CONFIGURE= yes -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -BUILD_DEPENDS+= p5-Net>=0:${PORTSDIR}/net/p5-Net -RUN_DEPENDS+= p5-Net>=0:${PORTSDIR}/net/p5-Net -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-Net-Frame-Dump/Makefile b/net/p5-Net-Frame-Dump/Makefile index 9d5b06cf818f..555024c99047 100644 --- a/net/p5-Net-Frame-Dump/Makefile +++ b/net/p5-Net-Frame-Dump/Makefile @@ -27,10 +27,4 @@ MAN3= Net::Frame::Dump.3 \ Net::Frame::Dump::Online.3 \ Net::Frame::Dump::Writer.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-Net-Radius/Makefile b/net/p5-Net-Radius/Makefile index 4e844955f911..1a1c06d66dc2 100644 --- a/net/p5-Net-Radius/Makefile +++ b/net/p5-Net-Radius/Makefile @@ -20,11 +20,4 @@ MAN3= Net::Radius::Dictionary.3 Net::Radius::Packet.3 post-extract: ${FIND} ${WRKDIR} -type f | ${XARGS} ${PERL5} -pi -e "s:\r::g" -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -BUILD_DEPENDS= ${RUN_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-Net-SNPP/Makefile b/net/p5-Net-SNPP/Makefile index 291ba04f80cb..bda56850d09e 100644 --- a/net/p5-Net-SNPP/Makefile +++ b/net/p5-Net-SNPP/Makefile @@ -24,11 +24,4 @@ post-patch: ${WRKSRC}/lib/Net/SNPP/Server.pm @${RM} ${WRKSRC}/lib/Net/SNPP/Server.pm.orig -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS= ${SITE_PERL}/Net/Cmd.pm:${PORTSDIR}/net/p5-Net -RUN_DEPENDS= ${BUILD_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-Net-Whois-ARIN/Makefile b/net/p5-Net-Whois-ARIN/Makefile index 05d36f113f6e..0db6b7d3b6fe 100644 --- a/net/p5-Net-Whois-ARIN/Makefile +++ b/net/p5-Net-Whois-ARIN/Makefile @@ -23,13 +23,4 @@ MAN3= Net::Whois::ARIN.3 \ PERL_CONFIGURE= yes -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= p5-Scalar-List-Utils>0:${PORTSDIR}/lang/p5-Scalar-List-Utils \ - p5-UNIVERSAL-isa>=0:${PORTSDIR}/devel/p5-UNIVERSAL-isa \ - p5-UNIVERSAL-can>=0:${PORTSDIR}/devel/p5-UNIVERSAL-can -RUN_DEPENDS= ${BUILD_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile index 91f538a2a307..625881df8d4d 100644 --- a/net/p5-Net/Makefile +++ b/net/p5-Net/Makefile @@ -32,11 +32,4 @@ MAN3= Net::Cmd.3 \ Net::Time.3 \ Net::libnetFAQ.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \ - p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-POE-Component-Client-Traceroute/Makefile b/net/p5-POE-Component-Client-Traceroute/Makefile index edde64a79d86..4dea57dcfab4 100644 --- a/net/p5-POE-Component-Client-Traceroute/Makefile +++ b/net/p5-POE-Component-Client-Traceroute/Makefile @@ -28,10 +28,4 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${EXAMPLESDIR} .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500702 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-POE-Component-Jabber/Makefile b/net/p5-POE-Component-Jabber/Makefile index 04756b888ade..d74e6a8ba279 100644 --- a/net/p5-POE-Component-Jabber/Makefile +++ b/net/p5-POE-Component-Jabber/Makefile @@ -46,11 +46,4 @@ post-install: @${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${EXAMPLESDIR} .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \ - p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile index 4fe616dfc97b..e819ecec02f3 100644 --- a/net/p5-PlRPC/Makefile +++ b/net/p5-PlRPC/Makefile @@ -28,10 +28,4 @@ MAN3= Bundle::PlRPC.3 \ post-patch: @${FIND} ${WRKSRC} -name ".svn" | ${XARGS} ${RM} -rf -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-URI/Makefile b/net/p5-URI/Makefile index 91ceafbd206a..e15ca172d187 100644 --- a/net/p5-URI/Makefile +++ b/net/p5-URI/Makefile @@ -27,10 +27,4 @@ MAN3= URI.3 \ URI::file.3 \ URI::ldap.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-MIME-Base64>=2:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-What/Makefile b/net/p5-What/Makefile index 252dcdf8ed46..45d20decf3c5 100644 --- a/net/p5-What/Makefile +++ b/net/p5-What/Makefile @@ -24,10 +24,4 @@ PERL_CONFIGURE= yes MAN3= What.3 What::MTA.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500702 -BUILD_DEPENDS+= ${SITE_PERL}/Net/Cmd.pm:${PORTSDIR}/net/p5-Net -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-XML-Compile-SOAP/Makefile b/net/p5-XML-Compile-SOAP/Makefile index 00e8f6aca5d0..7eb8686283b5 100644 --- a/net/p5-XML-Compile-SOAP/Makefile +++ b/net/p5-XML-Compile-SOAP/Makefile @@ -34,10 +34,4 @@ MAN3= XML::Compile::SOAP.3 \ XML::Compile::Transport::SOAPHTTP.3 XML::Compile::WSDL11.3 \ XML::Compile::XOP.3 XML::Compile::XOP::Include.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500702 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/p5-perl-ldap/Makefile b/net/p5-perl-ldap/Makefile index d4f2b7f40f54..840939c98ff4 100644 --- a/net/p5-perl-ldap/Makefile +++ b/net/p5-perl-ldap/Makefile @@ -66,10 +66,4 @@ MAN3= Bundle::Net::LDAP.3 \ Net::LDAPI.3 \ Net::LDAPS.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/rude/Makefile b/net/rude/Makefile index babc409484c6..ca06e97f350a 100644 --- a/net/rude/Makefile +++ b/net/rude/Makefile @@ -39,10 +39,4 @@ post-install: .endfor .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/news/cleanfeed/Makefile b/news/cleanfeed/Makefile index f2d82998277c..bc980d702732 100644 --- a/news/cleanfeed/Makefile +++ b/news/cleanfeed/Makefile @@ -25,12 +25,6 @@ SHAREGRP= news INSTALL+= -b PKGDEINSTALL= ${PKGINSTALL} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -.endif - post-patch: @${REINPLACE_CMD} -e 's,/news,${PREFIX}/news,g' ${WRKSRC}/cleanfeed* @@ -42,4 +36,4 @@ do-install: post-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/news/p5-NNML/Makefile b/news/p5-NNML/Makefile index 75f96ae6d675..e7eab997e564 100644 --- a/news/p5-NNML/Makefile +++ b/news/p5-NNML/Makefile @@ -21,17 +21,10 @@ RESTRICTED= License unknown MAN1= nnmirror.1 nnsync.1 overview.1 MAN3= NNML::Server.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500702 -BUILD_DEPENDS= ${SITE_PERL}/Net/Cmd.pm:${PORTSDIR}/net/p5-Net -RUN_DEPENDS= ${BUILD_DEPENDS} -.endif - .if defined(BATCH) CONFIGURE_ARGS+= < /dev/null .else IS_INTERACTIVE= yes .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile index 43e0eeee009b..a9ba14f72bd7 100644 --- a/print/muttprint/Makefile +++ b/print/muttprint/Makefile @@ -32,15 +32,8 @@ RUN_DEPENDS+= cupstestppd:${PORTSDIR}/print/cups-base \ espgs:${PORTSDIR}/print/cups-pstoraster .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -PLIST_SUB+= LANGINFO="" -.else NO_BUILD= yes PLIST_SUB+= LANGINFO="@comment " -.endif REINPLACE_ARGS= -i "" USE_GMAKE= yes @@ -90,4 +83,4 @@ post-patch: .endif @${GZIP_CMD} ${WRKSRC}/doc/manpages/*/muttprint.1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/science/p5-Chemistry-Elements/Makefile b/science/p5-Chemistry-Elements/Makefile index 34eb611b248b..8ccaeafc3078 100644 --- a/science/p5-Chemistry-Elements/Makefile +++ b/science/p5-Chemistry-Elements/Makefile @@ -18,10 +18,4 @@ PERL_CONFIGURE= yes MAN3= Chemistry::Elements.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Authen-Krb5/Makefile b/security/p5-Authen-Krb5/Makefile index 58dbc61fbc17..35f231901251 100644 --- a/security/p5-Authen-Krb5/Makefile +++ b/security/p5-Authen-Krb5/Makefile @@ -21,12 +21,7 @@ PERL_CONFIGURE= yes MAN3= Authen::Krb5.3 -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},g' ${WRKSRC}/Makefile.PL -.if ${PERL_LEVEL} < 500800 - @${REINPLACE_CMD} -e 's,const char,char,g' ${WRKSRC}/Krb5.xs -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Authen-NTLM/Makefile b/security/p5-Authen-NTLM/Makefile index 10de37dac5cd..f329ee4617aa 100644 --- a/security/p5-Authen-NTLM/Makefile +++ b/security/p5-Authen-NTLM/Makefile @@ -21,10 +21,4 @@ PERL_CONFIGURE= yes MAN3= Authen::NTLM.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Authen-Radius/Makefile b/security/p5-Authen-Radius/Makefile index 16af5dc5060d..919c39693a0e 100644 --- a/security/p5-Authen-Radius/Makefile +++ b/security/p5-Authen-Radius/Makefile @@ -34,8 +34,6 @@ RADDBFILES= dictionary \ dictionary.versanet \ dictionary.xtradius -.include <bsd.port.pre.mk> - pre-configure: @${RM} ${WRKSRC}/install-radius-db.PL @${PERL} -pi -e 's|/etc/raddb|${DATADIR}|' ${WRKSRC}/Radius.pm @@ -46,9 +44,4 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/raddb/${FILE} ${DATADIR}/${FILE} .endfor -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Authen-SASL/Makefile b/security/p5-Authen-SASL/Makefile index fb7b2019608d..4a3017f64585 100644 --- a/security/p5-Authen-SASL/Makefile +++ b/security/p5-Authen-SASL/Makefile @@ -31,14 +31,8 @@ MAN3+= Authen::SASL::Perl::GSSAPI.3 MAN3+= Authen::SASL::Perl::LOGIN.3 MAN3+= Authen::SASL::Perl::PLAIN.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 -.endif - .if !defined(WITHOUT_KERBEROS) RUN_DEPENDS+= p5-GSSAPI>0:${PORTSDIR}/security/p5-GSSAPI .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Crypt-AppleTwoFish/Makefile b/security/p5-Crypt-AppleTwoFish/Makefile index dc71a39dfa7d..eb60bc9fd488 100644 --- a/security/p5-Crypt-AppleTwoFish/Makefile +++ b/security/p5-Crypt-AppleTwoFish/Makefile @@ -16,12 +16,4 @@ PERL_CONFIGURE= yes MAN3= Crypt::AppleTwoFish.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -post-patch: - ${PERL} -pi -e '$$_="" if m{5.008|warnings}' ${WRKSRC}/t/*.t \ - ${WRKSRC}/lib/Crypt/AppleTwoFish.pm ${WRKSRC}/${CONFIGURE_SCRIPT} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Crypt-CBC/Makefile b/security/p5-Crypt-CBC/Makefile index e77d407985d5..04d399c35690 100644 --- a/security/p5-Crypt-CBC/Makefile +++ b/security/p5-Crypt-CBC/Makefile @@ -18,10 +18,4 @@ PERL_CONFIGURE= yes MAN3= Crypt::CBC.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS= p5-Digest-MD5>=2.00:${PORTSDIR}/security/p5-Digest-MD5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Crypt-DH/Makefile b/security/p5-Crypt-DH/Makefile index f598dbfb02c0..27869202377c 100644 --- a/security/p5-Crypt-DH/Makefile +++ b/security/p5-Crypt-DH/Makefile @@ -23,11 +23,4 @@ PLIST_DIRS= %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DH \ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt \ %%SITE_PERL%%/Crypt -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS= ${SITE_PERL}/Math/BigInt.pm:${PORTSDIR}/math/p5-Math-BigInt -RUN_DEPENDS= ${BUILD_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Crypt-HCE_SHA/Makefile b/security/p5-Crypt-HCE_SHA/Makefile index a13e99c04c66..94d4e22eb7cd 100644 --- a/security/p5-Crypt-HCE_SHA/Makefile +++ b/security/p5-Crypt-HCE_SHA/Makefile @@ -21,11 +21,4 @@ PERL_CONFIGURE= yes MAN3= Crypt::HCE_SHA.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Crypt-OpenPGP/Makefile b/security/p5-Crypt-OpenPGP/Makefile index 3a4911c57331..58417ef0e8ea 100644 --- a/security/p5-Crypt-OpenPGP/Makefile +++ b/security/p5-Crypt-OpenPGP/Makefile @@ -55,14 +55,4 @@ MAN3= Crypt::OpenPGP::ErrorHandler.3 Crypt::OpenPGP::Key.3 \ post-patch: @${RM} -f ${WRKSRC}/lib/Crypt/OpenPGP/Ciphertext.pm.orig -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -DEPENDS_56= p5-Scalar-List-Utils>0:${PORTSDIR}/lang/p5-Scalar-List-Utils \ - p5-MIME-Base64>0:${PORTSDIR}/converters/p5-MIME-Base64 \ - p5-Digest-MD5>0:${PORTSDIR}/security/p5-Digest-MD5 -BUILD_DEPENDS+= ${DEPENDS_56} -RUN_DEPENDS+= ${DEPENDS_56} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Crypt-RSA/Makefile b/security/p5-Crypt-RSA/Makefile index 7ce37ec3f58b..28bef5c77dd8 100644 --- a/security/p5-Crypt-RSA/Makefile +++ b/security/p5-Crypt-RSA/Makefile @@ -43,11 +43,4 @@ MAN3= Crypt::RSA.3 \ Crypt::RSA::SS::PKCS1v15.3 \ Crypt::RSA::SS::PSS.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \ - p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Crypt-SSLeay/Makefile b/security/p5-Crypt-SSLeay/Makefile index ee8d6a598b76..c7e86bed5c29 100644 --- a/security/p5-Crypt-SSLeay/Makefile +++ b/security/p5-Crypt-SSLeay/Makefile @@ -23,11 +23,4 @@ USE_OPENSSL= yes MAN3= Crypt::SSLeay.3 Net::SSL.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Digest-HMAC/Makefile b/security/p5-Digest-HMAC/Makefile index bba749235cce..3b941c73fdae 100644 --- a/security/p5-Digest-HMAC/Makefile +++ b/security/p5-Digest-HMAC/Makefile @@ -23,10 +23,4 @@ MAN3= Digest::HMAC.3 \ Digest::HMAC_MD5.3 \ Digest::HMAC_SHA1.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Digest-MD5-File/Makefile b/security/p5-Digest-MD5-File/Makefile index e9e777c245b4..9683b17454fa 100644 --- a/security/p5-Digest-MD5-File/Makefile +++ b/security/p5-Digest-MD5-File/Makefile @@ -18,10 +18,4 @@ PERL_CONFIGURE= yes MAN3= Digest::MD5::File.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Digest-SHA-PurePerl/Makefile b/security/p5-Digest-SHA-PurePerl/Makefile index 43f586ca6aa8..d77c0210d50c 100644 --- a/security/p5-Digest-SHA-PurePerl/Makefile +++ b/security/p5-Digest-SHA-PurePerl/Makefile @@ -18,10 +18,6 @@ MAN3= Digest::SHA::PurePerl.3 .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - .if ${PERL_LEVEL} < 500803 RUN_DEPENDS+= ${SITE_PERL}/Digest/base.pm:${PORTSDIR}/security/p5-Digest .endif diff --git a/security/p5-Digest/Makefile b/security/p5-Digest/Makefile index 020c3a777ec0..9c4346fbf4c7 100644 --- a/security/p5-Digest/Makefile +++ b/security/p5-Digest/Makefile @@ -18,10 +18,4 @@ PERL_CONFIGURE= yes MAN3= Digest.3 Digest::base.3 Digest::file.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-IO-Socket-SSL/Makefile b/security/p5-IO-Socket-SSL/Makefile index 419885768118..55bb5d1e2c0d 100644 --- a/security/p5-IO-Socket-SSL/Makefile +++ b/security/p5-IO-Socket-SSL/Makefile @@ -30,14 +30,8 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/example/* ${EXAMPLESDIR} .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - .if defined(WITH_IDN) RUN_DEPENDS+= p5-Net-LibIDN>=0:${PORTSDIR}/dns/p5-Net-LibIDN .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-MD5/Makefile b/security/p5-MD5/Makefile index 968f3aa604c6..dba75d05bda3 100644 --- a/security/p5-MD5/Makefile +++ b/security/p5-MD5/Makefile @@ -19,10 +19,4 @@ PERL_CONFIGURE= yes MAN3= MD5.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/swatch/Makefile b/security/swatch/Makefile index e41f19b35f54..bf14709cc3c8 100644 --- a/security/swatch/Makefile +++ b/security/swatch/Makefile @@ -19,6 +19,7 @@ BUILD_DEPENDS= ${BUILD_DEPENDS_56} \ ${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \ ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \ ${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc +RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes CONFIGURE_ARGS= INSTALLMAN1DIR=${PREFIX}/man/man1 @@ -37,12 +38,4 @@ post-patch: post-install: ${INSTALL_SCRIPT} ${WRKSRC}/swatch.sh ${PREFIX}/etc/rc.d -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS_56= \ - ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -.endif -RUN_DEPENDS= ${BUILD_DEPENDS} - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/munin-main/Makefile b/sysutils/munin-main/Makefile index 2c9cb0b48ed2..cf8ab9375120 100644 --- a/sysutils/munin-main/Makefile +++ b/sysutils/munin-main/Makefile @@ -24,15 +24,6 @@ RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool \ ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip BUILD_DEPENDS= ${RUN_DEPENDS} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} <= 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ - ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced -.endif - USE_GMAKE= yes PATCH_STRIP= -p1 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/} @@ -61,4 +52,4 @@ post-install: @${CHGRP} munin /var/run/munin /var/log/munin-main ${WWWDIR} ${PREFIX}/var/munin @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile index 2c9cb0b48ed2..cf8ab9375120 100644 --- a/sysutils/munin-master/Makefile +++ b/sysutils/munin-master/Makefile @@ -24,15 +24,6 @@ RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool \ ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip BUILD_DEPENDS= ${RUN_DEPENDS} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} <= 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ - ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced -.endif - USE_GMAKE= yes PATCH_STRIP= -p1 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/} @@ -61,4 +52,4 @@ post-install: @${CHGRP} munin /var/run/munin /var/log/munin-main ${WWWDIR} ${PREFIX}/var/munin @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile index 1fe9b92f703f..de23b71f1499 100644 --- a/sysutils/munin-node/Makefile +++ b/sysutils/munin-node/Makefile @@ -22,12 +22,6 @@ USE_PERL5= yes RUN_DEPENDS= ${SITE_PERL}/Net/Server/Fork.pm:${PORTSDIR}/net/p5-Net-Server BUILD_DEPENDS= ${RUN_DEPENDS} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net -.endif - USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/} PKGMESSAGE= ${WRKDIR}/pkg-message @@ -47,9 +41,6 @@ pre-su-install: post-install: ${INSTALL_SCRIPT} ${WRKDIR}/munin-node.sh ${PREFIX}/etc/rc.d/munin-node.sh -.if ${PERL_LEVEL} < 500800 - ${INSTALL_SCRIPT} ${WRKDIR}/munin-node-revive.sh ${PREFIX}/bin/munin-node-revive -.endif ${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf ${PREFIX}/etc/munin/munin-node.conf.sample ${INSTALL_DATA} ${FILESDIR}/plugins.conf ${PREFIX}/etc/munin/plugin-conf.d/plugins.conf.sample @if [ ! -f ${PREFIX}/etc/munin/plugin-conf.d/plugins.conf ]; then \ @@ -63,4 +54,4 @@ post-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${ECHO} ${DISTNAME} | ${SED} -e 's/munin_//' > ${PREFIX}/etc/munin/VERSION.node -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/p5-Fuse-Simple/Makefile b/sysutils/p5-Fuse-Simple/Makefile index e2f8969a05fe..c0f54862f6e6 100644 --- a/sysutils/p5-Fuse-Simple/Makefile +++ b/sysutils/p5-Fuse-Simple/Makefile @@ -21,10 +21,4 @@ PERL_CONFIGURE= yes MAN3= Fuse::Simple.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= ${SITE_PERL}/Switch.pm:${PORTSDIR}/lang/p5-Switch -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/psgconf/Makefile b/sysutils/psgconf/Makefile index 9c5f9c473c13..bf81ae864d9f 100644 --- a/sysutils/psgconf/Makefile +++ b/sysutils/psgconf/Makefile @@ -182,13 +182,6 @@ MAN3= PSGConf.3 \ PSGConf::Util.3 \ psgconf-intro.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Net/FTP.pm:${PORTSDIR}/net/p5-Net -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Net/FTP.pm:${PORTSDIR}/net/p5-Net -.endif - PKGINSTALL= ${WRKSRC}/postinstall PKGDEINSTALL= ${WRKSRC}/postinstall @@ -201,4 +194,4 @@ post-install: @${CP} ${WRKSRC}/etc/psgconf_modules ${PREFIX}/etc/psgconf_modules.sample PKG_PREFIX=${PREFIX} PKG_MGR=FreeBSD::Ports ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/rsnapshot/Makefile b/sysutils/rsnapshot/Makefile index 41ea0408a708..c450501076a8 100644 --- a/sysutils/rsnapshot/Makefile +++ b/sysutils/rsnapshot/Makefile @@ -23,18 +23,13 @@ GNU_CONFIGURE= yes MAN1= rsnapshot.1 rsnapshot-diff.1 PORTDOCS= AUTHORS ChangeLog README TODO +post-patch: + ${REINPLACE_CMD} -e 's,/usr/bin/pod2man,pod2man,' ${WRKSRC}/Makefile.in + .if !defined(NOPORTDOCS) post-install: @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif -.include <bsd.port.pre.mk> - -post-patch: - ${REINPLACE_CMD} -e 's,/usr/bin/pod2man,pod2man,' ${WRKSRC}/Makefile.in -.if ${PERL_LEVEL} < 500800 - ${REINPLACE_CMD} -e "s, -n 'rsnapshot',," ${WRKSRC}/Makefile.in -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile index 52f83ddee53b..c38a2122c116 100644 --- a/sysutils/system-tools-backends/Makefile +++ b/sysutils/system-tools-backends/Makefile @@ -31,14 +31,8 @@ CONFIGURE_ARGS= --with-stb-group=wheel \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} <= 500800 -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - post-configure: @${REINPLACE_CMD} -e 's|@GETTEXT_PACKAGE@|system-tools-backends|g' \ ${WRKSRC}/po/Makefile -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/tenshi/Makefile b/sysutils/tenshi/Makefile index e51832e434ec..73d48ff478ea 100644 --- a/sysutils/tenshi/Makefile +++ b/sysutils/tenshi/Makefile @@ -28,12 +28,6 @@ MAN8= tenshi.8 PORTDOCS= README Changelog -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net -.endif - post-patch: @${PERL5} -pi.bak -e ' \ s"/usr/bin/perl"${PERL}" if $$. == 1; \ @@ -50,4 +44,4 @@ do-install: ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/p5-Filter-Simple/Makefile b/textproc/p5-Filter-Simple/Makefile index 67122c8963da..31638f10df20 100644 --- a/textproc/p5-Filter-Simple/Makefile +++ b/textproc/p5-Filter-Simple/Makefile @@ -20,13 +20,4 @@ PERL_CONFIGURE= yes MAN3= Filter::Simple.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \ - ${SITE_PERL}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter -RUN_DEPENDS+= ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \ - ${SITE_PERL}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/p5-Makefile-Parser/Makefile b/textproc/p5-Makefile-Parser/Makefile index b81adfb8c523..7276540bd1f8 100644 --- a/textproc/p5-Makefile-Parser/Makefile +++ b/textproc/p5-Makefile-Parser/Makefile @@ -31,11 +31,4 @@ MAN3= Makefile::AST.3 \ Makefile::Parser.3 \ Makefile::Parser::GmakeDB.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ - p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/p5-Number-Format/Makefile b/textproc/p5-Number-Format/Makefile index 9e16e1266aee..5951785f94a0 100644 --- a/textproc/p5-Number-Format/Makefile +++ b/textproc/p5-Number-Format/Makefile @@ -19,12 +19,7 @@ PERL_CONFIGURE= yes MAN3= Number::Format.3 WRKSRC= ${WRKDIR}/${PORTNAME}-1.72 -.include <bsd.port.pre.mk> - post-patch: ${PERL} -pi -e 's/en_US/en_US.US-ASCII/' ${WRKSRC}/t/*.t -.if ${PERL_LEVEL} < 500800 - ${PERL} -pi -e '$$_="" if m{5.008}' ${WRKSRC}/Format.pm -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/p5-Parse-Flex/Makefile b/textproc/p5-Parse-Flex/Makefile index e6209b2efa25..68ca7dfe63b9 100644 --- a/textproc/p5-Parse-Flex/Makefile +++ b/textproc/p5-Parse-Flex/Makefile @@ -18,10 +18,4 @@ PERL_CONFIGURE= yes MAN3= Parse::Flex.3 Parse::Flex::Generate.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/p5-Parse-Syslog/Makefile b/textproc/p5-Parse-Syslog/Makefile index 482c3260b096..660a1a817b20 100644 --- a/textproc/p5-Parse-Syslog/Makefile +++ b/textproc/p5-Parse-Syslog/Makefile @@ -20,12 +20,4 @@ PERL_CONFIGURE= yes MAN3= Parse::Syslog.3 -.include <bsd.port.pre.mk> - -# requires Time::Local 1.07_94 -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/Time/Local.pm:${PORTSDIR}/devel/p5-Time-Local -RUN_DEPENDS+= ${SITE_PERL}/Time/Local.pm:${PORTSDIR}/devel/p5-Time-Local -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/p5-PerlPoint-Converters/Makefile b/textproc/p5-PerlPoint-Converters/Makefile index 2930b5dc7a6e..5237899ee532 100644 --- a/textproc/p5-PerlPoint-Converters/Makefile +++ b/textproc/p5-PerlPoint-Converters/Makefile @@ -42,10 +42,4 @@ post-install: @cd ${WRKSRC}/doc; ${FIND} . | ${CPIO} -padm ${DOCSDIR} .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/p5-Text-Reflow/Makefile b/textproc/p5-Text-Reflow/Makefile index 04f02f0c6d0b..c4570df32f2e 100644 --- a/textproc/p5-Text-Reflow/Makefile +++ b/textproc/p5-Text-Reflow/Makefile @@ -18,10 +18,6 @@ PERL_CONFIGURE= yes MAN3= Text::Reflow.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} > 500800 EXTRA_PATCHES= ${PATCHDIR}/5.8-Reflow.pm -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/p5-WDDX/Makefile b/textproc/p5-WDDX/Makefile index 9851382b6615..135942a1e8ed 100644 --- a/textproc/p5-WDDX/Makefile +++ b/textproc/p5-WDDX/Makefile @@ -28,10 +28,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/Changes ${DOCSDIR} .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/p5-XML-Feed/Makefile b/textproc/p5-XML-Feed/Makefile index 2fac8f64569e..b39dc2034405 100644 --- a/textproc/p5-XML-Feed/Makefile +++ b/textproc/p5-XML-Feed/Makefile @@ -37,10 +37,6 @@ MAN3= XML::Feed.3 \ .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - .if ${PERL_LEVEL} < 500905 RUN_DEPENDS+= p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable .endif diff --git a/textproc/p5-XML-SAX/Makefile b/textproc/p5-XML-SAX/Makefile index d85d763e60fc..96d59ccf3693 100644 --- a/textproc/p5-XML-SAX/Makefile +++ b/textproc/p5-XML-SAX/Makefile @@ -30,10 +30,4 @@ post-configure: @${PERL} -pi -e 's/^(POD2MAN_EXE.*)$$/\1 --lax/;' \ ${WRKSRC}/Makefile -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/p5-YAML-Syck/Makefile b/textproc/p5-YAML-Syck/Makefile index 028b4702ebca..80a098e2d9bc 100644 --- a/textproc/p5-YAML-Syck/Makefile +++ b/textproc/p5-YAML-Syck/Makefile @@ -19,12 +19,4 @@ CONFIGURE_ARGS+= < /dev/null MAN3= JSON::Syck.3 YAML::Syck.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500700 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ - p5-Scalar-List-Utils>0:${PORTSDIR}/lang/p5-Scalar-List-Utils -BUILD_DEPENDS= ${RUN_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/p5-pod2pdf/Makefile b/textproc/p5-pod2pdf/Makefile index f15f8f126faf..2e39469ed382 100644 --- a/textproc/p5-pod2pdf/Makefile +++ b/textproc/p5-pod2pdf/Makefile @@ -24,11 +24,4 @@ PERL_CONFIGURE= yes MAN1= pod2pdf.1 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-podlators>0:${PORTSDIR}/textproc/p5-podlators -BUILD_DEPENDS+= p5-podlators>0:${PORTSDIR}/textproc/p5-podlators -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/p5-xmltv/Makefile b/textproc/p5-xmltv/Makefile index c9023c88d92a..c8ad9316d24a 100644 --- a/textproc/p5-xmltv/Makefile +++ b/textproc/p5-xmltv/Makefile @@ -61,17 +61,6 @@ PORTDOCS= COPYING \ tv_check_doc.jpg .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= \ - ${SITE_PERL}/Memoize.pm:${PORTSDIR}/devel/p5-Memoize \ - ${SITE_PERL}/Storable.pm:${PORTSDIR}/devel/p5-Storable -RUN_DEPENDS+= \ - ${SITE_PERL}/Memoize.pm:${PORTSDIR}/devel/p5-Memoize \ - ${SITE_PERL}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif - MAN1= tv_cat.1 tv_check.1 tv_extractinfo_en.1 tv_find_grabbers.1 \ tv_grab_ar.1 tv_grab_be.1 tv_grab_br_net.1 \ tv_grab_ch_search.1 tv_grab_combiner.1 tv_grab_dk.1 \ @@ -118,4 +107,4 @@ post-install: @${MKDIR} ${PREFIX}/${CGIDIR} @${INSTALL_SCRIPT} ${WRKSRC}/choose/tv_pick/tv_pick_cgi ${PREFIX}/${CGIDIR}/tv_pick.cgi -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/apache13-modperl/Makefile b/www/apache13-modperl/Makefile index fa6b538e0ba7..71e16210c94f 100644 --- a/www/apache13-modperl/Makefile +++ b/www/apache13-modperl/Makefile @@ -138,17 +138,13 @@ MAN3= Apache.3 Apache::Constants.3 Apache::ExtUtils.3 \ Bundle::Apache.3 \ Apache::Debug.3 mod_perl.3 Apache::SIG.3 Apache::Resource.3 \ Apache::RegistryLoader.3 Apache::StatINC.3 Apache::Include.3 \ - Apache::PerlSections.3 cgi_to_mod_perl.3 \ + Apache::PerlSections.3 Apache::MyConfig.3 cgi_to_mod_perl.3 \ mod_perl_cvs.3 mod_perl_method_handlers.3 mod_perl_traps.3 \ mod_perl_tuning.3 MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \ ${SUEXEC_MAN} -.if ${PERL_LEVEL} >= 500800 -MAN3+= Apache::MyConfig.3 -.endif - pre-configure: @ cd ${WRKSRC_MODPERL}; \ ${PERL5} Makefile.PL EVERYTHING=1 APACHE_SRC=../apache_${VERSION_APACHE}\ diff --git a/www/dtse/Makefile b/www/dtse/Makefile index f813d520d78f..96504a8791ab 100644 --- a/www/dtse/Makefile +++ b/www/dtse/Makefile @@ -30,10 +30,4 @@ MAKEFILE= GNUmakefile WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/fswiki/Makefile b/www/fswiki/Makefile index 84f2cb530f7a..ff6846095a59 100644 --- a/www/fswiki/Makefile +++ b/www/fswiki/Makefile @@ -22,6 +22,8 @@ USE_ZIP= yes USE_PERL5= yes NO_BUILD= yes +JCODE= ${SITE_PERL}/Jcode.pm + post-extract: ${SED} -e 's|__DATADIR__|${DATADIR}|' ${FILESDIR}/setup.sh \ >${WRKSRC}/setup.sh @@ -39,12 +41,4 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/wiki.cgi ${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/setup.sh ${DATADIR} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500801 -JCODE= ${SITE_PERL}/${PERL_ARCH}/Jcode.pm -.else -JCODE= ${SITE_PERL}/Jcode.pm -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile index 37cafd725163..06cd21e6d2a0 100644 --- a/www/p5-Apache-ASP/Makefile +++ b/www/p5-Apache-ASP/Makefile @@ -43,13 +43,4 @@ MAN3= Apache::ASP.3 \ Bundle::Apache::ASP.3 \ Bundle::Apache::ASP::Extra.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile index a3bf7945c559..90cd8f06248c 100644 --- a/www/p5-Apache-AuthTicket/Makefile +++ b/www/p5-Apache-AuthTicket/Makefile @@ -23,10 +23,4 @@ PERL_CONFIGURE= yes MAN3= Apache::AuthTicket.3 Apache2::AuthTicket.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-Apache-DBI/Makefile b/www/p5-Apache-DBI/Makefile index ee75fd653a83..5c054d3fdb03 100644 --- a/www/p5-Apache-DBI/Makefile +++ b/www/p5-Apache-DBI/Makefile @@ -42,10 +42,4 @@ PLIST_DIRS= %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBI \ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache \ %%SITE_PERL%%/Apache -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile index a0e8c2651b3b..9c64f4d4717e 100644 --- a/www/p5-Apache-Gallery/Makefile +++ b/www/p5-Apache-Gallery/Makefile @@ -61,11 +61,4 @@ post-install: @${CAT} ${PKGMESSAGE} .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -RUN_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-Apache-MP3/Makefile b/www/p5-Apache-MP3/Makefile index d5eb1939b2e6..147341136cc1 100644 --- a/www/p5-Apache-MP3/Makefile +++ b/www/p5-Apache-MP3/Makefile @@ -34,11 +34,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/apache_mp3/* ${DATADIR} ${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext -RUN_DEPENDS+= ${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-Bundle-Sledge/Makefile b/www/p5-Bundle-Sledge/Makefile index 0234c451deb0..041de4b810d7 100644 --- a/www/p5-Bundle-Sledge/Makefile +++ b/www/p5-Bundle-Sledge/Makefile @@ -49,12 +49,6 @@ PERL_CONFIGURE= yes MAN3= Bundle::Sledge.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500801 -JCODE= ${SITE_PERL}/${PERL_ARCH}/Jcode.pm -.else JCODE= ${SITE_PERL}/Jcode.pm -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-CGI-Application-Plugin-Authorization/Makefile b/www/p5-CGI-Application-Plugin-Authorization/Makefile index d7e32fb683a2..3b84858b2a6e 100644 --- a/www/p5-CGI-Application-Plugin-Authorization/Makefile +++ b/www/p5-CGI-Application-Plugin-Authorization/Makefile @@ -33,8 +33,4 @@ MAN3= CGI::Application::Plugin::Authorization::Driver::Generic.3 \ CGI::Application::Plugin::Authorization.3 \ CGI::Application::Plugin::Authorization::Driver::HTGroup.3 -.include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500800 -IGNORE= requires Perl 5.8 or newer. Install lang/perl5.8, and try again -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-CGI-Application/Makefile b/www/p5-CGI-Application/Makefile index a61dd165479f..7e3a64de7a95 100644 --- a/www/p5-CGI-Application/Makefile +++ b/www/p5-CGI-Application/Makefile @@ -20,11 +20,4 @@ PERL_CONFIGURE= yes MAN3= CGI::Application.3 CGI::Application::Mailform.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA \ - p5-Net>=0:${PORTSDIR}/net/p5-Net -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-CGI-Cache/Makefile b/www/p5-CGI-Cache/Makefile index bf2e094231d6..737f9c840496 100644 --- a/www/p5-CGI-Cache/Makefile +++ b/www/p5-CGI-Cache/Makefile @@ -23,10 +23,4 @@ PERL_CONFIGURE= yes MAN3= CGI::Cache.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Storable>=0:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-CGI-Ex/Makefile b/www/p5-CGI-Ex/Makefile index 3f1fc8cfa863..d2636e52c3da 100644 --- a/www/p5-CGI-Ex/Makefile +++ b/www/p5-CGI-Ex/Makefile @@ -36,13 +36,4 @@ post-install: .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \ - p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \ - p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \ - p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-CGI-Kwiki/Makefile b/www/p5-CGI-Kwiki/Makefile index 2488f5cb81fa..043cac5ed8c2 100644 --- a/www/p5-CGI-Kwiki/Makefile +++ b/www/p5-CGI-Kwiki/Makefile @@ -40,15 +40,4 @@ MAN3= CGI::Kwiki.3 \ post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -# Damn ExtUtils::MM_Unix, and Damn Module::Install !!! -post-configure: - @${PERL} -pi -e 'if (/MAN3PODS/) { $$_ .= "\tlib/CGI/Kwiki/Config.pm \\\n\tlib/CGI/Kwiki/Config_yaml.pm \\\n" };' \ - -e 'if (/manifypods :/) {$$_ .= "\tlib/CGI/Kwiki/Config.pm \\\n\tlib/CGI/Kwiki/Config_yaml.pm \\\n" };' \ - -e 'if (/\@\$$\(POD2MAN\)/) { $$_ .= "\tlib/CGI/Kwiki/Config.pm \\\n\t\$$(INST_MAN3DIR)/CGI::Kwiki::Config.\$$(MAN3EXT) \\\n\tlib/CGI/Kwiki/Config_yaml.pm \\\n\t\$$(INST_MAN3DIR)/CGI::Kwiki::Config_yaml.\$$(MAN3EXT) \\\n"};' \ - ${WRKSRC}/Makefile -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-CGI-Session/Makefile b/www/p5-CGI-Session/Makefile index a24dec1d928a..602021f1a692 100644 --- a/www/p5-CGI-Session/Makefile +++ b/www/p5-CGI-Session/Makefile @@ -36,11 +36,4 @@ MAN3= \ CGI::Session::Test::Default.3 \ CGI::Session::Tutorial.3 \ -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -RUN_DEPENDS= ${BUILD_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-Catalyst-Plugin-Scheduler/Makefile b/www/p5-Catalyst-Plugin-Scheduler/Makefile index 006417db25cd..6d99e46a89ff 100644 --- a/www/p5-Catalyst-Plugin-Scheduler/Makefile +++ b/www/p5-Catalyst-Plugin-Scheduler/Makefile @@ -25,10 +25,4 @@ PERL_MODBUILD= yes MAN3= Catalyst::Plugin::Scheduler.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500801 -IGNORE= requires at least Perl 5.8.1. Install lang/perl5.8, and try again -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-FAQ-OMatic/Makefile b/www/p5-FAQ-OMatic/Makefile index 4ddac0e7195d..6f4e2d1662de 100644 --- a/www/p5-FAQ-OMatic/Makefile +++ b/www/p5-FAQ-OMatic/Makefile @@ -21,11 +21,4 @@ MAN3= FAQ::OMatic::API.3 post-install: @${CAT} ${WRKSRC}/install.notes -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 -RUN_DEPENDS= ${BUILD_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-HTML-Template/Makefile b/www/p5-HTML-Template/Makefile index a5e9ca8bb079..700de140a86c 100644 --- a/www/p5-HTML-Template/Makefile +++ b/www/p5-HTML-Template/Makefile @@ -19,12 +19,4 @@ PERL_CONFIGURE= yes MAN3= HTML::Template.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \ - p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \ - p5-Storable>=0:${PORTSDIR}/devel/p5-Storable -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-HTML-TreeBuilder-XPath/Makefile b/www/p5-HTML-TreeBuilder-XPath/Makefile index ef9590250c0d..4e2eaf5e9426 100644 --- a/www/p5-HTML-TreeBuilder-XPath/Makefile +++ b/www/p5-HTML-TreeBuilder-XPath/Makefile @@ -22,10 +22,4 @@ PERL_CONFIGURE= yes MAN3= HTML::TreeBuilder::XPath.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-HTTP-WebTest/Makefile b/www/p5-HTTP-WebTest/Makefile index 743c7f0f613f..6b40b73a4bd6 100644 --- a/www/p5-HTTP-WebTest/Makefile +++ b/www/p5-HTTP-WebTest/Makefile @@ -46,16 +46,4 @@ MAN3= Bundle::HTTP::WebTest.3 \ HTTP::WebTest::Test.3 HTTP::WebTest::TestResult.3 \ HTTP::WebTest::Utils.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS_56= \ - ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \ - ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \ - ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \ - ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ - ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI -.endif -RUN_DEPENDS= ${BUILD_DEPENDS} - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-LWPx-ParanoidAgent/Makefile b/www/p5-LWPx-ParanoidAgent/Makefile index 103589a27e21..42cd7a37d03e 100644 --- a/www/p5-LWPx-ParanoidAgent/Makefile +++ b/www/p5-LWPx-ParanoidAgent/Makefile @@ -22,10 +22,4 @@ PERL_CONFIGURE= yes MAN3= LWPx::ParanoidAgent.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -BUILD_DEPENDS+= ${SITE_PERL}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-URI-Fetch/Makefile b/www/p5-URI-Fetch/Makefile index 58fb7601ae96..068984c5c1d1 100644 --- a/www/p5-URI-Fetch/Makefile +++ b/www/p5-URI-Fetch/Makefile @@ -29,15 +29,6 @@ PERL_CONFIGURE= yes MAN3= URI::Fetch.3 \ URI::Fetch::Response.3 -post-patch: - ${PERL} -pi -e '$$_ = "" if m|auto_install|' ${WRKSRC}/Makefile.PL - -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Storable>=0:${PORTSDIR}/devel/p5-Storable -.endif - .if !defined(WITHOUT_ZLIB) RUN_DEPENDS+= p5-Compress-Zlib>=0:${PORTSDIR}/archivers/p5-Compress-Zlib .endif @@ -46,4 +37,7 @@ RUN_DEPENDS+= p5-Compress-Zlib>=0:${PORTSDIR}/archivers/p5-Compress-Zlib RUN_DEPENDS+= p5-Cache>=0:${PORTSDIR}/devel/p5-Cache .endif -.include <bsd.port.post.mk> +post-patch: + ${PERL} -pi -e '$$_ = "" if m|auto_install|' ${WRKSRC}/Makefile.PL + +.include <bsd.port.mk> diff --git a/www/p5-WWW-Facebook-API/Makefile b/www/p5-WWW-Facebook-API/Makefile index 8254a5010740..1834825dcf6d 100644 --- a/www/p5-WWW-Facebook-API/Makefile +++ b/www/p5-WWW-Facebook-API/Makefile @@ -44,10 +44,4 @@ MAN3= WWW::Facebook::API.3 \ WWW::Facebook::API::SMS.3 \ WWW::Facebook::API::Users.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-WWW-Mixi/Makefile b/www/p5-WWW-Mixi/Makefile index e20e969d0996..48f6c22d083a 100644 --- a/www/p5-WWW-Mixi/Makefile +++ b/www/p5-WWW-Mixi/Makefile @@ -14,19 +14,12 @@ PKGNAMEPREFIX= p5- MAINTAINER= kaoru@kaisei.org COMMENT= Perl module of Automated interface to the Mixi -BUILD_DEPENDS= ${SITE_PERL}/LWP/RobotUA.pm:${PORTSDIR}/www/p5-libwww +BUILD_DEPENDS= ${SITE_PERL}/LWP/RobotUA.pm:${PORTSDIR}/www/p5-libwww \ + ${SITE_PERL}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes MAN3= WWW::Mixi.3 WWW::Mixi::Cookbook.3 WWW::Mixi::Mixi.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} > 500800 -BUILD_DEPENDS+= ${SITE_PERL}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode -.else -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-WWW-Search-MSN/Makefile b/www/p5-WWW-Search-MSN/Makefile index e0b07b563ffd..763640bb112c 100644 --- a/www/p5-WWW-Search-MSN/Makefile +++ b/www/p5-WWW-Search-MSN/Makefile @@ -22,14 +22,4 @@ PERL_CONFIGURE= yes MAN3= WWW::Search::MSN.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500701 -BUILD_DEPENDS+= ${SITE_PERL}/Encode.pm:${PORTSDIR}/converters/p5-Encode -.endif - -.if ${PERL_LEVEL} < 500702 -BUILD_DEPENDS+= ${SITE_PERL}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile index c8d3b7af8aef..0405a8b85ced 100644 --- a/www/p5-WWW-Search/Makefile +++ b/www/p5-WWW-Search/Makefile @@ -45,10 +45,4 @@ MAN3= WWW::Search.3 \ WWW::Search::Simple.3 \ WWW::Search::Test.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Net>=0:${PORTSDIR}/net/p5-Net -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-WWW-Spinn3r/Makefile b/www/p5-WWW-Spinn3r/Makefile index a13420aadd9c..060d08c21ca1 100644 --- a/www/p5-WWW-Spinn3r/Makefile +++ b/www/p5-WWW-Spinn3r/Makefile @@ -26,11 +26,4 @@ PERL_CONFIGURE= yes MAN3= WWW::Spinn3r.3 \ WWW::Spinn3r::Synced.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \ - p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile index 21e31c1951b8..bc1c6d4f2424 100644 --- a/www/p5-libwww/Makefile +++ b/www/p5-libwww/Makefile @@ -38,15 +38,7 @@ MAN3= Bundle::LWP.3 File::Listing.3 HTML::Form.3 HTTP::Config.3 \ WWW::RobotRules::AnyDBM_File.3 lwpcook.3 lwptut.3 .include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500703 -RUN_DEPENDS+= p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \ - p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \ - p5-Net>=2.58:${PORTSDIR}/net/p5-Net -.endif - .if ${PERL_LEVEL} < 500903 RUN_DEPENDS+= p5-Compress-Zlib>=1.10:${PORTSDIR}/archivers/p5-Compress-Zlib .endif - .include <bsd.port.post.mk> diff --git a/www/perlbal/Makefile b/www/perlbal/Makefile index 1bc1ca67c70e..c269495f4153 100644 --- a/www/perlbal/Makefile +++ b/www/perlbal/Makefile @@ -32,16 +32,10 @@ MAN3= Perlbal.3 \ Perlbal::Test.3 \ Perlbal::Util.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -.endif - .ifndef NOPORTDOCS post-install: ${MKDIR} ${DOCSDIR} ${CP} -R ${WRKSRC}/doc/ ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/reportmagic/Makefile b/www/reportmagic/Makefile index 9b7787d6b015..ea31fa06ea52 100644 --- a/www/reportmagic/Makefile +++ b/www/reportmagic/Makefile @@ -38,10 +38,4 @@ post-install: @${ECHO} "using Report Magic." @${ECHO} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> |