svn commit: r388583 - in head: archivers/p5-IO-Compress devel/p5-App-cpanoutdated devel/p5-CPAN-Meta devel/p5-ExtUtils-XSpp devel/p5-File-ShareDir-ProjectDistDir devel/p5-IO-Detect devel/p5-Module-...
Mathieu Arnold
mat at FreeBSD.org
Fri Jun 5 14:21:49 UTC 2015
Author: mat
Date: Fri Jun 5 14:21:43 2015
New Revision: 388583
URL: https://svnweb.freebsd.org/changeset/ports/388583
Log:
Get rid of PERL_LEVEL checks for Perl versions not supported.
Sponsored by: Absolight
Modified:
head/archivers/p5-IO-Compress/Makefile
head/archivers/p5-IO-Compress/pkg-plist
head/devel/p5-App-cpanoutdated/Makefile
head/devel/p5-CPAN-Meta/Makefile
head/devel/p5-ExtUtils-XSpp/Makefile
head/devel/p5-File-ShareDir-ProjectDistDir/Makefile
head/devel/p5-IO-Detect/Makefile
head/devel/p5-Module-Load-Conditional/Makefile
head/devel/p5-Parse-CPAN-Meta/Makefile
head/devel/p5-Parse-RecDescent/Makefile
head/devel/p5-Scalar-Does/Makefile
head/devel/p5-Type-Tiny/Makefile
head/devel/p5-multidimensional/Makefile
head/mail/openwebmail/Makefile
head/misc/p5-Geo-Coder-OpenCage/Makefile
head/textproc/p5-Text-Xslate/Makefile
head/www/p5-Template-Provider-FromDATA/Makefile
head/www/webkit-gtk2/Makefile
head/www/webkit-gtk3/Makefile
Modified: head/archivers/p5-IO-Compress/Makefile
==============================================================================
--- head/archivers/p5-IO-Compress/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/archivers/p5-IO-Compress/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -24,17 +24,7 @@ CONFLICTS= p5-Compress-Zlib-2* p5-IO-Com
USE_PERL5= configure
USES= perl5
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} >= 501600
-PLIST_SUB+= EXE_FILES="@comment "
-.else
-PLIST_SUB+= EXE_FILES=""
-.endif
-
post-patch:
-.if ${PERL_LEVEL} >= 501600
@${REINPLACE_CMD} -e '/EXE_FILES/d' ${WRKSRC}/Makefile.PL
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/archivers/p5-IO-Compress/pkg-plist
==============================================================================
--- head/archivers/p5-IO-Compress/pkg-plist Fri Jun 5 14:18:24 2015 (r388582)
+++ head/archivers/p5-IO-Compress/pkg-plist Fri Jun 5 14:21:43 2015 (r388583)
@@ -1,4 +1,3 @@
-%%EXE_FILES%%bin/zipdetails
%%SITE_PERL%%/Compress/Zlib.pm
%%SITE_PERL%%/File/GlobMapper.pm
%%SITE_PERL%%/IO/Compress/Adapter/Bzip2.pm
@@ -44,4 +43,3 @@
%%PERL5_MAN3%%/IO::Uncompress::Inflate.3.gz
%%PERL5_MAN3%%/IO::Uncompress::RawInflate.3.gz
%%PERL5_MAN3%%/IO::Uncompress::Unzip.3.gz
-%%EXE_FILES%%man/man1/zipdetails.1.gz
Modified: head/devel/p5-App-cpanoutdated/Makefile
==============================================================================
--- head/devel/p5-App-cpanoutdated/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/devel/p5-App-cpanoutdated/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -22,11 +22,4 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501600
-BUILD_DEPENDS+= p5-Module-Metadata>=1.000007:${PORTSDIR}/devel/p5-Module-Metadata
-RUN_DEPENDS+= p5-Module-Metadata>=1.000007:${PORTSDIR}/devel/p5-Module-Metadata
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/p5-CPAN-Meta/Makefile
==============================================================================
--- head/devel/p5-CPAN-Meta/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/devel/p5-CPAN-Meta/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -18,11 +18,6 @@ USES= perl5
.include <bsd.port.pre.mk>
-.if ${PERL_LEVEL} < 501600
-BUILD_DEPENDS+= p5-JSON-PP>=2.27200:${PORTSDIR}/converters/p5-JSON-PP
-RUN_DEPENDS+= p5-JSON-PP>=2.27200:${PORTSDIR}/converters/p5-JSON-PP
-.endif
-
.if ${PERL_LEVEL} < 501800
BUILD_DEPENDS+= p5-CPAN-Meta-Requirements>=2.121:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements \
p5-CPAN-Meta-YAML>=0.008:${PORTSDIR}/devel/p5-CPAN-Meta-YAML
Modified: head/devel/p5-ExtUtils-XSpp/Makefile
==============================================================================
--- head/devel/p5-ExtUtils-XSpp/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/devel/p5-ExtUtils-XSpp/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -18,10 +18,4 @@ BUILD_DEPENDS= p5-Test-Base>=0:${PORTSDI
USES= perl5
USE_PERL5= modbuild
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501301
-BUILD_DEPENDS+= p5-ExtUtils-ParseXS>=2.22.02:${PORTSDIR}/devel/p5-ExtUtils-ParseXS
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/p5-File-ShareDir-ProjectDistDir/Makefile
==============================================================================
--- head/devel/p5-File-ShareDir-ProjectDistDir/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/devel/p5-File-ShareDir-ProjectDistDir/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -25,10 +25,4 @@ USES= perl5
USE_PERL5= configure
NO_ARCH= YES
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+= p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/p5-IO-Detect/Makefile
==============================================================================
--- head/devel/p5-IO-Detect/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/devel/p5-IO-Detect/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -25,11 +25,4 @@ CONFLICTS_INSTALL= p5-Scalar-Does-0.[1-9
USE_PERL5= configure
USES= perl5
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501601
-BUILD_DEPENDS+= p5-Scalar-List-Utils>=1.24:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+= p5-Scalar-List-Utils>=1.24:${PORTSDIR}/lang/p5-Scalar-List-Utils
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/p5-Module-Load-Conditional/Makefile
==============================================================================
--- head/devel/p5-Module-Load-Conditional/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/devel/p5-Module-Load-Conditional/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -19,7 +19,7 @@ USE_PERL5= configure
.include <bsd.port.pre.mk>
-.if ${PERL_LEVEL} < 5.02000
+.if ${PERL_LEVEL} < 502000
BUILD_DEPENDS= p5-Module-Load>=0.28:${PORTSDIR}/devel/p5-Module-Load
RUN_DEPENDS:= ${BUILD_DEPENDS}
.endif
Modified: head/devel/p5-Parse-CPAN-Meta/Makefile
==============================================================================
--- head/devel/p5-Parse-CPAN-Meta/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/devel/p5-Parse-CPAN-Meta/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -22,11 +22,4 @@ RUN_DEPENDS= p5-CPAN-Meta-YAML>=0.011:${
USES= perl5
USE_PERL5= configure
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501600
-BUILD_DEPENDS+= p5-JSON-PP>=2.27200:${PORTSDIR}/converters/p5-JSON-PP
-RUN_DEPENDS+= p5-JSON-PP>=2.27200:${PORTSDIR}/converters/p5-JSON-PP
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/p5-Parse-RecDescent/Makefile
==============================================================================
--- head/devel/p5-Parse-RecDescent/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/devel/p5-Parse-RecDescent/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -30,10 +30,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/tutorial/* ${STAGEDIR}${DOCSDIR}/tutorial
.endif
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501600
-BUILD_DEPENDS+= p5-ExtUtils-MakeMaker>=6.62:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/p5-Scalar-Does/Makefile
==============================================================================
--- head/devel/p5-Scalar-Does/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/devel/p5-Scalar-Does/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -33,11 +33,4 @@ CONFLICTS_INSTALL= p5-IO-Detect-[0-9]*
USE_PERL5= configure
USES= perl5
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501601
-BUILD_DEPENDS+= p5-Scalar-List-Utils>=1.24:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+= p5-Scalar-List-Utils>=1.24:${PORTSDIR}/lang/p5-Scalar-List-Utils
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/p5-Type-Tiny/Makefile
==============================================================================
--- head/devel/p5-Type-Tiny/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/devel/p5-Type-Tiny/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -48,11 +48,4 @@ USES= perl5
XS_BUILD_DEPENDS= p5-Type-Tiny-XS>=0.010:${PORTSDIR}/devel/p5-Type-Tiny-XS
XS_RUN_DEPENDS= p5-Type-Tiny-XS>=0.010:${PORTSDIR}/devel/p5-Type-Tiny-XS
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501600
-BUILD_DEPENDS+= p5-CPAN-Meta-Requirements>=2:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements
-RUN_DEPENDS+= p5-CPAN-Meta-Requirements>=2:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/p5-multidimensional/Makefile
==============================================================================
--- head/devel/p5-multidimensional/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/devel/p5-multidimensional/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -24,10 +24,4 @@ RUN_DEPENDS= p5-B-Hooks-OP-Check>=0.19:$
USE_PERL5= configure
USES= perl5
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501600
-BUILD_DEPENDS+= p5-CPAN-Meta>=2.112580:${PORTSDIR}/devel/p5-CPAN-Meta
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/mail/openwebmail/Makefile
==============================================================================
--- head/mail/openwebmail/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/mail/openwebmail/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -26,7 +26,7 @@ SUB_FILES= pkg-install
OPTIONS_DEFINE= ANTIWORD MAGICK ISPELL LEARNSPAM LSOF PAM POP3_OVER_SSL QUOTA \
SPAMCHECK SPAMCHECK_ALL SPEEDYCGI TNEF VIRUSCHECK VIRUSCHECK_ALL \
- WGET ZLIB
+ WGET
ANTIWORD_DESC= AntiWord
ISPELL_DESC= ISpell
@@ -42,13 +42,12 @@ TNEF_DESC= tnef
VIRUSCHECK_DESC= Virus check (Clam AntiVirus)
VIRUSCHECK_ALL_DESC= Virus check for all (default: pop3)
WGET_DESC= wget
-ZLIB_DESC= ZLib
.include <bsd.port.pre.mk>
# WITH_SPEEDYCGI needs suidperl enabled under perl 5.8.4 or above,
# so, disable it first, and enable it again if perl exists and enabled suidperl
-.if ${PERL_LEVEL} >= 500804 && !empty(PORT_OPTIONS:MSPEEDYCGI)
+.if ${PORT_OPTIONS:MSPEEDYCGI}
DISABLE_SPEEDYCGI=yes
PORT_OPTIONS:= ${PORT_OPTIONS:NSPEEDYCGI}
.if exists(${PERL})
@@ -57,7 +56,7 @@ PERL_V!= ${PERL} -V
.undef DISABLE_SPEEDYCGI
.endif # dosuid
.endif # exists(${PERL})
-.endif # perl5.8
+.endif # SPEEDYCGI
.if ${PORT_OPTIONS:MLEARNSPAM} || !empty(PORT_OPTIONS:MSPAMCHECK_ALL)
PORT_OPTIONS+= SPAMCHECK
@@ -106,11 +105,7 @@ RUN_DEPENDS+= spamassassin>=0:${PORTSDIR
.if ${PORT_OPTIONS:MSPEEDYCGI}
RUN_DEPENDS+= speedy_suidperl:${PORTSDIR}/www/p5-CGI-SpeedyCGI
SUB_LIST+= WITHOUT_SPEEDYCGI="@comment "
-.if ${PERL_LEVEL} < 500804
-EXTRA_PATCHES+= ${PATCH_WRKSRC}/misc/patches/suidperl2speedy_suidperl.patch
-.else
EXTRA_PATCHES+= ${PATCH_WRKSRC}/misc/patches/suidperl2speedy_suidperl.notmp.patch
-.endif
.else
SUB_LIST+= WITHOUT_SPEEDYCGI=""
.endif
@@ -123,12 +118,6 @@ RUN_DEPENDS+= clamdscan:${PORTSDIR}/secu
RUN_DEPENDS+= ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
.endif
-.if ${PORT_OPTIONS:MZLIB}
-. if ${PERL_LEVEL} < 500903
-RUN_DEPENDS+= p5-IO-Compress>=0:${PORTSDIR}/archivers/p5-IO-Compress
-. endif
-.endif
-
post-extract:
.for x in addressbooks/global calendar.book
@${RM} ${WRKSRC}/cgi-bin/openwebmail/etc/${x}
Modified: head/misc/p5-Geo-Coder-OpenCage/Makefile
==============================================================================
--- head/misc/p5-Geo-Coder-OpenCage/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/misc/p5-Geo-Coder-OpenCage/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -26,11 +26,6 @@ USES= perl5
.include <bsd.port.pre.mk>
-.if ${PERL_LEVEL} < 501600
-BUILD_DEPENDS+= p5-Carp>=1.26:${PORTSDIR}/devel/p5-Carp
-RUN_DEPENDS+= p5-Carp>=1.26:${PORTSDIR}/devel/p5-Carp
-.endif
-
.if ${PERL_LEVEL} < 502000
BUILD_DEPENDS+= p5-HTTP-Tiny>=0.028:${PORTSDIR}/www/p5-HTTP-Tiny \
p5-Pod-Perldoc>=3.21:${PORTSDIR}/textproc/p5-Pod-Perldoc
Modified: head/textproc/p5-Text-Xslate/Makefile
==============================================================================
--- head/textproc/p5-Text-Xslate/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/textproc/p5-Text-Xslate/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -24,13 +24,7 @@ MAKE_JOBS_UNSAFE= yes
USES= perl5
USE_PERL5= configure
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501600
-BUILD_DEPENDS+= p5-ExtUtils-MakeMaker>=6.59:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
-.endif
-
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Text/Xslate/Xslate.so
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/p5-Template-Provider-FromDATA/Makefile
==============================================================================
--- head/www/p5-Template-Provider-FromDATA/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/www/p5-Template-Provider-FromDATA/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -21,10 +21,4 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501502
-BUILD_DEPENDS+= p5-ExtUtils-MakeMaker>=6.59:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/webkit-gtk2/Makefile
==============================================================================
--- head/www/webkit-gtk2/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/www/webkit-gtk2/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -12,6 +12,7 @@ MAINTAINER= gnome at FreeBSD.org
COMMENT= Opensource browser engine using the GTK+ 2 toolkit
BUILD_DEPENDS= gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc \
+ p5-Switch>0:${PORTSDIR}/lang/p5-Switch \
geoclue>=0:${PORTSDIR}/net/geoclue
LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant \
libsecret-1.so:${PORTSDIR}/security/libsecret \
@@ -82,10 +83,6 @@ CFLAGS+= -mminimal-toc
.include <bsd.port.pre.mk>
-.if ${PERL_LEVEL} >= 501400
-BUILD_DEPENDS+= p5-Switch>0:${PORTSDIR}/lang/p5-Switch
-.endif
-
.if ${OSVERSION} < 1000033
BUILD_DEPENDS+= flex>=0:${PORTSDIR}/textproc/flex
CONFIGURE_ENV+= FLEX="${LOCALBASE}/bin/flex"
Modified: head/www/webkit-gtk3/Makefile
==============================================================================
--- head/www/webkit-gtk3/Makefile Fri Jun 5 14:18:24 2015 (r388582)
+++ head/www/webkit-gtk3/Makefile Fri Jun 5 14:21:43 2015 (r388583)
@@ -12,6 +12,7 @@ MAINTAINER= gnome at FreeBSD.org
COMMENT= Opensource browser engine using the GTK+ 3 toolkit
BUILD_DEPENDS= gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc \
+ p5-Switch>0:${PORTSDIR}/lang/p5-Switch \
geoclue>=0:${PORTSDIR}/net/geoclue
LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant \
libsecret-1.so:${PORTSDIR}/security/libsecret \
@@ -85,10 +86,6 @@ CFLAGS+= -mminimal-toc
.include <bsd.port.pre.mk>
-.if ${PERL_LEVEL} >= 501400
-BUILD_DEPENDS+= p5-Switch>0:${PORTSDIR}/lang/p5-Switch
-.endif
-
.if ${OSVERSION} < 1000033
BUILD_DEPENDS+= flex>=0:${PORTSDIR}/textproc/flex
CONFIGURE_ENV+= FLEX="${LOCALBASE}/bin/flex"
More information about the svn-ports-all
mailing list