diff options
| author | Sergey Skvortsov <skv@FreeBSD.org> | 2005-06-11 16:13:12 +0000 |
|---|---|---|
| committer | Sergey Skvortsov <skv@FreeBSD.org> | 2005-06-11 16:13:12 +0000 |
| commit | 54a1630d6e44ec2ef8cb3c4a00d6f4e0503f3b4f (patch) | |
| tree | 75f8d629d0ebf0e58a1b981a5cffc533b15375cf | |
| parent | Update to 1.23 (diff) | |
* reflect renaming on CPAN File-Spec to PathTools
+ add devel/p5-PathTools, remove devel/p5-File-Spec
+ update dependencies for all affected ports (make them unconditional),
bump PORTREVISION for these ports
module was renamed
* reflect renaming on CPAN PodParser to Pod-Parser
+ add textproc/p5-Pod-Parser, remove textproc/p5-PodParser
+ update dependencies for all affected ports (make them unconditional),
bump PORTREVISION for these ports
* for all changed ports make dependencies on File::Temp, Digest::MD5,
Storable unconditional
* remove 'CONFIGURE_ARGS= INSTALLDIRS=site' from Makefile's
(this variable is forced by bsd.port.mk now)
* update Class-Autouse to 1.17
* update POE-API-Hooks to 1.05
* make portlint happy (clean IGNORE, convert spaces to tabs and so on)
Diffstat (limited to '')
150 files changed, 334 insertions, 685 deletions
@@ -1516,3 +1516,5 @@ databases/jdbc-oracle816|databases/jdbc-oracle8i|2005-06-05|Obsolete version ftp/wget-devel|ftp/wget|2005-06-10|stable version caught up with -devel emulators/linux_base-6||2005-06-10|security bugs www/netscape7||2005-06-10|security bugs +devel/p5-File-Spec|devel/p5-PathTools|2005-06-11|module was merged with Cwd and renamed +textproc/p5-PodParser|textproc/p5-Pod-Parser|2005-06-11|module was renamed diff --git a/archivers/p5-Archive-Tar/Makefile b/archivers/p5-Archive-Tar/Makefile index 74043bf7914d..69a366abab9a 100644 --- a/archivers/p5-Archive-Tar/Makefile +++ b/archivers/p5-Archive-Tar/Makefile @@ -7,6 +7,7 @@ PORTNAME= Archive-Tar PORTVERSION= 1.23 +PORTREVISION= 1 CATEGORIES= archivers perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Archive @@ -16,6 +17,8 @@ MAINTAINER= ports@oven.org COMMENT= Perl module for creation and manipulation of tar files RUN_DEPENDS= ${SITE_PERL}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \ ${SITE_PERL}/IO/String.pm:${PORTSDIR}/devel/p5-IO-String BUILD_DEPENDS= ${RUN_DEPENDS} @@ -23,13 +26,4 @@ PERL_CONFIGURE= YES MAN3= Archive::Tar.3 Archive::Tar::File.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500600 -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif -.if ${PERL_LEVEL} < 500800 -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/archivers/p5-Archive-Zip/Makefile b/archivers/p5-Archive-Zip/Makefile index 52443e5b9efc..47c4b6554776 100644 --- a/archivers/p5-Archive-Zip/Makefile +++ b/archivers/p5-Archive-Zip/Makefile @@ -7,6 +7,7 @@ PORTNAME= Archive-Zip PORTVERSION= 1.14 +PORTREVISION= 1 CATEGORIES= archivers perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Archive @@ -15,20 +16,13 @@ PKGNAMEPREFIX= p5- MAINTAINER= erwin@FreeBSD.org COMMENT= Perl module to create, manipulate, read, and write Zip archive files -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes MAN3= Archive::Zip.3 Archive::Zip::Tree.3 Archive::Zip::FAQ.3 Archive::Zip::MemberRead.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} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/archivers/p5-PerlIO-gzip/Makefile b/archivers/p5-PerlIO-gzip/Makefile index 111366ded2ab..fee2af0e3705 100644 --- a/archivers/p5-PerlIO-gzip/Makefile +++ b/archivers/p5-PerlIO-gzip/Makefile @@ -22,7 +22,7 @@ MAN3= PerlIO::gzip.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500800 -IGNORE= "Perl 5.8 or newer required. Install lang/perl5.8 and try again." +IGNORE= Perl 5.8 or newer required. Install lang/perl5.8 and try again. .endif .include <bsd.port.post.mk> diff --git a/comms/p5-Device-SerialPort/Makefile b/comms/p5-Device-SerialPort/Makefile index 462950429c62..6a23e785992a 100644 --- a/comms/p5-Device-SerialPort/Makefile +++ b/comms/p5-Device-SerialPort/Makefile @@ -23,7 +23,7 @@ MAN3= Device::SerialPort.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500600 -IGNORE= "Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again." +IGNORE= Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again. .endif .include <bsd.port.post.mk> diff --git a/converters/p5-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile index d7cbaee995ea..621210cb0305 100644 --- a/converters/p5-MIME-Base64/Makefile +++ b/converters/p5-MIME-Base64/Makefile @@ -16,7 +16,6 @@ MAINTAINER= erwin@FreeBSD.org COMMENT= Perl5 module for Base64 and Quoted-Printable encodings PERL_CONFIGURE= YES -CONFIGURE_ARGS= INSTALLDIRS=site MAN3= MIME::Base64.3 \ MIME::QuotedPrint.3 diff --git a/databases/p5-POE-Component-LaDBI/Makefile b/databases/p5-POE-Component-LaDBI/Makefile index 94d761730b5d..16259a466073 100644 --- a/databases/p5-POE-Component-LaDBI/Makefile +++ b/databases/p5-POE-Component-LaDBI/Makefile @@ -35,7 +35,7 @@ post-patch: @${PERL} -pi -e 's!(?=read_answer_yes\()!0 and !;' ${WRKSRC}/Makefile.PL .if ${PERL_LEVEL} < 500600 -IGNORE= "Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again." +IGNORE= Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again. .endif .include <bsd.port.post.mk> diff --git a/databases/p5-SQL-Translator/Makefile b/databases/p5-SQL-Translator/Makefile index 11c3815336f6..1486c3345bb9 100644 --- a/databases/p5-SQL-Translator/Makefile +++ b/databases/p5-SQL-Translator/Makefile @@ -7,7 +7,7 @@ PORTNAME= SQL-Translator PORTVERSION= 0.06 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= SQL @@ -17,11 +17,12 @@ MAINTAINER= lth@FreeBSD.org COMMENT= Manipulate structured data definitions (SQL and more) BUILD_DEPENDS= ${SITE_PERL}/Class/Base.pm:${PORTSDIR}/devel/p5-Class-Base \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \ ${SITE_PERL}/GraphViz.pm:${PORTSDIR}/graphics/p5-GraphViz \ ${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \ ${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent \ - ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \ + ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ ${SITE_PERL}/Spreadsheet/ParseExcel.pm:${PORTSDIR}/textproc/p5-Spreadsheet-ParseExcel \ ${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \ ${SITE_PERL}/Text/RecordParser.pm:${PORTSDIR}/textproc/p5-Text-RecordParser \ @@ -90,8 +91,7 @@ MAN3= SQL::Translator.3 \ .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500600 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ - ${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO +BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO EXTRA_PATCHES+= ${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Parser::xSV.pm \ ${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::Diagram.pm \ ${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::GraphViz.pm \ diff --git a/databases/wfb2sql/Makefile b/databases/wfb2sql/Makefile index 28c3eb15908c..fd0b7a006d0f 100644 --- a/databases/wfb2sql/Makefile +++ b/databases/wfb2sql/Makefile @@ -7,6 +7,7 @@ PORTNAME= wfb2sql PORTVERSION= 0.5 +PORTREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +16,7 @@ MAINTAINER= seanc@FreeBSD.org COMMENT= CIA World Fact Book to SQL Conversion Utility BUILD_DEPENDS= ${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \ - ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \ + ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ ${SITE_PERL}/Config/General.pm:${PORTSDIR}/devel/p5-Config-General RUN_DEPENDS= ${BUILD_DEPENDS} diff --git a/devel/Makefile b/devel/Makefile index 16587676d324..694a8c0293fb 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -879,7 +879,6 @@ SUBDIR += p5-File-ReadBackwards SUBDIR += p5-File-Remove SUBDIR += p5-File-Slurp - SUBDIR += p5-File-Spec SUBDIR += p5-File-Sync SUBDIR += p5-File-Tail SUBDIR += p5-File-Temp @@ -1012,6 +1011,7 @@ SUBDIR += p5-Parse-Yapp SUBDIR += p5-ParseLex SUBDIR += p5-PatchReader + SUBDIR += p5-PathTools SUBDIR += p5-Path-Class SUBDIR += p5-Penguin SUBDIR += p5-Penguin-Easy diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile index 46a6c7b83e2c..43af4d847b71 100644 --- a/devel/bugzilla/Makefile +++ b/devel/bugzilla/Makefile @@ -7,6 +7,7 @@ PORTNAME?= bugzilla PORTVERSION?= 2.18.1 +PORTREVISION?= 1 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= webtools webtools/archived @@ -28,7 +29,7 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DB ${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \ ${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap \ ${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \ - ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/PatchReader.pm:${PORTSDIR}/devel/p5-PatchReader CONFLICTS?= ja-bugzilla-2.* diff --git a/devel/bugzilla2/Makefile b/devel/bugzilla2/Makefile index 46a6c7b83e2c..43af4d847b71 100644 --- a/devel/bugzilla2/Makefile +++ b/devel/bugzilla2/Makefile @@ -7,6 +7,7 @@ PORTNAME?= bugzilla PORTVERSION?= 2.18.1 +PORTREVISION?= 1 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= webtools webtools/archived @@ -28,7 +29,7 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DB ${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \ ${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap \ ${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \ - ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/PatchReader.pm:${PORTSDIR}/devel/p5-PatchReader CONFLICTS?= ja-bugzilla-2.* diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile index 46a6c7b83e2c..43af4d847b71 100644 --- a/devel/bugzilla3/Makefile +++ b/devel/bugzilla3/Makefile @@ -7,6 +7,7 @@ PORTNAME?= bugzilla PORTVERSION?= 2.18.1 +PORTREVISION?= 1 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= webtools webtools/archived @@ -28,7 +29,7 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DB ${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \ ${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap \ ${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \ - ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/PatchReader.pm:${PORTSDIR}/devel/p5-PatchReader CONFLICTS?= ja-bugzilla-2.* diff --git a/devel/cvsmonitor/Makefile b/devel/cvsmonitor/Makefile index bce6de76c757..8cad572e4112 100644 --- a/devel/cvsmonitor/Makefile +++ b/devel/cvsmonitor/Makefile @@ -7,7 +7,7 @@ PORTNAME= cvsmonitor PORTVERSION= 0.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,7 +17,7 @@ MAINTAINER= skv@FreeBSD.org COMMENT= Monitor activity on a CVS Repository BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ - ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/Time/Duration.pm:${PORTSDIR}/devel/p5-Time-Duration \ ${SITE_PERL}/Class/Autouse.pm:${PORTSDIR}/devel/p5-Class-Autouse \ ${SITE_PERL}/Class/Default.pm:${PORTSDIR}/devel/p5-Class-Default \ diff --git a/devel/p5-App-Info/Makefile b/devel/p5-App-Info/Makefile index b1411116d104..929bcb52ffab 100644 --- a/devel/p5-App-Info/Makefile +++ b/devel/p5-App-Info/Makefile @@ -7,6 +7,7 @@ PORTNAME= App-Info PORTVERSION= 0.25 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= App @@ -15,7 +16,8 @@ PKGNAMEPREFIX= p5- MAINTAINER= demon@FreeBSD.org COMMENT= Interface for providing metadata about installed software packages -BUILD_DEPENDS= ${SITE_PERL}/Test/Simple.pm:${PORTSDIR}/devel/p5-Test-Simple +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/Test/Simple.pm:${PORTSDIR}/devel/p5-Test-Simple PERL_MODBUILD= YES @@ -26,10 +28,4 @@ MAN3= App::Info::HTTPD.3 App::Info::Lib::Iconv.3 \ App::Info::Util.3 App::Info::Handler.3 App::Info.3 \ App::Info::Handler::Prompt.3 App::Info::Handler::Carp.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} <= 500600 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-AppConfig-Std/Makefile b/devel/p5-AppConfig-Std/Makefile index b0da6e8c7523..72e9798f64e7 100644 --- a/devel/p5-AppConfig-Std/Makefile +++ b/devel/p5-AppConfig-Std/Makefile @@ -7,6 +7,7 @@ PORTNAME= AppConfig-Std PORTVERSION= 1.07 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= AppConfig @@ -16,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A subclass of AppConfig that provides standard options BUILD_DEPENDS= ${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \ - ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser + ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes diff --git a/devel/p5-Array-Window/Makefile b/devel/p5-Array-Window/Makefile index 66f46ccaa354..6cc3d68de9f8 100644 --- a/devel/p5-Array-Window/Makefile +++ b/devel/p5-Array-Window/Makefile @@ -7,6 +7,7 @@ PORTNAME= Array-Window PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Array @@ -15,17 +16,12 @@ PKGNAMEPREFIX= p5- MAINTAINER= skv@FreeBSD.org COMMENT= Calculate windows/subsets/pages of arrays -BUILD_DEPENDS= ${SITE_PERL}/Class/Inspector.pm:${PORTSDIR}/devel/p5-Class-Inspector +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/Class/Inspector.pm:${PORTSDIR}/devel/p5-Class-Inspector RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes MAN3= Array::Window.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} <= 500800 -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-AtExit/Makefile b/devel/p5-AtExit/Makefile index 7c93b0bb5ac8..6280f29b1a1a 100644 --- a/devel/p5-AtExit/Makefile +++ b/devel/p5-AtExit/Makefile @@ -16,7 +16,6 @@ MAINTAINER= skv@FreeBSD.org COMMENT= AtExit - Perform exit processing for a program or object PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site MAN3= AtExit.3 diff --git a/devel/p5-Cache-Cache/Makefile b/devel/p5-Cache-Cache/Makefile index c505b0440880..abcc12934b7d 100644 --- a/devel/p5-Cache-Cache/Makefile +++ b/devel/p5-Cache-Cache/Makefile @@ -7,6 +7,7 @@ PORTNAME= Cache-Cache PORTVERSION= 1.04 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Cache @@ -16,6 +17,9 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Cache::Cache -- Perl Cache interface BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/IPC/ShareLite.pm:${PORTSDIR}/devel/p5-IPC-ShareLite \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ + ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ ${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \ ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 RUN_DEPENDS= ${BUILD_DEPENDS} @@ -43,17 +47,4 @@ MAN3= Cache::BaseCache.3 \ Cache::SizeAwareMemoryCache.3 \ Cache::SizeAwareSharedMemoryCache.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+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable -.endif -.if ${PERL_LEVEL} <= 500600 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.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 60169d9171d5..cdac581e0af7 100644 --- a/devel/p5-Class-Autouse/Makefile +++ b/devel/p5-Class-Autouse/Makefile @@ -6,7 +6,7 @@ # PORTNAME= Class-Autouse -PORTVERSION= 1.16 +PORTVERSION= 1.17 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Class @@ -16,7 +16,7 @@ MAINTAINER= skv@FreeBSD.org COMMENT= Defer loading of one or more classes BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/List/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils \ - ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/prefork.pm:${PORTSDIR}/devel/p5-prefork RUN_DEPENDS= ${BUILD_DEPENDS} diff --git a/devel/p5-Class-Autouse/distinfo b/devel/p5-Class-Autouse/distinfo index d79be49a09ab..b44637cfbfe8 100644 --- a/devel/p5-Class-Autouse/distinfo +++ b/devel/p5-Class-Autouse/distinfo @@ -1,2 +1,2 @@ -MD5 (Class-Autouse-1.16.tar.gz) = 7258938f734b3a308b7b6bd389ae61f8 -SIZE (Class-Autouse-1.16.tar.gz) = 27144 +MD5 (Class-Autouse-1.17.tar.gz) = 075c0d92df6ccc8628fd46ad46923fad +SIZE (Class-Autouse-1.17.tar.gz) = 32625 diff --git a/devel/p5-Class-Fields/Makefile b/devel/p5-Class-Fields/Makefile index 427f092b95b2..6be14f8eab5b 100644 --- a/devel/p5-Class-Fields/Makefile +++ b/devel/p5-Class-Fields/Makefile @@ -20,7 +20,6 @@ BUILD_DEPENDS= ${SITE_PERL}/Carp/Assert.pm:${PORTSDIR}/devel/p5-Carp-Assert \ RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS='site' MAN3= Class::Fields.3 Class::Fields::Attribs.3 \ Class::Fields::Fuxor.3 Class::Fields::Inherit.3 private.3 \ diff --git a/devel/p5-Class-Inspector/Makefile b/devel/p5-Class-Inspector/Makefile index 83fc75555ce7..9050f9c551cb 100644 --- a/devel/p5-Class-Inspector/Makefile +++ b/devel/p5-Class-Inspector/Makefile @@ -7,6 +7,7 @@ PORTNAME= Class-Inspector PORTVERSION= 1.08 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Class @@ -15,7 +16,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= skv@FreeBSD.org COMMENT= Provides information about classes -BUILD_DEPENDS= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes diff --git a/devel/p5-Config-Auto/Makefile b/devel/p5-Config-Auto/Makefile index da8396feca49..6effdb005b7a 100644 --- a/devel/p5-Config-Auto/Makefile +++ b/devel/p5-Config-Auto/Makefile @@ -6,6 +6,7 @@ PORTNAME= Config-Auto PORTVERSION= 0.12 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Config @@ -14,7 +15,8 @@ PKGNAMEPREFIX= p5- MAINTAINER= lth@FreeBSD.org COMMENT= Magical config file parser -BUILD_DEPENDS= ${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles RUN_DEPENDS= ${BUILD_DEPENDS} OPTIONS= XMLSIMPLE "Support for XML config files" off @@ -31,8 +33,6 @@ PERL_CONFIGURE= yes MAN3= Config::Auto.3 .if ${PERL_LEVEL} < 500600 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec - post-patch: @${PERL} -pi -e 's/^our (\$$\w+)/use vars qw($$1); $$1/;' \ -e '$$_ = "" if (/5.006/);' \ diff --git a/devel/p5-Config-General/Makefile b/devel/p5-Config-General/Makefile index e655738a3136..9753d443f10b 100644 --- a/devel/p5-Config-General/Makefile +++ b/devel/p5-Config-General/Makefile @@ -7,6 +7,7 @@ PORTNAME= Config-General PORTVERSION= 2.28 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Config @@ -15,6 +16,9 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Perl5 module for handling Apache-style configuration files +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools +RUN_DEPENDS= ${BUILD_DEPENDS} + PERL_CONFIGURE= YES MAN3= Config::General::Extended.3 Config::General::Interpolated.3 \ @@ -23,9 +27,6 @@ MAN3= Config::General::Extended.3 Config::General::Interpolated.3 \ .include <bsd.port.pre.mk> .if ${PERL_LEVEL} <= 500600 -BUILD_DEPENDS= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS= ${BUILD_DEPENDS} - post-patch: @${REINPLACE_CMD} -e 's|::Heavy||' ${WRKSRC}/General.pm .endif diff --git a/devel/p5-DateTime-Format-Builder/Makefile b/devel/p5-DateTime-Format-Builder/Makefile index 7fd2706fdeea..88c94290d8d7 100644 --- a/devel/p5-DateTime-Format-Builder/Makefile +++ b/devel/p5-DateTime-Format-Builder/Makefile @@ -7,6 +7,7 @@ PORTNAME= DateTime-Format-Builder PORTVERSION= 0.78.06 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= DateTime @@ -18,6 +19,7 @@ COMMENT= Create DateTime parser classes and objects BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \ ${SITE_PERL}/DateTime/Format/Strptime.pm:${PORTSDIR}/devel/p5-DateTime-Format-Strptime @@ -43,10 +45,4 @@ post-install: @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}." .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} <= 500600 -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-DateTime-Format-HTTP/Makefile b/devel/p5-DateTime-Format-HTTP/Makefile index 0fe946321a6a..674022908ad7 100644 --- a/devel/p5-DateTime-Format-HTTP/Makefile +++ b/devel/p5-DateTime-Format-HTTP/Makefile @@ -7,6 +7,7 @@ PORTNAME= DateTime-Format-HTTP PORTVERSION= 0.36 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= DateTime @@ -18,6 +19,7 @@ COMMENT= HTTP date conversion routines BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/HTTP/Date.pm:${PORTSDIR}/www/p5-libwww PERL_MODBUILD= yes @@ -26,9 +28,6 @@ MAN3= DateTime::Format::HTTP.3 .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} <= 500600 -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif .if ${PERL_LEVEL} < 500600 post-patch: @${PERL} -pi -e '$$_ = "" if /use warnings/;' \ diff --git a/devel/p5-Devel-Cycle/Makefile b/devel/p5-Devel-Cycle/Makefile index f63f7e63ee85..da75e5970a59 100644 --- a/devel/p5-Devel-Cycle/Makefile +++ b/devel/p5-Devel-Cycle/Makefile @@ -25,7 +25,7 @@ MAN3= Devel::Cycle.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500601 -IGNORE= "Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again." +IGNORE= Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again. .endif .include <bsd.port.post.mk> diff --git a/devel/p5-Devel-DProfPP/Makefile b/devel/p5-Devel-DProfPP/Makefile index 7f054dab9ba9..fdf5226ce2bf 100644 --- a/devel/p5-Devel-DProfPP/Makefile +++ b/devel/p5-Devel-DProfPP/Makefile @@ -22,7 +22,7 @@ MAN3= Devel::DProfPP.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500600 -IGNORE= "Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again." +IGNORE= Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again. .endif .include <bsd.port.post.mk> diff --git a/devel/p5-Devel-LeakTrace/Makefile b/devel/p5-Devel-LeakTrace/Makefile index eefc9ec49754..9962785fc00c 100644 --- a/devel/p5-Devel-LeakTrace/Makefile +++ b/devel/p5-Devel-LeakTrace/Makefile @@ -23,7 +23,7 @@ MAN3= Devel::LeakTrace.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500600 -IGNORE= "Perl 5.6 or newer required. Install lang/perl5.8 and try again." +IGNORE= Perl 5.6 or newer required. Install lang/perl5.8 and try again. .endif .if ${PERL_LEVEL} < 500702 diff --git a/devel/p5-Devel-PPPort/Makefile b/devel/p5-Devel-PPPort/Makefile index d7dd7720c294..86111d559b97 100644 --- a/devel/p5-Devel-PPPort/Makefile +++ b/devel/p5-Devel-PPPort/Makefile @@ -17,7 +17,6 @@ MAINTAINER= mat@FreeBSD.org COMMENT= Perl/Pollution/Portability PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site MAN3= Devel::PPPort.3 diff --git a/devel/p5-Devel-Pointer/Makefile b/devel/p5-Devel-Pointer/Makefile index 29660ae81880..bf4fcf7c5c3d 100644 --- a/devel/p5-Devel-Pointer/Makefile +++ b/devel/p5-Devel-Pointer/Makefile @@ -22,7 +22,7 @@ MAN3= Devel::Pointer.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500600 -IGNORE= "Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again." +IGNORE= Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again. .endif .include <bsd.port.post.mk> diff --git a/devel/p5-Devel-Profiler/Makefile b/devel/p5-Devel-Profiler/Makefile index 24e6d26c77cd..040863f8bde2 100644 --- a/devel/p5-Devel-Profiler/Makefile +++ b/devel/p5-Devel-Profiler/Makefile @@ -26,7 +26,7 @@ MAN3= Devel::Profiler.3 Devel::Profiler::Apache.3 \ .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500600 -IGNORE= "Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again." +IGNORE= Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again. .endif .include <bsd.port.post.mk> diff --git a/devel/p5-Devel-SmallProf/Makefile b/devel/p5-Devel-SmallProf/Makefile index 630657d9a863..20bacb8ddbe8 100644 --- a/devel/p5-Devel-SmallProf/Makefile +++ b/devel/p5-Devel-SmallProf/Makefile @@ -26,7 +26,7 @@ MAN3= Devel::SmallProf.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500600 -IGNORE= "Perl 5.6 or newer required. Install lang/perl5.6 and try again." +IGNORE= Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again. .endif .include <bsd.port.post.mk> diff --git a/devel/p5-Devel-ptkdb/Makefile b/devel/p5-Devel-ptkdb/Makefile index 74c66b95ef25..45d8ec526ab1 100644 --- a/devel/p5-Devel-ptkdb/Makefile +++ b/devel/p5-Devel-ptkdb/Makefile @@ -18,7 +18,6 @@ COMMENT= Tk debugger for Perl RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS='site' MAN3= Devel::ptkdb.3 diff --git a/devel/p5-ExtUtils-CBuilder/Makefile b/devel/p5-ExtUtils-CBuilder/Makefile index 049eb62bdc23..3871a9dec4a5 100644 --- a/devel/p5-ExtUtils-CBuilder/Makefile +++ b/devel/p5-ExtUtils-CBuilder/Makefile @@ -7,6 +7,7 @@ PORTNAME= ExtUtils-CBuilder PORTVERSION= 0.11 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= ExtUtils @@ -15,6 +16,9 @@ PKGNAMEPREFIX= p5- MAINTAINER= mat@FreeBSD.org COMMENT= Compile and link C code for Perl modules +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools +RUN_DEPENDS= ${BUILD_DEPENDS} + PERL_CONFIGURE= yes MAN3= ExtUtils::CBuilder.3 ExtUtils::CBuilder::Platform::Windows.3 @@ -28,11 +32,4 @@ post-install: @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} <= 500600 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-ExtUtils-Constant/Makefile b/devel/p5-ExtUtils-Constant/Makefile index 3985219990b8..bb92af781395 100644 --- a/devel/p5-ExtUtils-Constant/Makefile +++ b/devel/p5-ExtUtils-Constant/Makefile @@ -21,7 +21,6 @@ MAN3= ExtUtils::Constant.3 ExtUtils::Constant::Base.3 \ ExtUtils::Constant::Utils.3 ExtUtils::Constant::XS.3 post-patch: - @${PERL} -pi -e 's!^(\s+INSTALLDIRS\s+=>\s+).*$$!$$1"site",!' \ - ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -e '/INSTALLDIRS/d' ${WRKSRC}/Makefile.PL .include <bsd.port.mk> diff --git a/devel/p5-ExtUtils-Depends/Makefile b/devel/p5-ExtUtils-Depends/Makefile index 49c12802c729..ccbc45d89703 100644 --- a/devel/p5-ExtUtils-Depends/Makefile +++ b/devel/p5-ExtUtils-Depends/Makefile @@ -22,7 +22,7 @@ MAN3= ExtUtils::Depends.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500600 -IGNORE= "Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again." +IGNORE= Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again. .endif .include <bsd.port.post.mk> diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile index ec88729f0c42..30c9c6399aef 100644 --- a/devel/p5-ExtUtils-MakeMaker/Makefile +++ b/devel/p5-ExtUtils-MakeMaker/Makefile @@ -17,7 +17,6 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Designed to write a Makefile for an extension module PERL_CONFIGURE= YES -CONFIGURE_ARGS= INSTALLDIRS=site MAN1= instmodsh.1 MAN3= ExtUtils::Installed.3 ExtUtils::MM_OS2.3 ExtUtils::MakeMaker.3 \ diff --git a/devel/p5-ExtUtils-ParseXS/Makefile b/devel/p5-ExtUtils-ParseXS/Makefile index 5c892eb6c190..b76a01b04455 100644 --- a/devel/p5-ExtUtils-ParseXS/Makefile +++ b/devel/p5-ExtUtils-ParseXS/Makefile @@ -19,7 +19,6 @@ BUILD_DEPENDS= ${SITE_PERL}/ExtUtils/CBuilder.pm:${PORTSDIR}/devel/p5-ExtUtils-C RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site MAN3= ExtUtils::ParseXS.3 diff --git a/devel/p5-ExtUtils-XSBuilder/Makefile b/devel/p5-ExtUtils-XSBuilder/Makefile index 7d608203e1d7..1b8fb555d930 100644 --- a/devel/p5-ExtUtils-XSBuilder/Makefile +++ b/devel/p5-ExtUtils-XSBuilder/Makefile @@ -19,7 +19,6 @@ RUN_DEPENDS= ${SITE_PERL}/Tie/IxHash.pm:${PORTSDIR}/devel/p5-Tie-IxHash BUILD_DEPENDS= ${RUN_DEPENDS} PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site MAN3= ExtUtils::XSBuilder.3 ExtUtils::XSBuilder::PODTemplate.3 \ ExtUtils::xsbuilder.osc2002.3 diff --git a/devel/p5-File-Find-Rule/Makefile b/devel/p5-File-Find-Rule/Makefile index 5ff768c90392..3419e25ec347 100644 --- a/devel/p5-File-Find-Rule/Makefile +++ b/devel/p5-File-Find-Rule/Makefile @@ -7,6 +7,7 @@ PORTNAME= File-Find-Rule PORTVERSION= 0.28 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= File @@ -16,6 +17,7 @@ MAINTAINER= skv@FreeBSD.org COMMENT= Alternative interface to File::Find BUILD_DEPENDS= ${SITE_PERL}/Number/Compare.pm:${PORTSDIR}/math/p5-Number-Compare \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/Text/Glob.pm:${PORTSDIR}/textproc/p5-Text-Glob RUN_DEPENDS= ${BUILD_DEPENDS} @@ -27,11 +29,6 @@ MAN3= File::Find::Rule.3 File::Find::Rule::Extending.3 \ .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} <= 500600 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - .if ${PERL_LEVEL} < 500702 BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple .endif diff --git a/devel/p5-File-NCopy/Makefile b/devel/p5-File-NCopy/Makefile index 5785d6e6cd29..85e02c0bb985 100644 --- a/devel/p5-File-NCopy/Makefile +++ b/devel/p5-File-NCopy/Makefile @@ -7,6 +7,7 @@ PORTNAME= File-NCopy PORTVERSION= 0.34 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= ../../authors/id/M/MZ/MZSANFORD @@ -15,15 +16,11 @@ PKGNAMEPREFIX= p5- MAINTAINER= skv@FreeBSD.org COMMENT= Copy file(s) to directories/file +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools +RUN_DEPENDS= ${BUILD_DEPENDS} + PERL_CONFIGURE= yes MAN3= File::NCopy.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS= ${BUILD_DEPENDS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-File-Spec/Makefile b/devel/p5-File-Spec/Makefile deleted file mode 100644 index 310e58e5793e..000000000000 --- a/devel/p5-File-Spec/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# New ports collection makefile for: p5-File-Spec -# Date created: November 22, 2000 -# Whom: Donald Burr <dburr@FreeBSD.ORG> -# -# $FreeBSD$ -# - -PORTNAME= File-Spec -PORTVERSION= 0.90 -CATEGORIES= devel perl5 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= File -PKGNAMEPREFIX= p5- - -MAINTAINER= perl@FreeBSD.org -COMMENT= A Perl module for portably manipulating file specifications - -PERL_CONFIGURE= yes -CONFIGURE_ARGS+= INSTALLDIRS='site' - -MAN3= File::Spec.3 \ - File::Spec::Cygwin.3 \ - File::Spec::Epoc.3 \ - File::Spec::Functions.3 \ - File::Spec::Mac.3 \ - File::Spec::OS2.3 \ - File::Spec::Unix.3 \ - File::Spec::VMS.3 \ - File::Spec::Win32.3 - -.include <bsd.port.mk> diff --git a/devel/p5-File-Spec/distinfo b/devel/p5-File-Spec/distinfo deleted file mode 100644 index 8f8e7e29e368..000000000000 --- a/devel/p5-File-Spec/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (File-Spec-0.90.tar.gz) = 7b8d2c4db438ded45f78f79ee7562909 -SIZE (File-Spec-0.90.tar.gz) = 33064 diff --git a/devel/p5-File-Spec/pkg-descr b/devel/p5-File-Spec/pkg-descr deleted file mode 100644 index 3dd8fae8a883..000000000000 --- a/devel/p5-File-Spec/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -This module is designed to support operations commonly performed on file -specifications (usually called "file names", but not to be confused with -the contents of a file, or Perl's file handles), such as concatenating -several directory and file names into a single path, or determining -whether a path is rooted. - -WWW: http://search.cpan.org/dist/File-Spec/ diff --git a/devel/p5-File-Spec/pkg-plist b/devel/p5-File-Spec/pkg-plist deleted file mode 100644 index b17a359e3dbe..000000000000 --- a/devel/p5-File-Spec/pkg-plist +++ /dev/null @@ -1,14 +0,0 @@ -%%SITE_PERL%%/File/Spec.pm -%%SITE_PERL%%/File/Spec/Cygwin.pm -%%SITE_PERL%%/File/Spec/Epoc.pm -%%SITE_PERL%%/File/Spec/Functions.pm -%%SITE_PERL%%/File/Spec/Mac.pm -%%SITE_PERL%%/File/Spec/OS2.pm -%%SITE_PERL%%/File/Spec/Unix.pm -%%SITE_PERL%%/File/Spec/VMS.pm -%%SITE_PERL%%/File/Spec/Win32.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Spec/.packlist -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Spec -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true -@dirrm %%SITE_PERL%%/File/Spec -@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true diff --git a/devel/p5-File-Temp/Makefile b/devel/p5-File-Temp/Makefile index 924b3846e14b..5a715677d525 100644 --- a/devel/p5-File-Temp/Makefile +++ b/devel/p5-File-Temp/Makefile @@ -7,7 +7,7 @@ PORTNAME= File-Temp PORTVERSION= 0.16 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= File @@ -16,12 +16,11 @@ PKGNAMEPREFIX= p5- MAINTAINER= clsung@FreeBSD.org COMMENT= Perl5 module to generate temporary files or directories safely -BUILD_DEPENDS= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site MAN3= File::Temp.3 diff --git a/devel/p5-Locale-Maketext-Lexicon/Makefile b/devel/p5-Locale-Maketext-Lexicon/Makefile index 5cd45d95a7c6..c448bac94ed1 100644 --- a/devel/p5-Locale-Maketext-Lexicon/Makefile +++ b/devel/p5-Locale-Maketext-Lexicon/Makefile @@ -7,6 +7,7 @@ PORTNAME= Locale-Maketext-Lexicon PORTVERSION= 0.49 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Locale @@ -16,7 +17,7 @@ MAINTAINER= mat@FreeBSD.org COMMENT= Use other catalog formats in Locale::Maketext BUILD_DEPENDS= ${SITE_PERL}/Regexp/Common.pm:${PORTSDIR}/textproc/p5-Regexp-Common \ - ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \ + ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ ${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext RUN_DEPENDS= ${BUILD_DEPENDS} diff --git a/devel/p5-Locale-Maketext/Makefile b/devel/p5-Locale-Maketext/Makefile index 8a941e8f1c02..edcc1ff7889b 100644 --- a/devel/p5-Locale-Maketext/Makefile +++ b/devel/p5-Locale-Maketext/Makefile @@ -19,7 +19,6 @@ BUILD_DEPENDS= ${SITE_PERL}/I18N/LangTags.pm:${PORTSDIR}/misc/p5-I18N-LangTags RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= YES -CONFIGURE_ARGS= INSTALLDIRS=site MAN3= Locale::Maketext.3 Locale::Maketext::TPJ13.3 diff --git a/devel/p5-Locale-libintl/Makefile b/devel/p5-Locale-libintl/Makefile index e2eba4ecf6be..e375a0b5ea7d 100644 --- a/devel/p5-Locale-libintl/Makefile +++ b/devel/p5-Locale-libintl/Makefile @@ -7,6 +7,7 @@ PORTNAME= Locale-libintl PORTVERSION= 1.11 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Locale @@ -16,6 +17,9 @@ DISTNAME= libintl-perl-${PORTVERSION} MAINTAINER= erwin@FreeBSD.org COMMENT= Internationalization library for Perl +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools +RUN_DEPENDS= ${BUILD_DEPENDS} + PERL_CONFIGURE= yes USE_GETTEXT= yes @@ -166,11 +170,4 @@ MAN3= Locale::RecodeData::IBM862.3 \ Locale::RecodeData::IBM290.3 \ Locale::RecodeData::IBM903.3 \ -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Log-Log4perl/Makefile b/devel/p5-Log-Log4perl/Makefile index 899364ff3fa0..7a30e5839f89 100644 --- a/devel/p5-Log-Log4perl/Makefile +++ b/devel/p5-Log-Log4perl/Makefile @@ -7,6 +7,7 @@ PORTNAME= Log-Log4perl PORTVERSION= 0.52 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Log @@ -15,7 +16,8 @@ PKGNAMEPREFIX= p5- MAINTAINER= lth@FreeBSD.org COMMENT= Log4j implementation for Perl -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable +BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes @@ -64,10 +66,4 @@ MAN3= Log::Log4perl.3 \ Log::Log4perl::NDC.3 \ Log::Log4perl::Util.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Module-Build/Makefile b/devel/p5-Module-Build/Makefile index 8102f0dfd170..1bf1c3a6b953 100644 --- a/devel/p5-Module-Build/Makefile +++ b/devel/p5-Module-Build/Makefile @@ -7,6 +7,7 @@ PORTNAME= Module-Build PORTVERSION= 0.26.10 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Module/KWILLIAMS @@ -16,7 +17,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/} MAINTAINER= mat@FreeBSD.org COMMENT= Build and install Perl modules -BUILD_DEPENDS= ${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \ +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \ ${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \ ${SITE_PERL}/ExtUtils/CBuilder.pm:${PORTSDIR}/devel/p5-ExtUtils-CBuilder RUN_DEPENDS= ${BUILD_DEPENDS} @@ -60,9 +62,6 @@ post-install: .if ${PERL_LEVEL} > 500600 BUILD_DEPENDS+= ${SITE_PERL}/ExtUtils/ParseXS.pm:${PORTSDIR}/devel/p5-ExtUtils-ParseXS .endif -.if ${PERL_LEVEL} < 500600 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif .if ${PERL_LEVEL} < 500805 BUILD_DEPENDS+= ${SITE_PERL}/Pod/Man.pm:${PORTSDIR}/textproc/p5-podlators .endif diff --git a/devel/p5-Module-Info/Makefile b/devel/p5-Module-Info/Makefile index 435d375bf4ba..03f3b5aada89 100644 --- a/devel/p5-Module-Info/Makefile +++ b/devel/p5-Module-Info/Makefile @@ -7,6 +7,7 @@ PORTNAME= Module-Info PORTVERSION= 0.26 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Module @@ -15,15 +16,12 @@ PKGNAMEPREFIX= p5- MAINTAINER= demon@FreeBSD.org COMMENT= Provides information about Perl modules +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools +RUN_DEPENDS= ${BUILD_DEPENDS} + PERL_CONFIGURE= yes + MAN1= module_info.1 pfunc.1 MAN3= B::Utils.3 Module::Info.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} <= 500600 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Module-Load-Conditional/Makefile b/devel/p5-Module-Load-Conditional/Makefile index 5b53a4eb2093..0d36112f735a 100644 --- a/devel/p5-Module-Load-Conditional/Makefile +++ b/devel/p5-Module-Load-Conditional/Makefile @@ -7,6 +7,7 @@ PORTNAME= Module-Load-Conditional PORTVERSION= 0.08 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Module @@ -17,7 +18,8 @@ COMMENT= Looking up Perl modules information/loading at runtime BUILD_DEPENDS= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \ ${RUN_DEPENDS} -RUN_DEPENDS= ${SITE_PERL}/Module/Load.pm:${PORTSDIR}/devel/p5-Module-Load \ +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/Module/Load.pm:${PORTSDIR}/devel/p5-Module-Load \ ${SITE_PERL}/Locale/Maketext/Simple.pm:${PORTSDIR}/devel/p5-Locale-Maketext-Simple \ ${SITE_PERL}/Params/Check.pm:${PORTSDIR}/devel/p5-Params-Check @@ -34,11 +36,4 @@ post-install: @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} <= 500600 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Module-Pluggable/Makefile b/devel/p5-Module-Pluggable/Makefile index f6a21322f00e..14d0cf689ad7 100644 --- a/devel/p5-Module-Pluggable/Makefile +++ b/devel/p5-Module-Pluggable/Makefile @@ -7,6 +7,7 @@ PORTNAME= Module-Pluggable PORTVERSION= 2.8 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Module @@ -15,7 +16,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= lth@FreeBSD.org COMMENT= Automatically give your module the ability to have plugins -BUILD_DEPENDS= ${SITE_PERL}/File/Spec/Functions.pm:${PORTSDIR}/devel/p5-File-Spec +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools RUN_DEPENDS= ${BUILD_DEPENDS} PERL_MODBUILD= yes diff --git a/devel/p5-Module-Release/Makefile b/devel/p5-Module-Release/Makefile index 76a6052f334c..d486243b16b2 100644 --- a/devel/p5-Module-Release/Makefile +++ b/devel/p5-Module-Release/Makefile @@ -7,6 +7,7 @@ PORTNAME= release PORTVERSION= 0.99 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= ../../authors/id/B/BD/BDFOY @@ -15,7 +16,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= skv@FreeBSD.org COMMENT= Upload files to CPAN and SourceForge -BUILD_DEPENDS= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \ ${SITE_PERL}/Test/Pod.pm:${PORTSDIR}/devel/p5-Test-Pod \ ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ diff --git a/devel/p5-NEXT/Makefile b/devel/p5-NEXT/Makefile index 58747cedfa8d..8f0846b144ea 100644 --- a/devel/p5-NEXT/Makefile +++ b/devel/p5-NEXT/Makefile @@ -16,7 +16,6 @@ MAINTAINER= mat@FreeBSD.org COMMENT= Provide a pseudo-class NEXT (et al) that allows method redispatch PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site MAN3= NEXT.3 diff --git a/devel/p5-PCSC-Card/Makefile b/devel/p5-PCSC-Card/Makefile index 796f63eb04d2..c60a220d1afc 100644 --- a/devel/p5-PCSC-Card/Makefile +++ b/devel/p5-PCSC-Card/Makefile @@ -26,7 +26,6 @@ IGNORE= Requires perl-5.6.0 or better to build correctly .endif PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site MAKE_ENV= "LOCALBASE=$(LOCALBASE)" MAN3= Chipcard::PCSC::Card.3 Chipcard::PCSC.3 diff --git a/devel/p5-POE-API-Hooks/Makefile b/devel/p5-POE-API-Hooks/Makefile index 118cff152b73..c31672e6e985 100644 --- a/devel/p5-POE-API-Hooks/Makefile +++ b/devel/p5-POE-API-Hooks/Makefile @@ -6,7 +6,7 @@ # PORTNAME= POE-API-Hooks -PORTVERSION= 1.0443 +PORTVERSION= 1.05 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= ../../authors/id/S/SU/SUNGO @@ -26,7 +26,7 @@ MAN3= POE::API::Hooks.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500601 -IGNORE= "Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again." +IGNORE= Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again. .endif .include <bsd.port.post.mk> diff --git a/devel/p5-POE-API-Hooks/distinfo b/devel/p5-POE-API-Hooks/distinfo index 7c5d28e523c2..80525c78fb36 100644 --- a/devel/p5-POE-API-Hooks/distinfo +++ b/devel/p5-POE-API-Hooks/distinfo @@ -1,2 +1,2 @@ -MD5 (POE-API-Hooks-1.0443.tar.gz) = f25e086c70aa14dc3523822cdea6041d -SIZE (POE-API-Hooks-1.0443.tar.gz) = 4773 +MD5 (POE-API-Hooks-1.05.tar.gz) = b48a6ddf120639af44dad25ce0a76ea2 +SIZE (POE-API-Hooks-1.05.tar.gz) = 5013 diff --git a/devel/p5-POE-API-Peek/Makefile b/devel/p5-POE-API-Peek/Makefile index 4b7d1d964aaf..6352797c83a4 100644 --- a/devel/p5-POE-API-Peek/Makefile +++ b/devel/p5-POE-API-Peek/Makefile @@ -26,7 +26,7 @@ MAN3= POE::API::Peek.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500601 -IGNORE= "Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again." +IGNORE= Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again. .endif .include <bsd.port.post.mk> diff --git a/devel/p5-POE-Component-DebugShell/Makefile b/devel/p5-POE-Component-DebugShell/Makefile index aa88849dfb5f..97ec213242fd 100644 --- a/devel/p5-POE-Component-DebugShell/Makefile +++ b/devel/p5-POE-Component-DebugShell/Makefile @@ -30,7 +30,7 @@ post-patch: .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500601 -IGNORE= "Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again." +IGNORE= Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again. .endif .include <bsd.port.post.mk> diff --git a/devel/p5-POE-Devel-Profiler/Makefile b/devel/p5-POE-Devel-Profiler/Makefile index ae70eb4fd512..85909cf4f51d 100644 --- a/devel/p5-POE-Devel-Profiler/Makefile +++ b/devel/p5-POE-Devel-Profiler/Makefile @@ -26,7 +26,7 @@ MAN3= POE::Devel::Profiler.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500600 -IGNORE= "Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again" +IGNORE= Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again. .endif .include <bsd.port.post.mk> diff --git a/devel/p5-POE/Makefile b/devel/p5-POE/Makefile index 3ee3a919c9cf..6e4e1d244730 100644 --- a/devel/p5-POE/Makefile +++ b/devel/p5-POE/Makefile @@ -7,6 +7,7 @@ PORTNAME= POE PORTVERSION= 0.3101 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= POE @@ -17,7 +18,7 @@ MAINTAINER= skv@FreeBSD.org COMMENT= Multitasking and networking framework for perl BUILD_DEPENDS= \ - ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \ ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \ ${SITE_PERL}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event \ diff --git a/devel/p5-Path-Class/Makefile b/devel/p5-Path-Class/Makefile index cecbc12eb5cd..2cf9fc279633 100644 --- a/devel/p5-Path-Class/Makefile +++ b/devel/p5-Path-Class/Makefile @@ -15,6 +15,9 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Cross-platform path specification manipulation +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools +RUN_DEPENDS= ${BUILD_DEPENDS} + PERL_MODBUILD= yes MAN3= Path::Class.3 \ @@ -33,10 +36,7 @@ post-install: .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500600 -EXTRA_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO \ - ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -BUILD_DEPENDS= ${EXTRA_DEPENDS} -RUN_DEPENDS= ${EXTRA_DEPENDS} +BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO .endif .include <bsd.port.post.mk> diff --git a/devel/p5-PathTools/Makefile b/devel/p5-PathTools/Makefile index 310e58e5793e..052ca3a34253 100644 --- a/devel/p5-PathTools/Makefile +++ b/devel/p5-PathTools/Makefile @@ -5,8 +5,8 @@ # $FreeBSD$ # -PORTNAME= File-Spec -PORTVERSION= 0.90 +PORTNAME= PathTools +PORTVERSION= 3.08 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= File @@ -15,17 +15,13 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= A Perl module for portably manipulating file specifications +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils +RUN_DEPENDS= ${BUILD_DEPENDS} + PERL_CONFIGURE= yes -CONFIGURE_ARGS+= INSTALLDIRS='site' -MAN3= File::Spec.3 \ - File::Spec::Cygwin.3 \ - File::Spec::Epoc.3 \ - File::Spec::Functions.3 \ - File::Spec::Mac.3 \ - File::Spec::OS2.3 \ - File::Spec::Unix.3 \ - File::Spec::VMS.3 \ - File::Spec::Win32.3 +MAN3= Cwd.3 File::Spec.3 File::Spec::Cygwin.3 File::Spec::Epoc.3 \ + File::Spec::Functions.3 File::Spec::Mac.3 File::Spec::OS2.3 \ + File::Spec::Unix.3 File::Spec::VMS.3 File::Spec::Win32.3 .include <bsd.port.mk> diff --git a/devel/p5-PathTools/distinfo b/devel/p5-PathTools/distinfo index 8f8e7e29e368..ed569267fffb 100644 --- a/devel/p5-PathTools/distinfo +++ b/devel/p5-PathTools/distinfo @@ -1,2 +1,2 @@ -MD5 (File-Spec-0.90.tar.gz) = 7b8d2c4db438ded45f78f79ee7562909 -SIZE (File-Spec-0.90.tar.gz) = 33064 +MD5 (PathTools-3.08.tar.gz) = 6648d4f94a656b16f4f7393da082ceaa +SIZE (PathTools-3.08.tar.gz) = 110666 diff --git a/devel/p5-PathTools/pkg-descr b/devel/p5-PathTools/pkg-descr index 3dd8fae8a883..539a02f00b86 100644 --- a/devel/p5-PathTools/pkg-descr +++ b/devel/p5-PathTools/pkg-descr @@ -4,4 +4,4 @@ the contents of a file, or Perl's file handles), such as concatenating several directory and file names into a single path, or determining whether a path is rooted. -WWW: http://search.cpan.org/dist/File-Spec/ +WWW: http://search.cpan.org/dist/PathTools/ diff --git a/devel/p5-PathTools/pkg-plist b/devel/p5-PathTools/pkg-plist index b17a359e3dbe..fd64d5b4b89b 100644 --- a/devel/p5-PathTools/pkg-plist +++ b/devel/p5-PathTools/pkg-plist @@ -1,14 +1,16 @@ -%%SITE_PERL%%/File/Spec.pm -%%SITE_PERL%%/File/Spec/Cygwin.pm -%%SITE_PERL%%/File/Spec/Epoc.pm -%%SITE_PERL%%/File/Spec/Functions.pm -%%SITE_PERL%%/File/Spec/Mac.pm -%%SITE_PERL%%/File/Spec/OS2.pm -%%SITE_PERL%%/File/Spec/Unix.pm -%%SITE_PERL%%/File/Spec/VMS.pm -%%SITE_PERL%%/File/Spec/Win32.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Spec/.packlist -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Spec -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true -@dirrm %%SITE_PERL%%/File/Spec -@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true +%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/.packlist +%%SITE_PERL%%/%%PERL_ARCH%%/Cwd.pm +%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec.pm +%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Cygwin.pm +%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Epoc.pm +%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Functions.pm +%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Mac.pm +%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/OS2.pm +%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Unix.pm +%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/VMS.pm +%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Win32.pm +%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/Cwd.bs +%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/Cwd.so +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/File/Spec +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd +@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/File 2>/dev/null || true diff --git a/devel/p5-Pod-Coverage/Makefile b/devel/p5-Pod-Coverage/Makefile index c4d6cc454253..c9b322840aa9 100644 --- a/devel/p5-Pod-Coverage/Makefile +++ b/devel/p5-Pod-Coverage/Makefile @@ -7,6 +7,7 @@ PORTNAME= Pod-Coverage PORTVERSION= 0.17 +PORTREVISION= 1 CATEGORIES= devel textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Pod @@ -16,7 +17,7 @@ MAINTAINER= mat@FreeBSD.org COMMENT= Checks if the documentation of a module is comprehensive BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \ +RUN_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ ${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump PERL_MODBUILD= yes diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile index 94e1e2f714a3..50c009663f5e 100644 --- a/devel/p5-Storable/Makefile +++ b/devel/p5-Storable/Makefile @@ -16,7 +16,6 @@ MAINTAINER= tobez@FreeBSD.org COMMENT= Persistency for perl data structures PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site MAN3= Storable.3 diff --git a/devel/p5-Test-Harness/Makefile b/devel/p5-Test-Harness/Makefile index 6f0356652fd1..adc80e79f7b9 100644 --- a/devel/p5-Test-Harness/Makefile +++ b/devel/p5-Test-Harness/Makefile @@ -7,6 +7,7 @@ PORTNAME= Test-Harness PORTVERSION= 2.42 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Test @@ -25,7 +26,7 @@ MAN3= Test::Harness.3 Test::Harness::Assert.3 \ .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser +BUILD_DEPENDS+= ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser RUN_DEPENDS+= ${BUILD_DEPENDS} .endif diff --git a/devel/p5-Test-Inline/Makefile b/devel/p5-Test-Inline/Makefile index d8b4705f03cc..8ad846643df9 100644 --- a/devel/p5-Test-Inline/Makefile +++ b/devel/p5-Test-Inline/Makefile @@ -7,6 +7,7 @@ PORTNAME= Test-Inline PORTVERSION= 0.16 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Test @@ -15,7 +16,9 @@ PKGNAMEPREFIX= p5- MAINTAINER= erwin@FreeBSD.org COMMENT= Test::Inline - Inlining your tests next to the code being tested -BUILD_DEPENDS= ${SITE_PERL}/Test/Harness.pm:${PORTSDIR}/devel/p5-Test-Harness +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/Test/Harness.pm:${PORTSDIR}/devel/p5-Test-Harness \ + ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes @@ -23,16 +26,4 @@ PERL_CONFIGURE= yes MAN1= pod2test.1 MAN3= Pod::Tests.3 Pod::Tests::Tutorial.3 Test::Inline.3 Test::Inline::Tutorial.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.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 - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Test-Reporter/Makefile b/devel/p5-Test-Reporter/Makefile index 3a999a462456..447f76a62d1f 100644 --- a/devel/p5-Test-Reporter/Makefile +++ b/devel/p5-Test-Reporter/Makefile @@ -7,6 +7,7 @@ PORTNAME= Test-Reporter PORTVERSION= 1.27 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Test @@ -15,7 +16,9 @@ PKGNAMEPREFIX= p5- MAINTAINER= lth@FreeBSD.org COMMENT= Sends test results to cpan-testers@perl.org -BUILD_DEPENDS= ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \ + ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes @@ -26,16 +29,4 @@ MAN3= Test::Reporter.3 \ Test::Reporter::Mail::Util.3 \ Test::Reporter::Time::Zone.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} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif -.if ${PERL_LEVEL} <= 500503 -EXTRA_PATCHES= ${FILESDIR}/500503-Test::Reporter.pm -.endif -.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 3f9c3194d34d..a7e72eb2f633 100644 --- a/devel/p5-Test-Tester/Makefile +++ b/devel/p5-Test-Tester/Makefile @@ -17,7 +17,6 @@ MAINTAINER= mat@FreeBSD.org COMMENT= Helps to test various Test::Builder derivatives PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site INSTALL_TARGET= pure_install MAN3= Test::Tester.3 Test::Tester::Capture.3 \ diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile index 4cb8c04ac0f6..686f5742bc9a 100644 --- a/devel/p5-Time-HiRes/Makefile +++ b/devel/p5-Time-HiRes/Makefile @@ -17,7 +17,6 @@ MAINTAINER= tobez@FreeBSD.org COMMENT= A perl5 module implementing High resolution time, sleep, and alarm PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site MAN3= Time::HiRes.3 diff --git a/devel/p5-Time-Local/Makefile b/devel/p5-Time-Local/Makefile index a1c696a6bcdb..27e431b1d4ea 100644 --- a/devel/p5-Time-Local/Makefile +++ b/devel/p5-Time-Local/Makefile @@ -16,7 +16,6 @@ MAINTAINER= mat@FreeBSD.org COMMENT= Efficiently compute time from local and GMT time PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS='site' MAN3= Time::Local.3 diff --git a/devel/p5-VCS/Makefile b/devel/p5-VCS/Makefile index 37b7d0d200a0..04406064b1b4 100644 --- a/devel/p5-VCS/Makefile +++ b/devel/p5-VCS/Makefile @@ -7,6 +7,7 @@ PORTNAME= VCS PORTVERSION= 0.14 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= VCS @@ -16,6 +17,7 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Library for generic Version Control System access in Perl BUILD_DEPENDS= ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/Sort/Versions.pm:${PORTSDIR}/devel/p5-Sort-Versions RUN_DEPENDS= ${BUILD_DEPENDS} @@ -25,10 +27,4 @@ MAN1= diff-hist.1 MAN3= VCS.3 VCS::Cvs.3 VCS::Dir.3 VCS::File.3 \ VCS::Rcs.3 VCS::Version.3 VCS_dev.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/p5-Want/Makefile b/devel/p5-Want/Makefile index 37bd0e0f5aad..2bd7c4d9ab93 100644 --- a/devel/p5-Want/Makefile +++ b/devel/p5-Want/Makefile @@ -22,7 +22,7 @@ MAN3= Want.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500600 -IGNORE= "Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again." +IGNORE= Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again. .endif .include <bsd.port.post.mk> diff --git a/devel/p5-base/Makefile b/devel/p5-base/Makefile index 236b4b8977b0..97df9c049de6 100644 --- a/devel/p5-base/Makefile +++ b/devel/p5-base/Makefile @@ -16,7 +16,6 @@ MAINTAINER= skv@FreeBSD.org COMMENT= Set of modules to operate with inheritance and class fields at runtime PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS='site' MAN3= base.3 fields.3 diff --git a/devel/p5-release/Makefile b/devel/p5-release/Makefile index 76a6052f334c..d486243b16b2 100644 --- a/devel/p5-release/Makefile +++ b/devel/p5-release/Makefile @@ -7,6 +7,7 @@ PORTNAME= release PORTVERSION= 0.99 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= ../../authors/id/B/BD/BDFOY @@ -15,7 +16,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= skv@FreeBSD.org COMMENT= Upload files to CPAN and SourceForge -BUILD_DEPENDS= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \ ${SITE_PERL}/Test/Pod.pm:${PORTSDIR}/devel/p5-Test-Pod \ ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile index f94df2d92b64..efc8feed3d34 100644 --- a/mail/cyrus-imapd2/Makefile +++ b/mail/cyrus-imapd2/Makefile @@ -6,8 +6,8 @@ # PORTNAME= cyrus-imapd -PORTVERSION= 2.1.18 -#PORTREVISION= 0 +PORTVERSION= 2.1.18 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ @@ -20,11 +20,13 @@ PATCHFILES= ${PORTNAME}-2.1.16-ipv6-20031121.diff.gz MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols -CONFLICTS= cyrus-1.* cyrus-imapd-2.[^1].* - LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 +RUN_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ + ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend +CONFLICTS= cyrus-1.* cyrus-imapd-2.[^1].* + LATEST_LINK= ${PORTNAME}2 USE_RC_SUBR= imapd.sh @@ -115,13 +117,6 @@ DOCS= altnamespace anoncvs bugs changes faq feedback index \ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif -.if ${PERL_LEVEL} < 500600 -RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser -.endif - pre-everything:: .if !defined(WITH_BDB_VER) @if ${LDCONFIG} -r | ${GREP} -qwE -e "-ldb(41|4)"; then \ diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile index 1ea20cd1067d..d137aefb38fe 100644 --- a/mail/cyrus-imapd22/Makefile +++ b/mail/cyrus-imapd22/Makefile @@ -6,8 +6,8 @@ # PORTNAME= cyrus-imapd -PORTVERSION= 2.2.12 -#PORTREVISION= 0 +PORTVERSION= 2.2.12 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ @@ -17,6 +17,8 @@ MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 +RUN_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ + ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp CONFLICTS= cyrus-1.* cyrus-imapd-2.[^2].* @@ -247,13 +249,6 @@ CONFS= cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif -.if ${PERL_LEVEL} < 500600 -RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser -.endif - post-patch: @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%PREFIX%%|${PREFIX}|g" \ diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index 1ea20cd1067d..d137aefb38fe 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -6,8 +6,8 @@ # PORTNAME= cyrus-imapd -PORTVERSION= 2.2.12 -#PORTREVISION= 0 +PORTVERSION= 2.2.12 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ @@ -17,6 +17,8 @@ MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 +RUN_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ + ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp CONFLICTS= cyrus-1.* cyrus-imapd-2.[^2].* @@ -247,13 +249,6 @@ CONFS= cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif -.if ${PERL_LEVEL} < 500600 -RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser -.endif - post-patch: @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%PREFIX%%|${PREFIX}|g" \ diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index 1ea20cd1067d..d137aefb38fe 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -6,8 +6,8 @@ # PORTNAME= cyrus-imapd -PORTVERSION= 2.2.12 -#PORTREVISION= 0 +PORTVERSION= 2.2.12 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ @@ -17,6 +17,8 @@ MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 +RUN_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ + ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp CONFLICTS= cyrus-1.* cyrus-imapd-2.[^2].* @@ -247,13 +249,6 @@ CONFS= cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.endif -.if ${PERL_LEVEL} < 500600 -RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser -.endif - post-patch: @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%PREFIX%%|${PREFIX}|g" \ diff --git a/mail/mailscanner-devel/Makefile b/mail/mailscanner-devel/Makefile index 2a355c20d7e5..0b18a6cfdb59 100644 --- a/mail/mailscanner-devel/Makefile +++ b/mail/mailscanner-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= MailScanner PORTVERSION= 4.42.1 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/ PKGNAMESUFFIX= -devel @@ -17,6 +18,8 @@ COMMENT= Powerful virus/spam scanning framework for mail gateways BUILD_DEPENDS= \ ${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \ ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \ ${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \ ${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset \ @@ -50,14 +53,6 @@ MLINKS= MailScanner.8 mailscanner.8 \ .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif -.endif - DOC_FILES= INSTALL INSTALL.FreeBSD INSTALL.OpenBSD README ETC_FILES= MailScanner.conf filename.rules.conf \ filetype.rules.conf spam.assassin.prefs.conf \ diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile index 3a40c659e9c2..e89b12cac408 100644 --- a/mail/mailscanner/Makefile +++ b/mail/mailscanner/Makefile @@ -7,6 +7,7 @@ PORTNAME= MailScanner PORTVERSION= 4.42.9 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/ DISTNAME= ${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL} @@ -16,6 +17,8 @@ COMMENT= Powerful virus/spam scanning framework for mail gateways BUILD_DEPENDS= \ ${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \ ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \ ${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \ ${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset \ @@ -53,14 +56,6 @@ MLINKS= MailScanner.8 mailscanner.8 \ .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif -.endif - DOC_FILES= INSTALL INSTALL.FreeBSD INSTALL.OpenBSD README ETC_FILES= MailScanner.conf filename.rules.conf \ filetype.rules.conf spam.assassin.prefs.conf \ diff --git a/mail/msgconvert/Makefile b/mail/msgconvert/Makefile index 3d0907cbef44..ca7f90b58307 100644 --- a/mail/msgconvert/Makefile +++ b/mail/msgconvert/Makefile @@ -7,7 +7,7 @@ PORTNAME= msgconvert PORTVERSION= 20040531 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail perl5 MASTER_SITES= http://www.webonaut.com/distfiles/ DISTNAME= ${PORTNAME}-${PORTVERSION}.pl @@ -18,6 +18,7 @@ COMMENT= Convert .MSG files to multipart MIME messages (mbox) RUN_DEPENDS= ${SITE_PERL}/OLE/Storage_Lite.pm:${PORTSDIR}/devel/p5-OLE-Storage_Lite \ ${SITE_PERL}/MIME/Words.pm:${PORTSDIR}/mail/p5-MIME-Tools \ + ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ ${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate NO_BUILD= yes @@ -31,10 +32,4 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME}.pl ${LN} -s ${PREFIX}/bin/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500601 -RUN_DEPENDS+= ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/p5-MIME-Fast/Makefile b/mail/p5-MIME-Fast/Makefile index 830f76dfc24a..fa1694de18ed 100644 --- a/mail/p5-MIME-Fast/Makefile +++ b/mail/p5-MIME-Fast/Makefile @@ -28,7 +28,7 @@ MAN3= MIME::Fast.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500800 -IGNORE= "Perl 5.8 or newer required. Install lang/perl5.8 and try again." +IGNORE= Perl 5.8 or newer required. Install lang/perl5.8 and try again. .endif .include <bsd.port.post.mk> diff --git a/mail/p5-Mail-Box1/Makefile b/mail/p5-Mail-Box1/Makefile index 661367ca1bca..198d49d80436 100644 --- a/mail/p5-Mail-Box1/Makefile +++ b/mail/p5-Mail-Box1/Makefile @@ -16,6 +16,7 @@ MAINTAINER= tobez@FreeBSD.org COMMENT= Perl module implementing a modern mail-folder managerat BUILD_DEPENDS= ${SITE_PERL}/MIME/Entity.pm:${PORTSDIR}/mail/p5-MIME-Tools \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \ ${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate RUN_DEPENDS= ${BUILD_DEPENDS} @@ -42,11 +43,4 @@ post-patch: ${PERL} -pi -e 's/^our\s+([\$$\@]\w+)/use vars qw($$1);$$1/' \ ${WRKSRC}/Message.pm -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} <= 500600 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/sqlgrey/Makefile b/mail/sqlgrey/Makefile index 7cf8312c4787..4d4a5fbac3e9 100644 --- a/mail/sqlgrey/Makefile +++ b/mail/sqlgrey/Makefile @@ -7,7 +7,7 @@ PORTNAME= sqlgrey PORTVERSION= 1.4.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,7 +17,7 @@ COMMENT= Greylisting policy server for Postfix using an SQL backend RUN_DEPENDS= ${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \ ${SITE_PERL}/IO/Multiplex.pm:${PORTSDIR}/devel/p5-IO-Multiplex \ - ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser + ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser .if defined(WITH_PGSQL) RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/pg.pm:${PORTSDIR}/databases/p5-DBD-Pg diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile index 652095479ab3..d3986d5455be 100644 --- a/mail/sympa/Makefile +++ b/mail/sympa/Makefile @@ -7,7 +7,7 @@ PORTNAME= sympa PORTVERSION?= 4.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES?= http://www.sympa.org/distribution/old/ @@ -17,7 +17,7 @@ COMMENT?= Sympa is an electronic mailing list manager BUILD_DEPENDS+= ${SITE_PERL}/Mail/Mailer.pm:${PORTSDIR}/mail/p5-Mail-Tools \ ${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \ ${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \ - ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \ ${SITE_PERL}/Crypt/CipherSaber.pm:${PORTSDIR}/security/p5-Crypt-CipherSaber \ diff --git a/math/p5-Math-BigInt/Makefile b/math/p5-Math-BigInt/Makefile index 35f7edde3188..266fe6de9bd9 100644 --- a/math/p5-Math-BigInt/Makefile +++ b/math/p5-Math-BigInt/Makefile @@ -16,7 +16,6 @@ MAINTAINER= tobez@FreeBSD.org COMMENT= Math::BigInt - Arbitrary size integer math package PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS='site' MAN3= Math::BigFloat.3 \ Math::BigInt.3 \ diff --git a/math/p5-Math-BigRat/Makefile b/math/p5-Math-BigRat/Makefile index 03bdc4328855..5c1738688628 100644 --- a/math/p5-Math-BigRat/Makefile +++ b/math/p5-Math-BigRat/Makefile @@ -23,6 +23,6 @@ PERL_CONFIGURE= yes MAN3= Math::BigRat.3 post-patch: - @${PERL} -pi -e '$$_="" if m/INSTALLDIRS/;' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -e '/INSTALLDIRS/d' ${WRKSRC}/Makefile.PL .include <bsd.port.mk> diff --git a/misc/gpt/Makefile b/misc/gpt/Makefile index b62103e456a7..55ef47ea8192 100644 --- a/misc/gpt/Makefile +++ b/misc/gpt/Makefile @@ -7,6 +7,7 @@ PORTNAME= gpt PORTVERSION= 3.2 +PORTREVISION= 1 CATEGORIES= misc archivers devel parallel MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/aces/gpt/releases/gpt-${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -19,9 +20,9 @@ CONFLICTS= gpt-3.1 RUN_DEPENDS+= ${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \ ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \ ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib \ - ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \ + ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \ ${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake \ ${LOCALBASE}/bin/makepatch:${PORTSDIR}/textproc/makepatch diff --git a/misc/gpt31/Makefile b/misc/gpt31/Makefile index bf43512e8590..fcc34baa15b6 100644 --- a/misc/gpt31/Makefile +++ b/misc/gpt31/Makefile @@ -7,7 +7,7 @@ PORTNAME= gpt PORTVERSION= 3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc archivers devel parallel MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/aces/gpt/releases/gpt-${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -21,9 +21,9 @@ NO_LATEST_LINK= YES RUN_DEPENDS+= ${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \ ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \ ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib \ - ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \ + ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \ ${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake \ ${LOCALBASE}/bin/makepatch:${PORTSDIR}/textproc/makepatch diff --git a/misc/p5-I18N-LangTags/Makefile b/misc/p5-I18N-LangTags/Makefile index 8c61d5a55ea2..364a967f9733 100644 --- a/misc/p5-I18N-LangTags/Makefile +++ b/misc/p5-I18N-LangTags/Makefile @@ -16,7 +16,6 @@ MAINTAINER= demon@FreeBSD.org COMMENT= Functions for dealing with RFC-1766-style language tags PERL_CONFIGURE= YES -CONFIGURE_ARGS+=INSTALLDIRS=site MAN3= I18N::LangTags.3 I18N::LangTags::Detect.3 I18N::LangTags::List.3 diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile index 607210c9198a..d93fbadc1e82 100644 --- a/net-mgmt/mrtg/Makefile +++ b/net-mgmt/mrtg/Makefile @@ -7,6 +7,7 @@ PORTNAME= mrtg PORTVERSION= 2.12.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-mgmt ipv6 MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \ @@ -21,7 +22,7 @@ MAINTAINER= demon@FreeBSD.org COMMENT= The multi-router traffic grapher RUN_DEPENDS= ${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \ - ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \ + ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ ${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6 LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile index 169f92ecdf4b..612d062fb21e 100644 --- a/net-mgmt/smokeping/Makefile +++ b/net-mgmt/smokeping/Makefile @@ -7,6 +7,7 @@ PORTNAME= smokeping PORTVERSION= 1.40 +PORTREVISION= 1 CATEGORIES= net www MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/ @@ -18,7 +19,7 @@ RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \ ${SITE_PERL}/BER.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \ ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \ + ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net IGNORE= only works with old versions (1.0.x) of net/rrdtool diff --git a/net/ldapsh/Makefile b/net/ldapsh/Makefile index 6580cf0fe111..6dbce55798c8 100644 --- a/net/ldapsh/Makefile +++ b/net/ldapsh/Makefile @@ -7,6 +7,7 @@ PORTNAME= ldapsh PORTVERSION= 2.00 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_PERL_CPAN} @@ -37,7 +38,7 @@ PERL_CONFIGURE= yes .if ${PERL_LEVEL} > 500600 MAN3+= Net::LDAP::Config.3 .else -BUILD_DEPENDS+= ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser +BUILD_DEPENDS+= ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser .endif post-patch: diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile index 7c12f69244c0..37981b63e196 100644 --- a/net/p5-Net/Makefile +++ b/net/p5-Net/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${SITE_PERL}/Authen/SASL.pm:${PORTSDIR}/security/p5-Authen-SASL \ ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site < /dev/null +CONFIGURE_ARGS= < /dev/null MAN3= Net::Cmd.3 \ Net::Config.3 \ diff --git a/net/p5-RPC-XML/Makefile b/net/p5-RPC-XML/Makefile index 2ec83a721517..45665481394a 100644 --- a/net/p5-RPC-XML/Makefile +++ b/net/p5-RPC-XML/Makefile @@ -7,6 +7,7 @@ PORTNAME= RPC-XML PORTVERSION= 0.57 +PORTREVISION= 1 CATEGORIES= net www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= RPC @@ -16,6 +17,7 @@ MAINTAINER= martin@matuska.org COMMENT= XML-RPC client and server library for Perl BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww RUN_DEPENDS= ${BUILD_DEPENDS} @@ -33,10 +35,4 @@ MAN3= Apache::RPC::Server.3 \ RPC::XML::Procedure.3 \ RPC::XML::Server.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif # ${PERL_LEVEL} < 500601 - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile index 169f92ecdf4b..612d062fb21e 100644 --- a/net/smokeping/Makefile +++ b/net/smokeping/Makefile @@ -7,6 +7,7 @@ PORTNAME= smokeping PORTVERSION= 1.40 +PORTREVISION= 1 CATEGORIES= net www MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/ @@ -18,7 +19,7 @@ RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \ ${SITE_PERL}/BER.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \ ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \ + ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net IGNORE= only works with old versions (1.0.x) of net/rrdtool diff --git a/security/p5-Authen-Captcha/Makefile b/security/p5-Authen-Captcha/Makefile index 27068e071512..da3e4a1577d1 100644 --- a/security/p5-Authen-Captcha/Makefile +++ b/security/p5-Authen-Captcha/Makefile @@ -7,6 +7,7 @@ PORTNAME= Authen-Captcha PORTVERSION= 1.023 +PORTREVISION= 1 CATEGORIES= security perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Authen @@ -15,22 +16,13 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Perl module to verify the human element in transactions -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \ + ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes MAN3= Authen::Captcha.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 -.if ${PERL_LEVEL} <= 500600 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Crypt-Twofish/Makefile b/security/p5-Crypt-Twofish/Makefile index 1871f1e375ff..14c612f1fea1 100644 --- a/security/p5-Crypt-Twofish/Makefile +++ b/security/p5-Crypt-Twofish/Makefile @@ -7,6 +7,7 @@ PORTNAME= Crypt-Twofish PORTVERSION= 2.12 +PORTREVISION= 1 CATEGORIES= security perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Crypt @@ -15,14 +16,11 @@ PKGNAMEPREFIX= p5- MAINTAINER= erwin@FreeBSD.org COMMENT= Perl module implementing the Twofish cipher +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools +RUN_DEPENDS= ${BUILD_DEPENDS} + PERL_CONFIGURE= yes MAN3= Crypt::Twofish.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Digest-MD4/Makefile b/security/p5-Digest-MD4/Makefile index 4bfbdbe61a78..a91a99395727 100644 --- a/security/p5-Digest-MD4/Makefile +++ b/security/p5-Digest-MD4/Makefile @@ -17,7 +17,6 @@ MAINTAINER= mat@FreeBSD.org COMMENT= Perl5 interface to the MD4 message digest algorithm PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site MAN3= Digest::MD4.3 diff --git a/security/p5-Digest-MD5-M4p/Makefile b/security/p5-Digest-MD5-M4p/Makefile index 98b976206483..f9e43b4e7197 100644 --- a/security/p5-Digest-MD5-M4p/Makefile +++ b/security/p5-Digest-MD5-M4p/Makefile @@ -19,7 +19,6 @@ BUILD_DEPENDS= ${SITE_PERL}/Digest.pm:${PORTSDIR}/security/p5-Digest RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site MAN3= Digest::MD5::M4p.3 diff --git a/security/p5-Digest-MD5/Makefile b/security/p5-Digest-MD5/Makefile index b62d9dac0795..3073e87f0a08 100644 --- a/security/p5-Digest-MD5/Makefile +++ b/security/p5-Digest-MD5/Makefile @@ -19,7 +19,6 @@ BUILD_DEPENDS= ${SITE_PERL}/Digest.pm:${PORTSDIR}/security/p5-Digest RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site MAN3= Digest::MD5.3 diff --git a/security/p5-Digest-SHA2/Makefile b/security/p5-Digest-SHA2/Makefile index 4ded06990d2c..ca3b71188b64 100644 --- a/security/p5-Digest-SHA2/Makefile +++ b/security/p5-Digest-SHA2/Makefile @@ -26,7 +26,7 @@ MAN3= Digest::SHA2.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500600 -IGNORE= "Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again." +IGNORE= Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again. .endif .include <bsd.port.post.mk> diff --git a/security/p5-Digest/Makefile b/security/p5-Digest/Makefile index 46ff2753c1de..9f95c03a805d 100644 --- a/security/p5-Digest/Makefile +++ b/security/p5-Digest/Makefile @@ -19,7 +19,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes -CONFIGURE_ARGS+= INSTALLDIRS="site" MAN3= Digest.3 Digest::base.3 Digest::file.3 diff --git a/security/p5-Filter-Crypto/Makefile b/security/p5-Filter-Crypto/Makefile index 9abd792c3043..f2d4a1321d85 100644 --- a/security/p5-Filter-Crypto/Makefile +++ b/security/p5-Filter-Crypto/Makefile @@ -29,7 +29,7 @@ MAN3= Filter::Crypto.3 Filter::Crypto::CryptFile.3 \ .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500600 -IGNORE= "Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again." +IGNORE= Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again. .endif .include <bsd.port.post.mk> diff --git a/sysutils/pmap/Makefile b/sysutils/pmap/Makefile index 1c768b443ed5..3fed12f01100 100644 --- a/sysutils/pmap/Makefile +++ b/sysutils/pmap/Makefile @@ -28,12 +28,12 @@ BROKEN= "Currently does not support -CURRENT" .endif .if ${OSVERSION} < 450000 -IGNORE= "Not supported on systems prior to 4.5" +IGNORE= Not supported on systems prior to 4.5 .endif pre-fetch: .if !exists(${SRC_BASE}/sys/Makefile) -IGNORE= "This port requires kernel sources" +IGNORE= This port requires kernel sources .endif post-install: diff --git a/textproc/Makefile b/textproc/Makefile index cb920a76ae51..0dd3ea7c90ad 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -335,10 +335,10 @@ SUBDIR += p5-Pod-DocBook SUBDIR += p5-Pod-Escapes SUBDIR += p5-Pod-POM + SUBDIR += p5-Pod-Parser SUBDIR += p5-Pod-Simple SUBDIR += p5-Pod-Stripper SUBDIR += p5-Pod-Tree - SUBDIR += p5-PodParser SUBDIR += p5-RADIUS-UserFile SUBDIR += p5-RDF-Core SUBDIR += p5-RDF-Notation3 diff --git a/textproc/p5-Apache-XBEL/Makefile b/textproc/p5-Apache-XBEL/Makefile index 13d14df4d79c..d4f3a7fd482b 100644 --- a/textproc/p5-Apache-XBEL/Makefile +++ b/textproc/p5-Apache-XBEL/Makefile @@ -7,7 +7,7 @@ PORTNAME= Apache-XBEL PORTVERSION= 1.3 -# PORTREVISION= +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Apache @@ -19,7 +19,7 @@ COMMENT= Apache mod_perl handler to render an XBEL file as an HTML tree BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache.pm:${PORTSDIR}/www/mod_perl \ ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \ ${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT \ - ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/Memoize.pm:${PORTSDIR}/devel/p5-Memoize RUN_DEPENDS= ${BUILD_DEPENDS} diff --git a/textproc/p5-CSS-Tiny/Makefile b/textproc/p5-CSS-Tiny/Makefile index 3de781f9deaf..742f5a9c385a 100644 --- a/textproc/p5-CSS-Tiny/Makefile +++ b/textproc/p5-CSS-Tiny/Makefile @@ -7,6 +7,7 @@ PORTNAME= CSS-Tiny PORTVERSION= 1.08 +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= CSS @@ -15,6 +16,9 @@ PKGNAMEPREFIX= p5- MAINTAINER= hansjoerg.pehofer@uibk.ac.at COMMENT= Read/Write .css files with as little code as possible +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools +RUN_DEPENDS= ${BUILD_DEPENDS} + PERL_CONFIGURE= yes MAN3= CSS::Tiny.3 @@ -24,11 +28,6 @@ MAN3= CSS::Tiny.3 EXTRA_PATCHES= ${PATCHDIR}/500503-lib::CSS::Tiny.pm .endif -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - post-patch: @${RM} ${WRKSRC}/inc/Module/Install/AutoInstall.pm @${PERL} -pi -e '$$_="" if /AutoInstall/' ${WRKSRC}/MANIFEST diff --git a/textproc/p5-PerlPoint-Package/Makefile b/textproc/p5-PerlPoint-Package/Makefile index 5eeec7e2ad50..1bbb985c0618 100644 --- a/textproc/p5-PerlPoint-Package/Makefile +++ b/textproc/p5-PerlPoint-Package/Makefile @@ -7,7 +7,7 @@ PORTNAME= PerlPoint-Package PORTVERSION= 0.39 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= PerlPoint @@ -17,7 +17,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= mat@FreeBSD.org COMMENT= PerlPoint is both a presentation and a documentation toolset -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \ + ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= YES @@ -43,14 +46,4 @@ post-install: @cd ${WRKSRC}/demo; ${FIND} . | ${CPIO} -padm ${EXAMPLESDIR} .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ - ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.if ${PERL_LEVEL} < 500600 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/p5-Plucene/Makefile b/textproc/p5-Plucene/Makefile index 59493d097dd0..98f791d24753 100644 --- a/textproc/p5-Plucene/Makefile +++ b/textproc/p5-Plucene/Makefile @@ -7,6 +7,7 @@ PORTNAME= Plucene PORTVERSION= 1.21 +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= ../by-authors/id/T/TM/TMTM @@ -17,7 +18,7 @@ COMMENT= Perl port of the Java Lucene search engine BUILD_DEPENDS= ${SITE_PERL}/Memoize.pm:${PORTSDIR}/devel/p5-Memoize \ ${SITE_PERL}/Tie/Array/Sorted.pm:${PORTSDIR}/devel/p5-Tie-Array-Sorted \ - ${SITE_PERL}/File/Spec/Functions.pm:${PORTSDIR}/devel/p5-File-Spec \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/Encode/compat.pm:${PORTSDIR}/devel/p5-Encode-compat \ ${SITE_PERL}/File/Slurp.pm:${PORTSDIR}/devel/p5-File-Slurp \ ${SITE_PERL}/Class/Virtual.pm:${PORTSDIR}/devel/p5-Class-Virtual \ @@ -104,7 +105,7 @@ MAN3= Plucene.3 \ .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500600 -IGNORE= "This port requires perl 5.6 or above." +IGNORE= This port requires perl 5.6 or above. .endif .include <bsd.port.post.mk> diff --git a/textproc/p5-Pod-Constants/Makefile b/textproc/p5-Pod-Constants/Makefile index 795683ef71c2..ec206f798379 100644 --- a/textproc/p5-Pod-Constants/Makefile +++ b/textproc/p5-Pod-Constants/Makefile @@ -7,7 +7,7 @@ PORTNAME= Pod-Constants PORTVERSION= 0.15 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= ../../authors/id/S/SA/SAMV @@ -16,7 +16,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= skv@FreeBSD.org COMMENT= Include constants from POD -BUILD_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser +BUILD_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes diff --git a/textproc/p5-Pod-DocBook/Makefile b/textproc/p5-Pod-DocBook/Makefile index 17b07ca7e8b9..6ea03575f506 100644 --- a/textproc/p5-Pod-DocBook/Makefile +++ b/textproc/p5-Pod-DocBook/Makefile @@ -7,6 +7,7 @@ PORTNAME= Pod-DocBook PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= ../../authors/id/N/NA/NANDU @@ -16,7 +17,7 @@ MAINTAINER= skv@FreeBSD.org COMMENT= Convert Pod data to DocBook SGML BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \ + ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ ${SITE_PERL}/Pod/ParseLink.pm:${PORTSDIR}/textproc/p5-podlators \ ${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap RUN_DEPENDS= ${BUILD_DEPENDS} @@ -29,7 +30,7 @@ MAN3= Pod::DocBook.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500601 -IGNORE= "Perl 5.6.1 or newer required. Install lang/perl5.8 or lang/perl5 and try again." +IGNORE= Perl 5.6.1 or newer required. Install lang/perl5.8 or lang/perl5 and try again. .endif .include <bsd.port.post.mk> diff --git a/textproc/p5-Pod-Parser/Makefile b/textproc/p5-Pod-Parser/Makefile index f1d062ba1825..be4680bcaef4 100644 --- a/textproc/p5-Pod-Parser/Makefile +++ b/textproc/p5-Pod-Parser/Makefile @@ -5,9 +5,8 @@ # $FreeBSD$ # -PORTNAME= PodParser -PORTVERSION= 1.28 -PORTREVISION= 2 +PORTNAME= Pod-Parser +PORTVERSION= 1.31 CATEGORIES= textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Pod @@ -16,11 +15,10 @@ PKGNAMEPREFIX= p5- MAINTAINER= skv@FreeBSD.org COMMENT= Modules to work with POD (Plain Old Documentation) -BUILD_DEPENDS= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS="site" MAN1= pod2usage.1 podchecker.1 podselect.1 MAN3= Pod::Checker.3 Pod::Find.3 Pod::InputObjects.3 \ diff --git a/textproc/p5-Pod-Parser/distinfo b/textproc/p5-Pod-Parser/distinfo index 6eb9a734dd67..775d0195b462 100644 --- a/textproc/p5-Pod-Parser/distinfo +++ b/textproc/p5-Pod-Parser/distinfo @@ -1,2 +1,2 @@ -MD5 (PodParser-1.28.tar.gz) = 82b26c8cef5ef2bea0d7bf0294682382 -SIZE (PodParser-1.28.tar.gz) = 91327 +MD5 (Pod-Parser-1.31.tar.gz) = 9239f922617f805bc9da2f71d717061c +SIZE (Pod-Parser-1.31.tar.gz) = 94086 diff --git a/textproc/p5-Pod-Parser/pkg-descr b/textproc/p5-Pod-Parser/pkg-descr index 52476fcb8f2b..2242df2ea619 100644 --- a/textproc/p5-Pod-Parser/pkg-descr +++ b/textproc/p5-Pod-Parser/pkg-descr @@ -9,4 +9,4 @@ Set of modules: * Pod::ParseUtils - helpers for POD parsing and conversion * Pod::Find - find POD documents in directory trees -WWW: http://search.cpan.org/dist/PodParser/ +WWW: http://search.cpan.org/dist/Pod-Parser/ diff --git a/textproc/p5-Pod-Stripper/Makefile b/textproc/p5-Pod-Stripper/Makefile index cca5d55dc9ce..75ca01d894ae 100644 --- a/textproc/p5-Pod-Stripper/Makefile +++ b/textproc/p5-Pod-Stripper/Makefile @@ -7,7 +7,7 @@ PORTNAME= Pod-Stripper PORTVERSION= 0.22 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Pod @@ -16,11 +16,10 @@ PKGNAMEPREFIX= p5- MAINTAINER= skv@FreeBSD.org COMMENT= Strip all pod, and output what's left -BUILD_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser +BUILD_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS="site" MAN1= podstrip.1 MAN3= Pod::Stripper.3 diff --git a/textproc/p5-PodParser/Makefile b/textproc/p5-PodParser/Makefile deleted file mode 100644 index f1d062ba1825..000000000000 --- a/textproc/p5-PodParser/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# New ports collection makefile for: Pod::Parser -# Date created: 18 Dec 2001 -# Whom: Sergey Skvortsov <skv@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= PodParser -PORTVERSION= 1.28 -PORTREVISION= 2 -CATEGORIES= textproc perl5 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Pod -PKGNAMEPREFIX= p5- - -MAINTAINER= skv@FreeBSD.org -COMMENT= Modules to work with POD (Plain Old Documentation) - -BUILD_DEPENDS= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS= ${BUILD_DEPENDS} - -PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS="site" - -MAN1= pod2usage.1 podchecker.1 podselect.1 -MAN3= Pod::Checker.3 Pod::Find.3 Pod::InputObjects.3 \ - Pod::ParseUtils.3 Pod::Parser.3 Pod::PlainText.3 Pod::Select.3 \ - Pod::Usage.3 - -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500600 -PLIST_SUB+= PL_FILES="" -.else -.undef MAN1 -PLIST_SUB+= PL_FILES="@comment " -.endif - -post-patch: -.if ${PERL_LEVEL} >= 500600 - @${REINPLACE_CMD} -e '/EXE_FILES/d' ${WRKSRC}/Makefile.PL -.endif - @${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \; - -.include <bsd.port.post.mk> diff --git a/textproc/p5-PodParser/distinfo b/textproc/p5-PodParser/distinfo deleted file mode 100644 index 6eb9a734dd67..000000000000 --- a/textproc/p5-PodParser/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (PodParser-1.28.tar.gz) = 82b26c8cef5ef2bea0d7bf0294682382 -SIZE (PodParser-1.28.tar.gz) = 91327 diff --git a/textproc/p5-PodParser/pkg-descr b/textproc/p5-PodParser/pkg-descr deleted file mode 100644 index 52476fcb8f2b..000000000000 --- a/textproc/p5-PodParser/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Set of modules: - -* Pod::Parser - base class for creating POD filters and translators -* Pod::Select - extract selected sections of POD from input -* Pod::Usage - print a usage message from embedded pod documentation -* Pod::PlainText - convert POD data to formatted ASCII text -* Pod::InputObjects - objects representing POD input paragraphs, commands, etc. -* Pod::Checker - check pod documents for syntax errors -* Pod::ParseUtils - helpers for POD parsing and conversion -* Pod::Find - find POD documents in directory trees - -WWW: http://search.cpan.org/dist/PodParser/ diff --git a/textproc/p5-PodParser/pkg-plist b/textproc/p5-PodParser/pkg-plist deleted file mode 100644 index 767ad94ec02d..000000000000 --- a/textproc/p5-PodParser/pkg-plist +++ /dev/null @@ -1,15 +0,0 @@ -%%PL_FILES%%bin/pod2usage -%%PL_FILES%%bin/podchecker -%%PL_FILES%%bin/podselect -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Parser/.packlist -%%SITE_PERL%%/Pod/Checker.pm -%%SITE_PERL%%/Pod/Find.pm -%%SITE_PERL%%/Pod/InputObjects.pm -%%SITE_PERL%%/Pod/ParseUtils.pm -%%SITE_PERL%%/Pod/Parser.pm -%%SITE_PERL%%/Pod/PlainText.pm -%%SITE_PERL%%/Pod/Select.pm -%%SITE_PERL%%/Pod/Usage.pm -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Parser -@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true diff --git a/textproc/p5-RDF-Notation3/Makefile b/textproc/p5-RDF-Notation3/Makefile index 02e424d7791e..203b213aa0ff 100644 --- a/textproc/p5-RDF-Notation3/Makefile +++ b/textproc/p5-RDF-Notation3/Makefile @@ -7,6 +7,7 @@ PORTNAME= RDF-Notation3 PORTVERSION= 0.90 +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= RDF @@ -16,6 +17,7 @@ MAINTAINER= skv@FreeBSD.org COMMENT= RDF Notation3 parser BUILD_DEPENDS= ${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/RDF/Core.pm:${PORTSDIR}/textproc/p5-RDF-Core \ ${SITE_PERL}/RDFStore.pm:${PORTSDIR}/textproc/p5-RDFStore RUN_DEPENDS= ${BUILD_DEPENDS} @@ -30,14 +32,8 @@ MAN3= RDF::Notation3.3 RDF::Notation3::PrefTriples.3 \ RDF::Notation3::Template::TXML.3 RDF::Notation3::Triples.3 \ RDF::Notation3::XML.3 -.include <bsd.port.pre.mk> - post-patch: @${FIND} ${WRKSRC} -name "*.pm" | \ ${XARGS} ${PERL} -pi -e 's!^require 5.005_62;!!' -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/p5-XML-Directory/Makefile b/textproc/p5-XML-Directory/Makefile index b40b3feb2f6e..eb39f78d4779 100644 --- a/textproc/p5-XML-Directory/Makefile +++ b/textproc/p5-XML-Directory/Makefile @@ -7,6 +7,7 @@ PORTNAME= XML-Directory PORTVERSION= 1.00 +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= XML @@ -16,6 +17,7 @@ MAINTAINER= skv@FreeBSD.org COMMENT= Returns a content of directory as XML BUILD_DEPENDS= ${SITE_PERL}/RDF/Notation3.pm:${PORTSDIR}/textproc/p5-RDF-Notation3 \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX RUN_DEPENDS= ${BUILD_DEPENDS} @@ -24,10 +26,4 @@ PERL_CONFIGURE= yes MAN3= XML::Directory.3 XML::Directory::Apache.3 \ XML::Directory::SAX.3 XML::Directory::String.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/p5-podlators/Makefile b/textproc/p5-podlators/Makefile index a3f318f7cfa5..87a8b6763eb1 100644 --- a/textproc/p5-podlators/Makefile +++ b/textproc/p5-podlators/Makefile @@ -7,7 +7,7 @@ PORTNAME= podlators PORTVERSION= 1.27 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Pod @@ -16,12 +16,11 @@ PKGNAMEPREFIX= p5- MAINTAINER= skv@FreeBSD.org COMMENT= Modules to convert and parse POD (Plain Old Documentation) -RUN_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \ - ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser BUILD_DEPENDS= ${RUN_DEPENDS} PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site MAN1= pod2man.1 pod2text.1 MAN3= Pod::Man.3 Pod::ParseLink.3 Pod::Text.3 Pod::Text::Color.3 \ diff --git a/www/MT/Makefile b/www/MT/Makefile index c81a37d4953b..fa8e642739d4 100644 --- a/www/MT/Makefile +++ b/www/MT/Makefile @@ -7,7 +7,7 @@ PORTNAME= MT PORTVERSION= 2.661 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://www.movabletype.org/downloads/ .if defined(WITH_OLD_DISTFILE) @@ -77,7 +77,7 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp .endif .endif .if ${PERL_LEVEL} < 500601 -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools .endif pre-everything:: diff --git a/www/p5-Apache-DebugInfo/Makefile b/www/p5-Apache-DebugInfo/Makefile index fbb38d6c3f2e..296163794497 100644 --- a/www/p5-Apache-DebugInfo/Makefile +++ b/www/p5-Apache-DebugInfo/Makefile @@ -16,7 +16,7 @@ MAINTAINER= skv@FreeBSD.org COMMENT= Log various bits of per-request data .if defined(WITH_MODPERL2) -IGNORE= "This port does not support mod_perl2" +IGNORE= This port does not support mod_perl2 .else RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl BUILD_DEPENDS= ${RUN_DEPENDS} diff --git a/www/p5-Apache-Test/Makefile b/www/p5-Apache-Test/Makefile index 6fe596a3d9e7..1563fba4b666 100644 --- a/www/p5-Apache-Test/Makefile +++ b/www/p5-Apache-Test/Makefile @@ -7,6 +7,7 @@ PORTNAME= Apache-Test PORTVERSION= 1.24 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Apache @@ -16,9 +17,10 @@ MAINTAINER= skv@FreeBSD.org COMMENT= Test.pm wrapper with helpers for testing Apache .if defined(WITH_MODPERL2) -IGNORE= "This port is already included in mod_perl2" +IGNORE= This port is already included in mod_perl2 .else -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl BUILD_DEPENDS= ${RUN_DEPENDS} .endif @@ -32,10 +34,6 @@ MAN3= Apache::Test.3 Apache::TestConfig.3 Apache::TestConfigData.3 \ .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500600 -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - .if ${PERL_LEVEL} < 500800 EXTRA_PATCHES= ${PATCHDIR}/500503-Makefile.PL .endif diff --git a/www/p5-Bundle-Slash/Makefile b/www/p5-Bundle-Slash/Makefile index 67d136cf97bf..ccd4e1403c1f 100644 --- a/www/p5-Bundle-Slash/Makefile +++ b/www/p5-Bundle-Slash/Makefile @@ -7,6 +7,7 @@ PORTNAME= Bundle-Slash PORTVERSION= 2.32 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Bundle @@ -16,6 +17,7 @@ MAINTAINER= autrijus@autrijus.org COMMENT= A bundle to install all modules used for Slash BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \ ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \ @@ -59,10 +61,4 @@ PERL_CONFIGURE= yes MAN3= Bundle::Slash.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.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 8949b4e4e0c7..b7b170895ca1 100644 --- a/www/p5-Bundle-Sledge/Makefile +++ b/www/p5-Bundle-Sledge/Makefile @@ -7,6 +7,7 @@ PORTNAME= Bundle-Sledge PORTVERSION= 0.03 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Bundle @@ -18,6 +19,8 @@ COMMENT= A bundle to install all modules used for Sledge BUILD_DEPENDS= ${PM_DEPENDS} RUN_DEPENDS= ${PM_DEPENDS} +PM_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp PM_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq PM_DEPENDS+= ${SITE_PERL}/Apache/Reload.pm:${PORTSDIR}/www/p5-Apache-Reload PM_DEPENDS+= ${SITE_PERL}/Test/Inline.pm:${PORTSDIR}/devel/p5-Test-Inline @@ -48,14 +51,4 @@ PERL_CONFIGURE= yes MAN3= Bundle::Sledge.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500800 -PM_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.if ${PERL_LEVEL} < 500601 -PM_DEPENDS+= ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm -PM_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif -.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 1b37bcc24959..2699bc8e5532 100644 --- a/www/p5-CGI-Cache/Makefile +++ b/www/p5-CGI-Cache/Makefile @@ -7,6 +7,7 @@ PORTNAME= CGI-Cache PORTVERSION= 1.40 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= CGI @@ -16,19 +17,13 @@ MAINTAINER= petef@FreeBSD.org COMMENT= Perl extension to cache output of time-intensive CGI scripts BUILD_DEPENDS= ${SITE_PERL}/File/Cache.pm:${PORTSDIR}/devel/p5-File-Cache \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/Cache/SizeAwareFileCache.pm:${PORTSDIR}/devel/p5-Cache-Cache \ ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable - -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} <= 500600 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec/Functions.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes MAN3= CGI::Cache.3 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-CGI.pm/Makefile b/www/p5-CGI.pm/Makefile index be42504e0837..7cc84f46ca97 100644 --- a/www/p5-CGI.pm/Makefile +++ b/www/p5-CGI.pm/Makefile @@ -7,6 +7,7 @@ PORTNAME= CGI.pm PORTVERSION= 3.10 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} @@ -16,8 +17,10 @@ PKGNAMEPREFIX= p5- MAINTAINER= tobez@FreeBSD.org COMMENT= Simple Common Gateway Interface Class for Perl +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools +RUN_DEPENDS= ${BUILD_DEPENDS} + PERL_CONFIGURE= yes -CONFIGURE_ARGS= INSTALLDIRS=site MAN3= CGI.3 CGI::Apache.3 CGI::Carp.3 CGI::Cookie.3 \ CGI::Fast.3 CGI::Pretty.3 CGI::Push.3 CGI::Switch.3 \ @@ -41,15 +44,7 @@ post-install: @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}." .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec - post-patch: - @${PERL} -i -pe '$$_ = "" if /require 5\.6/' ${WRKSRC}/Makefile.PL - -.endif + @${REINPLACE_CMD} -e '/require 5\.6/d; /INSTALLDIRS/d' ${WRKSRC}/Makefile.PL -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-HTML-Embperl/Makefile b/www/p5-HTML-Embperl/Makefile index 6b1dd059aa37..43156ca94c3c 100644 --- a/www/p5-HTML-Embperl/Makefile +++ b/www/p5-HTML-Embperl/Makefile @@ -7,7 +7,7 @@ PORTNAME= HTML-Embperl PORTVERSION= 1.3.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= HTML @@ -19,6 +19,7 @@ COMMENT= A module to allow embedded perl in HTML documents .if !defined(WITHOUT_APACHE) BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session # ${SITE_PERL}/Apache/SessionX.pm:${PORTSDIR}/www/p5-Apache-SessionX .endif @@ -34,7 +35,6 @@ CONFIGURE_ENV= NOAPACHE=true INSTALL_TARGET= pure_install -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= HTML::Embperl.3 HTML::Embperl::Faq.3 HTML::Embperl::Changes.3 \ HTML::Embperl::FeaturesD.3 HTML::Embperl::TipsAndTricks.3 \ HTML::Embperl::Intro.3 HTML::Embperl::Session.3 HTML::Embperl::Mail.3 \ @@ -47,8 +47,6 @@ MAN1= embpexec.pl.1 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec BROKEN= Incorrect pkg-plist .endif diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile index 3a4d6ed7925d..9f5d0fa1f4fe 100644 --- a/www/p5-HTML-Mason/Makefile +++ b/www/p5-HTML-Mason/Makefile @@ -7,7 +7,7 @@ PORTNAME= HTML-Mason PORTVERSION= 1.28 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= HTML @@ -17,6 +17,7 @@ MAINTAINER= dsh@vlink.ru COMMENT= High-performance, dynamic web site authoring system BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class \ ${SITE_PERL}/Class/Container.pm:${PORTSDIR}/devel/p5-Class-Container \ ${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache @@ -61,10 +62,6 @@ OPTIONS= MOD_PERL "with mod_perl dependency" off .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - .if defined(WITH_MOD_PERL) .if defined(WITH_APACHE2) RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache2/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq2 diff --git a/www/p5-HTML-Template/Makefile b/www/p5-HTML-Template/Makefile index 4d63a202e1c3..34564b7ec28a 100644 --- a/www/p5-HTML-Template/Makefile +++ b/www/p5-HTML-Template/Makefile @@ -7,6 +7,7 @@ PORTNAME= HTML-Template PORTVERSION= 2.7 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= HTML @@ -15,22 +16,12 @@ PKGNAMEPREFIX= p5- MAINTAINER= kuriyama@FreeBSD.org COMMENT= Perl module to use HTML Templates from CGI scripts +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 +RUN_DEPENDS= ${BUILD_DEPENDS} + PERL_CONFIGURE= yes MAN3= HTML::Template.3 -post-patch: - ${PERL} -i -pe 's@%%PERL_INC%%@${SITE_PERL}@' ${WRKSRC}/Template.pm - -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500600 && !exists(${SITE_PERL}/File/Spec.pm) -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif -.if ${PERL_LEVEL} < 500800 && !exists(${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm) -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/www/p5-HTML-Template/files/patch-Template.pm b/www/p5-HTML-Template/files/patch-Template.pm deleted file mode 100644 index 6c4d3879d1f3..000000000000 --- a/www/p5-HTML-Template/files/patch-Template.pm +++ /dev/null @@ -1,12 +0,0 @@ ---- Template.pm.orig Fri Jun 18 21:42:06 2004 -+++ Template.pm Fri Jun 25 13:33:50 2004 -@@ -890,7 +890,9 @@ - use strict; # and no funny business, either. - - use Carp; # generate better errors with more context -+BEGIN { unshift(@INC, "%%PERL_INC%%"); } - use File::Spec; # generate paths that work on all platforms -+shift(@INC); - use Digest::MD5 qw(md5_hex); # generate cache keys - - # define accessor constants used to improve readability of array diff --git a/www/p5-POE-Component-Server-HTTP/Makefile b/www/p5-POE-Component-Server-HTTP/Makefile index 8f20ea7a4c4b..9cda220e37a1 100644 --- a/www/p5-POE-Component-Server-HTTP/Makefile +++ b/www/p5-POE-Component-Server-HTTP/Makefile @@ -7,6 +7,7 @@ PORTNAME= POE-Component-Server-HTTP PORTVERSION= 0.07 +PORTREVISION= 1 CATEGORIES= www devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= POE @@ -18,7 +19,7 @@ COMMENT= POE Component to create HTTP Servers BUILD_DEPENDS= ${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \ ${SITE_PERL}/HTTP/Date.pm:${PORTSDIR}/www/p5-libwww \ ${SITE_PERL}/POE/API/Peek.pm:${PORTSDIR}/devel/p5-POE-API-Peek \ - ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \ ${SITE_PERL}/HTTP/Status.pm:${PORTSDIR}/www/p5-libwww RUN_DEPENDS= ${BUILD_DEPENDS} diff --git a/www/p5-PodToHTML/Makefile b/www/p5-PodToHTML/Makefile index 0a826d07301c..e5458afbe251 100644 --- a/www/p5-PodToHTML/Makefile +++ b/www/p5-PodToHTML/Makefile @@ -6,6 +6,7 @@ PORTNAME= PodToHTML PORTVERSION= 0.05 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Pod @@ -15,7 +16,7 @@ MAINTAINER= hrs@FreeBSD.org COMMENT= Generating HTML from several files containg POD documentation BUILD_DEPENDS= ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \ - ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \ + ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ ${SITE_PERL}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \ ${SITE_PERL}/HTML/FormatPS.pm:${PORTSDIR}/textproc/p5-HTML-Format RUN_DEPENDS= ${BUILD_DEPENDS} diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile index 3b193d6a0de4..ceb9f2a8d986 100644 --- a/www/p5-Template-Toolkit/Makefile +++ b/www/p5-Template-Toolkit/Makefile @@ -7,6 +7,7 @@ PORTNAME= Template-Toolkit PORTVERSION= 2.14 +PORTREVISION= 2 CATEGORIES= www textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Template @@ -15,7 +16,9 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Extensive Toolkit for template processing -BUILD_DEPENDS= ${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \ + ${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig RUN_DEPENDS= ${BUILD_DEPENDS} OPTIONS=TEXT_AUTOFORMAT "With Text::Autoformat Plugin" off \ @@ -40,13 +43,6 @@ MASTER_SITE_BACKUP+= http://www.template-toolkit.org/download/ .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec/Functions.pm:${PORTSDIR}/devel/p5-File-Spec -.endif -.endif - .if defined(WITH_TEXT_AUTOFORMAT) BUILD_DEPENDS+=${SITE_PERL}/Text/Autoformat.pm:${PORTSDIR}/textproc/p5-Text-Autoformat .endif diff --git a/www/p5-WWW-Mechanize/Makefile b/www/p5-WWW-Mechanize/Makefile index 75981599a266..d8834f976b01 100644 --- a/www/p5-WWW-Mechanize/Makefile +++ b/www/p5-WWW-Mechanize/Makefile @@ -7,6 +7,7 @@ PORTNAME= WWW-Mechanize PORTVERSION= 1.12 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= WWW @@ -40,7 +41,7 @@ post-install: .if ${PERL_LEVEL} < 500800 BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \ - ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser + ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser .if ${PERL_LEVEL} < 500601 IGNORE= requires perl 5.6.x or later. Install lang/perl5.8 then try again .endif diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile index fd3d87689987..cda1a3d019a7 100644 --- a/www/p5-WWW-Search/Makefile +++ b/www/p5-WWW-Search/Makefile @@ -7,6 +7,7 @@ PORTNAME= WWW-Search PORTVERSION= 2.46 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= WWW @@ -15,7 +16,9 @@ PKGNAMEPREFIX= p5- MAINTAINER= ports@FreeBSD.org COMMENT= A perl5 module for WWW searches -BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \ +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \ + ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \ ${SITE_PERL}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree \ ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \ @@ -42,13 +45,4 @@ MAN3= WWW::Search.3 \ post-patch: @${RM} ${WRKSRC}/lib/WWW/Search/Test.pm.orig -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ - ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple -RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \ - ${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-libapreq/Makefile b/www/p5-libapreq/Makefile index 3cbc0eb39bef..528b1de6c9fa 100644 --- a/www/p5-libapreq/Makefile +++ b/www/p5-libapreq/Makefile @@ -8,15 +8,15 @@ PORTNAME= libapreq PORTVERSION= 1.33 CATEGORIES= www perl5 devel -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Apache +MASTER_SITES= ${MASTER_SITE_PERL_CPAN} +MASTER_SITE_SUBDIR= Apache PKGNAMEPREFIX= p5- MAINTAINER= skv@FreeBSD.org COMMENT= Generic Apache Request Library .if defined(WITH_MODPERL2) -IGNORE= "This port does not support mod_perl2" +IGNORE= This port does not support mod_perl2 .else RUN_DEPENDS?= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl BUILD_DEPENDS= ${RUN_DEPENDS} \ diff --git a/www/rt2/Makefile b/www/rt2/Makefile index e6666738a1f4..51125eca4449 100644 --- a/www/rt2/Makefile +++ b/www/rt2/Makefile @@ -7,7 +7,7 @@ PORTNAME= rt2 PORTVERSION= 2.0.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.fsck.com/pub/rt/release/ DISTNAME= rt-${PORTVERSION:S/./-/g} @@ -16,6 +16,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= RT is an industrial-grade ticketing system written in Perl BUILD_DEPENDS= ${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \ ${SITE_PERL}/${PERL_ARCH}/Apache/Cookie.pm:${PORTSDIR}/www/p5-libapreq \ ${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI \ ${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \ @@ -157,11 +159,4 @@ post-install: BROKEN= "Broken pkg-plist" .endif -.if ${PERL_LEVEL} < 500800 -BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif -.endif - .include <bsd.port.post.mk> diff --git a/www/slash/Makefile b/www/slash/Makefile index f46fe02419e1..80a5bcd47f3f 100644 --- a/www/slash/Makefile +++ b/www/slash/Makefile @@ -7,6 +7,7 @@ PORTNAME= slash PORTVERSION= 2.2.6 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= slashcode @@ -16,6 +17,7 @@ MAINTAINER= autrijus@autrijus.org COMMENT= Slash-Like Automatic Storytelling Homepage system BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \ + ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ ${SITE_PERL}/Bundle/Slash.pm:${PORTSDIR}/www/p5-Bundle-Slash RUN_DEPENDS= ${BUILD_DEPENDS} \ ${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl @@ -46,10 +48,4 @@ post-install: @${FIND} ${PREFIX}/slash -name "*.orig" -delete @${SED} s!%%LOCALBASE%%!${LOCALBASE}!g ${PKGMESSAGE} -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500601 -BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> |