From owner-svn-ports-all@FreeBSD.ORG Mon Jan 6 22:07:25 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 832C1198; Mon, 6 Jan 2014 22:07:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 561411EFF; Mon, 6 Jan 2014 22:07:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s06M7PpS066052; Mon, 6 Jan 2014 22:07:25 GMT (envelope-from ache@svn.freebsd.org) Received: (from ache@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s06M7OKt066048; Mon, 6 Jan 2014 22:07:24 GMT (envelope-from ache@svn.freebsd.org) Message-Id: <201401062207.s06M7OKt066048@svn.freebsd.org> From: "Andrey A. Chernov" Date: Mon, 6 Jan 2014 22:07:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338948 - in head/graphics/ImageMagick: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jan 2014 22:07:25 -0000 Author: ache Date: Mon Jan 6 22:07:24 2014 New Revision: 338948 URL: http://svnweb.freebsd.org/changeset/ports/338948 Log: Fix PerlMagick build and install Added: head/graphics/ImageMagick/files/patch-PerlMagick-Makefile.PL.in (contents, props changed) Modified: head/graphics/ImageMagick/Makefile Modified: head/graphics/ImageMagick/Makefile ============================================================================== --- head/graphics/ImageMagick/Makefile Mon Jan 6 21:55:38 2014 (r338947) +++ head/graphics/ImageMagick/Makefile Mon Jan 6 22:07:24 2014 (r338948) @@ -406,6 +406,10 @@ post-patch: ${WRKSRC}/${i} . endfor .endif +.if ${PORT_OPTIONS:MPERL} + ${REINPLACE_CMD} -e "s|LIBS_magick = '|LIBS_magick = '-L${LOCALBASE}/lib/perl5/${PERL_VER}/mach/CORE |" \ + ${WRKSRC}/PerlMagick/Makefile.PL.in +.endif # deprecated gvCleanup @${REINPLACE_CMD} -e "s|gvCleanup|gvFreeContext|g" \ ${WRKSRC}/coders/dot.c @@ -424,8 +428,6 @@ pre-configure: post-install: test .if ${PORT_OPTIONS:MPERL} @${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod - ${REINPLACE_CMD} '303 s/EXTRALIBS =/EXTRALIBS = -L${LOCALBASE}/lib/perl5/${PERL_VER}/mach/CORE/g' \ - ${WRKSRC}/PerlMagick/Makefile .endif .if ${PORT_OPTIONS:MMODULES} . if ${PORT_OPTIONS:M16BIT_PIXEL} Added: head/graphics/ImageMagick/files/patch-PerlMagick-Makefile.PL.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ImageMagick/files/patch-PerlMagick-Makefile.PL.in Mon Jan 6 22:07:24 2014 (r338948) @@ -0,0 +1,10 @@ +--- PerlMagick/Makefile.PL.in.orig 2013-11-18 17:03:16.000000000 +0400 ++++ PerlMagick/Makefile.PL.in 2014-01-07 01:28:38.000000000 +0400 +@@ -239,6 +239,7 @@ + 'PERLMAINCC' => '@PERLMAINCC@ @OPENMP_CFLAGS@', + 'AR' => '@AR@', + 'LD' => '@PERLMAINCC@', ++ 'MAKE' => 'gmake', + + # Set Perl installation prefix to ImageMagick installation prefix + # 'PREFIX' => '@prefix@',