[pkgsrc/trunk]: pkgsrc/converters/libiconv Changes 1.9.2:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ebb176b09936
branches:  trunk
changeset: 484031:ebb176b09936
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Nov 23 12:38:00 2004 +0000

description:
Changes 1.9.2:
* Bug fixes

diffstat:

 converters/libiconv/Makefile         |  18 ++++++++----------
 converters/libiconv/PLIST.common     |   3 ++-
 converters/libiconv/distinfo         |  10 +++++-----
 converters/libiconv/patches/patch-aa |  16 ++++++++--------
 converters/libiconv/patches/patch-ad |   6 +++---
 5 files changed, 26 insertions(+), 27 deletions(-)

diffs (113 lines):

diff -r 261ba670d52e -r ebb176b09936 converters/libiconv/Makefile
--- a/converters/libiconv/Makefile      Tue Nov 23 12:03:32 2004 +0000
+++ b/converters/libiconv/Makefile      Tue Nov 23 12:38:00 2004 +0000
@@ -1,21 +1,19 @@
-# $NetBSD: Makefile,v 1.29 2004/10/03 00:13:17 tv Exp $
-#
+# $NetBSD: Makefile,v 1.30 2004/11/23 12:38:00 adam Exp $
 
-DISTNAME=              libiconv-1.9.1
-PKGREVISION=           4
-CATEGORIES=            converters
-MASTER_SITES=          ${MASTER_SITE_GNU:=libiconv/}
+DISTNAME=      libiconv-1.9.2
+CATEGORIES=    converters
+MASTER_SITES=  ${MASTER_SITE_GNU:=libiconv/}
 
-MAINTAINER=            rh%NetBSD.org@localhost
-HOMEPAGE=              http://www.gnu.org/software/libiconv/
-COMMENT=               Character set conversion library
+MAINTAINER=    rh%NetBSD.org@localhost
+HOMEPAGE=      http://www.gnu.org/software/libiconv/
+COMMENT=       Character set conversion library
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 USE_BUILDLINK3=                YES
+USE_LIBTOOL=           YES
 USE_PKGINSTALL=                YES
 GNU_CONFIGURE=         YES
-USE_LIBTOOL=           YES
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Linux"
diff -r 261ba670d52e -r ebb176b09936 converters/libiconv/PLIST.common
--- a/converters/libiconv/PLIST.common  Tue Nov 23 12:03:32 2004 +0000
+++ b/converters/libiconv/PLIST.common  Tue Nov 23 12:38:00 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.4 2004/09/22 08:09:21 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.5 2004/11/23 12:38:00 adam Exp $
 bin/iconv
 include/iconv.h
 include/libcharset.h
@@ -15,4 +15,5 @@
 share/doc/html/libiconv/iconv_open.3.html
 share/examples/libiconv/charset.alias
 @unexec ${RM} -f %D/lib/charset.alias
+@dirrm share/examples/libiconv
 @dirrm share/doc/html/libiconv
diff -r 261ba670d52e -r ebb176b09936 converters/libiconv/distinfo
--- a/converters/libiconv/distinfo      Tue Nov 23 12:03:32 2004 +0000
+++ b/converters/libiconv/distinfo      Tue Nov 23 12:38:00 2004 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.17 2004/04/28 15:19:04 tv Exp $
+$NetBSD: distinfo,v 1.18 2004/11/23 12:38:00 adam Exp $
 
-SHA1 (libiconv-1.9.1.tar.gz) = f130c93fdf20903ca21bace8b8822f46468c9d65
-Size (libiconv-1.9.1.tar.gz) = 3907735 bytes
-SHA1 (patch-aa) = c7b0a6c8d95df305a348d45394a87bc2432683ef
+SHA1 (libiconv-1.9.2.tar.gz) = 41090f57ef638aaf531c964256cc91735e46438f
+Size (libiconv-1.9.2.tar.gz) = 3919945 bytes
+SHA1 (patch-aa) = b1e27a936302f762afaff2bca937ff30aaeeaf46
 SHA1 (patch-ab) = 26ada1bf2dbb99a56713331f0830ccef9250fc7a
 SHA1 (patch-ac) = 2858dc88a214af794b6358863b1aed24a129d41d
-SHA1 (patch-ad) = 3e256af27c28b37160a3788c096497241f62d783
+SHA1 (patch-ad) = ffe22ef24e296e978b09886f07409ddcede6d2e2
 SHA1 (patch-ae) = 626c959de9d4b5276ddf774f6aa68d20bff32184
 SHA1 (patch-af) = ee6ce5cf4f2fd0a5606bb23296964f34ca2e165c
diff -r 261ba670d52e -r ebb176b09936 converters/libiconv/patches/patch-aa
--- a/converters/libiconv/patches/patch-aa      Tue Nov 23 12:03:32 2004 +0000
+++ b/converters/libiconv/patches/patch-aa      Tue Nov 23 12:38:00 2004 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2003/09/16 13:57:19 xtraeme Exp $
+$NetBSD: patch-aa,v 1.7 2004/11/23 12:38:00 adam Exp $
 
---- src/Makefile.in.orig       2003-09-16 15:51:43.000000000 +0200
-+++ src/Makefile.in    2003-09-16 15:52:08.000000000 +0200
-@@ -87,7 +87,7 @@
-       if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(exec_prefix) ; fi
+--- src/Makefile.in.orig       2004-11-23 13:27:22.000000000 +0000
++++ src/Makefile.in
+@@ -92,7 +92,7 @@ install : all force
        if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
        case "@host_os@" in \
--        hpux* | freebsd*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
-+        hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
-         *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \
+         hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
+-        *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
++        *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \
        esac
        $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
+ 
diff -r 261ba670d52e -r ebb176b09936 converters/libiconv/patches/patch-ad
--- a/converters/libiconv/patches/patch-ad      Tue Nov 23 12:03:32 2004 +0000
+++ b/converters/libiconv/patches/patch-ad      Tue Nov 23 12:38:00 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.4 2003/09/12 13:52:02 seb Exp $
+$NetBSD: patch-ad,v 1.5 2004/11/23 12:38:00 adam Exp $
 
---- configure.orig     2003-05-22 20:19:20.000000000 +0000
+--- configure.orig     2003-07-02 10:34:07.000000000 +0000
 +++ configure
 @@ -1905,7 +1905,7 @@ fi
  
@@ -11,7 +11,7 @@
  
  
  ac_ext=c
-@@ -13898,6 +13898,7 @@ else
+@@ -13900,6 +13900,7 @@ else
     chmod u+w .
     $rm conftest* out/*
     rmdir out