[pkgsrc/trunk]: pkgsrc/archivers/unalz The patch-ab assumes that on NetBSD, e...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/222cefb369f7
branches:  trunk
changeset: 490467:222cefb369f7
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Mar 11 22:18:27 2005 +0000

description:
The patch-ab assumes that on NetBSD, every <iconv.h> has the non-const
prototype argument for the second parameter of iconv(). This is true for
all but some release candidates of NetBSD-2.0, because either the
package converters/libiconv is used or there's a current <iconv.h>.
Needed for NetBSD-1.6.2. Approved by wiz.

diffstat:

 archivers/unalz/distinfo         |   4 ++--
 archivers/unalz/patches/patch-ab |  16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diffs (48 lines):

diff -r 650b1e9c9ea5 -r 222cefb369f7 archivers/unalz/distinfo
--- a/archivers/unalz/distinfo  Fri Mar 11 21:27:17 2005 +0000
+++ b/archivers/unalz/distinfo  Fri Mar 11 22:18:27 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/03/02 16:18:47 minskim Exp $
+$NetBSD: distinfo,v 1.4 2005/03/11 22:18:27 rillig Exp $
 
 SHA1 (unalz-0.31.tgz) = 0d6f21b1fc9b00c5ca763b4e402c792ebe045fc9
 RMD160 (unalz-0.31.tgz) = 23ccefe2b29b8127c15ebf4f93e313316ad34510
 Size (unalz-0.31.tgz) = 129623 bytes
 SHA1 (patch-aa) = 35072979d009ff4a0d110e64aeac99e2f7a584cc
-SHA1 (patch-ab) = c54333e760b012b14af906ea9e9e442e0cf12ee2
+SHA1 (patch-ab) = 18d0cfe73125a91c671c70b5a523e9834fdc70e1
diff -r 650b1e9c9ea5 -r 222cefb369f7 archivers/unalz/patches/patch-ab
--- a/archivers/unalz/patches/patch-ab  Fri Mar 11 21:27:17 2005 +0000
+++ b/archivers/unalz/patches/patch-ab  Fri Mar 11 22:18:27 2005 +0000
@@ -1,7 +1,12 @@
-$NetBSD: patch-ab,v 1.1 2005/03/02 16:18:47 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2005/03/11 22:18:27 rillig Exp $
 
---- UnAlz.cpp.orig     2004-11-27 10:28:17.000000000 -0600
-+++ UnAlz.cpp
+This patch assumes that on NetBSD, every <iconv.h> has the non-const
+prototype argument for the second parameter of iconv(). This is true for
+all but some release candidates of NetBSD-2.0, because either the
+package converters/libiconv is used or there's a current <iconv.h>.
+
+--- UnAlz.cpp.orig     Sat Nov 27 17:28:17 2004
++++ UnAlz.cpp  Fri Mar 11 22:48:31 2005
 @@ -18,6 +18,10 @@
  #     include <errno.h>               // iconv.h ¶§¹®¿¡ ÇÊ¿ä 
  #endif
@@ -22,13 +27,12 @@
  #     include <sys/endian.h>  
        inline UINT16   unalz_le16toh(UINT16 a){return le16toh(a);}
        inline UINT32   unalz_le32toh(UINT32 a){return le32toh(a);}
-@@ -376,7 +380,8 @@ BOOL CUnAlz::ReadLocalFileheader()
+@@ -376,7 +380,7 @@ BOOL CUnAlz::ReadLocalFileheader()
        size_t size;
        char inbuf[ICONV_BUF_SIZE];
        char outbuf[ICONV_BUF_SIZE];
 -#if defined(__FreeBSD__) || defined(__CYGWIN__)
-+#if defined(__FreeBSD__) || defined(__CYGWIN__) || \
-+  (defined(__NetBSD__) && __NetBSD_Version__ >= 200000000)
++#if defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__NetBSD__)
        const char *inptr = inbuf;
  #else
        char *inptr = inbuf;