diff options
| -rw-r--r-- | misc/setup/Solaris_pkg.sh | 7 | ||||
| -rw-r--r-- | misc/setup/pkg/ioq3ded.sh | 11 | ||||
| -rw-r--r-- | misc/setup/pkg/ioquake3.sh | 11 | ||||
| -rw-r--r-- | misc/setup/pkg/ioquake3/depend | 5 | ||||
| -rw-r--r-- | misc/setup/pkg/ioquake3/pkginfo.template | 4 | ||||
| -rw-r--r-- | misc/setup/pkg/ioquake3d/depend | 3 | ||||
| -rw-r--r-- | misc/setup/pkg/ioquake3m/depend | 3 |
7 files changed, 28 insertions, 16 deletions
diff --git a/misc/setup/Solaris_pkg.sh b/misc/setup/Solaris_pkg.sh index 3acac28..650d285 100644 --- a/misc/setup/Solaris_pkg.sh +++ b/misc/setup/Solaris_pkg.sh @@ -37,10 +37,11 @@ DEMO_PKGFILE="${PKG_DEMO_NAME}-${BUILD_VERSION}-${PKG_VERSION}.pkg" BUILD_DIR="${MOUNT_DIR}/build/release-${PLATFORM}-${ARCH}" PKG_SRC_DIR="${MOUNT_DIR}/misc/setup/pkg/${PKG_SOLARIS_NAME}" PKG_BUILD_DIR="/tmp/ioquake3-build/${PKG_SOLARIS_NAME}-${BUILD_VERSION}" +PKG_EXTRA_BUILD_DIR="/usr/local/src/quake3-data/ioquake3/quake3" PKG_DATA_SRC_DIR="${MOUNT_DIR}/misc/setup/pkg/${PKG_DATA_NAME}" -PKG_DATA_BUILD_DIR="/usr/local/src/quake3-data/quake3" +PKG_DATA_BUILD_DIR="/usr/local/src/quake3-data/ioquake3d/quake3" PKG_DEMO_SRC_DIR="${MOUNT_DIR}/misc/setup/pkg/${PKG_DEMO_NAME}" -PKG_DEMO_BUILD_DIR="/usr/local/src/quake3-demo/quake3" +PKG_DEMO_BUILD_DIR="/usr/local/src/quake3-data/ioquake3m/quake3" # Tools RM="/usr/bin/rm" @@ -113,7 +114,7 @@ if [ -d ${BUILD_DIR} ]; then fi done - ${PKGPROTO} ${PKG_BUILD_DIR}=quake3 | \ + ${PKGPROTO} ${PKG_BUILD_DIR}=quake3 ${PKG_EXTRA_BUILD_DIR}=quake3 | \ ${NAWK} '{ print $1,$2,$3,$4 }' >> ${PKG_SRC_DIR}/prototype ${PKGMK} -o -p "${PKG_MAINT_ID}${BUILD_DATE}" \ -b ${PKG_SRC_DIR} -f ${PKG_SRC_DIR}/prototype \ diff --git a/misc/setup/pkg/ioq3ded.sh b/misc/setup/pkg/ioq3ded.sh index 62e92ef..511f4fb 100644 --- a/misc/setup/pkg/ioq3ded.sh +++ b/misc/setup/pkg/ioq3ded.sh @@ -5,8 +5,15 @@ IOQ3_DIR=/usr/local/share/games/quake3 -COMPILE_PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'` -COMPILE_ARCH=`uname -p | sed -e s/i.86/i386/` +if [ "x${LD_LIBRARY_PATH}" = "x" ]; then + LD_LIBRARY_PATH="${IOQ3_DIR}/lib" +else + LD_LIBRARY_PATH="${IOQ3_DIR}/lib:${LD_LIBRARY_PATH}" +fi +export LD_LIBRARY_PATH + +COMPILE_PLATFORM=`uname|sed -e 's/_.*//'|tr '[:upper:]' '[:lower:]'` +COMPILE_ARCH=`uname -p | sed -e 's/i.86/i386/'` EXEC_REL=release diff --git a/misc/setup/pkg/ioquake3.sh b/misc/setup/pkg/ioquake3.sh index f0d784f..29a050b 100644 --- a/misc/setup/pkg/ioquake3.sh +++ b/misc/setup/pkg/ioquake3.sh @@ -5,8 +5,15 @@ IOQ3_DIR=/usr/local/share/games/quake3 -COMPILE_PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'` -COMPILE_ARCH=`uname -p | sed -e s/i.86/i386/` +if [ "x${LD_LIBRARY_PATH}" = "x" ]; then + LD_LIBRARY_PATH="${IOQ3_DIR}/lib" +else + LD_LIBRARY_PATH="${IOQ3_DIR}/lib:${LD_LIBRARY_PATH}" +fi +export LD_LIBRARY_PATH + +COMPILE_PLATFORM=`uname|sed -e 's/_.*//'|tr '[:upper:]' '[:lower:]'` +COMPILE_ARCH=`uname -p | sed -e 's/i.86/i386/'` EXEC_REL=release diff --git a/misc/setup/pkg/ioquake3/depend b/misc/setup/pkg/ioquake3/depend index 11170ca..ad9a1d9 100644 --- a/misc/setup/pkg/ioquake3/depend +++ b/misc/setup/pkg/ioquake3/depend @@ -1,3 +1,2 @@ -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) +P SUNWxwplt X Window System platform software +P ioquake3d Icculus.Org Quake3 patch data files for Solaris 10 (X11,GLX,SDL) diff --git a/misc/setup/pkg/ioquake3/pkginfo.template b/misc/setup/pkg/ioquake3/pkginfo.template index 34d5b1f..18f81c3 100644 --- a/misc/setup/pkg/ioquake3/pkginfo.template +++ b/misc/setup/pkg/ioquake3/pkginfo.template @@ -3,10 +3,10 @@ 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) +NAME=ioquake3 for Solaris 10 (X11,GLX,SDL) VERSION= CATEGORY=application,graphics,opengl -DESC=Icculus.Org Quake3 1.34 for Solaris 10 (http://www.ioquake3.org/) +DESC=Icculus.Org Quake3 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/ioquake3d/depend b/misc/setup/pkg/ioquake3d/depend index b55ff88..101bfab 100644 --- a/misc/setup/pkg/ioquake3d/depend +++ b/misc/setup/pkg/ioquake3d/depend @@ -1,2 +1 @@ -P SUNWxilrl XIL Runtime Environment -P SFWsdl SDL - Simple DirectMedia Layer library +P SUNWxwplt X Window System platform software diff --git a/misc/setup/pkg/ioquake3m/depend b/misc/setup/pkg/ioquake3m/depend index b55ff88..101bfab 100644 --- a/misc/setup/pkg/ioquake3m/depend +++ b/misc/setup/pkg/ioquake3m/depend @@ -1,2 +1 @@ -P SUNWxilrl XIL Runtime Environment -P SFWsdl SDL - Simple DirectMedia Layer library +P SUNWxwplt X Window System platform software |