Burkhard Linke <Burkhard.Linke@Uni-Bielefeld.DE>

fixed and simplified xtris


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1016 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -8,7 +8,7 @@ whole rxr-tree.
                    updated reiserfsprogs updated openh323 and so
                    fixed gnomemeeting
                    updated sylpheed
-                   fixed freeciv and openglad
+                   fixed freeciv, openglad and xtris
  - Dimitar Zhekov: fixed Build-Pkg (echo * -> ls), added "no rtti/exceptions"
                    in C++ option (limitcxx), fixed kbd and added hwclock as
                    well as RTC configuraton to stone and some "echo * -> ls"

package/avm/xtris/xlibs.patch

@@ -1,34 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/avm/xtris/xlibs.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-diff -ruN xtris/Makefile xtris-linux/Makefile
---- xtris/Makefile	1997-12-14 19:43:35.000000000 +0100
-+++ xtris-linux/Makefile	2003-06-13 21:26:50.000000000 +0200
-@@ -23,7 +23,7 @@
- # EXTRALIBS = -lnsl -lsocket 
- 
- # specify X11 libdir if your system needs it
--# XLIBDIR = -L/usr/X11/lib
-+XLIBDIR = -L/usr/X11/lib
- 
- 
- ###########################################################################

package/avm/xtris/xtris.conf

@@ -21,6 +21,8 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-var_append makeopt " " "bindir=$ROCKCFG_PKG_GAMES_BINDIR"
-var_append makeintopt " " "bindir=$ROCKCFG_PKG_GAMES_BINDIR"
+var_append makeopt " " "BINDIR=\$root/\$ROCKCFG_PKG_GAMES_BINDIR \
+                        MANDIR=\$mandir \
+                        XLIBDIR=\"-L\$root/\$prefix/X11/lib\""
+makeinstopt"$makeopt install"