Crude fixup to install on amd64.

svn path=/; revision=57

8 files changed, 8 insertions, 252 deletions

diff --git a/sys-cluster/charm/files/charm-5.9-gcc4.patch b/sys-cluster/charm/files/charm-5.9-gcc4.patch
deleted file mode 100755
index 9a1cb9f..0000000
--- a/sys-cluster/charm/files/charm-5.9-gcc4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur charm-5.9/src/ck-com/MsgPacker.h charm-5.9-new/src/ck-com/MsgPacker.h
---- charm-5.9/src/ck-com/MsgPacker.h	2005-03-20 23:21:51.000000000 -0600
-+++ charm-5.9-new/src/ck-com/MsgPacker.h	2006-04-19 17:16:05.000000000 -0500
-@@ -83,7 +83,7 @@
-     
-     //Takes a queue of envelopes as char* ptrs and not charm message holders
-     //Used by mesh streaming strategy
--    MsgPacker::MsgPacker(CkQ<char *> &msgq, int n_msgs);
-+    MsgPacker(CkQ<char *> &msgq, int n_msgs);
-     
-     void getMessage(CombinedMessage *&msg, int &size);
-     static void deliver(CombinedMessage *cmb_msg);
-diff -Naur charm-5.9/src/ck-core/charisma.h charm-5.9-new/src/ck-core/charisma.h
---- charm-5.9/src/ck-core/charisma.h	2003-03-20 18:30:50.000000000 -0600
-+++ charm-5.9-new/src/ck-core/charisma.h	2006-04-19 17:19:34.000000000 -0500
-@@ -295,6 +295,7 @@
- class CharismaInPort
- {
-   public:
-+    virtual ~CharismaInPort() {}
-     virtual void send(void *msg, int len) = 0;
-     void _create(const char *name)
-     {
-@@ -307,6 +308,7 @@
-   protected:
-     CharismaInPort *inport;
-   public:
-+    virtual ~CharismaOutPort() {}
-     virtual void emitData(void *data, int len)
-     {
-       inport->send(data, len);
-diff -Naur charm-5.9/src/ck-core/cklocation.h charm-5.9-new/src/ck-core/cklocation.h
---- charm-5.9/src/ck-core/cklocation.h	2004-10-30 11:35:25.000000000 -0500
-+++ charm-5.9-new/src/ck-core/cklocation.h	2006-04-19 17:21:24.000000000 -0500
-@@ -431,6 +431,7 @@
- /// Abstract superclass of all array manager objects 
- class CkArrMgr {
- public:
-+	virtual ~CkArrMgr() {}
- 	/// Insert this initial element on this processor
- 	virtual void insertInitial(const CkArrayIndex &idx,void *ctorMsg, int local=1)=0;
diff --git a/sys-cluster/charm/files/charm-charmc-gentoo.patch b/sys-cluster/charm/files/charm-9999-charmc-gentoo.patch
index e5be49a..505cf58 100644
--- a/sys-cluster/charm/files/charm-charmc-gentoo.patch
+++ b/sys-cluster/charm/files/charm-9999-charmc-gentoo.patch
@@ -1,9 +1,6 @@
-# adjust paths in charmc wrapper to point to the proper include
-# and libary directories
-
---- charm-5.9/src/scripts/charmc	2005-01-25 23:13:30.000000000 +0000
-+++ charm-5.9-patched/src/scripts/charmc	2005-09-26 00:52:57.000000000 +0000
-@@ -656,20 +656,9 @@
+--- charm/src/scripts/charmc-old	2007-04-24 14:13:21.000000000 -0500
++++ charm/src/scripts/charmc	2007-08-23 20:14:01.034374325 -0500
+@@ -681,21 +681,9 @@
  	PROG_EXT=".exe"
  fi
  
@@ -21,9 +18,10 @@
 -  test -z "$CHARMLIBSO" && echo "$CHARMBIN/../lib_so: not found" && exit 1
 -fi
 -
+-
 +CHARMLIB="/usr/lib"
 +CHARMINC="/usr/include/gentoo-include"
 +CHARMLIBSO="/usr/lib"
  
- 
  ##############################################################################
+ #
diff --git a/sys-cluster/charm/files/charm-doc-makefile-gentoo.patch b/sys-cluster/charm/files/charm-doc-makefile-gentoo.patch
deleted file mode 100644
index f18497a..0000000
--- a/sys-cluster/charm/files/charm-doc-makefile-gentoo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# patch to properly build the docs as pdf and html
-
---- charm-5.9/doc/Makefile	2004-10-14 06:12:10.000000000 +0000
-+++ charm-5.9-patched/doc/Makefile	2005-09-24 22:55:53.000000000 +0000
-@@ -1,4 +1,4 @@
--IDIR=../../doc
-+IDIR=./doc
- LNCMD=test ! -f pplmanual.sty && ln -f -s ../pplmanual.sty .
- RMCMD=rm -f ./pplmanual.sty
- DIRS=install converse convext charm++ libraries f90charm pose \
---- charm-5.9/doc/Makefile.common	2005-04-19 17:21:52.000000000 +0000
-+++ charm-5.9-patched/doc/Makefile.common	2005-09-24 22:56:30.000000000 +0000
-@@ -10,7 +10,7 @@
- # (optional) PROJECT_LINK: HTML to include at bottom of page
- 
- # Destination directory for local copy of files (e.g., on user machine)
--DOCDIR=..
-+DOCDIR=../doc
- 
- # Destination directory for web-accessible copy of files (e.g., on PPL machines)
- WEBDIR=/www/ppl_manuals
-@@ -71,12 +71,10 @@
- 	-rm -fr index.tex $(FIG_CLEAN)
- 
- # Build local copy of documentation:
--doc: all
-+doc: pdf html
- 	if [ ! -d $(DOCDIR) ] ; then mkdir $(DOCDIR) ; fi
--	if [ ! -d $(DOCDIR)/ps ] ; then mkdir $(DOCDIR)/ps ; fi
- 	if [ ! -d $(DOCDIR)/pdf ] ; then mkdir $(DOCDIR)/pdf ; fi
- 	if [ ! -d $(DOCDIR)/html ] ; then mkdir $(DOCDIR)/html ; fi
--	/bin/cp $(FILE).ps $(DOCDIR)/ps/$(DEST).ps
- 	/bin/cp $(FILE).pdf $(DOCDIR)/pdf/$(DEST).pdf
- 	/bin/rm -rf $(DOCDIR)/html/$(DEST)
- 	/bin/cp -R $(FILE) $(DOCDIR)/html/$(DEST)
diff --git a/sys-cluster/charm/files/charm-examples-gentoo.patch b/sys-cluster/charm/files/charm-examples-gentoo.patch
deleted file mode 100644
index ef8089f..0000000
--- a/sys-cluster/charm/files/charm-examples-gentoo.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -Naur charm-5.9/examples/pose/ASIM/Makefile charm-5.9-backup/examples/pose/ASIM/Makefile
---- charm-5.9/examples/pose/ASIM/Makefile	2004-10-22 04:38:26.000000000 +0000
-+++ charm-5.9-backup/examples/pose/ASIM/Makefile	2005-09-27 03:27:08.000000000 +0000
-@@ -12,8 +12,8 @@
- OPTS=-O#-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1
- 
- CHARMBASE=../../..
--CHARMBIN=$(CHARMBASE)/bin
--CHARMINC=$(CHARMBASE)/include
-+CHARMBIN=/usr/bin
-+CHARMINC=/usr/include/charm-5.9
- 
- CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS)
- 
-diff -Naur charm-5.9/examples/pose/BigNetSim/Makefile charm-5.9-backup/examples/pose/BigNetSim/Makefile
---- charm-5.9/examples/pose/BigNetSim/Makefile	2004-10-17 22:48:10.000000000 +0000
-+++ charm-5.9-backup/examples/pose/BigNetSim/Makefile	2005-09-27 03:27:08.000000000 +0000
-@@ -16,8 +16,8 @@
- 
- CHARMBASE=../../../
- #CHARMBASE=/expand8/home/gzheng/old/charm-6-8/net-linux/
--CHARMBIN=$(CHARMBASE)/bin
--CHARMINC=$(CHARMBASE)/include
-+CHARMBIN=/usr/bin
-+CHARMINC=/usr/include/charm-5.9
- 
- ifeq ($(SEQUENTIAL),1)
- CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS) -DSEQUENTIAL_POSE=1
-diff -Naur charm-5.9/examples/pose/ChunkSim/Makefile charm-5.9-backup/examples/pose/ChunkSim/Makefile
---- charm-5.9/examples/pose/ChunkSim/Makefile	2004-10-12 17:12:26.000000000 +0000
-+++ charm-5.9-backup/examples/pose/ChunkSim/Makefile	2005-09-27 03:27:08.000000000 +0000
-@@ -12,8 +12,8 @@
- OPTS=-O#-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1
- 
- CHARMBASE=../../../
--CHARMBIN=$(CHARMBASE)/bin
--CHARMINC=$(CHARMBASE)/include
-+CHARMBIN=/usr/bin
-+CHARMINC=/usr/include/charm-5.9
- 
- CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS)
- 
-@@ -109,4 +109,4 @@
- 	$(CHARMBIN)/etrans.pl Worker
- 
- test:
--	./pgm 1000 10 1 RANDOM SPARSE 50 -gf 344
-\ No newline at end of file
-+	./pgm 1000 10 1 RANDOM SPARSE 50 -gf 344
-diff -Naur charm-5.9/examples/pose/HiSim/Makefile.common charm-5.9-backup/examples/pose/HiSim/Makefile.common
---- charm-5.9/examples/pose/HiSim/Makefile.common	2004-11-02 07:29:40.000000000 +0000
-+++ charm-5.9-backup/examples/pose/HiSim/Makefile.common	2005-09-27 03:27:08.000000000 +0000
-@@ -1,8 +1,8 @@
- 
- CHARMBASE=../../../../
- #CHARMBASE=/expand8/home/gzheng/tmp/pose/charm/net-linux
--CHARMBIN=$(CHARMBASE)/bin
--CHARMINC=$(CHARMBASE)/include
-+CHARMBIN=/usr/bin
-+CHARMINC=/usr/include/charm-5.9
- ETRANS=$(CHARMBIN)/etrans.pl
- OPTS=-g
- 
-diff -Naur charm-5.9/examples/pose/LBSim/Makefile charm-5.9-backup/examples/pose/LBSim/Makefile
---- charm-5.9/examples/pose/LBSim/Makefile	2004-11-04 04:30:45.000000000 +0000
-+++ charm-5.9-backup/examples/pose/LBSim/Makefile	2005-09-27 03:27:08.000000000 +0000
-@@ -12,8 +12,8 @@
- OPTS=-O#-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1
- 
- CHARMBASE=../../../
--CHARMBIN=$(CHARMBASE)/bin
--CHARMINC=$(CHARMBASE)/include
-+CHARMBIN=/usr/bin
-+CHARMINC=/usr/include/charm-5.9
- 
- CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS)
- 
-diff -Naur charm-5.9/examples/pose/Ring/Makefile charm-5.9-backup/examples/pose/Ring/Makefile
---- charm-5.9/examples/pose/Ring/Makefile	2005-02-08 18:58:05.000000000 +0000
-+++ charm-5.9-backup/examples/pose/Ring/Makefile	2005-09-27 03:27:08.000000000 +0000
-@@ -12,8 +12,8 @@
- OPTS=-O#-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1
- 
- CHARMBASE=../../..
--CHARMBIN=$(CHARMBASE)/bin
--CHARMINC=$(CHARMBASE)/include
-+CHARMBIN=/usr/bin/
-+CHARMINC=/usr/include/charm-5.9
- 
- CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS)
- 
-diff -Naur charm-5.9/examples/pose/SimBenchmark/Makefile charm-5.9-backup/examples/pose/SimBenchmark/Makefile
---- charm-5.9/examples/pose/SimBenchmark/Makefile	2005-03-17 22:31:41.000000000 +0000
-+++ charm-5.9-backup/examples/pose/SimBenchmark/Makefile	2005-09-27 03:27:08.000000000 +0000
-@@ -12,8 +12,8 @@
- OPTS=-O#-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1
- 
- CHARMBASE=../../..
--CHARMBIN=$(CHARMBASE)/bin
--CHARMINC=$(CHARMBASE)/include
-+CHARMBIN=/usr/bin
-+CHARMINC=/usr/include/charm-5.9
- 
- CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS)
- 
diff --git a/sys-cluster/charm/files/charm-fpic-gentoo.patch b/sys-cluster/charm/files/charm-fpic-gentoo.patch
deleted file mode 100644
index e70874d..0000000
--- a/sys-cluster/charm/files/charm-fpic-gentoo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# compile with -fPIC to avoid TEXTRELs
-
---- charm-5.9/src/arch/net-linux/conv-mach.sh	2005-04-22 01:14:55.000000000 +0000
-+++ charm-5.9-backup/src/arch/net-linux/conv-mach.sh	2005-09-27 18:07:10.000000000 +0000
-@@ -1,8 +1,8 @@
- CMK_CPP_CHARM="/lib/cpp -P"
- CMK_CPP_C="gcc -E"
--CMK_CC="gcc "
--CMK_CXX="g++ "
--CMK_CXXPP="$CMK_CXX -x c++ -E "
-+CMK_CC="gcc -fPIC"
-+CMK_CXX="g++ -fPIC -Wno-deprecated"
-+CMK_CXXPP="$CMK_CXX -E "
- CMK_CF77="g77 "
- CMK_CF90="f90 "
- CMK_CF90_FIXED="$CMK_CF90 -W132 "
-@@ -10,12 +10,12 @@
- CMK_LIBS="-lckqt"
- #CMK_LD="$CMK_CC -Wl,--allow-multiple-definition "
- #CMK_LDXX="$CMK_CXX -Wl,--allow-multiple-definition "
--CMK_LD="$CMK_CC "
--CMK_LDXX="$CMK_CXX "
-+CMK_LD="gcc "
-+CMK_LDXX="g++ "
- CMK_LD_SHARED="-shared"
- CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
- CMK_XIOPTS=""
--CMK_F90LIBS="-L/usr/absoft/lib -L/opt/absoft/lib -lf90math -lfio -lU77 -lf77math "
-+CMK_F90LIBS=""
- CMK_F77LIBS="-lg2c "
- CMK_MOD_NAME_ALLCAPS=1
- CMK_MOD_EXT="mod"
diff --git a/sys-cluster/charm/files/charm-python-configure-gentoo.patch b/sys-cluster/charm/files/charm-python-configure-gentoo.patch
deleted file mode 100644
index 6e98642..0000000
--- a/sys-cluster/charm/files/charm-python-configure-gentoo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# include proper python headers 
-
---- charm-5.9/src/scripts/configure	2005-06-01 03:46:06.000000000 +0000
-+++ charm-5.9-backup/src/scripts/configure	2005-09-27 14:28:48.000000000 +0000
-@@ -1970,11 +1970,12 @@
- fi
- 
- #### test if Python headers are installed ####
-+PYTHON_VERSION=`python -V 2>&1 | awk {'print $2'} | awk -F. {'print $1"."$2'}`
- cat > $t <<EOT
--#include "python/Python.h"
--#include "python/compile.h"
--#include "python/eval.h"
--#include "python/node.h"
-+#include "python${PYTHON_VERSION}/Python.h"
-+#include "python${PYTHON_VERSION}/compile.h"
-+#include "python${PYTHON_VERSION}/eval.h"
-+#include "python${PYTHON_VERSION}/node.h"
- 
- int main() {
-     Py_Initialize();
-@@ -1983,7 +1984,6 @@
-     PyCodeObject *program = PyNode_Compile(programNode, "");
- }
- EOT
--PYTHON_VERSION=`python -V 2>&1 | awk {'print $2'} | awk -F. {'print $1"."$2'}`
- test_link "whether Python is installed" "yes" "no" "-lpython$PYTHON_VERSION -lpthread -lutil -ldl"
- 
- cat >>confdefs.h <<_ACEOF
diff --git a/sys-cluster/charm/files/digest-charm-5.9 b/sys-cluster/charm/files/digest-charm-5.9
deleted file mode 100644
index 2c50cfb..0000000
--- a/sys-cluster/charm/files/digest-charm-5.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e0632ea7993a9b9f197fe5c20712a6be charm-5.9.tar.gz 7580639
-RMD160 ebc3a8515fd918c6e0fc0fd9963a22b3ae5d057d charm-5.9.tar.gz 7580639
-SHA256 b5f8d53f0b447dbd720a0f2607a0e7902c227c7377326bf279e448ed570dcc89 charm-5.9.tar.gz 7580639
diff --git a/sys-cluster/charm/files/digest-charm-9999 b/sys-cluster/charm/files/digest-charm-9999
new file mode 100644
index 0000000..d07fd57
--- /dev/null
+++ b/sys-cluster/charm/files/digest-charm-9999
@@ -0,0 +1,3 @@
+MD5 5cd124de4edca98637a18b61314c9609 charm_src.tar.gz 13288706
+RMD160 ef4e46b9975a41eb2791708a9d5a3aea946b599c charm_src.tar.gz 13288706
+SHA256 67773512e745f3e7aedc3517a09fb59b13f94411ab7866627f47420ee3385098 charm_src.tar.gz 13288706