diff options
| author | Lars Thegler <lth@FreeBSD.org> | 2004-10-13 20:42:03 +0000 |
|---|---|---|
| committer | Lars Thegler <lth@FreeBSD.org> | 2004-10-13 20:42:03 +0000 |
| commit | 0bf0511804942c89210e0c3cab63c35cbaf5edcc (patch) | |
| tree | b51cb5a2e384f86a7ee4a064b6d2024f43f3d60e /mail | |
| parent | b6fa2d612e3ca7d5d1c106a935e3e6f0c51e719d (diff) | |
| download | ports-0bf0511804942c89210e0c3cab63c35cbaf5edcc.tar.gz ports-0bf0511804942c89210e0c3cab63c35cbaf5edcc.zip | |
- Unbreak under Perl 5.005_03
- Moved simple patches into Makefile
Notes
Notes:
svn path=/head/; revision=119304
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/p5-Email-MIME-ContentType/Makefile | 11 | ||||
| -rw-r--r-- | mail/p5-Email-MIME-ContentType/files/5.005_03-ContentType.pm | 17 | ||||
| -rw-r--r-- | mail/p5-Email-MIME-ContentType/files/5.005_03-Makefile.PL | 7 |
3 files changed, 8 insertions, 27 deletions
diff --git a/mail/p5-Email-MIME-ContentType/Makefile b/mail/p5-Email-MIME-ContentType/Makefile index 23435bc30dff..cd2ca5ff477b 100644 --- a/mail/p5-Email-MIME-ContentType/Makefile +++ b/mail/p5-Email-MIME-ContentType/Makefile @@ -7,6 +7,7 @@ PORTNAME= Email-MIME-ContentType PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Email @@ -20,7 +21,11 @@ PERL_CONFIGURE= yes MAN3= Email::MIME::ContentType.3 .include <bsd.port.pre.mk> -.if ${PERL_LEVEL} <= 500503 -EXTRA_PATCHES= ${PATCHDIR}/5.005_03-* -.endif +post-patch: + ${PERL} -pi -e '$$_ = "" if /use 5.006;/;' \ + ${WRKSRC}/Makefile.PL + ${PERL} -pi -e '$$_ = "" if /require 5.006;/;' \ + -e '$$_ = "" if /use warnings/;' \ + -e 's/^our\s+([\$$\@\%]\w+)/use vars qw($$1); $$1/;' \ + ${WRKSRC}/ContentType.pm .include <bsd.port.post.mk> diff --git a/mail/p5-Email-MIME-ContentType/files/5.005_03-ContentType.pm b/mail/p5-Email-MIME-ContentType/files/5.005_03-ContentType.pm deleted file mode 100644 index 328351ed0634..000000000000 --- a/mail/p5-Email-MIME-ContentType/files/5.005_03-ContentType.pm +++ /dev/null @@ -1,17 +0,0 @@ ---- ContentType.pm.orig Sun Aug 29 15:11:25 2004 -+++ ContentType.pm Sun Aug 29 15:11:51 2004 -@@ -1,11 +1,11 @@ - package Email::MIME::ContentType; --require 5.006; - use base 'Exporter'; --our @EXPORT = qw(parse_content_type); -+use vars qw(@EXPORT $VERSION); -+@EXPORT = qw(parse_content_type); - use strict; - use Carp; - use warnings; --our $VERSION = '1.0'; -+$VERSION = '1.0'; - - my $tspecials = quotemeta '()<>@,;:\\"/[]?='; - my $ct_default = 'text/plain; charset=us-ascii'; diff --git a/mail/p5-Email-MIME-ContentType/files/5.005_03-Makefile.PL b/mail/p5-Email-MIME-ContentType/files/5.005_03-Makefile.PL deleted file mode 100644 index b23bcb911c53..000000000000 --- a/mail/p5-Email-MIME-ContentType/files/5.005_03-Makefile.PL +++ /dev/null @@ -1,7 +0,0 @@ ---- Makefile.PL.orig Wed Jan 7 18:05:03 2004 -+++ Makefile.PL Sun Aug 29 15:10:58 2004 -@@ -1,4 +1,3 @@ --use 5.006; - use ExtUtils::MakeMaker; - # See lib/ExtUtils/MakeMaker.pm for details of how to influence - # the contents of the Makefile that is written. |