diff options
-rw-r--r-- | archivers/p5-IO-Compress/Makefile | 12 | ||||
-rw-r--r-- | archivers/p5-IO-Compress/pkg-plist | 2 | ||||
-rw-r--r-- | devel/p5-App-cpanoutdated/Makefile | 9 | ||||
-rw-r--r-- | devel/p5-CPAN-Meta/Makefile | 5 | ||||
-rw-r--r-- | devel/p5-ExtUtils-XSpp/Makefile | 8 | ||||
-rw-r--r-- | devel/p5-File-ShareDir-ProjectDistDir/Makefile | 8 | ||||
-rw-r--r-- | devel/p5-IO-Detect/Makefile | 9 | ||||
-rw-r--r-- | devel/p5-Module-Load-Conditional/Makefile | 2 | ||||
-rw-r--r-- | devel/p5-Parse-CPAN-Meta/Makefile | 9 | ||||
-rw-r--r-- | devel/p5-Parse-RecDescent/Makefile | 8 | ||||
-rw-r--r-- | devel/p5-Scalar-Does/Makefile | 9 | ||||
-rw-r--r-- | devel/p5-Type-Tiny/Makefile | 9 | ||||
-rw-r--r-- | devel/p5-multidimensional/Makefile | 8 | ||||
-rw-r--r-- | mail/openwebmail/Makefile | 17 | ||||
-rw-r--r-- | misc/p5-Geo-Coder-OpenCage/Makefile | 5 | ||||
-rw-r--r-- | textproc/p5-Text-Xslate/Makefile | 8 | ||||
-rw-r--r-- | www/p5-Template-Provider-FromDATA/Makefile | 8 | ||||
-rw-r--r-- | www/webkit-gtk2/Makefile | 5 | ||||
-rw-r--r-- | www/webkit-gtk3/Makefile | 5 |
19 files changed, 18 insertions, 128 deletions
diff --git a/archivers/p5-IO-Compress/Makefile b/archivers/p5-IO-Compress/Makefile index 8609e402411d..8d7c636b81fa 100644 --- a/archivers/p5-IO-Compress/Makefile +++ b/archivers/p5-IO-Compress/Makefile @@ -24,17 +24,7 @@ CONFLICTS= p5-Compress-Zlib-2* p5-IO-Compress-Base-2* p5-IO-Compress-Zlib-2* p5- 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> diff --git a/archivers/p5-IO-Compress/pkg-plist b/archivers/p5-IO-Compress/pkg-plist index b4c2775f1ad5..5b371f3361aa 100644 --- a/archivers/p5-IO-Compress/pkg-plist +++ b/archivers/p5-IO-Compress/pkg-plist @@ -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 diff --git a/devel/p5-App-cpanoutdated/Makefile b/devel/p5-App-cpanoutdated/Makefile index d38d8df478da..da915728159f 100644 --- a/devel/p5-App-cpanoutdated/Makefile +++ b/devel/p5-App-cpanoutdated/Makefile @@ -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> diff --git a/devel/p5-CPAN-Meta/Makefile b/devel/p5-CPAN-Meta/Makefile index 831d72d3c93c..517418c71756 100644 --- a/devel/p5-CPAN-Meta/Makefile +++ b/devel/p5-CPAN-Meta/Makefile @@ -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 diff --git a/devel/p5-ExtUtils-XSpp/Makefile b/devel/p5-ExtUtils-XSpp/Makefile index 8e9af11f0992..2363634d11f7 100644 --- a/devel/p5-ExtUtils-XSpp/Makefile +++ b/devel/p5-ExtUtils-XSpp/Makefile @@ -18,10 +18,4 @@ BUILD_DEPENDS= p5-Test-Base>=0:${PORTSDIR}/devel/p5-Test-Base \ 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> diff --git a/devel/p5-File-ShareDir-ProjectDistDir/Makefile b/devel/p5-File-ShareDir-ProjectDistDir/Makefile index 7d06bf069f48..1dfd2ba09435 100644 --- a/devel/p5-File-ShareDir-ProjectDistDir/Makefile +++ b/devel/p5-File-ShareDir-ProjectDistDir/Makefile @@ -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> diff --git a/devel/p5-IO-Detect/Makefile b/devel/p5-IO-Detect/Makefile index ae6134ccd415..93d5f286845d 100644 --- a/devel/p5-IO-Detect/Makefile +++ b/devel/p5-IO-Detect/Makefile @@ -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> diff --git a/devel/p5-Module-Load-Conditional/Makefile b/devel/p5-Module-Load-Conditional/Makefile index 178579178563..6a9c4db70286 100644 --- a/devel/p5-Module-Load-Conditional/Makefile +++ b/devel/p5-Module-Load-Conditional/Makefile @@ -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 diff --git a/devel/p5-Parse-CPAN-Meta/Makefile b/devel/p5-Parse-CPAN-Meta/Makefile index dc782df7e41a..b562b194a6c9 100644 --- a/devel/p5-Parse-CPAN-Meta/Makefile +++ b/devel/p5-Parse-CPAN-Meta/Makefile @@ -22,11 +22,4 @@ RUN_DEPENDS= p5-CPAN-Meta-YAML>=0.011:${PORTSDIR}/devel/p5-CPAN-Meta-YAML 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> diff --git a/devel/p5-Parse-RecDescent/Makefile b/devel/p5-Parse-RecDescent/Makefile index e9c2fbe00fac..a939022c6443 100644 --- a/devel/p5-Parse-RecDescent/Makefile +++ b/devel/p5-Parse-RecDescent/Makefile @@ -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> diff --git a/devel/p5-Scalar-Does/Makefile b/devel/p5-Scalar-Does/Makefile index f84bd1b61e0f..77c615be0914 100644 --- a/devel/p5-Scalar-Does/Makefile +++ b/devel/p5-Scalar-Does/Makefile @@ -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> diff --git a/devel/p5-Type-Tiny/Makefile b/devel/p5-Type-Tiny/Makefile index 2261da473c0a..f49ddd6456ad 100644 --- a/devel/p5-Type-Tiny/Makefile +++ b/devel/p5-Type-Tiny/Makefile @@ -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> diff --git a/devel/p5-multidimensional/Makefile b/devel/p5-multidimensional/Makefile index 17e18b6e3d2f..321878d48332 100644 --- a/devel/p5-multidimensional/Makefile +++ b/devel/p5-multidimensional/Makefile @@ -24,10 +24,4 @@ RUN_DEPENDS= p5-B-Hooks-OP-Check>=0.19:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \ 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> diff --git a/mail/openwebmail/Makefile b/mail/openwebmail/Makefile index 4427df878c32..104775241fd0 100644 --- a/mail/openwebmail/Makefile +++ b/mail/openwebmail/Makefile @@ -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}/mail/spamassassin .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}/security/clamav 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} diff --git a/misc/p5-Geo-Coder-OpenCage/Makefile b/misc/p5-Geo-Coder-OpenCage/Makefile index 0caf86119d5e..956fb2788056 100644 --- a/misc/p5-Geo-Coder-OpenCage/Makefile +++ b/misc/p5-Geo-Coder-OpenCage/Makefile @@ -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 diff --git a/textproc/p5-Text-Xslate/Makefile b/textproc/p5-Text-Xslate/Makefile index bb862ed864db..bf417488e8eb 100644 --- a/textproc/p5-Text-Xslate/Makefile +++ b/textproc/p5-Text-Xslate/Makefile @@ -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> diff --git a/www/p5-Template-Provider-FromDATA/Makefile b/www/p5-Template-Provider-FromDATA/Makefile index 7374293d5a47..3ea70f5aaad6 100644 --- a/www/p5-Template-Provider-FromDATA/Makefile +++ b/www/p5-Template-Provider-FromDATA/Makefile @@ -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> diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index 48b1e0477dcf..04d4a90d92a4 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -12,6 +12,7 @@ MAINTAINER= gnome@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" diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile index 2b33c4e1e408..a8e2b44d1d86 100644 --- a/www/webkit-gtk3/Makefile +++ b/www/webkit-gtk3/Makefile @@ -12,6 +12,7 @@ MAINTAINER= gnome@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" |