summaryrefslogtreecommitdiffstats
path: root/freenx
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2008-12-31 13:20:48 +0000
committer Eric Hameleers <alien@slackware.com>2008-12-31 13:20:48 +0000
commit611a8772f07906215465d2276d8b1b999755ca9e (patch)
tree0e189f2437635a6712e6e5a9f582de36ba7c0b22 /freenx
parent2850012e514f7de7a96c89eb900b19f29106c7bc (diff)
downloadasb-611a8772f07906215465d2276d8b1b999755ca9e.tar.gz
asb-611a8772f07906215465d2276d8b1b999755ca9e.tar.xz
Some 64bit fixes, install all of nxredir
Diffstat (limited to 'freenx')
-rwxr-xr-xfreenx/build/freenx.SlackBuild21
1 files changed, 16 insertions, 5 deletions
diff --git a/freenx/build/freenx.SlackBuild b/freenx/build/freenx.SlackBuild
index f03e236a..237b165c 100755
--- a/freenx/build/freenx.SlackBuild
+++ b/freenx/build/freenx.SlackBuild
@@ -68,6 +68,12 @@ ARCH=${ARCH:-i486}
BUILD=${BUILD:-2}
TAG=${TAG:-alien}
+if [ "$ARCH" = "x86_64" ]; then
+ LIBDIRSUFFIX="64"
+else
+ LIBDIRSUFFIX=""
+fi
+
# Where do we look for sources?
SRCDIR=$(cd $(dirname $0); pwd)
@@ -79,7 +85,6 @@ TMP=${TMP:-/tmp/build}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-# Input URL: http://prdownload.berlios.de/freenx/freenx-server-0.7.3.tar.gz
SOURCE="$SRCDIR/${PRGNAM}-server-${VERSION}.tar.gz"
SRCURL="http://download.berlios.de/${PRGNAM}/${PRGNAM}-server-${VERSION}.tar.gz"
@@ -138,10 +143,19 @@ cd ${PRGNAM}-server-${VERSION}
cat $SRCDIR/authkeys.patch | patch -p1 --verbose || exit 1
cat $SRCDIR/netcat.patch | patch -p1 --verbose || exit 1
cat $SRCDIR/nxserver_multimedia.diff | patch -p1 --verbose || exit 1
+cat $SRCDIR/nxpaths.diff | patch -p1 --verbose || exit 1
+sed -i -e "s#/usr/lib\$#/usr/lib${LIBDIRSUFFIX}#" \
+ -e "s#/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#g" \
+ $(grep -lr '/usr/lib' *)
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
echo Building ...
+mkdir -p ${PKG}/usr/bin
+mkdir -p ${PKG}/usr/lib${LIBDIRSUFFIX}/cups/backend
+mkdir -p ${PKG}/etc/{nxserver,rc.d}
+mkdir -p ${PKG}/var/lib/nxserver/db/{closed,running,failed}
+
cd nxserver-helper
make
cd ..
@@ -153,18 +167,15 @@ cd ..
cd nxredir
make
+make install DESTDIR=$PKG
cd ..
-mkdir -p ${PKG}/usr/bin
-mkdir -p ${PKG}/etc/{nxserver,rc.d}
-mkdir -p ${PKG}/var/lib/nxserver/db/{closed,running,failed}
chmod 755 ${PKG}/var/lib/nxserver
chmod 700 ${PKG}/var/lib/nxserver/*
chmod 700 ${PKG}/var/lib/nxserver/db/*
install -m 755 nxserver-helper/nxserver-helper $PKG/usr/bin
install -m 755 nxviewer-passwd/nxpasswd/nxpasswd $PKG/usr/bin
-install -m 755 nxredir/nxredir $PKG/usr/bin
install -m 755 nxcups-gethost nxdesktop_helper nxdialog nxkeygen nxloadconfig \
nxnode nxnode-login nxprint nxserver nxsetup nxviewer_helper \