[pkgsrc/trunk]: pkgsrc/converters/libiconv Apparently cp(1) under Irix does n...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d847fdd56db
branches:  trunk
changeset: 472043:8d847fdd56db
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Fri Apr 02 19:08:37 2004 +0000

description:
Apparently cp(1) under Irix does not like to overwrite symbolic links.
This causes the package to fail to install, as this section is executed
a second time.
Use pax instead and all's peachy.

diffstat:

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

diffs (53 lines):

diff -r f8f3310c2cab -r 8d847fdd56db converters/libiconv/Makefile
--- a/converters/libiconv/Makefile      Fri Apr 02 18:50:54 2004 +0000
+++ b/converters/libiconv/Makefile      Fri Apr 02 19:08:37 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/03/02 05:01:38 snj Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/02 19:08:37 jschauma Exp $
 #
 
 DISTNAME=              libiconv-1.9.1
@@ -22,7 +22,7 @@
 EGDIR=                 ${PREFIX}/share/examples/libiconv
 SUPPORT_FILES=         ${EGDIR}/charset.alias ${PREFIX}/lib/charset.alias
 
-MAKE_ENV+=             CP=${CP}
+MAKE_ENV+=             PAX="${PAX}"
 
 # remove any existing charset.alias; if it already exists, libiconv does
 # not overwrite it, and older versions of libiconv wrote incorrect
diff -r f8f3310c2cab -r 8d847fdd56db converters/libiconv/distinfo
--- a/converters/libiconv/distinfo      Fri Apr 02 18:50:54 2004 +0000
+++ b/converters/libiconv/distinfo      Fri Apr 02 19:08:37 2004 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2004/03/02 05:01:38 snj Exp $
+$NetBSD: distinfo,v 1.16 2004/04/02 19:08:37 jschauma 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) = 1815eac6ba4d7b9bdb3a750758dee5b4e7d07e46
+SHA1 (patch-ab) = 26ada1bf2dbb99a56713331f0830ccef9250fc7a
 SHA1 (patch-ac) = 2858dc88a214af794b6358863b1aed24a129d41d
 SHA1 (patch-ad) = 3e256af27c28b37160a3788c096497241f62d783
 SHA1 (patch-ae) = be3bf77c41432dc2caf0c5696f1f1591bb1b6310
diff -r f8f3310c2cab -r 8d847fdd56db converters/libiconv/patches/patch-ab
--- a/converters/libiconv/patches/patch-ab      Fri Apr 02 18:50:54 2004 +0000
+++ b/converters/libiconv/patches/patch-ab      Fri Apr 02 19:08:37 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.7 2004/03/02 05:01:38 snj Exp $
+$NetBSD: patch-ab,v 1.8 2004/04/02 19:08:37 jschauma 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"
++      ${PAX} -rw lib/libcharset.la lib/.libs "$$builddir/" && \
++      ${PAX} -rw include/*.h "$$builddir/"
  
  # Installs the library and include files only. Typically called with only
  # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.