Date: Fri, 24 Apr 2015 16:52:30 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384668 - in head/mail/p5-MIME-Fast: . files Message-ID: <201504241652.t3OGqUWU092611@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Apr 24 16:52:29 2015 New Revision: 384668 URL: https://svnweb.freebsd.org/changeset/ports/384668 Log: Fix build with 5.18+. Rename a patch to follow makepatch naming. Sponsored by: Absolight Added: head/mail/p5-MIME-Fast/files/patch-Fast_Part.xs - copied unchanged from r384650, head/mail/p5-MIME-Fast/files/patch-Part.xs head/mail/p5-MIME-Fast/files/patch-Fast_Stream.xs (contents, props changed) Deleted: head/mail/p5-MIME-Fast/files/patch-Part.xs Modified: head/mail/p5-MIME-Fast/Makefile Modified: head/mail/p5-MIME-Fast/Makefile ============================================================================== --- head/mail/p5-MIME-Fast/Makefile Fri Apr 24 16:52:03 2015 (r384667) +++ head/mail/p5-MIME-Fast/Makefile Fri Apr 24 16:52:29 2015 (r384668) @@ -19,13 +19,4 @@ USES= perl5 USE_PERL5= configure CONFIGURE_ENV= PREFIX="${PREFIX}" CCFLAGS="${CCFLAGS}" -DEPRECATED= Does not work with 5.18 or above -EXPIRATION_DATE=2015-07-31 - -.include <bsd.port.pre.mk> - -.if ${PERL_VER} >= 5.18 -BROKEN= Does not build with Perl 5.18 or above -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Copied: head/mail/p5-MIME-Fast/files/patch-Fast_Part.xs (from r384650, head/mail/p5-MIME-Fast/files/patch-Part.xs) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/p5-MIME-Fast/files/patch-Fast_Part.xs Fri Apr 24 16:52:29 2015 (r384668, copy of r384650, head/mail/p5-MIME-Fast/files/patch-Part.xs) @@ -0,0 +1,30 @@ +--- Fast/Part.xs.orig 2004-12-20 17:59:39.603786200 +0300 ++++ Fast/Part.xs 2004-12-27 18:05:31.374875000 +0300 +@@ -48,7 +48,6 @@ + XSINTERFACE_FUNC_MIMEFAST_PART_SET + INTERFACE: + set_content_description +- set_content_md5 + set_content_location + set_content_disposition + set_filename +@@ -240,6 +239,9 @@ + g_mime_part_set_content_object(mime_part, mime_data_wrapper); + + g_mime_stream_unref(mime_stream); ++ } else if (SvPOKp(svval)) { ++ data = (char *)SvPV(svval, len); ++ g_mime_part_set_content(mime_part, data, len); + } else if (svvaltype == SVt_PVMG) { // possible STDIN/STDOUT etc. + int fd0 = (int)SvIV( svval ); + int fd; +@@ -256,9 +258,6 @@ + g_mime_part_set_content_object(mime_part, mime_data_wrapper); + + g_mime_stream_unref(mime_stream); +- } else if (SvPOK(svval)) { +- data = (char *)SvPV(svval, len); +- g_mime_part_set_content(mime_part, data, len); + } else { + croak("mime_set_content: Unknown type: %d", (int)svvaltype); + } Added: head/mail/p5-MIME-Fast/files/patch-Fast_Stream.xs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/p5-MIME-Fast/files/patch-Fast_Stream.xs Fri Apr 24 16:52:29 2015 (r384668) @@ -0,0 +1,12 @@ +--- Fast/Stream.xs.orig 2003-06-23 08:57:12 UTC ++++ Fast/Stream.xs +@@ -218,8 +218,7 @@ g_mime_stream_read(mime_stream, buf, len + if (SvREADONLY(buf) && PL_curcop != &PL_compiling) + croak("MIME::Fast::Stream->read: buffer parameter is read-only"); + else +- if (!SvUPGRADE(buf, SVt_PV)) +- croak("MIME::Fast::Stream->read: cannot use buf argument as lvalue"); ++ SvUPGRADE(buf, SVt_PV); + SvPOK_only(buf); + SvCUR_set(buf, 0); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504241652.t3OGqUWU092611>