Update to 296:

modify delimiter in configure macro used to add a library
after a given library to avoid confusion with -Wl
pass-through options to linker (NetBSD #48031).

fix quoting in expression used to trim extra libraries from
patch #295 changes (report by Thomas Klausner).

3 files changed, 6 insertions, 104 deletions

diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 37a29e69e92..278809a1129 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.80 2013/07/08 08:39:10 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2013/07/11 09:37:01 wiz Exp $
 
-DISTNAME=	xterm-295
+DISTNAME=	xterm-296
 CATEGORIES=	x11
 MASTER_SITES=	ftp://invisible-island.net/xterm/ \
 		http://www.sfr-fresh.com/unix/misc/
diff --git a/x11/xterm/distinfo b/x11/xterm/distinfo
index 619fa343f81..a68677993d4 100644
--- a/x11/xterm/distinfo
+++ b/x11/xterm/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.51 2013/07/10 09:11:04 wiz Exp $
+$NetBSD: distinfo,v 1.52 2013/07/11 09:37:01 wiz Exp $
 
-SHA1 (xterm-295.tgz) = e17742c01c447ab64e02275e96a1939a01f0f731
-RMD160 (xterm-295.tgz) = 5e17045f05b6304cc12ab9a6ff591da229d9d4bb
-Size (xterm-295.tgz) = 1111813 bytes
+SHA1 (xterm-296.tgz) = 50d9aa65ef878b026519d82f2ec843b33d932463
+RMD160 (xterm-296.tgz) = a7cf53fe301b469a562b89505a6873b63702dc34
+Size (xterm-296.tgz) = 1112847 bytes
 SHA1 (patch-aa) = 46076243c1b53d481b4cafe3d3f6f1f35291a153
-SHA1 (patch-configure) = 0cd789df7856cfdf09da85812f02b83bd15ec931
diff --git a/x11/xterm/patches/patch-configure b/x11/xterm/patches/patch-configure
deleted file mode 100644
index f5dfc10f6e1..00000000000
--- a/x11/xterm/patches/patch-configure
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2013/07/10 09:11:05 wiz Exp $
-
-Patch from Thomas Dickey <dickey@his.com>
-addressing build issues on NetBSD with native X and SunOS.
-
---- configure.orig	2013-07-07 01:16:33.000000000 +0000
-+++ configure
-@@ -9225,7 +9225,7 @@ test -n "$verbose" && echo "	...before $
- 
- echo "${as_me:-configure}:9226: testing ...before $LIBS ..." 1>&5
- 
--LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXt ,-lXt -lX11 ," -e 's/  / /g'`
-+LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
- test -n "$verbose" && echo "	...after  $LIBS" 1>&6
- 
- echo "${as_me:-configure}:9231: testing ...after  $LIBS ..." 1>&5
-@@ -9497,7 +9497,7 @@ test -n "$verbose" && echo "	...before $
- 
- echo "${as_me:-configure}:9498: testing ...before $LIBS ..." 1>&5
- 
--LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/  / /g'`
-+LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
- test -n "$verbose" && echo "	...after  $LIBS" 1>&6
- 
- echo "${as_me:-configure}:9503: testing ...after  $LIBS ..." 1>&5
-@@ -10267,7 +10267,7 @@ EOF
- 	do
- 		case "$LIBS" in
- 		*-l$cf_trim_lib\ *-l$cf_trim_lib*)
--			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's/-l'$cf_trim_lib' //' -e 's/ $//'`
-+			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
- 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
- 
- echo "${as_me:-configure}:10273: testing ..trimmed $LIBS ..." 1>&5
-@@ -10436,7 +10436,7 @@ test -n "$verbose" && echo "	...before $
- 
- echo "${as_me:-configure}:10437: testing ...before $LIBS ..." 1>&5
- 
--LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,$cf_first_lib ,$cf_first_lib $cf_pkgconfig_libs ," -e 's/  / /g'`
-+LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
- test -n "$verbose" && echo "	...after  $LIBS" 1>&6
- 
- echo "${as_me:-configure}:10442: testing ...after  $LIBS ..." 1>&5
-@@ -10449,7 +10449,7 @@ test -n "$verbose" && echo "	...before $
- 
- echo "${as_me:-configure}:10450: testing ...before $LIBS ..." 1>&5
- 
--LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,$cf_first_lib ,$cf_first_lib -lXmu ," -e 's/  / /g'`
-+LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
- test -n "$verbose" && echo "	...after  $LIBS" 1>&6
- 
- echo "${as_me:-configure}:10455: testing ...after  $LIBS ..." 1>&5
-@@ -10460,7 +10460,7 @@ fi
- 	do
- 		case "$LIBS" in
- 		*-l$cf_trim_lib\ *-l$cf_trim_lib*)
--			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's/-l'$cf_trim_lib' //' -e 's/ $//'`
-+			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
- 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
- 
- echo "${as_me:-configure}:10466: testing ..trimmed $LIBS ..." 1>&5
-@@ -10899,7 +10899,7 @@ test -n "$verbose" && echo "	...before $
- 
- echo "${as_me:-configure}:10900: testing ...before $LIBS ..." 1>&5
- 
--LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXt ,-lXt -lX11 ," -e 's/  / /g'`
-+LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
- test -n "$verbose" && echo "	...after  $LIBS" 1>&6
- 
- echo "${as_me:-configure}:10905: testing ...after  $LIBS ..." 1>&5
-@@ -11171,7 +11171,7 @@ test -n "$verbose" && echo "	...before $
- 
- echo "${as_me:-configure}:11172: testing ...before $LIBS ..." 1>&5
- 
--LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/  / /g'`
-+LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
- test -n "$verbose" && echo "	...after  $LIBS" 1>&6
- 
- echo "${as_me:-configure}:11177: testing ...after  $LIBS ..." 1>&5
-@@ -15315,7 +15315,7 @@ test -n "$verbose" && echo "	...before $
- 
- echo "${as_me:-configure}:15316: testing ...before $LIBS ..." 1>&5
- 
--LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXft ,-lXft $cf_pkgconfig_libs ," -e 's/  / /g'`
-+LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXft %-lXft $cf_pkgconfig_libs %" -e 's%  % %g'`
- test -n "$verbose" && echo "	...after  $LIBS" 1>&6
- 
- echo "${as_me:-configure}:15321: testing ...after  $LIBS ..." 1>&5
-@@ -15328,7 +15328,7 @@ test -n "$verbose" && echo "	...before $
- 
- echo "${as_me:-configure}:15329: testing ...before $LIBS ..." 1>&5
- 
--LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXft ,-lXft -lfontconfig ," -e 's/  / /g'`
-+LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXft %-lXft -lfontconfig %" -e 's%  % %g'`
- test -n "$verbose" && echo "	...after  $LIBS" 1>&6
- 
- echo "${as_me:-configure}:15334: testing ...after  $LIBS ..." 1>&5