summaryrefslogtreecommitdiff
path: root/science/omnetpp/files
diff options
context:
space:
mode:
Diffstat (limited to 'science/omnetpp/files')
-rw-r--r--science/omnetpp/files/patch-configure18
-rw-r--r--science/omnetpp/files/patch-src-plove76
-rw-r--r--science/omnetpp/files/patch-src-sim-cstat.cc13
-rw-r--r--science/omnetpp/files/patch-src-utils-opp_makemake.in8
4 files changed, 29 insertions, 86 deletions
diff --git a/science/omnetpp/files/patch-configure b/science/omnetpp/files/patch-configure
new file mode 100644
index 000000000000..b91204ae708c
--- /dev/null
+++ b/science/omnetpp/files/patch-configure
@@ -0,0 +1,18 @@
+--- configure.orig 2006-10-21 17:47:44.000000000 +0200
++++ configure 2008-04-06 15:04:21.000000000 +0200
+@@ -5152,6 +5152,7 @@
+ echo "$as_me: error: Cannot find wish, part of Tcl/Tk -- maybe it is not in the PATH or has some exotic name (tested names were: wish wish85 wish8.5 wish84 wish8.4 cygwish cygwish85 cygwish84)" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
++if false; then
+ if echo 'puts OK; exit' | $WISH | grep OK >/dev/null; then :; else
+ { { echo "$as_me:$LINENO: error: Cannot run wish (wish command \"puts OK; exit\" failed): maybe you're not running X or DISPLAY environment variable not set?" >&5
+ echo "$as_me: error: Cannot run wish (wish command \"puts OK; exit\" failed): maybe you're not running X or DISPLAY environment variable not set?" >&2;}
+@@ -5162,6 +5163,7 @@
+ echo "$as_me: error: wish command \"package require Tk 8.4\" failed: probably old Tcl/Tk version, version 8.4.0+ required" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
++fi
+
+ # note: square brackets necessary otherwise M4 messes up the Tcl command
+ tcl_library=`echo 'puts [info library]; exit' | $WISH`
diff --git a/science/omnetpp/files/patch-src-plove b/science/omnetpp/files/patch-src-plove
deleted file mode 100644
index e3a0191ec19d..000000000000
--- a/science/omnetpp/files/patch-src-plove
+++ /dev/null
@@ -1,76 +0,0 @@
---- src/plove/Makefile.in.bak Mon Jan 24 02:21:32 2005
-+++ src/plove/Makefile.in Mon Jan 24 02:24:52 2005
-@@ -39,7 +39,12 @@
- @echo '' # NOP to prevent automatic rules from firing
-
- plove-sh:
-- echo "$(WISH) -f $(OMNETPP_PLOVE_DIR)/plove.sh "'$$*' > plove
-+ echo "#!/bin/sh" > plove
-+ echo "if [ -z \`which gnuplot\` ]; then" >> plove
-+ echo " echo \"You have to install math/gnuplot in order to use plove.\"" >> plove
-+ echo "else" >> plove
-+ echo " $(WISH) -f $(OMNETPP_PLOVE_DIR)/plove.sh "'$$*' >> plove
-+ echo "fi" >> plove
- chmod +x plove
-
- plove-cyg:
---- src/plove/config.tcl Sat Jan 11 12:07:54 2003
-+++ src/plove/config.tcl Wed Dec 15 15:57:23 2004
-@@ -128,7 +128,7 @@
- -text "my gnuplot prefers filenames with fwd slashes"
- }
- label-entry .ize.f.f1.awk "awk:" $config(awk)
-- label-entry .ize.f.f1.mknod "mknod:" $config(mknod)
-+ label-entry .ize.f.f1.mkfifo "mkfifo:" $config(mkfifo)
- label-entry .ize.f.f1.sh "sh:" $config(sh)
- label-entry .ize.f.f1.tmp "tmp:" $config(tmp)
-
-@@ -140,7 +140,7 @@
- pack .ize.f.f1.slash -expand 0 -fill x -side top
- }
- pack .ize.f.f1.awk -expand 0 -fill x -side top
-- pack .ize.f.f1.mknod -expand 0 -fill x -side top
-+ pack .ize.f.f1.mkfifo -expand 0 -fill x -side top
- pack .ize.f.f1.sh -expand 0 -fill x -side top
- pack .ize.f.f1.tmp -expand 0 -fill x -side top
-
-@@ -155,7 +155,7 @@
- set config(gp-slash) $tmp(gp-slash)
- }
- set config(awk) [.ize.f.f1.awk.e get]
-- set config(mknod) [.ize.f.f1.mknod.e get]
-+ set config(mkfifo) [.ize.f.f1.mkfifo.e get]
- set config(sh) [.ize.f.f1.sh.e get]
- set config(tmp) [.ize.f.f1.tmp.e get]
- }
---- src/plove/doplot.tcl Sat Jan 11 12:07:54 2003
-+++ src/plove/doplot.tcl Wed Dec 15 15:57:57 2004
-@@ -335,7 +335,7 @@
- -message "Cannot create named pipe $pipe, file name already exists!"
- }
- } else {
-- if [catch {exec $config(mknod) $pipe p} errmsg] {
-+ if [catch {exec $config(mkfifo) $pipe} errmsg] {
- tk_messageBox -icon warning -type ok -title Warning \
- -message "Cannot create named pipe $pipe: $errmsg"
- }
-@@ -511,7 +511,7 @@
- # pipes
- set pipecmd ""
- foreach id $idlist {
-- append pipecmd "rm -f $pipebasefname-$id; mknod $pipebasefname-$id p\n"
-+ append pipecmd "rm -f $pipebasefname-$id; mkfifo $pipebasefname-$id\n"
- }
-
- # grep and filter commands
---- src/plove/main.tcl Sun Jan 19 10:17:00 2003
-+++ src/plove/main.tcl Wed Dec 15 15:58:12 2004
-@@ -45,7 +45,7 @@
- set config(zcat) "zcat"
- set config(gnuplot) "gnuplot"
- set config(awk) "awk"
--set config(mknod) "mknod"
-+set config(mkfifo) "mkfifo"
- set config(sh) "sh"
- set config(gp-slash) "1" ;# use slash (not backslash) in filenames in gnuplot scripts (WIN32)
-
diff --git a/science/omnetpp/files/patch-src-sim-cstat.cc b/science/omnetpp/files/patch-src-sim-cstat.cc
index 554ed4def7d8..633994783299 100644
--- a/science/omnetpp/files/patch-src-sim-cstat.cc
+++ b/science/omnetpp/files/patch-src-sim-cstat.cc
@@ -1,6 +1,6 @@
---- src/sim/cstat.cc 2003-06-25 17:38:24.000000000 +0200
-+++ src/sim/cstat.cc 2004-11-19 12:23:03.000000000 +0100
-@@ -252,8 +252,31 @@
+--- src/sim/cstat.cc.orig 2006-10-21 16:44:55.000000000 +0200
++++ src/sim/cstat.cc 2008-04-06 14:42:30.000000000 +0200
+@@ -370,8 +370,31 @@
void cWeightedStdDev::collect2(double val, double weight)
{
@@ -33,13 +33,13 @@
}
void cWeightedStdDev::clearResult()
-@@ -264,18 +287,18 @@
+@@ -382,18 +405,18 @@
double cWeightedStdDev::variance() const
{
-- throw new cException(this, "variance()/stddev() not implemented");
+- throw new cRuntimeError(this, "variance()/stddev() not implemented");
+ // Lars Westerhoff
-
+-
- // if (sum_weights==0)
- // return 0.0;
- // else
@@ -50,6 +50,7 @@
- // else
- // return devsqr;
- //}
++
+ if (sum_weights==0)
+ return 0.0;
+ else
diff --git a/science/omnetpp/files/patch-src-utils-opp_makemake.in b/science/omnetpp/files/patch-src-utils-opp_makemake.in
index f5bda0876dec..020f96ca22ea 100644
--- a/science/omnetpp/files/patch-src-utils-opp_makemake.in
+++ b/science/omnetpp/files/patch-src-utils-opp_makemake.in
@@ -1,10 +1,10 @@
---- src/utils/opp_makemake.in Sun Jan 23 22:29:17 2005
-+++ src/utils/opp_makemake.in Sun Jan 23 22:29:44 2005
-@@ -94,7 +94,7 @@
+--- src/utils/opp_makemake.in.orig 2006-10-21 16:43:59.000000000 +0200
++++ src/utils/opp_makemake.in 2008-04-06 14:33:13.000000000 +0200
+@@ -254,7 +254,7 @@
-u | --userinterface)
shift
-- userif=`echo $1 | tr [a-z] [A-Z]`
+- userif=`echo $1 | tr '[a-z]' '[A-Z]'`
+ userif=`echo $1 | tr '[[:lower:]]' '[[:upper:]]'`
case "$userif" in
CMDENV | TKENV)
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-10 21:31:08 +0000