From 92d112b5a69d7677965d37045f127880a844c937 Mon Sep 17 00:00:00 2001 From: Daniel Jahre Date: Mon, 4 Apr 2005 09:22:21 +0000 Subject: [PATCH] Daniel Jahre: reworked the clanlib package as a forked package version 0.6.5 and 0.7.8 [2005030223110721960] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5765 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/kasc/clanlib/clanlib.conf | 11 +++++++ package/kasc/clanlib/clanlib.desc | 17 ++++++----- .../{ => clanlib06}/clanlib_glxfix.patch | 0 .../{ => clanlib06}/directfb_fix.patch | 0 .../{ => clanlib06}/freetype-update.patch | 0 .../kasc/clanlib/{ => clanlib06}/gcc34.patch | 0 package/kasc/clanlib/preconfig.in | 29 +++++++++++++++++++ 7 files changed, 49 insertions(+), 8 deletions(-) rename package/kasc/clanlib/{ => clanlib06}/clanlib_glxfix.patch (100%) rename package/kasc/clanlib/{ => clanlib06}/directfb_fix.patch (100%) rename package/kasc/clanlib/{ => clanlib06}/freetype-update.patch (100%) rename package/kasc/clanlib/{ => clanlib06}/gcc34.patch (100%) create mode 100644 package/kasc/clanlib/preconfig.in diff --git a/package/kasc/clanlib/clanlib.conf b/package/kasc/clanlib/clanlib.conf index f4d5468f0..e96d25d53 100644 --- a/package/kasc/clanlib/clanlib.conf +++ b/package/kasc/clanlib/clanlib.conf @@ -54,3 +54,14 @@ [ "$ROCKCFG_PKG_CLANLIB_TTF" == "1" ] && \ var_append extraconfopt " " "--enable-ttf" +if [ "$xpkg" == "clanlib06" ]; then + prefix=$root/opt/clanlib06 + var_append makeopt " " "LIBDIR=$root/$libdir" + set_confopt + var_append patchfiles " " "$confdir/$xpkg/*.patch" +fi +if [ "$xpkg" == "clanlib07" ]; then + prefix=$root/opt/clanlib07 + set_confopt +fi + diff --git a/package/kasc/clanlib/clanlib.desc b/package/kasc/clanlib/clanlib.desc index 5ac9582e2..5e1329281 100644 --- a/package/kasc/clanlib/clanlib.desc +++ b/package/kasc/clanlib/clanlib.desc @@ -60,13 +60,14 @@ [L] GPL [S] Stable -[V] 0.6.5-1 [P] X -?---5---9 213.500 -# FIXME: -# sources should be fetched from cvs: -# CVSROOT=":pserver:anonymous@cvs.clanlib.org:/usr/local/cvsroot" -# cvs login with empty passwd -# cvs -z3 co Libs/ClanLib-0.6 - -[D] 150661944 ClanLib-0.6.5-1.tar.gz http://www.clanlib.org/~sphair/download/ +#if xpkg == clanlib06 +[V] 0.6.5-1 +[D] 150661944 ClanLib-0.6.5-1.tar.gz http://www.clanlib.org/download/files/ +#endif + +#if xpkg == clanlib07 +[V] 0.7.8 +[D] 1763564094 ClanLib-0.7.8-1.tar.bz2 http://www.clanlib.org/download/files/ +#endif diff --git a/package/kasc/clanlib/clanlib_glxfix.patch b/package/kasc/clanlib/clanlib06/clanlib_glxfix.patch similarity index 100% rename from package/kasc/clanlib/clanlib_glxfix.patch rename to package/kasc/clanlib/clanlib06/clanlib_glxfix.patch diff --git a/package/kasc/clanlib/directfb_fix.patch b/package/kasc/clanlib/clanlib06/directfb_fix.patch similarity index 100% rename from package/kasc/clanlib/directfb_fix.patch rename to package/kasc/clanlib/clanlib06/directfb_fix.patch diff --git a/package/kasc/clanlib/freetype-update.patch b/package/kasc/clanlib/clanlib06/freetype-update.patch similarity index 100% rename from package/kasc/clanlib/freetype-update.patch rename to package/kasc/clanlib/clanlib06/freetype-update.patch diff --git a/package/kasc/clanlib/gcc34.patch b/package/kasc/clanlib/clanlib06/gcc34.patch similarity index 100% rename from package/kasc/clanlib/gcc34.patch rename to package/kasc/clanlib/clanlib06/gcc34.patch diff --git a/package/kasc/clanlib/preconfig.in b/package/kasc/clanlib/preconfig.in new file mode 100644 index 000000000..813256dc2 --- /dev/null +++ b/package/kasc/clanlib/preconfig.in @@ -0,0 +1,29 @@ +# --- 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/base/clanlib/preconfig.in +# ROCK Linux is Copyright (C) 1998 - 2005 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 --- + +if pkgcheck clanlib X +then + pkgfork clanlib clanlib06 + pkgfork clanlib clanlib07 + pkgremove clanlib +fi +