8 files changed, 120 insertions, 1 deletions

diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 2e87c0ac5501..441082d9d267 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -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 convertion from/to UTF-8
 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}/devel/pcre
 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 <bsd.port.options.mk>
 
diff --git a/x11/xterm/files/patch-MANIFEST b/x11/xterm/files/patch-MANIFEST
new file mode 100644
index 000000000000..3820d5f491ec
--- /dev/null
+++ b/x11/xterm/files/patch-MANIFEST
@@ -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
diff --git a/x11/xterm/files/patch-package__debian__changelog b/x11/xterm/files/patch-package__debian__changelog
new file mode 100644
index 000000000000..a8c4c6565d0b
--- /dev/null
+++ b/x11/xterm/files/patch-package__debian__changelog
@@ -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 <dickey@invisible-island.net>  Mon, 14 Jul 2014 19:36:58 -0400
++
+ xterm-dev (309) unstable; urgency=low
+ 
+   * maintenance updates
diff --git a/x11/xterm/files/patch-package__freebsd__Makefile b/x11/xterm/files/patch-package__freebsd__Makefile
new file mode 100644
index 000000000000..4bbfe76f0241
--- /dev/null
+++ b/x11/xterm/files/patch-package__freebsd__Makefile
@@ -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
diff --git a/x11/xterm/files/patch-package__xterm.spec b/x11/xterm/files/patch-package__xterm.spec
new file mode 100644
index 000000000000..65f95f96018b
--- /dev/null
+++ b/x11/xterm/files/patch-package__xterm.spec
@@ -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
diff --git a/x11/xterm/files/patch-version.h b/x11/xterm/files/patch-version.h
new file mode 100644
index 000000000000..b433d0166822
--- /dev/null
+++ b/x11/xterm/files/patch-version.h
@@ -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"
diff --git a/x11/xterm/files/patch-xterm.log.html b/x11/xterm/files/patch-xterm.log.html
new file mode 100644
index 000000000000..e8cdaf812259
--- /dev/null
+++ b/x11/xterm/files/patch-xterm.log.html
@@ -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 $
+   -->
+ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+ 
+@@ -72,6 +72,8 @@
+   CHANGELOG</a>).</p>
+ 
+   <ul>
++    <li><a href="#xterm_dev">Development</a></li>
++
+     <li><a href="#xterm_309">Patch #309 - 2014/07/13</a></li>
+ 
+     <li><a href="#xterm_308">Patch #308 - 2014/06/19</a></li>
+@@ -903,6 +905,13 @@
+     <li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
+   </ul>
+ 
++  <h1><a name="xterm_dev" id="xterm_dev">Development</a></h1>
++
++  <ul>
++    <li>build-fix for <code>--with-Xaw3dxft</code> option (report
++    by Emanuel Haupt).</li>
++  </ul>
++
+   <h1><a name="xterm_309" id="xterm_309">Patch #309 -
+   2014/07/13</a></h1>
+ 
diff --git a/x11/xterm/files/patch-xtermcfg.hin b/x11/xterm/files/patch-xtermcfg.hin
new file mode 100644
index 000000000000..a6b7285e906d
--- /dev/null
+++ b/x11/xterm/files/patch-xtermcfg.hin
@@ -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) */