[pkgsrc/trunk]: pkgsrc/converters/libiconv Use ${CP} instead of cp. From Geo...

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6f82e5ff7faf
branches:  trunk
changeset: 469878:6f82e5ff7faf
user:      snj <snj%pkgsrc.org@localhost>
date:      Tue Mar 02 05:01:38 2004 +0000

description:
Use ${CP} instead of cp.  From Georg Schwarz in PR pkg/24634.

diffstat:

 converters/libiconv/Makefile         |  4 +++-
 converters/libiconv/distinfo         |  4 ++--
 converters/libiconv/patches/patch-ab |  6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r 3cd043b274e9 -r 6f82e5ff7faf converters/libiconv/Makefile
--- a/converters/libiconv/Makefile      Mon Mar 01 23:06:29 2004 +0000
+++ b/converters/libiconv/Makefile      Tue Mar 02 05:01:38 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:35 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2004/03/02 05:01:38 snj Exp $
 #
 
 DISTNAME=              libiconv-1.9.1
@@ -22,6 +22,8 @@
 EGDIR=                 ${PREFIX}/share/examples/libiconv
 SUPPORT_FILES=         ${EGDIR}/charset.alias ${PREFIX}/lib/charset.alias
 
+MAKE_ENV+=             CP=${CP}
+
 # remove any existing charset.alias; if it already exists, libiconv does
 # not overwrite it, and older versions of libiconv wrote incorrect
 # charset.alias files, which were not removed during deinstall since
diff -r 3cd043b274e9 -r 6f82e5ff7faf converters/libiconv/distinfo
--- a/converters/libiconv/distinfo      Mon Mar 01 23:06:29 2004 +0000
+++ b/converters/libiconv/distinfo      Tue Mar 02 05:01:38 2004 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2003/09/16 13:57:18 xtraeme Exp $
+$NetBSD: distinfo,v 1.15 2004/03/02 05:01:38 snj Exp $
 
 SHA1 (libiconv-1.9.1.tar.gz) = f130c93fdf20903ca21bace8b8822f46468c9d65
 Size (libiconv-1.9.1.tar.gz) = 3907735 bytes
 SHA1 (patch-aa) = c7b0a6c8d95df305a348d45394a87bc2432683ef
-SHA1 (patch-ab) = bfceb0cde182022bdcf181d3214f88ff27acc4b3
+SHA1 (patch-ab) = 1815eac6ba4d7b9bdb3a750758dee5b4e7d07e46
 SHA1 (patch-ac) = 2858dc88a214af794b6358863b1aed24a129d41d
 SHA1 (patch-ad) = 3e256af27c28b37160a3788c096497241f62d783
 SHA1 (patch-ae) = be3bf77c41432dc2caf0c5696f1f1591bb1b6310
diff -r 3cd043b274e9 -r 6f82e5ff7faf converters/libiconv/patches/patch-ab
--- a/converters/libiconv/patches/patch-ab      Mon Mar 01 23:06:29 2004 +0000
+++ b/converters/libiconv/patches/patch-ab      Tue Mar 02 05:01:38 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2003/07/13 13:32:30 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2004/03/02 05:01:38 snj Exp $
 
 --- Makefile.in.orig   Wed Apr 23 13:29:22 2003
 +++ Makefile.in
@@ -8,8 +8,8 @@
  lib/localcharset.h :
 -      builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib"
 +      builddir="`pwd`"; cd libcharset && $(MAKE) all &&       \
-+      cp -R lib/libcharset.la lib/.libs "$$builddir/lib" &&   \
-+      cp -R include/*.h "$$builddir/include"
++      ${CP} -R lib/libcharset.la lib/.libs "$$builddir/lib" &&        \
++      ${CP} -R include/*.h "$$builddir/include"
  
  # Installs the library and include files only. Typically called with only
  # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.