diff --git a/package/stf/pegasus/gcc34.patch b/package/stf/pegasus/gcc34.patch deleted file mode 100644 index d092c6f31..000000000 --- a/package/stf/pegasus/gcc34.patch +++ /dev/null @@ -1,41 +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/stf/pegasus/gcc34.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- pegasus-2.3.2/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h 2003-10-22 14:26:03.000000000 +0000 -+++ pegasus-2.3.2-patched/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h 2004-06-20 01:17:37.000000000 +0000 -@@ -59,7 +59,7 @@ - - #define PEGASUS_HAVE_FOR_SCOPE - --// #define PEGASUS_HAVE_TEMPLATE_SPECIALIZATION -+#define PEGASUS_HAVE_TEMPLATE_SPECIALIZATION - - #ifndef _GNU_SOURCE - #define _GNU_SOURCE -@@ -71,7 +71,7 @@ - #include - #include - #include --#ifndef min --#define min(a,b) (((a)<(b))?(a):(b)) --#endif -+// #ifndef min -+// #define min(a,b) (((a)<(b))?(a):(b)) -+// #endif - #endif /* Pegasus_Platform_LINUX_IX86_GNU_h */ diff --git a/package/stf/pegasus/pegasus.conf b/package/stf/pegasus/pegasus.conf index 8d72df858..2847c4ab1 100644 --- a/package/stf/pegasus/pegasus.conf +++ b/package/stf/pegasus/pegasus.conf @@ -25,28 +25,15 @@ export PEGASUS_HOME='/opt/pegasus' [[ $arch == x86 ]] && export PEGASUS_PLATFORM='LINUX_IX86_GNU' [[ $arch == powerpc ]] && export PEGASUS_PLATFORM='LINUX_PPC_GNU' [[ $arch == ia64 ]] && export PEGASUS_PLATFORM='LINUX_IA64_GNU' -# WIN32_IX86_MSVC -# LINUX_IX86_GNU -# LINUX_PPC_GNU -# LINUX_IA64_GNU # LINUX_ZSERIES_GNU -# AIX_RS_IBMCXX -# HPUX_PARISC_ACC -# HPUX_IA64_ACC -# TRU64_ALPHA_DECCXX -# SOLARIS_SPARC_GNU -# SOLARIS_SPARC_CC -# ZOS_ZSERIES_IBM -# NSK_NONSTOP_NMCPLUS - -PEGASUS_ROOT='' var_insert PATH ':' "$PEGASUS_HOME/bin" -var_insert LD_LIBRARY_PATH ':' "$LD_LIBRARY_PATH:$PEGASUS_HOME/lib" +# var_insert LD_LIBRARY_PATH ':' "$LD_LIBRARY_PATH:$PEGASUS_HOME/lib" makeinstopt='repository' -docdir='/usr/share/doc/pegasus/' +docdir='/opt/pegasus/doc/' + +export PEGASUS_ROOT=`dirs` hook_add premake 5 'export PEGASUS_ROOT=`dirs`' hook_add postmake 5 'mkdir -p $docdir ; cp -a doc/* $docdir' - diff --git a/package/stf/pegasus/pegasus.desc b/package/stf/pegasus/pegasus.desc index 7e12947b7..4fff82ca9 100644 --- a/package/stf/pegasus/pegasus.desc +++ b/package/stf/pegasus/pegasus.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 2.3.2 +[V] 2.5 [P] X -?---5---9 217.700 -[D] 3536911471 pegasus-2.3.2.tar.gz http://www.openpegasus.org//uploads/40/4299/ +[D] 3560730903 pegasus-2.5.tar.gz http://www.openpegasus.org//uploads/40/8660/ #[D] 0 pegasus-cvs-190503.tar.bz2 CVSROOT=:pserver:anon@cvs.opengroup.org:/cvs/MSB password "anon" VERSION_2_1_1_RELEASE