From owner-svn-ports-head@FreeBSD.ORG Tue Jan 14 03:23:02 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF216654; Tue, 14 Jan 2014 03:23:01 +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 CB8891721; Tue, 14 Jan 2014 03:23:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0E3N1uu040878; Tue, 14 Jan 2014 03:23:01 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0E3N19E040871; Tue, 14 Jan 2014 03:23:01 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201401140323.s0E3N19E040871@svn.freebsd.org> From: Matthias Andree Date: Tue, 14 Jan 2014 03:23:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339659 - head/graphics/ImageMagick X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 03:23:02 -0000 Author: mandree Date: Tue Jan 14 03:23:01 2014 New Revision: 339659 URL: http://svnweb.freebsd.org/changeset/ports/339659 Log: Convert to staging. Beat Perl's .packlist into shape. Fix shebang line in one example file. Approved by: portmgr (implicit, blanket) Modified: head/graphics/ImageMagick/Makefile head/graphics/ImageMagick/pkg-plist Modified: head/graphics/ImageMagick/Makefile ============================================================================== --- head/graphics/ImageMagick/Makefile Tue Jan 14 02:49:02 2014 (r339658) +++ head/graphics/ImageMagick/Makefile Tue Jan 14 03:23:01 2014 (r339659) @@ -33,23 +33,18 @@ COMMENT= Image processing tools LICENSE= APACHE20 -USES= gmake pkgconfig:both pathfix perl5 +USES= gmake pkgconfig:both pathfix perl5 shebangfix +SHEBANG_FILES= www/source/examples.pl USE_XZ= yes USE_PERL5= run build patch WANT_GNOME= yes USE_AUTOTOOLS= libltdl -NO_STAGE= yes # For some reason, using our libtool breaks the build into pieces: #USE_AUTOTOOLS+= libtool GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --without-dps --without-lcms USE_LDCONFIG= yes -MAN1= ImageMagick.1 Magick++-config.1 Magick-config.1 Wand-config.1 \ - animate.1 conjure.1 compare.1 composite.1 convert.1 display.1 \ - MagickCore-config.1 MagickWand-config.1 \ - identify.1 import.1 mogrify.1 montage.1 stream.1 - CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -416,15 +411,16 @@ pre-configure: post-install: test .if ${PORT_OPTIONS:MPERL} - @${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod + @${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod + ${REINPLACE_CMD} -i '' -e 's}^${STAGEDIR}}}' ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Image/Magick/.packlist .endif .if ${PORT_OPTIONS:MMODULES} . if ${PORT_OPTIONS:M16BIT_PIXEL} - @${TOUCH} ${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q16/coders/.keep - @${TOUCH} ${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q16/filters/.keep + @${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q16/coders/.keep + @${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q16/filters/.keep . else - @${TOUCH} ${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/coders/.keep - @${TOUCH} ${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/filters/.keep + @${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/coders/.keep + @${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/filters/.keep . endif .endif Modified: head/graphics/ImageMagick/pkg-plist ============================================================================== --- head/graphics/ImageMagick/pkg-plist Tue Jan 14 02:49:02 2014 (r339658) +++ head/graphics/ImageMagick/pkg-plist Tue Jan 14 03:23:01 2014 (r339659) @@ -417,6 +417,24 @@ libdata/pkgconfig/Wand.pc %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/autosplit.ix +%%WITH_PERL%%%%PERL5_MAN3%%/Image::Magick.3.gz +man/man1/ImageMagick.1.gz +man/man1/Magick++-config.1.gz +man/man1/Magick-config.1.gz +man/man1/MagickCore-config.1.gz +man/man1/MagickWand-config.1.gz +man/man1/Wand-config.1.gz +man/man1/animate.1.gz +man/man1/compare.1.gz +man/man1/composite.1.gz +man/man1/conjure.1.gz +man/man1/convert.1.gz +man/man1/display.1.gz +man/man1/identify.1.gz +man/man1/import.1.gz +man/man1/mogrify.1.gz +man/man1/montage.1.gz +man/man1/stream.1.gz %%DATADIR%%-%%PORTVERSION%%/english.xml %%DATADIR%%-%%PORTVERSION%%/francais.xml %%DATADIR%%-%%PORTVERSION%%/locale.xml