svn commit: r340810 - head/x11/xterm

[Emanuel Haupt]

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}