From owner-svn-ports-head@FreeBSD.ORG Tue Jul 15 12:24:34 2014
Return-Path:
Delivered-To: svn-ports-head@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 D16D3A85;
Tue, 15 Jul 2014 12:24:34 +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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id B2A6720D2;
Tue, 15 Jul 2014 12:24:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6FCOY77038969;
Tue, 15 Jul 2014 12:24:34 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6FCOXj2038960;
Tue, 15 Jul 2014 12:24:33 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201407151224.s6FCOXj2038960@svn.freebsd.org>
From: Emanuel Haupt
Date: Tue, 15 Jul 2014 12:24:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r361911 - in head/x11/xterm: . files
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.18
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, 15 Jul 2014 12:24:34 -0000
Author: ehaupt
Date: Tue Jul 15 12:24:32 2014
New Revision: 361911
URL: http://svnweb.freebsd.org/changeset/ports/361911
QAT: https://qat.redports.org/buildarchive/r361911/
Log:
Add an Xaw 3d xft library support option.
Added:
head/x11/xterm/files/
head/x11/xterm/files/patch-MANIFEST (contents, props changed)
head/x11/xterm/files/patch-package__debian__changelog (contents, props changed)
head/x11/xterm/files/patch-package__freebsd__Makefile (contents, props changed)
head/x11/xterm/files/patch-package__xterm.spec (contents, props changed)
head/x11/xterm/files/patch-version.h (contents, props changed)
head/x11/xterm/files/patch-xterm.log.html (contents, props changed)
head/x11/xterm/files/patch-xtermcfg.hin (contents, props changed)
Modified:
head/x11/xterm/Makefile
Modified: head/x11/xterm/Makefile
==============================================================================
--- head/x11/xterm/Makefile Tue Jul 15 12:20:30 2014 (r361910)
+++ head/x11/xterm/Makefile Tue Jul 15 12:24:32 2014 (r361911)
@@ -25,7 +25,7 @@ LIBS+= -L${LOCALBASE}/lib
ICONVERSION= 1
-OPTIONS_DEFINE= WCHAR LUIT DECTERM PCRE DABBREV 256COLOR SIXEL GNOME
+OPTIONS_DEFINE= WCHAR LUIT DECTERM PCRE DABBREV 256COLOR SIXEL GNOME XAW3DXFT
DABBREV_DESC= Enable support for dabbrev-expand
DECTERM_DESC= Enable DECterm Locator support
@@ -33,6 +33,7 @@ LUIT_DESC= Use LUIT for locale convertio
SIXEL_DESC= Enable Sixel graphics support
WCHAR_DESC= Enable wide-character support
256COLOR_DESC= Enable 256-color support
+XAW3DXFT_DESC= Enable Xaw 3d xft library support
OPTIONS_DEFAULT=WCHAR LUIT 256COLOR
@@ -46,6 +47,8 @@ PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR
DABBREV_CONFIGURE_ENABLE= dabbrev
SIXEL_CONFIGURE_ENABLE= sixel-graphics
GNOME_USES= desktop-file-utils
+XAW3DXFT_CONFIGURE_WITH= Xaw3dxft
+XAW3DXFT_LIB_DEPENDS= libXaw3dxft.so:${PORTSDIR}/x11-toolkits/libxaw3dxft
.include
Added: head/x11/xterm/files/patch-MANIFEST
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/xterm/files/patch-MANIFEST Tue Jul 15 12:24:32 2014 (r361911)
@@ -0,0 +1,8 @@
+--- ./MANIFEST.orig 2014-06-28 16:34:28.000000000 +0200
++++ ./MANIFEST 2014-07-15 09:09:15.487622345 +0200
+@@ -1,4 +1,4 @@
+-MANIFEST for xterm-309, version xterm-309
++MANIFEST for xterm-310, version xterm-310
+ --------------------------------------------------------------------------------
+ MANIFEST this file
+ 256colres.h resource-definitions for 256-color mode
Added: head/x11/xterm/files/patch-package__debian__changelog
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/xterm/files/patch-package__debian__changelog Tue Jul 15 12:24:32 2014 (r361911)
@@ -0,0 +1,12 @@
+--- ./package/debian/changelog.orig 2014-06-28 16:34:28.000000000 +0200
++++ ./package/debian/changelog 2014-07-15 09:09:15.487622345 +0200
+@@ -1,3 +1,9 @@
++xterm-dev (310) unstable; urgency=low
++
++ * maintenance updates
++
++ -- Thomas E. Dickey Mon, 14 Jul 2014 19:36:58 -0400
++
+ xterm-dev (309) unstable; urgency=low
+
+ * maintenance updates
Added: head/x11/xterm/files/patch-package__freebsd__Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/xterm/files/patch-package__freebsd__Makefile Tue Jul 15 12:24:32 2014 (r361911)
@@ -0,0 +1,11 @@
+--- ./package/freebsd/Makefile.orig 2014-06-28 16:34:28.000000000 +0200
++++ ./package/freebsd/Makefile 2014-07-15 09:09:15.488621885 +0200
+@@ -5,7 +5,7 @@
+ # and "make makesum".
+
+ PORTNAME= xterm
+-PORTVERSION= 309
++PORTVERSION= 310
+ CATEGORIES= x11
+ MASTER_SITES= ftp://invisible-island.net/xterm/ \
+ CRITICAL
Added: head/x11/xterm/files/patch-package__xterm.spec
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/xterm/files/patch-package__xterm.spec Tue Jul 15 12:24:32 2014 (r361911)
@@ -0,0 +1,16 @@
+--- ./package/xterm.spec.orig 2014-07-13 17:29:11.000000000 +0200
++++ ./package/xterm.spec 2014-07-15 09:09:15.488621885 +0200
+@@ -1,11 +1,11 @@
+-# $XTermId: xterm.spec,v 1.74 2014/07/13 15:29:11 tom Exp $
++# $XTermId: xterm.spec,v 1.75 2014/07/14 23:36:58 tom Exp $
+ Summary: X terminal emulator (development version)
+ %global my_middle xterm
+ %global my_suffix -dev
+ %global fullname %{my_middle}%{my_suffix}
+ %global my_class XTermDev
+ Name: %{fullname}
+-Version: 309
++Version: 310
+ Release: 1
+ License: X11
+ Group: User Interface/X
Added: head/x11/xterm/files/patch-version.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/xterm/files/patch-version.h Tue Jul 15 12:24:32 2014 (r361911)
@@ -0,0 +1,19 @@
+--- ./version.h.orig 2014-07-13 23:54:02.000000000 +0200
++++ ./version.h 2014-07-15 09:09:15.488621885 +0200
+@@ -1,4 +1,4 @@
+-/* $XTermId: version.h,v 1.393 2014/07/13 21:54:02 tom Exp $ */
++/* $XTermId: version.h,v 1.394 2014/07/14 23:36:58 tom Exp $ */
+
+ /*
+ * Copyright 1998-2013,2014 by Thomas E. Dickey
+@@ -38,8 +38,8 @@
+ * version of X to which this version of xterm has been built. The resulting
+ * number in parentheses is my patch number (Thomas E. Dickey).
+ */
+-#define XTERM_PATCH 309
+-#define XTERM_DATE 2014-07-13
++#define XTERM_PATCH 310
++#define XTERM_DATE 2014-07-14
+
+ #ifndef __vendorversion__
+ #define __vendorversion__ "XTerm"
Added: head/x11/xterm/files/patch-xterm.log.html
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/xterm/files/patch-xterm.log.html Tue Jul 15 12:24:32 2014 (r361911)
@@ -0,0 +1,34 @@
+--- ./xterm.log.html.orig 2014-07-13 23:58:07.000000000 +0200
++++ ./xterm.log.html 2014-07-15 09:09:15.492622374 +0200
+@@ -30,7 +30,7 @@
+ * sale, use or other dealings in this Software without prior written *
+ * authorization. *
+ *****************************************************************************
+- $XTermId: xterm.log.html,v 1.1504 2014/07/13 21:58:07 tom Exp $
++ $XTermId: xterm.log.html,v 1.1506 2014/07/15 00:01:10 tom Exp $
+ -->
+
+
+@@ -72,6 +72,8 @@
+ CHANGELOG).
+
+
+
++
++
++
++ - build-fix for
--with-Xaw3dxft
option (report
++ by Emanuel Haupt).
++
++
+
+
Added: head/x11/xterm/files/patch-xtermcfg.hin
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/xterm/files/patch-xtermcfg.hin Tue Jul 15 12:24:32 2014 (r361911)
@@ -0,0 +1,16 @@
+--- ./xtermcfg.hin.orig 2014-05-08 10:05:07.000000000 +0200
++++ ./xtermcfg.hin 2014-07-15 09:09:15.492622374 +0200
+@@ -1,4 +1,4 @@
+-/* $XTermId: xtermcfg.hin,v 1.205 2014/05/08 08:05:07 tom Exp $ */
++/* $XTermId: xtermcfg.hin,v 1.206 2014/07/14 23:42:59 tom Exp $ */
+
+ /*
+ * Copyright 1997-2013,2014 by Thomas E. Dickey
+@@ -62,6 +62,7 @@
+ #undef HAVE_LIB_PCRE /* CF_WITH_PCRE */
+ #undef HAVE_LIB_XAW /* CF_X_ATHENA */
+ #undef HAVE_LIB_XAW3D /* CF_X_ATHENA(--with-Xaw3d) */
++#undef HAVE_LIB_XAW3DXFT /* CF_X_ATHENA(--with-Xaw3dxft) */
+ #undef HAVE_LIB_XAWPLUS /* CF_X_ATHENA(--with-XawPlus) */
+ #undef HAVE_LIB_XCURSOR /* AC_CHECK_LIB(Xcursor) */
+ #undef HAVE_MKDTEMP /* AC_CHECK_FUNCS(mkdtemp) */