pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/benchmarks/skampi "echo -e" is not portable, use print...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f20352546171
branches:  trunk
changeset: 610116:f20352546171
user:      asau <asau%pkgsrc.org@localhost>
date:      Thu Oct 18 16:58:18 2012 +0000

description:
"echo -e" is not portable, use printf to generate horizontal tabulation.
Reported by Mikhail Danilov on IRC.

diffstat:

 benchmarks/skampi/Makefile                 |   6 ++++-
 benchmarks/skampi/distinfo                 |   3 +-
 benchmarks/skampi/patches/patch-makedep.sh |  34 ++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diffs (69 lines):

diff -r 67d532fc1a7b -r f20352546171 benchmarks/skampi/Makefile
--- a/benchmarks/skampi/Makefile        Thu Oct 18 16:16:54 2012 +0000
+++ b/benchmarks/skampi/Makefile        Thu Oct 18 16:58:18 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/09/11 22:37:14 asau Exp $
+# $NetBSD: Makefile,v 1.26 2012/10/18 16:58:18 asau Exp $
 #
 
 DISTNAME=      skampi
@@ -18,6 +18,10 @@
 BUILD_TARGET=  skampi
 INSTALLATION_DIRS=     bin
 
+# Force file regeneration:
+post-extract:
+       rm $(WRKSRC)/Makefile.dep
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/skampi ${DESTDIR}${PREFIX}/bin/skampi
        ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/skampi
diff -r 67d532fc1a7b -r f20352546171 benchmarks/skampi/distinfo
--- a/benchmarks/skampi/distinfo        Thu Oct 18 16:16:54 2012 +0000
+++ b/benchmarks/skampi/distinfo        Thu Oct 18 16:58:18 2012 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2009/12/13 01:49:18 asau Exp $
+$NetBSD: distinfo,v 1.6 2012/10/18 16:58:18 asau Exp $
 
 SHA1 (skampi-5.0.4.355/skampi.tar.gz) = a1e55043505dc10a576d47e018206ae9c79f145f
 RMD160 (skampi-5.0.4.355/skampi.tar.gz) = bfc545eb065124fabd71e6aec7684887c3fb4974
 Size (skampi-5.0.4.355/skampi.tar.gz) = 386126 bytes
+SHA1 (patch-makedep.sh) = c43f77e46f98215355ca2a2325c14937ce38f589
diff -r 67d532fc1a7b -r f20352546171 benchmarks/skampi/patches/patch-makedep.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/benchmarks/skampi/patches/patch-makedep.sh        Thu Oct 18 16:58:18 2012 +0000
@@ -0,0 +1,34 @@
+$NetBSD: patch-makedep.sh,v 1.1 2012/10/18 16:58:18 asau Exp $
+
+"echo -e" is not portable.
+
+--- makedep.sh.orig    2007-09-21 08:48:19.000000000 +0000
++++ makedep.sh
+@@ -3,17 +3,21 @@
+ # Script for automatic generation of Makefile dependencies
+ # Receives list of .c files as arguments
+ 
+-echo "# Created by makedep.sh, do not edit" > Makefile.dep
+-echo "" >> Makefile.dep
++exec > Makefile.dep
++
++echo "# Created by makedep.sh, do not edit"
++echo
+ 
+ for x in $@
+ do
+-  if ! $CPP $CPPFLAGS -E -MG -MM $x >> Makefile.dep ; then
++  if ! $CPP $CPPFLAGS -E -MG -MM $x ; then
+     rm -f Makefile.dep
+     exit 1
+   fi
+-  echo -e "\t\$(MPICC) -c \$(CFLAGS) $x" >> Makefile.dep
++  printf "\t"
++  echo "\$(MPICC) -c \$(CFLAGS) $x"
+ done
+ 
+-echo "skampi: $OBJECTS"   >> Makefile.dep
+-echo -e "\t\$(MPICC) -o skampi $OBJECTS -lm" >> Makefile.dep
++echo "skampi: $OBJECTS"
++printf "\t"
++echo -e "\$(MPICC) -o skampi $OBJECTS -lm"



Home | Main Index | Thread Index | Old Index