(Updated diffs attached.) A question on the scaffolding..
why is the CC defined as gcc ? (why not studio cc ?) | - resize.patch, menu-include.patch: Can you provide a short explanation of | why you needed to add the former and remove the latter? The last build | I did was of 222, and I didn't need to make either change. | (Do you mean I should update this in comments?) +resize.patch The termio struct complains about getting redefined when xtermcap.h is included in this file. Since the file compiles correctly with out including xtermcap.h I assume no functionality is broken. - menu-include.patch it just changes <menu.h> to "menu.h" but this compilation completes successfully without this. | > + /usr/ccs/bin/make 2>&1 ) | | Why the 2>&1? Not necessary here. Will remove it. | > - MAKE=/usr/sfw/bin/gmake \ | > - ./configure --prefix=/opt/sfw) | > + MAKE=/usr/ccs/bin/make \ | > + ./configure --prefix=/opt/sfw --enable-256-colors) | | Might as well use /usr/bin/make; I think the CCD is now built on a system | where that's happened. I've also been using --enable-88-color and | --enable-wide-chars in my builds in addition to --enable-256-colors. will update with this too. | > -SUNW_PRODVERS="RELEASE/196" | > +SUNW_PRODVERS="RELEASE/229" | | You missed updating VERSION. done. | Don't forget to update README.sfw and METADATA, too. done. 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/METADATA =================================================================== --- cmd/xterm/METADATA (revision 0) +++ cmd/xterm/METADATA (revision 0) @@ -0,0 +1,7 @@ +Name: xterm +URL: http://invisible-island.net/xterm/xterm.html +Package Name: SFWxterm +Version: 229 +License: MIT/X Consortium License +Owner: +Comments: 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/bin/make \ + /usr/bin/make ) @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/bin/make \ + ./configure --prefix=/opt/sfw --enable-256-colors --enable-88-color --enable-wide-chars ) # # 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/README.SFWxterm =================================================================== --- cmd/xterm/README.SFWxterm (revision 0) +++ cmd/xterm/README.SFWxterm (revision 0) @@ -0,0 +1,22 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# + 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) @@ -33,9 +33,9 @@ PKG="SFWxterm" NAME="xterm - Terminal emulator for X Windows" ARCH="ISA" -VERSION="196,REV=0.0.0" +VERSION="229,REV=0.0.0" SUNW_PRODNAME="xterm" -SUNW_PRODVERS="RELEASE/196" +SUNW_PRODVERS="RELEASE/229" SUNW_PKGTYPE="" MAXINST="1000" CATEGORY="system"
