Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Nov 2015 06:32:48 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r402136 - head/graphics/GraphicsMagick
Message-ID:  <201511210632.tAL6WmbD094158@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sat Nov 21 06:32:47 2015
New Revision: 402136
URL: https://svnweb.freebsd.org/changeset/ports/402136

Log:
  - Add WMF and XML options
  - Remove unnecessary dependencies
  - Bump PORTREVISION for dependency change

Modified:
  head/graphics/GraphicsMagick/Makefile

Modified: head/graphics/GraphicsMagick/Makefile
==============================================================================
--- head/graphics/GraphicsMagick/Makefile	Sat Nov 21 06:32:43 2015	(r402135)
+++ head/graphics/GraphicsMagick/Makefile	Sat Nov 21 06:32:47 2015	(r402136)
@@ -3,6 +3,7 @@
 
 PORTNAME=	GraphicsMagick
 PORTVERSION=	1.3.23
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF \
@@ -18,8 +19,8 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/
 		libpng.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
-OPTIONS_DEFINE=	DOCS DPS FPX OPENMP Q8BIT SSE TEST WEBP X11
-OPTIONS_DEFAULT=OPENMP WEBP X11
+OPTIONS_DEFINE=	DOCS DPS FPX OPENMP Q8BIT SSE TEST WEBP WMF X11 XML
+OPTIONS_DEFAULT=OPENMP 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
@@ -30,10 +31,8 @@ CONFIGURE_ARGS=	--enable-shared --enable
 CONFIGURE_ENV=	PTHREAD_LIBS=-lpthread
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
-USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
-#USES=		ghostscript iconv jpeg libtool localbase tar:bzip2
-USES=		ghostscript iconv jpeg libtool tar:bzip2
+USES=		jpeg libtool tar:bzip2
 
 PORTDATA=	*
 PORTDOCS=	*
@@ -62,10 +61,11 @@ TEST_BUILD_DEPENDS=	webfonts>=0:${PORTSD
 TEST_RUN_DEPENDS=	webfonts>=0:${PORTSDIR}/x11-fonts/webfonts
 WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WMF_CONFIGURE_WITH=	wmf
 X11_CONFIGURE_WITH=	x
-X11_LIB_DEPENDS=	libwmflite.so:${PORTSDIR}/graphics/libwmf
-X11_LIB_DEPENDS_OFF=	libwmflite.so:${PORTSDIR}/graphics/libwmf-nox11
 X11_USE=		XORG=xext
+XML_CONFIGURE_WITH=	xml
+XML_USE=		GNOME=libxml2
 
 .include <bsd.port.options.mk>
 
@@ -81,6 +81,14 @@ CFLAGS+=	-msse3
 .endif
 .endif
 
+.if ${PORT_OPTIONS:MWMF}
+.if ${PORT_OPTIONS:MX11}
+LIB_DEPENDS+=	libwmflite.so:${PORTSDIR}/graphics/libwmf
+.else
+LIB_DEPENDS+=	libwmflite.so:${PORTSDIR}/graphics/libwmf-nox11
+.endif
+.endif
+
 post-install-Q8BIT-off:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q16/coders ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q16/filters
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511210632.tAL6WmbD094158>