From owner-svn-ports-head@FreeBSD.ORG  Sun Dec 15 12:22:30 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 8DE25961;
 Sun, 15 Dec 2013 12:22:30 +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 7A4771108;
 Sun, 15 Dec 2013 12:22:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFCMUqi095244;
 Sun, 15 Dec 2013 12:22:30 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFCMULG095242;
 Sun, 15 Dec 2013 12:22:30 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201312151222.rBFCMULG095242@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sun, 15 Dec 2013 12:22:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r336518 - head/graphics/tiff
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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Dec 2013 12:22:30 -0000

Author: dinoex
Date: Sun Dec 15 12:22:29 2013
New Revision: 336518
URL: http://svnweb.freebsd.org/changeset/ports/336518

Log:
  - use X11_CONFIGURE_WITH, X11_USE

Modified:
  head/graphics/tiff/Makefile
  head/graphics/tiff/pkg-plist

Modified: head/graphics/tiff/Makefile
==============================================================================
--- head/graphics/tiff/Makefile	Sun Dec 15 12:19:33 2013	(r336517)
+++ head/graphics/tiff/Makefile	Sun Dec 15 12:22:29 2013	(r336518)
@@ -81,6 +81,9 @@ MLINKS=	TIFFError.3tiff          TIFFSet
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
+OPTIONS_SUB=	yes
+X11_CONFIGURE_WITH=	x libgl
+X11_USE=	xorg=sm,ice,xmu,xi,x11 gl=glut,glu,gl
 
 .include <bsd.port.options.mk>
 
@@ -93,15 +96,6 @@ __pmlinks3!= ${ECHO_CMD} '${MLINKS:S/   
 	} }'
 .endif
 
-.if ${PORT_OPTIONS:MX11}
-USE_XORG=	sm ice xmu xi x11
-USE_GL=		glut glu gl
-PLIST_SUB+=	WITH_X11=""
-.else
-CONFIGURE_ARGS+=	--without-x --without-libgl
-PLIST_SUB+=	WITH_X11="@comment "
-.endif
-
 pre-configure:
 	${REINPLACE_CMD} \
 		-e 's|^LIBTIFF_VERSION_INFO =.*$$|LIBTIFF_VERSION_INFO = 4:0:0|' \

Modified: head/graphics/tiff/pkg-plist
==============================================================================
--- head/graphics/tiff/pkg-plist	Sun Dec 15 12:19:33 2013	(r336517)
+++ head/graphics/tiff/pkg-plist	Sun Dec 15 12:22:29 2013	(r336518)
@@ -17,7 +17,7 @@ bin/tiffcp
 bin/tiffcrop
 bin/tiffdither
 bin/tiffdump
-%%WITH_X11%%bin/tiffgt
+%%X11%%bin/tiffgt
 bin/tiffinfo
 bin/tiffmedian
 bin/tiffset