From owner-svn-ports-all@FreeBSD.ORG Fri Jan 17 14:25:55 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 591011EA; Fri, 17 Jan 2014 14:25:55 +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 2B3B717A8; Fri, 17 Jan 2014 14:25:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HEPsUN013474; Fri, 17 Jan 2014 14:25:54 GMT (envelope-from ehaupt@svn.freebsd.org) Received: (from ehaupt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HEPsY7013473; Fri, 17 Jan 2014 14:25:54 GMT (envelope-from ehaupt@svn.freebsd.org) Message-Id: <201401171425.s0HEPsY7013473@svn.freebsd.org> From: Emanuel Haupt Date: Fri, 17 Jan 2014 14:25:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340044 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 14:25:55 -0000 Author: ehaupt Date: Fri Jan 17 14:25:54 2014 New Revision: 340044 URL: http://svnweb.freebsd.org/changeset/ports/340044 QAT: https://qat.redports.org/buildarchive/r340044/ Log: Use new dependency macros based on options. Submitted by: bapt Modified: head/x11/xterm/Makefile Modified: head/x11/xterm/Makefile ============================================================================== --- head/x11/xterm/Makefile Fri Jan 17 14:11:32 2014 (r340043) +++ head/x11/xterm/Makefile Fri Jan 17 14:25:54 2014 (r340044) @@ -37,46 +37,18 @@ WCHAR_DESC= Enable wide-character suppor OPTIONS_DEFAULT=WCHAR LUIT 256COLOR -.include - -.if ${PORT_OPTIONS:M256COLOR} -CONFIGURE_ARGS+= --enable-256-color -.endif - -.if ${PORT_OPTIONS:MLUIT} -CONFIGURE_ARGS+= --enable-luit -BUILD_DEPENDS= luit:${PORTSDIR}/x11/luit -.endif - -.if ${PORT_OPTIONS:MWCHAR} -CONFIGURE_ARGS+= --enable-wide-chars -.endif - -.if ${PORT_OPTIONS:MDECTERM} -CONFIGURE_ARGS+= --enable-dec-locator -.endif +256COLOR_CONFIGURE_ENABLE= 256-color +LUIT_BUILD_DEPENDS= libluit.so:${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 +DABBREV_CONFIGURE_ENABLE= dabbrev +SIXEL_CONFIGURE_ENABLE= sixel-graphics +GNOME_USES= desktop-file-utils -.if ${PORT_OPTIONS:MPCRE} -CONFIGURE_ARGS+= --with-pcre -LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre -.endif - -.if ${PORT_OPTIONS:MDABBREV} -CONFIGURE_ARGS+= --enable-dabbrev -.endif - -.if ${PORT_OPTIONS:MSIXEL} -CONFIGURE_ARGS+= --enable-sixel-graphics -.endif - -.if ${PORT_OPTIONS:MGNOME} -USE_GNOME= desktopfileutils -PLIST_SUB+= GNOME="" -.else -PLIST_SUB+= GNOME="@comment " -.endif - -.include +.include .if ${OSVERSION} < 900004 LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter @@ -91,12 +63,9 @@ post-install: @${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/bin/${f} .endfor @${INSTALL_DATA} ${WRKSRC}/xterm.desktop ${STAGEDIR}${PREFIX}/share/applications/ -.if ${PORT_OPTIONS:MGNOME} - @-update-desktop-database -.endif .if ${PORT_OPTIONS:MWCHAR} @${CAT} ${PKGMESSAGE} .endif -.include +.include