From owner-svn-ports-all@FreeBSD.ORG  Thu Jan 23 08:43:09 2014
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: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 39AEF9B7;
 Thu, 23 Jan 2014 08:43:09 +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 0C3021310;
 Thu, 23 Jan 2014 08:43:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0N8h8OZ038680;
 Thu, 23 Jan 2014 08:43:08 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0N8h8hx038679;
 Thu, 23 Jan 2014 08:43:08 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201401230843.s0N8h8hx038679@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Thu, 23 Jan 2014 08:43:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r340810 - head/x11/xterm
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Thu, 23 Jan 2014 08:43:09 -0000

Author: ehaupt
Date: Thu Jan 23 08:43:08 2014
New Revision: 340810
URL: http://svnweb.freebsd.org/changeset/ports/340810
QAT: https://qat.redports.org/buildarchive/r340810/

Log:
  Reintroduce the GNOME knob (disabled by default) to avoid pulling in undesired
  dependencies.

Modified:
  head/x11/xterm/Makefile

Modified: head/x11/xterm/Makefile
==============================================================================
--- head/x11/xterm/Makefile	Thu Jan 23 08:42:15 2014	(r340809)
+++ head/x11/xterm/Makefile	Thu Jan 23 08:43:08 2014	(r340810)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xterm
 PORTVERSION=	301
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://invisible-island.net/xterm/:src1 \
 		CRITICAL:src1 CRITICAL:src2
@@ -15,7 +16,6 @@ COMMENT=	Terminal emulator for the X Win
 
 CONFLICTS=	x11iraf-[0-9]*
 
-USES=		desktop-file-utils
 USE_XORG=	xaw xft
 GNU_CONFIGURE=	yes
 
@@ -26,7 +26,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 
 ICONVERSION=	1
 
-OPTIONS_DEFINE=	WCHAR LUIT DECTERM PCRE DABBREV 256COLOR SIXEL
+OPTIONS_DEFINE=	WCHAR LUIT DECTERM PCRE DABBREV 256COLOR SIXEL GNOME
 
 DABBREV_DESC=	Enable support for dabbrev-expand
 DECTERM_DESC=	Enable DECterm Locator support
@@ -38,14 +38,15 @@ WCHAR_DESC=	Enable wide-character suppor
 OPTIONS_DEFAULT=WCHAR LUIT 256COLOR
 
 256COLOR_CONFIGURE_ENABLE=	256-color
-LUIT_BUILD_DEPENDS=	luit:${PORTSDIR}/x11/luit
-LUIT_CONFIGURE_ENABLE=	luit
-WCHAR_CONFIGURE_ENABLE=	wide-chars
+LUIT_BUILD_DEPENDS=		luit:${PORTSDIR}/x11/luit
+LUIT_CONFIGURE_ENABLE=		luit
+WCHAR_CONFIGURE_ENABLE=		wide-chars
 DECTERM_CONFIGURE_ENABLE=	dec-locator
-PCRE_CONFIGURE_WITH=	pcre
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_CONFIGURE_WITH=		pcre
+PCRE_LIB_DEPENDS=		libpcre.so:${PORTSDIR}/devel/pcre
 DABBREV_CONFIGURE_ENABLE=	dabbrev
-SIXEL_CONFIGURE_ENABLE=	sixel-graphics
+SIXEL_CONFIGURE_ENABLE=		sixel-graphics
+GNOME_USES=			desktop-file-utils
 
 .include <bsd.port.options.mk>
 
@@ -54,14 +55,16 @@ LIB_DEPENDS+=	utempter:${PORTSDIR}/sysut
 .endif
 
 post-extract:
-	@${CP} ${WRKDIR}/bsd-xterm-icons-1/*.png ${WRKDIR}/bsd-xterm-icons-1/*.xpm \
-		${WRKSRC}/icons/
+	@${CP} ${WRKDIR}/bsd-xterm-icons-1/*.png \
+		${WRKDIR}/bsd-xterm-icons-1/*.xpm \
+			${WRKSRC}/icons/
 
 post-install:
 .for f in koi8rxterm resize uxterm xterm
 	@${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
-	@${INSTALL_DATA} ${WRKSRC}/xterm.desktop ${STAGEDIR}${PREFIX}/share/applications/
+	@${INSTALL_DATA} ${WRKSRC}/xterm.desktop \
+		${STAGEDIR}${PREFIX}/share/applications/
 
 .if ${PORT_OPTIONS:MWCHAR}
 	@${CAT} ${PKGMESSAGE}