From owner-svn-ports-head@FreeBSD.ORG Tue Oct 23 13:50:34 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7B1BC8D2; Tue, 23 Oct 2012 13:50:34 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 480F48FC0A; Tue, 23 Oct 2012 13:50:34 +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 q9NDoYCb077159; Tue, 23 Oct 2012 13:50:34 GMT (envelope-from ehaupt@svn.freebsd.org) Received: (from ehaupt@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9NDoY0N077156; Tue, 23 Oct 2012 13:50:34 GMT (envelope-from ehaupt@svn.freebsd.org) Message-Id: <201210231350.q9NDoY0N077156@svn.freebsd.org> From: Emanuel Haupt Date: Tue, 23 Oct 2012 13:50:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306312 - 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Oct 2012 13:50:34 -0000 Author: ehaupt Date: Tue Oct 23 13:50:33 2012 New Revision: 306312 URL: http://svn.freebsd.org/changeset/ports/306312 Log: - Restore the 256 color option but have it on per default [1] - Provide super sexy FreeBSD icons [2] PR: 172915 [1] Submitted by: Martin Tournoij [1], self [2] Feature safe: yes Modified: head/x11/xterm/Makefile head/x11/xterm/distinfo Modified: head/x11/xterm/Makefile ============================================================================== --- head/x11/xterm/Makefile Tue Oct 23 13:34:33 2012 (r306311) +++ head/x11/xterm/Makefile Tue Oct 23 13:50:33 2012 (r306312) @@ -2,10 +2,13 @@ PORTNAME= xterm PORTVERSION= 284 +PORTREVISION= 1 CATEGORIES= x11 -MASTER_SITES= ftp://invisible-island.net/xterm/ \ - CRITICAL +MASTER_SITES= ftp://invisible-island.net/xterm/:src1 \ + CRITICAL:src1 CRITICAL:src2 EXTRACT_SUFX= .tgz +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src1 \ + bsd-xterm-icons-${ICONVERSION}${EXTRACT_SUFX}:src2 MAINTAINER= ehaupt@FreeBSD.org COMMENT= Terminal emulator for the X Window System @@ -17,21 +20,28 @@ WANT_GNOME= desktopfileutils GNU_CONFIGURE= yes CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS+= --with-utempter --enable-narrowproto --enable-256-color +CONFIGURE_ARGS+= --with-utempter --enable-narrowproto CPPFLAGS+= -I${LOCALBASE}/include -OPTIONS_DEFINE= WCHAR LUIT DECTERM PCRE GNOME DABBREV +ICONVERSION= 1 + +OPTIONS_DEFINE= WCHAR LUIT DECTERM PCRE GNOME DABBREV 256COLOR DABBREV_DESC= Enable support for dabbrev-expand DECTERM_DESC= Enable DECterm Locator support LUIT_DESC= Use LUIT for locale convertion from/to UTF-8 WCHAR_DESC= Enable wide-character support +256COLOR_DESC= Enable 256-color support -OPTIONS_DEFAULT=WCHAR LUIT +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 @@ -69,6 +79,10 @@ MAN1= resize.1 koi8rxterm.1 uxterm.1 xt LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter .endif +post-extract: + @${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} ${PREFIX}/bin/${f} Modified: head/x11/xterm/distinfo ============================================================================== --- head/x11/xterm/distinfo Tue Oct 23 13:34:33 2012 (r306311) +++ head/x11/xterm/distinfo Tue Oct 23 13:50:33 2012 (r306312) @@ -1,2 +1,4 @@ SHA256 (xterm-284.tgz) = a5c400c753bc9d6c219753a210e516de388dd1e8771f44a91c0094d4901365af SIZE (xterm-284.tgz) = 1098456 +SHA256 (bsd-xterm-icons-1.tgz) = fcf51dce0e23e9911a16ed7f2ce835bb6ff2ada65f023c29fdd8abda2795bf7c +SIZE (bsd-xterm-icons-1.tgz) = 22718