[companion-discuss] Xterm updates (196 to 229) - review request
rahul
Rahul.G.Nair at Sun.COM
Tue Nov 13 04:48:57 PST 2007
Hi,
is xterm still considered for companion cd?
(I have confirmed that it is not there for SFW as a separate
package, but may be part of another?) If it is considered, I
would like to update it. Please do review
below is the stat
|/opt/dscm/bin/svn stat
A cmd/xterm/resize.patch
D cmd/xterm/xterm-196.tar.gz
M cmd/xterm/uxterm.patch
M cmd/xterm/install-sfw
D cmd/xterm/menu-include.patch
M cmd/xterm/Makefile.sfw
A cmd/xterm/xterm-229.tar.gz
M pkgdefs/SFWxterm/pkginfo.tmpl
and diff
Index: cmd/xterm/resize.patch
===================================================================
--- cmd/xterm/resize.patch (revision 0)
+++ cmd/xterm/resize.patch (revision 0)
@@ -0,0 +1,11 @@
+--- xterm-229/resize.c.orig Tue Nov 13 17:43:17 2007
++++ xterm-229/resize.c Tue Nov 13 17:43:30 2007
+@@ -191,8 +191,6 @@
+ static void Usage(void);
+ static void readstring(FILE *fp, char *buf, char *str);
+
+-#include <xtermcap.h>
+-
+ #ifdef USE_TERMCAP
+ static void
+ print_termcap(const char *termcap)
Index: cmd/xterm/xterm-196.tar.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: cmd/xterm/uxterm.patch
===================================================================
--- cmd/xterm/uxterm.patch (revision 145)
+++ cmd/xterm/uxterm.patch (working copy)
@@ -1,11 +1,11 @@
---- xterm-196/uxterm.orig Tue Oct 19 10:38:33 2004
-+++ xterm-196/uxterm Tue Oct 19 10:39:02 2004
+--- xterm-229/uxterm.orig Tue Nov 13 17:06:23 2007
++++ xterm-229/uxterm Tue Nov 13 17:06:36 2007
@@ -3,7 +3,7 @@
- # $XFree86: xc/programs/xterm/uxterm,v 1.9 2004/07/13 00:41:30 dickey Exp $
+ # $XFree86: xc/programs/xterm/uxterm,v 1.12 2006/01/04 02:10:27 dickey Exp $
# wrapper script to setup xterm with UTF-8 locale
--program=xterm
-+program=/opt/sfw/bin/xterm
- found=no
+-: ${XTERM_PROGRAM=xterm}
++: ${XTERM_PROGRAM=/opt/sfw/bin/xterm}
- # Check for -version and -help options, to provide a simple return without
+ # Check if there is a workable locale program. If there is not, we will read
+ # something via the standard error. Ignore whatever is written to the
Index: cmd/xterm/install-sfw
===================================================================
--- cmd/xterm/install-sfw (revision 145)
+++ cmd/xterm/install-sfw (working copy)
@@ -31,7 +31,7 @@
#
#ident "@(#)install-sfw 1.7 04/10/20 SMI"
-VERS=196
+VERS=229
PKGVERS=xterm-${VERS}
PREFIX=${ROOT}/opt/sfw
BINDIR=${PREFIX}/bin
Index: cmd/xterm/menu-include.patch
===================================================================
--- cmd/xterm/menu-include.patch (revision 145)
+++ cmd/xterm/menu-include.patch (working copy)
@@ -1,121 +0,0 @@
---- xterm-196/button.c.orig Tue Oct 19 15:51:04 2004
-+++ xterm-196/button.c Tue Oct 19 15:52:53 2004
-@@ -73,7 +73,7 @@
-
- #include <data.h>
- #include <error.h>
--#include <menu.h>
-+#include "menu.h"
- #include <xcharmouse.h>
- #include <charclass.h>
-
---- xterm-196/charproc.c.orig Tue Oct 19 15:51:04 2004
-+++ xterm-196/charproc.c Tue Oct 19 15:52:53 2004
-@@ -126,7 +126,7 @@
- #include <VTparse.h>
- #include <data.h>
- #include <error.h>
--#include <menu.h>
-+#include "menu.h"
- #include <main.h>
- #include <fontutils.h>
- #include <xcharmouse.h>
---- xterm-196/fontutils.c.orig Tue Oct 19 15:51:04 2004
-+++ xterm-196/fontutils.c Tue Oct 19 15:52:53 2004
-@@ -49,7 +49,7 @@
-
- #include <main.h>
- #include <data.h>
--#include <menu.h>
-+#include "menu.h"
- #include <xstrings.h>
- #include <xterm.h>
-
---- xterm-196/main.c.orig Tue Oct 19 15:51:04 2004
-+++ xterm-196/main.c Tue Oct 19 15:52:53 2004
-@@ -121,7 +121,7 @@
-
- #include <data.h>
- #include <error.h>
--#include <menu.h>
-+#include "menu.h"
- #include <main.h>
- #include <xstrings.h>
- #include <xterm_io.h>
---- xterm-196/menu.c.orig Tue Oct 19 15:51:04 2004
-+++ xterm-196/menu.c Tue Oct 19 15:52:53 2004
-@@ -51,7 +51,7 @@
-
- #include <xterm.h>
- #include <data.h>
--#include <menu.h>
-+#include "menu.h"
- #include <fontutils.h>
-
- #include <X11/Xmu/CharSet.h>
---- xterm-196/misc.c.orig Tue Oct 19 15:51:05 2004
-+++ xterm-196/misc.c Tue Oct 19 15:52:53 2004
-@@ -81,7 +81,7 @@
-
- #include <data.h>
- #include <error.h>
--#include <menu.h>
-+#include "menu.h"
- #include <fontutils.h>
- #include <xcharmouse.h>
- #include <xstrings.h>
---- xterm-196/os2main.c.orig Tue Oct 19 15:51:05 2004
-+++ xterm-196/os2main.c Tue Oct 19 15:52:53 2004
-@@ -92,7 +92,7 @@
-
- #include <data.h>
- #include <error.h>
--#include <menu.h>
-+#include "menu.h"
- #include <main.h>
- #include <xstrings.h>
- #include <xterm_io.h>
---- xterm-196/print.c.orig Tue Oct 19 15:51:05 2004
-+++ xterm-196/print.c Tue Oct 19 15:52:53 2004
-@@ -36,7 +36,7 @@
-
- #include <xterm.h>
- #include <data.h>
--#include <menu.h>
-+#include "menu.h"
- #include <error.h>
-
- #include <stdio.h>
---- xterm-196/scrollbar.c.orig Tue Oct 19 15:51:05 2004
-+++ xterm-196/scrollbar.c Tue Oct 19 15:52:53 2004
-@@ -72,7 +72,7 @@
-
- #include <data.h>
- #include <error.h>
--#include <menu.h>
-+#include "menu.h"
- #include <xcharmouse.h>
-
- /* Event handlers */
---- xterm-196/Tekproc.c.orig Tue Oct 19 15:51:05 2004
-+++ xterm-196/Tekproc.c Tue Oct 19 15:52:53 2004
-@@ -113,7 +113,7 @@
- #include <Tekparse.h>
- #include <data.h>
- #include <error.h>
--#include <menu.h>
-+#include "menu.h"
-
- #define DefaultGCID XGContextFromGC(DefaultGC(screen->display, DefaultScreen(screen->display)))
-
---- xterm-196/util.c.orig Tue Oct 19 15:51:05 2004
-+++ xterm-196/util.c Tue Oct 19 15:52:53 2004
-@@ -64,7 +64,7 @@
-
- #include <data.h>
- #include <error.h>
--#include <menu.h>
-+#include "menu.h"
- #include <fontutils.h>
-
- #if OPT_WIDE_CHARS
Index: cmd/xterm/Makefile.sfw
===================================================================
--- cmd/xterm/Makefile.sfw (revision 145)
+++ cmd/xterm/Makefile.sfw (working copy)
@@ -27,14 +27,14 @@
#
#
-VER=xterm-196
+VER=xterm-229
all: $(VER)/config.status
(cd $(VER); env \
- CC=$(SRC)/tools/gcc CXX=$(SRC)/tools/g++ \
PATH=/usr/perl5/bin:/usr/sfw/bin:$(PATH) \
"LD_OPTIONS=-L/usr/sfw/lib -L$(ROOT)/opt/sfw/lib -R/usr/sfw/lib:/opt/sfw/lib" \
- MAKE=/usr/sfw/bin/gmake /usr/sfw/bin/gmake)
+ MAKE=/usr/ccs/bin/make \
+ /usr/ccs/bin/make 2>&1 )
@find . -name core -exec rm -f {} \;
include ../Makefile.cmd
@@ -44,16 +44,15 @@
$(VER)/config.status: $(VER)/configure
(cd $(VER); env \
- CC=$(SRC)/tools/gcc CXX=$(SRC)/tools/g++ \
PATH=/usr/perl5/bin:/usr/sfw/bin:$(PATH) \
"LD_OPTIONS=-L/usr/sfw/lib -L$(ROOT)/opt/sfw/lib -R/usr/sfw/lib:/opt/sfw/lib" \
- MAKE=/usr/sfw/bin/gmake \
- ./configure --prefix=/opt/sfw)
+ MAKE=/usr/ccs/bin/make \
+ ./configure --prefix=/opt/sfw --enable-256-colors)
#
# Patches:
-# 1. menu-include.patch
-# patch include menu.h lines
+# 1. resize
+# patch resize to remove xtermcap include
# 2. uxterm.patch
# explicity define path to xterm
#
@@ -61,8 +60,8 @@
$(VER)/configure: $(VER).tar.gz
/usr/bin/gzip -dc $(VER).tar.gz | /usr/sfw/bin/gtar xpf -
touch $(VER)/configure
- /usr/bin/gpatch -p0< menu-include.patch
- /usr/bin/gpatch -p0 < uxterm.patch
+ /usr/bin/gpatch -p0< resize.patch
+ /usr/bin/gpatch -p0< uxterm.patch
clean:
-rm -rf $(VER)
Index: cmd/xterm/xterm-229.tar.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: cmd/xterm/xterm-229.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Index: pkgdefs/SFWxterm/pkginfo.tmpl
===================================================================
--- pkgdefs/SFWxterm/pkginfo.tmpl (revision 145)
+++ pkgdefs/SFWxterm/pkginfo.tmpl (working copy)
@@ -35,7 +35,7 @@
ARCH="ISA"
VERSION="196,REV=0.0.0"
SUNW_PRODNAME="xterm"
-SUNW_PRODVERS="RELEASE/196"
+SUNW_PRODVERS="RELEASE/229"
SUNW_PKGTYPE=""
MAXINST="1000"
CATEGORY="system"
rahul
More information about the companion-discuss
mailing list