Sun Jan 13 09:30:57 2008 UTC ()
Keep locale_alias symbol and don't hide it when visibility support
exists and libiconv is compiled. This restores symmetry between
libiconv.so, libiconv.a and libintl and fixes the build of gettext-tools
on Linux. Bump revision.


(joerg)
diff -r1.52 -r1.53 pkgsrc/converters/libiconv/Makefile
diff -r1.28 -r1.29 pkgsrc/converters/libiconv/distinfo
diff -r0 -r1.8 pkgsrc/converters/libiconv/patches/patch-ad
cvs diff -r1.52 -r1.53 pkgsrc/converters/libiconv/Makefile (expand / switch to unified diff)

--- pkgsrc/converters/libiconv/Makefile 2007/11/29 17:05:34 1.52
+++ pkgsrc/converters/libiconv/Makefile 2008/01/13 09:30:57 1.53
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.52 2007/11/29 17:05:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.53 2008/01/13 09:30:57 joerg Exp $
2 2
3DISTNAME= libiconv-1.12 3DISTNAME= libiconv-1.12
 4PKGREVISION= 1
4CATEGORIES= converters 5CATEGORIES= converters
5MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/} 6MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/}
6 7
7MAINTAINER= rh@NetBSD.org 8MAINTAINER= rh@NetBSD.org
8HOMEPAGE= http://www.gnu.org/software/libiconv/ 9HOMEPAGE= http://www.gnu.org/software/libiconv/
9COMMENT= Character set conversion library 10COMMENT= Character set conversion library
10 11
11PKG_INSTALLATION_TYPES= overwrite pkgviews 12PKG_INSTALLATION_TYPES= overwrite pkgviews
12PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
13 14
14USE_LANGUAGES+= c c++ 15USE_LANGUAGES+= c c++
15USE_LIBTOOL= yes 16USE_LIBTOOL= yes
16GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
cvs diff -r1.28 -r1.29 pkgsrc/converters/libiconv/distinfo (expand / switch to unified diff)

--- pkgsrc/converters/libiconv/distinfo 2008/01/08 22:08:36 1.28
+++ pkgsrc/converters/libiconv/distinfo 2008/01/13 09:30:57 1.29
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.28 2008/01/08 22:08:36 sketch Exp $ 1$NetBSD: distinfo,v 1.29 2008/01/13 09:30:57 joerg Exp $
2 2
3SHA1 (libiconv-1.12-cp932.patch.gz) = 7c433e19a61a15bd9585e01c0a6fbe2eb9129625 3SHA1 (libiconv-1.12-cp932.patch.gz) = 7c433e19a61a15bd9585e01c0a6fbe2eb9129625
4RMD160 (libiconv-1.12-cp932.patch.gz) = 33eb9758470f5e7ca0608fc478ea1342bf6bd0dc 4RMD160 (libiconv-1.12-cp932.patch.gz) = 33eb9758470f5e7ca0608fc478ea1342bf6bd0dc
5Size (libiconv-1.12-cp932.patch.gz) = 107962 bytes 5Size (libiconv-1.12-cp932.patch.gz) = 107962 bytes
6SHA1 (libiconv-1.12.tar.gz) = a5738d7dfbbd01c49e8ce026ea4ffa0f01af0179 6SHA1 (libiconv-1.12.tar.gz) = a5738d7dfbbd01c49e8ce026ea4ffa0f01af0179
7RMD160 (libiconv-1.12.tar.gz) = 74a63c1a2963ac1729c1ac7adfec8fd397a685bd 7RMD160 (libiconv-1.12.tar.gz) = 74a63c1a2963ac1729c1ac7adfec8fd397a685bd
8Size (libiconv-1.12.tar.gz) = 4513309 bytes 8Size (libiconv-1.12.tar.gz) = 4513309 bytes
9SHA1 (patch-aa) = 2ae2484e92362fc3ac6ecd06f8c8bf6c634fcda9 9SHA1 (patch-aa) = 2ae2484e92362fc3ac6ecd06f8c8bf6c634fcda9
10SHA1 (patch-ab) = d459b849adf870c345007d11a0a9dc790649adbc 10SHA1 (patch-ab) = d459b849adf870c345007d11a0a9dc790649adbc
11SHA1 (patch-ac) = a27e8ab5a776a2bc8b2c790eabff5c15985d9584 11SHA1 (patch-ac) = a27e8ab5a776a2bc8b2c790eabff5c15985d9584
 12SHA1 (patch-ad) = 8ca08bced3f63276c998091948d781114901bf61
12SHA1 (patch-ae) = e18c4d9dd76b27e40c8dcd273f856fe5933f72bc 13SHA1 (patch-ae) = e18c4d9dd76b27e40c8dcd273f856fe5933f72bc
13SHA1 (patch-af) = de976e1f97fa5f8b973be1a225ae3e0ee2352851 14SHA1 (patch-af) = de976e1f97fa5f8b973be1a225ae3e0ee2352851
File Added: pkgsrc/converters/libiconv/patches/Attic/patch-ad
$NetBSD: patch-ad,v 1.8 2008/01/13 09:30:57 joerg Exp $

Always export locale_alias as e.g. libintl expects it.

--- libcharset/include/localcharset.h.build.in.orig	2008-01-12 18:20:07.000000000 +0100
+++ libcharset/include/localcharset.h.build.in
@@ -20,7 +20,7 @@
 #ifndef _LOCALCHARSET_H
 #define _LOCALCHARSET_H
 
-#if @HAVE_VISIBILITY@ && BUILDING_LIBCHARSET
+#if @HAVE_VISIBILITY@
 #define LIBCHARSET_DLL_EXPORTED __attribute__((__visibility__("default")))
 #else
 #define LIBCHARSET_DLL_EXPORTED