From nobody@FreeBSD.org  Mon Sep 10 08:23:37 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4DAE31065670
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 10 Sep 2012 08:23:37 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 37E7F8FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 10 Sep 2012 08:23:37 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q8A8NavH029791
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 10 Sep 2012 08:23:36 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id q8A8Naa5029790;
	Mon, 10 Sep 2012 08:23:36 GMT
	(envelope-from nobody)
Message-Id: <201209100823.q8A8Naa5029790@red.freebsd.org>
Date: Mon, 10 Sep 2012 08:23:36 GMT
From: Rainer Duffner <rainer@ultra-secure.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: GrahpicsMagick* ports depend on libwmf even if WITHOUT_X11=yes is set
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         171516
>Category:       ports
>Synopsis:       graphics/GraphicsMagick: GraphicsMagick* ports depend on libwmf even if WITHOUT_X11=yes is set
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    glarkin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 10 08:30:02 UTC 2012
>Closed-Date:    Thu Sep 20 16:30:57 EDT 2012
>Last-Modified:  Thu Sep 20 16:30:57 EDT 2012
>Originator:     Rainer Duffner
>Release:        9.0p3
>Organization:
>Environment:
FreeBSD f2d169d8-20d2-41d4-8e43-8a9fc5a2b509 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Tue Jun 12 02:52:29 UTC 2012     root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
ImageMagick port says:
# WMF (Windows Meta File) images
.if ${PORT_OPTIONS:MWMF}
. if !defined(WITHOUT_X11)
LIB_DEPENDS+=           wmf:${PORTSDIR}/graphics/libwmf
. else
LIB_DEPENDS+=           wmf:${PORTSDIR}/graphics/libwmf-nox11
. endif
CONFIGURE_ARGS+=        --with-wmf=yes
CFLAGS+=                -I${LOCALBASE}/include/freetype2
PLIST_SUB+=             WMF=""
.else
CONFIGURE_ARGS+=        --without-wmf
PLIST_SUB+=             WMF="@comment "
.endif


GrahpicsMagick port says:

LIB_DEPENDS=    freetype:${PORTSDIR}/print/freetype2    \
                fpx.[2-9]:${PORTSDIR}/graphics/libfpx   \
                jbig:${PORTSDIR}/graphics/jbigkit       \
                png15:${PORTSDIR}/graphics/png          \
                wmflite:${PORTSDIR}/graphics/libwmf     \
                xml2:${PORTSDIR}/textproc/libxml2

>How-To-Repeat:
Found trying to do a build with poudriere.
ImageMagick pulls in libwmf-nox11, GraphicsMagick pulls in libwmf, poudriere does not like this
>Fix:
Not sure how to fix this.
ImageMagick is already OPTIONS_NG, so little point in just copying over the relevant  sections...

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->glarkin 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Sep 10 08:42:15 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer of affected ports. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171516 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/171516: commit references a PR
Date: Thu, 20 Sep 2012 20:26:06 +0000 (UTC)

 Author: glarkin
 Date: Thu Sep 20 20:25:55 2012
 New Revision: 304595
 URL: http://svn.freebsd.org/changeset/ports/304595
 
 Log:
   - Updated to 1.3.16
   - Fixed X11-conditional dependency injection [1]
   - Converted to optionsNG
   
   PR:		ports/171516 (based on) [1]
   Submitted by:	Rainer Duffner <rainer@ultra-secure.de> [1]
 
 Deleted:
   head/graphics/GraphicsMagick13/files/patch-coders__png.c
 Modified:
   head/graphics/GraphicsMagick13/Makefile
   head/graphics/GraphicsMagick13/distinfo
   head/graphics/GraphicsMagick13/pkg-plist
 
 Modified: head/graphics/GraphicsMagick13/Makefile
 ==============================================================================
 --- head/graphics/GraphicsMagick13/Makefile	Thu Sep 20 19:51:30 2012	(r304594)
 +++ head/graphics/GraphicsMagick13/Makefile	Thu Sep 20 20:25:55 2012	(r304595)
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	GraphicsMagick
 -PORTVERSION=	1.3.15
 -PORTREVISION=	2
 +PORTVERSION=	1.3.16
  CATEGORIES=	graphics
  MASTER_SITES=	SF \
  		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
 @@ -22,18 +21,20 @@ CONFLICTS=	GraphicsMagick-1.[12].*
  LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2	\
  		png15:${PORTSDIR}/graphics/png		\
  		jbig:${PORTSDIR}/graphics/jbigkit	\
 -		wmflite:${PORTSDIR}/graphics/libwmf	\
  		xml2:${PORTSDIR}/textproc/libxml2
  OTHERGRAPHICS=	jasper jpeg lcms tiff
  LIB_DEPENDS+=	${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|}
  
 -OPTIONS=	Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \
 -		FPX "Enable FlashPIX support" on \
 -		DPS "Enable Display Ghostscript support" on \
 -		OPENMP "Enable OpenMP support" on \
 -		SSE "Enable SSE opcodes on supported CPUs" off \
 -		X11 "Enable X11 support" on \
 -		TESTS "Run bundled self-tests after build" on
 +OPTIONS_DEFINE=	Q8BIT FPX OPENMP SSE TESTS X11 DOCS
 +
 +Q8BIT_DESC=	Use 8-bit pixels (speed) instead of 16 (quality)
 +DPS_DESC=	Enable Display Ghostscript support
 +NODPS_DESC=	Disable Display Ghostscript support
 +TESTS_DESC=	Run bundled self-tests after build
 +
 +OPTIONS_DEFAULT=FPX DPS OPENMP X11 TESTS DOCS
 +OPTIONS_SINGLE=	X11
 +OPTIONS_SINGLE_X11=	DPS NODPS
  
  USE_ICONV=	yes
  USE_AUTOTOOLS=	libtool libltdl
 @@ -63,15 +64,15 @@ LDFLAGS+=	-L${LOCALBASE}/lib
  test check:
  	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
  
 -.include <bsd.port.pre.mk>
 +.include <bsd.port.options.mk>
  
 -.if defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS} == ""
  # Get rid of the Makefile targets that install the documentation
  # and HTML files into DOCSDIR
  EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Makefile.in
  .endif
  
 -.if defined(WITH_SSE)
 +.if ${PORT_OPTIONS:MSSE}
  .if ${MACHINE_CPU:Msse}
  CFLAGS+=	-msse
  .endif
 @@ -83,21 +84,21 @@ CFLAGS+=	-msse3
  .endif
  .endif
  
 -.if defined(WITH_FPX)
 +.if ${PORT_OPTIONS:MFPX}
  LIB_DEPENDS+=		fpx.[2-9]:${PORTSDIR}/graphics/libfpx
  CONFIGURE_ARGS+=	--with-fpx
  .else
  CONFIGURE_ARGS+=	--without-fpx
  .endif
  
 -.if defined(WITH_DPS)
 +.if ${PORT_OPTIONS:MDPS}
  LIB_DEPENDS+=		dps:${PORTSDIR}/x11/dgs
  CONFIGURE_ARGS+=	--with-dps
  .else
  CONFIGURE_ARGS+=	--without-dps
  .endif
  
 -.if defined(WITH_OPENMP)
 +.if ${PORT_OPTIONS:MOPENMP}
  .if ${OSVERSION} < 700042
  IGNORE=		does not support OpenMP on FreeBSD version ${OSVERSION}
  .endif
 @@ -117,12 +118,15 @@ WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fo
  CONFIGURE_ARGS+=	--with-windows-font-dir="${WINDOWS_FONT_DIR}"
  .endif
  
 -.if !defined(WITH_X11)
 +.if ${PORT_OPTIONS:MX11} == ""
  PKGNAMESUFFIX+=	-nox11
  CONFIGURE_ARGS+=--without-x
 +LIB_DEPENDS+=	wmflite:${PORTSDIR}/graphics/libwmf-nox11
 +.else
 +LIB_DEPENDS+=	wmflite:${PORTSDIR}/graphics/libwmf
  .endif
  
 -.if defined(WITH_Q8BIT) || defined(WITHOUT_GRAPHICSMAGICK_16BIT_PIXEL)
 +.if ${PORT_OPTIONS:MQ8BIT}
  CONFIGURE_ARGS+=	--with-quantum-depth=8
  PLIST_SUB+=		Q=8
  .else
 @@ -130,7 +134,7 @@ CONFIGURE_ARGS+=	--with-quantum-depth=16
  PLIST_SUB+=		Q=16
  .endif
  
 -.if !defined(WITHOUT_TESTS)
 +.if ${PORT_OPTIONS:MTESTS}
  post-build::	test
  .else
  post-build::
 @@ -140,4 +144,4 @@ post-build::
  	#
  .endif
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/graphics/GraphicsMagick13/distinfo
 ==============================================================================
 --- head/graphics/GraphicsMagick13/distinfo	Thu Sep 20 19:51:30 2012	(r304594)
 +++ head/graphics/GraphicsMagick13/distinfo	Thu Sep 20 20:25:55 2012	(r304595)
 @@ -1,2 +1,2 @@
 -SHA256 (GraphicsMagick-1.3.15.tar.bz2) = fd79168feaca5a2d230ce294541bb3655fd0fb6f21aec7c29dd7f00db14109ed
 -SIZE (GraphicsMagick-1.3.15.tar.bz2) = 6686564
 +SHA256 (GraphicsMagick-1.3.16.tar.bz2) = 2845bfcd53b0ea57755f21aac80df3becfa7d37ac50c6f67387f004d67d58d83
 +SIZE (GraphicsMagick-1.3.16.tar.bz2) = 7328861
 
 Modified: head/graphics/GraphicsMagick13/pkg-plist
 ==============================================================================
 --- head/graphics/GraphicsMagick13/pkg-plist	Thu Sep 20 19:51:30 2012	(r304594)
 +++ head/graphics/GraphicsMagick13/pkg-plist	Thu Sep 20 20:25:55 2012	(r304595)
 @@ -95,7 +95,7 @@ lib/libGraphicsMagick++.so.9
  lib/libGraphicsMagick.a
  lib/libGraphicsMagick.la
  lib/libGraphicsMagick.so
 -lib/libGraphicsMagick.so.11
 +lib/libGraphicsMagick.so.12
  lib/libGraphicsMagickWand.a
  lib/libGraphicsMagickWand.la
  lib/libGraphicsMagickWand.so
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: glarkin 
State-Changed-When: Thu Sep 20 16:30:43 EDT 2012 
State-Changed-Why:  
Committed, thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171516 
>Unformatted:
