* Merge unified-sdl to trunk

* Bump Q3_VERSION to 1.35


git-svn-id: svn://svn.icculus.org/quake3/trunk@1161 edf5b092-35ff-0310-97b2-ce42778d08ea

18 files changed, 232 insertions, 0 deletions

diff --git a/misc/setup/pkg/ioq3ded.sh b/misc/setup/pkg/ioq3ded.sh
new file mode 100644
index 0000000..5ed9742
--- /dev/null
+++ b/misc/setup/pkg/ioq3ded.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+# Rev: $Id: ioq3ded.sh,v 1.9 2006/01/18 13:47:42 raistlin Exp raistlin $
+# Needed to make symlinks/shortcuts work.
+# the binaries must run with correct working directory
+#
+
+IOQ3_DIR=/usr/local/share/games/quake3
+
+COMPILE_PLATFORM=`uname|sed -e s/_.*//|tr A-Z a-z`
+COMPILE_ARCH=`uname -p | sed -e s/i.86/i386/`
+
+EXEC_REL=release
+
+#EXEC_BIN=ioquake3.${COMPILE_ARCH}
+#EXEC_BIN=ioquake3-smp.${COMPILE_ARCH}
+EXEC_BIN=ioq3ded.${COMPILE_ARCH}
+
+EXEC_FLAGS="+set fs_cdpath ${IOQ3_DIR} +set vm_game 1 +set vm_cgame 1 +set vm_ui 1 +set sv_pure 1 +set ttycon 0"
+
+EXEC_DIR_LIST=${IOQ3_DIR}
+
+for d in ${EXEC_DIR_LIST}
+do
+	if [ -d $d ]; then
+		EXEC_DIR=${d}
+		break
+	fi
+done
+
+if [ "X${EXEC_DIR}" != "X" ]; then
+	if [ ! -x  ${EXEC_DIR}/${EXEC_BIN} ]; then
+		echo "Executable ${EXEC_DIR}/${EXEC_BIN} not found!" ; exit 1
+	fi
+	cd ${IOQ3_DIR} && \
+	${EXEC_DIR}/${EXEC_BIN} ${EXEC_FLAGS} $*
+	exit $? 
+else
+	echo "No ioq3 binaries found!"
+	exit 1
+fi
+  
+
diff --git a/misc/setup/pkg/ioquake3.sh b/misc/setup/pkg/ioquake3.sh
new file mode 100644
index 0000000..495d9cd
--- /dev/null
+++ b/misc/setup/pkg/ioquake3.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+# Rev: $Id: ioquake3.sh,v 1.11 2006/01/18 13:47:42 raistlin Exp raistlin $
+# Needed to make symlinks/shortcuts work.
+# the binaries must run with correct working directory
+
+IOQ3_DIR=/usr/local/share/games/quake3
+
+COMPILE_PLATFORM=`uname|sed -e s/_.*//|tr A-Z a-z`
+COMPILE_ARCH=`uname -p | sed -e s/i.86/i386/`
+
+EXEC_REL=release
+
+EXEC_BIN=ioquake3.${COMPILE_ARCH}
+#EXEC_BIN=ioquake3-smp.${COMPILE_ARCH}
+#EXEC_BIN=ioq3ded.${COMPILE_ARCH}
+
+EXEC_FLAGS="+set fs_cdpath ${IOQ3_DIR} +set vm_game 1 +set vm_cgame 1 +set vm_ui 1 +set sv_pure 1 +set ttycon 0"
+
+EXEC_DIR_LIST=${IOQ3_DIR} 
+
+for d in ${EXEC_DIR_LIST}
+do
+	if [ -d $d ]; then
+		EXEC_DIR=${d}
+		break
+	fi
+done
+
+if [ "X${EXEC_DIR}" != "X" ]; then
+	if [ ! -x  ${EXEC_DIR}/${EXEC_BIN} ]; then
+		echo "Executable ${EXEC_DIR}/${EXEC_BIN} not found!" ; exit 1
+	fi
+	cd ${IOQ3_DIR} && \
+	${EXEC_DIR}/${EXEC_BIN} ${EXEC_FLAGS} $*
+	exit $? 
+else
+	echo "No ioq3 binaries found!"
+	exit 1
+fi
+  
+
diff --git a/misc/setup/pkg/ioquake3/depend b/misc/setup/pkg/ioquake3/depend
new file mode 100644
index 0000000..11170ca
--- /dev/null
+++ b/misc/setup/pkg/ioquake3/depend
@@ -0,0 +1,3 @@
+P SUNWxilrl XIL Runtime Environment
+P SFWsdl SDL - Simple DirectMedia Layer library
+P ioquake3d Icculus.Org Quake3 game data files for Solaris 10 (X11,GLX,SDL)
diff --git a/misc/setup/pkg/ioquake3/pkginfo.template b/misc/setup/pkg/ioquake3/pkginfo.template
new file mode 100644
index 0000000..34d5b1f
--- /dev/null
+++ b/misc/setup/pkg/ioquake3/pkginfo.template
@@ -0,0 +1,12 @@
+CLASSES=none
+BASEDIR=/usr/local/share/games
+TZ=PST
+PATH=/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin
+PKG=ioquake3
+NAME=ioquake3 1.34 for Solaris 10 (X11,GLX,SDL)
+VERSION=
+CATEGORY=application,graphics,opengl
+DESC=Icculus.Org Quake3 1.34 for Solaris 10 (http://www.ioquake3.org/)
+VENDOR=http://www.ioquake3.org/
+EMAIL=quake@cojot.name
+PKGSAV=/var/sadm/pkg/ioquake3/save
diff --git a/misc/setup/pkg/ioquake3/postinstall b/misc/setup/pkg/ioquake3/postinstall
new file mode 100644
index 0000000..2775d5e
--- /dev/null
+++ b/misc/setup/pkg/ioquake3/postinstall
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# @(#)postinstall	$Id: postinstall,v 1.3 2006/01/21 12:54:52 coyote Exp $
+#
+# postinstall script for quake3
+
+quake3_dir=$BASEDIR/quake3
+dest_dir=${PKG_INSTALL_ROOT}/usr/local/bin
+
+if [ -d ${dest_dir} ]; then
+	for inst_script in ioq3ded.sh ioquake3.sh
+	do
+		dest_script=${dest_dir}/${inst_script}
+		if [ ! -h ${dest_script} ]; then
+			ln -s ${quake3_dir}/${inst_script} ${dest_script}
+		fi
+	done
+fi
+
+exit 0
+
diff --git a/misc/setup/pkg/ioquake3/postremove b/misc/setup/pkg/ioquake3/postremove
new file mode 100644
index 0000000..37690f6
--- /dev/null
+++ b/misc/setup/pkg/ioquake3/postremove
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# @(#)postremove	$Id: postremove,v 1.3 2006/01/21 12:54:52 coyote Exp $
+#
+# postremove script for quake3
+
+quake3_dir=$BASEDIR
+dest_dir=${PKG_INSTALL_ROOT}/usr/local/bin
+
+if [ -d ${dest_dir} ]; then
+	for inst_script in ioq3ded.sh ioquake3.sh
+	do
+		dest_script=${dest_dir}/${inst_script}
+		if [ -h ${dest_script} ]; then
+			rm -f ${dest_script}
+		fi
+	done
+fi
+
+exit 0
+
diff --git a/misc/setup/pkg/ioquake3/preinstall b/misc/setup/pkg/ioquake3/preinstall
new file mode 100644
index 0000000..ad126a1
--- /dev/null
+++ b/misc/setup/pkg/ioquake3/preinstall
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# @(#)postinstall	$Id: preinstall,v 1.2 2006/01/25 13:22:56 coyote Exp $
+#
+# postinstall script for quake3
+
+quake3_dir=$BASEDIR
+
+exit 0
+
diff --git a/misc/setup/pkg/ioquake3/preremove b/misc/setup/pkg/ioquake3/preremove
new file mode 100644
index 0000000..3f316f3
--- /dev/null
+++ b/misc/setup/pkg/ioquake3/preremove
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# @(#)postinstall	$Id: preremove,v 1.2 2006/01/25 13:22:56 coyote Exp $
+#
+# postinstall script for quake3
+
+quake3_dir=$BASEDIR
+
+exit 0
+
diff --git a/misc/setup/pkg/ioquake3/prototype.template b/misc/setup/pkg/ioquake3/prototype.template
new file mode 100644
index 0000000..f23af77
--- /dev/null
+++ b/misc/setup/pkg/ioquake3/prototype.template
@@ -0,0 +1,8 @@
+!default 0755 root bin
+i pkginfo
+i copyright
+i depend
+i postinstall
+i postremove
+i preinstall
+i preremove
diff --git a/misc/setup/pkg/ioquake3/space b/misc/setup/pkg/ioquake3/space
new file mode 100644
index 0000000..95b7294
--- /dev/null
+++ b/misc/setup/pkg/ioquake3/space
@@ -0,0 +1 @@
+/usr/local/share 20000 15
diff --git a/misc/setup/pkg/ioquake3d/depend b/misc/setup/pkg/ioquake3d/depend
new file mode 100644
index 0000000..b55ff88
--- /dev/null
+++ b/misc/setup/pkg/ioquake3d/depend
@@ -0,0 +1,2 @@
+P SUNWxilrl XIL Runtime Environment
+P SFWsdl SDL - Simple DirectMedia Layer library
diff --git a/misc/setup/pkg/ioquake3d/pkginfo.template b/misc/setup/pkg/ioquake3d/pkginfo.template
new file mode 100644
index 0000000..a351c4d
--- /dev/null
+++ b/misc/setup/pkg/ioquake3d/pkginfo.template
@@ -0,0 +1,12 @@
+CLASSES=none
+BASEDIR=/usr/local/share/games
+TZ=PST
+PATH=/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin
+PKG=ioquake3d
+NAME=ioquake3 game data files for Solaris 10 (X11,GLX,SDL)
+VERSION=
+CATEGORY=application,graphics,opengl
+DESC=ioquake3 game data files for Solaris 10 (http://www.ioquake3.org/)
+VENDOR=http://www.ioquake3.org/
+EMAIL=quake@cojot.name
+PKGSAV=/var/sadm/pkg/ioquake3d/save
diff --git a/misc/setup/pkg/ioquake3d/postinstall b/misc/setup/pkg/ioquake3d/postinstall
new file mode 100644
index 0000000..f116fc3
--- /dev/null
+++ b/misc/setup/pkg/ioquake3d/postinstall
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# @(#)postinstall	$Id: postinstall,v 1.2 2006/01/25 13:22:56 coyote Exp $
+#
+# postinstall script for quake3
+
+quake3_dir=$BASEDIR
+
+exit 0
+
diff --git a/misc/setup/pkg/ioquake3d/postremove b/misc/setup/pkg/ioquake3d/postremove
new file mode 100644
index 0000000..7614348
--- /dev/null
+++ b/misc/setup/pkg/ioquake3d/postremove
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# @(#)postinstall	$Id: postremove,v 1.2 2006/01/25 13:22:56 coyote Exp $
+#
+# postinstall script for quake3
+
+quake3_dir=$BASEDIR
+
+exit 0
+
diff --git a/misc/setup/pkg/ioquake3d/preinstall b/misc/setup/pkg/ioquake3d/preinstall
new file mode 100644
index 0000000..ad126a1
--- /dev/null
+++ b/misc/setup/pkg/ioquake3d/preinstall
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# @(#)postinstall	$Id: preinstall,v 1.2 2006/01/25 13:22:56 coyote Exp $
+#
+# postinstall script for quake3
+
+quake3_dir=$BASEDIR
+
+exit 0
+
diff --git a/misc/setup/pkg/ioquake3d/preremove b/misc/setup/pkg/ioquake3d/preremove
new file mode 100644
index 0000000..3f316f3
--- /dev/null
+++ b/misc/setup/pkg/ioquake3d/preremove
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# @(#)postinstall	$Id: preremove,v 1.2 2006/01/25 13:22:56 coyote Exp $
+#
+# postinstall script for quake3
+
+quake3_dir=$BASEDIR
+
+exit 0
+
diff --git a/misc/setup/pkg/ioquake3d/prototype.template b/misc/setup/pkg/ioquake3d/prototype.template
new file mode 100644
index 0000000..f23af77
--- /dev/null
+++ b/misc/setup/pkg/ioquake3d/prototype.template
@@ -0,0 +1,8 @@
+!default 0755 root bin
+i pkginfo
+i copyright
+i depend
+i postinstall
+i postremove
+i preinstall
+i preremove
diff --git a/misc/setup/pkg/ioquake3d/space b/misc/setup/pkg/ioquake3d/space
new file mode 100644
index 0000000..a8d224c
--- /dev/null
+++ b/misc/setup/pkg/ioquake3d/space
@@ -0,0 +1 @@
+/usr/local/share 50000 100