From owner-svn-ports-head@freebsd.org Sun May 22 14:20:16 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BC0C4B45769; Sun, 22 May 2016 14:20:16 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6A84914BF; Sun, 22 May 2016 14:20:16 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4MEKFq5003887; Sun, 22 May 2016 14:20:15 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4MEKFRe003886; Sun, 22 May 2016 14:20:15 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201605221420.u4MEKFRe003886@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sun, 22 May 2016 14:20:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415633 - head/graphics/GraphicsMagick 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.22 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: Sun, 22 May 2016 14:20:16 -0000 Author: adamw Date: Sun May 22 14:20:15 2016 New Revision: 415633 URL: https://svnweb.freebsd.org/changeset/ports/415633 Log: Turn hard dependencies into OPTIONS. GraphicsMagick actually has the ability to be a slim package, and support for every format is configurable. All previously hard dependencies are now on by default, so the default package is unchanged. No PORTREVISION bump necessary. PR: 209362 Approved by: maintainer timeout (15 days) Modified: head/graphics/GraphicsMagick/Makefile Modified: head/graphics/GraphicsMagick/Makefile ============================================================================== --- head/graphics/GraphicsMagick/Makefile Sun May 22 13:52:40 2016 (r415632) +++ head/graphics/GraphicsMagick/Makefile Sun May 22 14:20:15 2016 (r415633) @@ -12,15 +12,8 @@ MASTER_SITES= SF \ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Fast image processing tools based on ImageMagick -LIB_DEPENDS= libfreetype.so:print/freetype2 \ - libjbig.so:graphics/jbigkit \ - libjasper.so:graphics/jasper \ - liblcms2.so:graphics/lcms2 \ - libpng.so:graphics/png \ - libtiff.so:graphics/tiff - -OPTIONS_DEFINE= DOCS DPS FPX OPENMP Q8BIT SSE TEST WEBP WMF X11 XML -OPTIONS_DEFAULT=OPENMP WEBP WMF X11 XML +OPTIONS_DEFINE= DOCS DPS FPX FREETYPE JASPER JBIG JPEG LCMS2 OPENMP Q8BIT PNG SSE TEST TIFF WEBP WMF X11 XML +OPTIONS_DEFAULT=FREETYPE JASPER JBIG JPEG LCMS2 OPENMP PNG TIFF WEBP WMF X11 XML DPS_DESC= Display Ghostscript support Q8BIT_DESC= Use 8-bit pixels (speed) instead of 16-bit (quality) TEST_DESC= Run bundled self-tests after build @@ -32,7 +25,7 @@ CONFIGURE_ENV= PTHREAD_LIBS=-lpthread INSTALL_TARGET= install-strip TEST_TARGET= check USE_LDCONFIG= yes -USES= jpeg libtool localbase tar:bzip2 +USES= libtool localbase tar:bzip2 PORTDATA= * PORTDOCS= * @@ -46,15 +39,29 @@ DPS_LIB_DEPENDS= libdps.so:x11/dgs DPS_USE= XORG=xt FPX_CONFIGURE_WITH= fpx FPX_LIB_DEPENDS= libfpx.so:graphics/libfpx +FREETYPE_CONFIGURE_WITH= ttf +FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 +JASPER_CONFIGURE_WITH= jp2 +JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper +JBIG_CONFIGURE_WITH= jbig +JBIG_LIB_DEPENDS= libjbig.so:graphics/jbigkit +JPEG_CONFIGURE_WITH= jpeg +JPEG_USES= jpeg +LCMS2_CONFIGURE= lcms2 +LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 OPENMP_CONFIGURE_OFF= --without-threads --disable-openmp OPENMP_CONFIGURE_ON= --with-threads --enable-openmp --disable-openmp-slow OPENMP_USES= compiler:openmp +PNG_CONFIGURE_WITH= png +PNG_LIB_DEPENDS= libpng.so:graphics/png Q8BIT_CONFIGURE_OFF= --with-quantum-depth=16 Q8BIT_CONFIGURE_ON= --with-quantum-depth=8 Q8BIT_PLIST_SUB= Q=8 Q8BIT_PLIST_SUB_OFF= Q=16 TEST_BUILD_DEPENDS= webfonts>=0:x11-fonts/webfonts TEST_RUN_DEPENDS= webfonts>=0:x11-fonts/webfonts +TIFF_CONFIGURE_WITH= tiff +TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WMF_CONFIGURE_WITH= wmf