From owner-svn-ports-all@FreeBSD.ORG  Fri Aug 24 07:25:17 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3D564106564A;
	Fri, 24 Aug 2012 07:25:17 +0000 (UTC)
	(envelope-from danfe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 284A78FC08;
	Fri, 24 Aug 2012 07:25:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7O7PHrS090905;
	Fri, 24 Aug 2012 07:25:17 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7O7PGhm090903;
	Fri, 24 Aug 2012 07:25:16 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201208240725.q7O7PGhm090903@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Fri, 24 Aug 2012 07:25:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303058 - head/multimedia/handbrake
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2012 07:25:17 -0000

Author: danfe
Date: Fri Aug 24 07:25:16 2012
New Revision: 303058
URL: http://svn.freebsd.org/changeset/ports/303058

Log:
  Rename GUI option to X11 (to respect global OPTIONS_UNSET=X11 setting when
  building for e.g. headless servers).
  
  Suggested by:	crees

Modified:
  head/multimedia/handbrake/Makefile

Modified: head/multimedia/handbrake/Makefile
==============================================================================
--- head/multimedia/handbrake/Makefile	Fri Aug 24 06:55:55 2012	(r303057)
+++ head/multimedia/handbrake/Makefile	Fri Aug 24 07:25:16 2012	(r303058)
@@ -61,22 +61,22 @@ ALL_TARGET=	#
 
 NOPRECIOUSMAKEVARS=	yes			# for ffmpeg and x264
 
-OPTIONS_DEFINE=	GUI
-GUI_DESC=	Build GTK+2 based GUI program
-OPTIONS_DEFAULT=	GUI
+OPTIONS_DEFINE=	X11
+X11_DESC=	Build GTK+2 based GUI program
+OPTIONS_DEFAULT=	X11
 
 .include <bsd.port.pre.mk>
 
 # Recent GNU binutils are required to handle inline SSSE3 asm (in x264), and
 # to support --exclude-libs option for ld(1) when building GUI program
-.if ${PORT_OPTIONS:MGUI} || ${OSVERSION} < 802509 || \
+.if ${PORT_OPTIONS:MX11} || ${OSVERSION} < 802509 || \
 	${OSVERSION} >= 900000 && ${OSVERSION} < 900033
 BUILD_DEPENDS+=	as:${PORTSDIR}/devel/binutils
 CONFIGURE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
 .endif
 
-.if ${PORT_OPTIONS:MGUI}
+.if ${PORT_OPTIONS:MX11}
 CONFIGURE_ARGS+=	--disable-gtk-update-checks --disable-gst
 LIB_DEPENDS+=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		notify:${PORTSDIR}/devel/libnotify
@@ -131,7 +131,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/HandBrakeCLI ${PREFIX}/bin
-.if ${PORT_OPTIONS:MGUI}
+.if ${PORT_OPTIONS:MX11}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gtk/src/ghb ${PREFIX}/bin/HandBrake
 .endif