OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Jul-2003 20:12:34
Branch: HEAD Handle: 2003072819123202
Added files:
openpkg-src/icon icon.patch
Modified files:
openpkg-src/icon icon.spec
openpkg-web news.txt
Log:
add back Solaris/x86 support from older Icon 9.3
Summary:
Revision Changes Path
1.1 +70 -0 openpkg-src/icon/icon.patch
1.11 +7 -4 openpkg-src/icon/icon.spec
1.5875 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/icon/icon.patch
============================================================================
$ cvs diff -u -r0 -r1.1 icon.patch
--- /dev/null 2003-07-28 20:12:34.000000000 +0200
+++ icon.patch 2003-07-28 20:12:34.000000000 +0200
@@ -0,0 +1,70 @@
+--- /dev/null Thu Jan 1 01:00:00 1970
++++ config/intel_solaris/Makedefs Mon Jul 28 19:54:54 2003
+@@ -0,0 +1,19 @@
++# CC C compiler
++# CFLAGS flags for building C files
++# CFDYN additional flags for dynamic functions
++# RLINK flags for linking run-time system
++# RLIBS libraries to link with run-time system
++# TLIBS libraries to link for POSIX threads
++# XLIBS libraries to link for graphics
++# XPMDEFS definitions for building XPM library
++# GDIR directory of graphics helper library
++
++CC = gcc
++CFLAGS = -O -I/usr/openwin/include
++CFDYN = -fPIC
++RLINK =
++RLIBS = -lm -ldl
++TLIBS = -lposix4 -lpthread
++XLIBS = -L /usr/openwin/lib -Xlinker -R/usr/openwin/lib -lX11
++XPMDEFS = -DZPIPE -DSYSV
++GDIR = xpm
+--- /dev/null Thu Jan 1 01:00:00 1970
++++ config/intel_solaris/define.h Mon Jul 28 19:54:54 2003
+@@ -0,0 +1,10 @@
++/*
++ * Icon configuration file for Sun 4 running Solaris 2.x with Cygnus gcc
++ */
++
++#define UNIX 1
++#define LoadFunc
++
++/* use gcc to compile generated code */
++#define CComp "gcc"
++#define COpts "-I/usr/openwin/include -ldl"
+--- /dev/null Thu Jan 1 01:00:00 1970
++++ config/intel_solaris/rswitch.c Mon Jul 28 19:55:32 2003
+@@ -0,0 +1,28 @@
++/*
++ * This is the co-expression context switch for the Intel 80386
++ * under Solaris.
++ */
++
++/*
++ * coswitch
++ */
++
++coswitch(old_cs, new_cs, first)
++int *old_cs, *new_cs;
++int first;
++ {
++ asm(" movl 8(%ebp),%eax");
++ asm(" movl %esp,0(%eax)");
++ asm(" movl %ebp,4(%eax)");
++ asm(" movl 12(%ebp),%eax");
++ if (first == 0) { /* this is the first activation */
++ asm(" movl 0(%eax),%esp");
++ asm(" movl $0,%ebp");
++ new_context(0, 0);
++ syserr("new_context() returned in coswitch");
++ }
++ else {
++ asm(" movl 0(%eax),%esp");
++ asm(" movl 4(%eax),%ebp");
++ }
++ }
+--- /dev/null Thu Jan 1 01:00:00 1970
++++ config/intel_solaris/status Mon Jul 28 19:55:32 2003
+@@ -0,0 +1,1 @@
++This is from Icon 9.3.2's config/intel_solaris/.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/icon/icon.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 icon.spec
--- openpkg-src/icon/icon.spec 8 Jul 2003 14:40:04 -0000 1.10
+++ openpkg-src/icon/icon.spec 28 Jul 2003 18:12:34 -0000 1.11
@@ -37,10 +37,11 @@
Group: Language
License: GPL
Version: %{V_here}
-Release: 20030417
+Release: 20030728
# list of sources
Source0: ftp://ftp.cs.arizona.edu/icon/packages/unix/icon.v%{V_real}src.tgz
+Patch0: icon.patch
# build information
Prefix: %{l_prefix}
@@ -59,12 +60,14 @@
%prep
%setup -q -n icon.v%{V_real}src
+ %patch -p0
%build
case "%{l_target}" in
- *-freebsd* ) name="freebsd" ;;
- *-linux* ) name="linux" ;;
- *-solaris* ) name="sun_gcc" ;;
+ *-freebsd* ) name="freebsd" ;;
+ *-linux* ) name="linux" ;;
+ ix86-solaris* ) name="intel_solaris" ;;
+ sparc*-solaris* ) name="sun_gcc" ;;
* ) echo "platform %{l_target} not supported" 1>&2; exit 1 ;;
esac
%{l_make} %{l_mflags} Configure name=$name
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5874 -r1.5875 news.txt
--- openpkg-web/news.txt 28 Jul 2003 17:17:10 -0000 1.5874
+++ openpkg-web/news.txt 28 Jul 2003 18:12:32 -0000 1.5875
@@ -1,3 +1,4 @@
+28-Jul-2003: Upgraded package: P<icon-9.4.2-20030728>
28-Jul-2003: Upgraded package: P<openpkg-tool-20030728-20030728>
28-Jul-2003: Upgraded package: P<openpkg-20030728-20030728>
28-Jul-2003: Upgraded package: P<samhain-1.7.10-1.20030728>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
