From d2041bec6286b638d4ba7a17869d3b40bd350e3f Mon Sep 17 00:00:00 2001 From: Kai Schwenzfeier Date: Sun, 12 Sep 2004 13:39:37 +0000 Subject: [PATCH] Kai Schwenzfeier: - some "uncluttering the config system" - typo fixing - several beautifications [2004090716390606933] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4196 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/kasc/freeciv/freeciv.conf | 2 -- package/kasc/freeciv/subconfig-games.hlp | 2 -- package/kasc/freeciv/subconfig-games.in | 4 ---- package/kasc/freedroid_rpg/freedroid_rpg.conf | 2 +- package/kasc/frozen-bubble/frozen-bubble.conf | 2 +- package/kasc/gnubg/gnubg.conf | 2 +- package/kasc/lbreakout2/lbreakout2.conf | 2 +- .../kasc/libsdl_console/libsdl_console.conf | 2 +- package/kasc/mahjong/mahjong.conf | 4 ++-- package/kasc/metakit/metakit.conf | 2 +- package/kasc/openal/openal.conf | 2 +- package/kasc/powermanga/powermanga.conf | 2 +- .../kasc/rocksndiamonds/rocksndiamonds.conf | 4 ++-- package/kasc/rubiclox/rubiclox.conf | 4 ++-- package/kasc/simutrans/simutrans.conf | 4 ++-- package/kasc/smpeg/smpeg.conf | 3 ++- package/kasc/squaroid/squaroid.conf | 3 ++- package/kasc/swig/swig.conf | 24 +++++++++++++++++++ package/kasc/torcs/torcs.conf | 4 +--- package/kasc/wmi/wmi.conf | 1 + package/kasc/xblasttnt/xblasttnt.conf | 4 ++-- package/kasc/xskat/xskat.conf | 2 +- 22 files changed, 49 insertions(+), 32 deletions(-) diff --git a/package/kasc/freeciv/freeciv.conf b/package/kasc/freeciv/freeciv.conf index c9bed97e3..0d61283d4 100644 --- a/package/kasc/freeciv/freeciv.conf +++ b/package/kasc/freeciv/freeciv.conf @@ -38,6 +38,4 @@ elif [ "$ROCKCFG_PKG_FREECIV_XAW" == "xaw3d" ] ; then fi [ "$ROCKCFG_PKG_FREECIV_ZLIB" == "1" ] && \ var_append extraconfopt " " "--with-zlib" -[ "$ROCKCFG_PKG_FREECIV_EFENCE" == "1" ] && \ - var_append extraconfopt " " "--with-efence" diff --git a/package/kasc/freeciv/subconfig-games.hlp b/package/kasc/freeciv/subconfig-games.hlp index 5f058b398..007777715 100644 --- a/package/kasc/freeciv/subconfig-games.hlp +++ b/package/kasc/freeciv/subconfig-games.hlp @@ -16,5 +16,3 @@ ROCKCFG_PKG_FREECIV_XAW ROCKCFG_PKG_FREECIV_ZLIB use zlib to (un)compress savegames transparently. -ROCKCFG_PKG_FREECIV_EFENCE - use Electric Fence, malloc debugger diff --git a/package/kasc/freeciv/subconfig-games.in b/package/kasc/freeciv/subconfig-games.in index 18061d0fe..c49e19730 100644 --- a/package/kasc/freeciv/subconfig-games.in +++ b/package/kasc/freeciv/subconfig-games.in @@ -44,9 +44,5 @@ if pkgcheck freeciv X ; then bool 'zlib support' ROCKCFG_PKG_FREECIV_ZLIB 1 " use zlib to (un)compress savegames transparently" fi - if pkgcheck electricfence X ; then - bool 'efence support' ROCKCFG_PKG_FREECIV_EFENCE 0 " - use Electric Fence, malloc debugger" - fi menu_end fi diff --git a/package/kasc/freedroid_rpg/freedroid_rpg.conf b/package/kasc/freedroid_rpg/freedroid_rpg.conf index 75bfb4e07..08606c3d8 100644 --- a/package/kasc/freedroid_rpg/freedroid_rpg.conf +++ b/package/kasc/freedroid_rpg/freedroid_rpg.conf @@ -24,5 +24,5 @@ bindir=$root/$ROCKCFG_PKG_GAMES_BINDIR datadir=$root/$ROCKCFG_PKG_GAMES_DATADIR -premake="make clean" +hook_add premake 3 "make clean" diff --git a/package/kasc/frozen-bubble/frozen-bubble.conf b/package/kasc/frozen-bubble/frozen-bubble.conf index 2e145ec31..594b1958a 100644 --- a/package/kasc/frozen-bubble/frozen-bubble.conf +++ b/package/kasc/frozen-bubble/frozen-bubble.conf @@ -30,5 +30,5 @@ frozen-bubble_premake() { make clean } -premake=frozen-bubble_premake +hook_add premake 3 "frozen-bubble_premake" diff --git a/package/kasc/gnubg/gnubg.conf b/package/kasc/gnubg/gnubg.conf index d8668cee0..5028576fa 100644 --- a/package/kasc/gnubg/gnubg.conf +++ b/package/kasc/gnubg/gnubg.conf @@ -36,7 +36,7 @@ gnubg_preconf() bunzip2 gnubg_*.bd.bz2 } -preconf=gnubg_preconf +hook_add preconf 3 "gnubg_preconf" [ "$ROCKCFG_PKG_GNUBG_READLINE" == "1" ] && \ var_append extraconfopt " " "--with-readline" diff --git a/package/kasc/lbreakout2/lbreakout2.conf b/package/kasc/lbreakout2/lbreakout2.conf index 55f3654bb..51fc75ae2 100644 --- a/package/kasc/lbreakout2/lbreakout2.conf +++ b/package/kasc/lbreakout2/lbreakout2.conf @@ -32,5 +32,5 @@ var_append extraconfopt " " "--with-highscore-path=$scoredir" [ "$ROCKCFG_PKG_LBREAKOUT2_NET" == "0" ] && \ var_append extraconfopt " " "--disable-network" -inmake="mkdir -p $scoredir" +hook_add inmake 3 "mkdir -p $scoredir" diff --git a/package/kasc/libsdl_console/libsdl_console.conf b/package/kasc/libsdl_console/libsdl_console.conf index 6875c26cc..9989a5ae2 100644 --- a/package/kasc/libsdl_console/libsdl_console.conf +++ b/package/kasc/libsdl_console/libsdl_console.conf @@ -25,5 +25,5 @@ libsdl_console_premake() { var_append makeopt " " "prefix=$root/$prefix" } -premake=libsdl_console_premake +hook_add premake 3 libsdl_console_premake diff --git a/package/kasc/mahjong/mahjong.conf b/package/kasc/mahjong/mahjong.conf index fb9509793..2301ae31f 100644 --- a/package/kasc/mahjong/mahjong.conf +++ b/package/kasc/mahjong/mahjong.conf @@ -21,10 +21,10 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -bindir="`dirname $root/$ROCKCFG_PKG_GAMES_BINDIE`" +bindir="`dirname $root/$ROCKCFG_PKG_GAMES_BINDIR`" datadir=$root/$ROCKCFG_PKG_GAMES_DATADIR prefix="`basename $root/$ROCKCFG_PKG_GAMES_BINDIR`" -var_append makeopt " " "DESTDIR=$prefix BINDIR=$my_bin" +var_append makeopt " " "DESTDIR=$prefix BINDIR=$bindir" var_append makeinstopt " " "$makeopt" diff --git a/package/kasc/metakit/metakit.conf b/package/kasc/metakit/metakit.conf index 48883da22..128344dc4 100644 --- a/package/kasc/metakit/metakit.conf +++ b/package/kasc/metakit/metakit.conf @@ -21,6 +21,6 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -preconf="cd builds" +hook_add preconf 3 "cd builds" configscript="../unix/configure" diff --git a/package/kasc/openal/openal.conf b/package/kasc/openal/openal.conf index 971b8b1e7..8b76ef8d0 100644 --- a/package/kasc/openal/openal.conf +++ b/package/kasc/openal/openal.conf @@ -22,7 +22,7 @@ # --- ROCK-COPYRIGHT-NOTE-END --- autogen=1 -preconf="cd linux; touch configure; chmod +x configure " +hook_add preconf 3 "cd linux; touch configure; chmod +x configure " var_append extraconfopt " " "--enable-optimization --enable-arch-asm" diff --git a/package/kasc/powermanga/powermanga.conf b/package/kasc/powermanga/powermanga.conf index 3f1d55f6b..ae98620d1 100644 --- a/package/kasc/powermanga/powermanga.conf +++ b/package/kasc/powermanga/powermanga.conf @@ -28,5 +28,5 @@ scoredir=$ROCKCFG_PKG_GAMES_SCOREDIR var_append makeopt " " "PREFIX=$root/$prefix EXEDIR=$bindir DATADIR=$datadir/powermanga SCOREDIR=$scoredir" var_append makeinstopt " " "$makeopt" -premake="mkdir -p $scoredir" +hook_add premake 3 "mkdir -p $scoredir" diff --git a/package/kasc/rocksndiamonds/rocksndiamonds.conf b/package/kasc/rocksndiamonds/rocksndiamonds.conf index 60d738496..c4580da9b 100644 --- a/package/kasc/rocksndiamonds/rocksndiamonds.conf +++ b/package/kasc/rocksndiamonds/rocksndiamonds.conf @@ -43,8 +43,8 @@ rocksndiamonds_inmake() { makeinstopt="" -premake="make clean" -inmake=rocksndiamonds_inmake +hook_add premake 3 "make clean" +hook_add inmake 3 rocksndiamonds_inmake # targets: sdl, x11, solaris, solaris-sdl, mac diff --git a/package/kasc/rubiclox/rubiclox.conf b/package/kasc/rubiclox/rubiclox.conf index 39e70dfa8..fdeb0552f 100644 --- a/package/kasc/rubiclox/rubiclox.conf +++ b/package/kasc/rubiclox/rubiclox.conf @@ -25,6 +25,6 @@ bindir=$root/$ROCKCFG_PKG_GAMES_BINDIR datadir=$root/$ROCKCFG_PKG_GAMES_DATADIR makeinstopt="" -premake="make clean" -inmake="cp -f rubiclox $bindir" +hook_add premake 3 "make clean" +hook_add inmake 3 "cp -f rubiclox $bindir" diff --git a/package/kasc/simutrans/simutrans.conf b/package/kasc/simutrans/simutrans.conf index 891bae052..0ca38db79 100644 --- a/package/kasc/simutrans/simutrans.conf +++ b/package/kasc/simutrans/simutrans.conf @@ -47,6 +47,6 @@ simutrans_doc() { done } -premake=simutrans_main -postdoc=simutrans_doc +hook_add premake 3 simutrans_main +hook_add postdoc 3 simutrans_doc diff --git a/package/kasc/smpeg/smpeg.conf b/package/kasc/smpeg/smpeg.conf index 34ad7469e..9bee73e2f 100644 --- a/package/kasc/smpeg/smpeg.conf +++ b/package/kasc/smpeg/smpeg.conf @@ -69,5 +69,6 @@ smpeg_preconf() var_append extraconfopt " " "--disable-assertions" fi } -preconf=smpeg_preconf + +hook_add preconf 3 smpeg_preconf diff --git a/package/kasc/squaroid/squaroid.conf b/package/kasc/squaroid/squaroid.conf index d2487276f..6d4d9cade 100644 --- a/package/kasc/squaroid/squaroid.conf +++ b/package/kasc/squaroid/squaroid.conf @@ -38,7 +38,8 @@ squaroid_preconf() var_append extraconfopt " " "--enable-ircserver=$ROCKCFG_PKG_SQUAROID_IRCSERV" var_append extraconfopt " " "--enable-plugin" } -preconf=squaroid_preconf + +hook_add preconf 3 squaroid_preconf # for some reason this wont work: # var_append extraconfopt " " "--with-gtk-prefix=$ROCKCFG_PKG_GNOME14_CORE_PREFIX" diff --git a/package/kasc/swig/swig.conf b/package/kasc/swig/swig.conf index a91860ad0..8c0125946 100644 --- a/package/kasc/swig/swig.conf +++ b/package/kasc/swig/swig.conf @@ -1,3 +1,27 @@ + +# --- 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/kasc/swig/swig.conf +# 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 --- + # also build and install swig runtime makeopt="$makeopt swig runtime" makeinstopt="$makeinstopt install-runtime" + diff --git a/package/kasc/torcs/torcs.conf b/package/kasc/torcs/torcs.conf index 0b34a78a9..2a1f382e5 100644 --- a/package/kasc/torcs/torcs.conf +++ b/package/kasc/torcs/torcs.conf @@ -24,8 +24,6 @@ bindir=$root/$ROCKCFG_PKG_GAMES_BINDIR datadir=$root/$ROCKCFG_PKG_GAMES_DATADIR -runconf=1 - torcs_preconf() { for x in $archdir/TORCS-$ver-src-robots* ; do @@ -37,5 +35,5 @@ torcs_preconf() find -name '*.o' | xargs rm -fv } -preconf=torcs_preconf +hook_add preconf 3 torcs_preconf diff --git a/package/kasc/wmi/wmi.conf b/package/kasc/wmi/wmi.conf index 6ecc4ea3e..112719a27 100644 --- a/package/kasc/wmi/wmi.conf +++ b/package/kasc/wmi/wmi.conf @@ -21,4 +21,5 @@ # --- ROCK-COPYRIGHT-NOTE-END --- hook_add postinstall 3 "register_wm wmi WMI /$prefix/bin/wmi" +hook_add postdoc 3 "cp -rf examples $docdir" diff --git a/package/kasc/xblasttnt/xblasttnt.conf b/package/kasc/xblasttnt/xblasttnt.conf index c409a208c..e4567952d 100644 --- a/package/kasc/xblasttnt/xblasttnt.conf +++ b/package/kasc/xblasttnt/xblasttnt.conf @@ -37,8 +37,8 @@ xblasttnt_postmake() { } runxmkmf=1 -premake=xblasttnt_premake -postmake=xblasttnt_postmake +hook_add premake 3 xblasttnt_premake +hook_add postmake 3 xblasttnt_postmake var_append makeopt " " "DESTDIR=$prefix BINDIR=$bindir XBLASTDIR=$root/$datadir" var_append makeinstopt " " "$makeopt install" diff --git a/package/kasc/xskat/xskat.conf b/package/kasc/xskat/xskat.conf index c64c93545..53e08b2ce 100644 --- a/package/kasc/xskat/xskat.conf +++ b/package/kasc/xskat/xskat.conf @@ -37,6 +37,6 @@ xskat_inmake() { cp -v xskat.man $mandir/man6/xskat.6 } -inmake=xskat_inmake +hook_add inmake 3 xskat_inmake