Bring converters/libiconv to 1.12.
(How did this slip so much again? *sigh*)
This is pretty much a maintenance update with some cleanup, but
considering that much of the ports tree depends on it directly or
indirectly, I'd really like more eyes on it.
License: Don't panic, the library is still LGPL, only iconv(1) is
GPLv3. If this ever poses a problem, we can multi-package it.
I'm currently running a full bulk build with this on i386.
Index: Makefile
===================================================================
RCS file: /cvs/ports/converters/libiconv/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile 3 Apr 2008 09:23:40 -0000 1.29
+++ Makefile 24 May 2008 16:30:36 -0000
@@ -2,43 +2,37 @@
COMMENT= character set conversion library
-DISTNAME= libiconv-1.9.2
-PKGNAME= ${DISTNAME}p5
+DISTNAME= libiconv-1.12
CATEGORIES= converters devel
MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/}
SHARED_LIBS += charset 1.0 # .1.0
-SHARED_LIBS += iconv 4.0 # .4.0
-BUILD_DEPENDS= ::devel/gperf
+SHARED_LIBS += iconv 5.0 # .6.0
HOMEPAGE= http://www.gnu.org/software/libiconv/
MAINTAINER= Brad Smith <[EMAIL PROTECTED]>
-# LGPL
+# LGPL, GPLv3
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c
-SEPARATE_BUILD= concurrent
-CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION=2.57
-MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autoconf ${WRKSRC}/libcharset/autoconf
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --enable-static \
- --enable-extra-encodings \
- --disable-nls \
- --mandir=${PREFIX}/man
+WANTLIB= c
+BUILD_DEPENDS= ::devel/gperf
-USE_LIBTOOL=Yes
+USE_LIBTOOL= Yes
+SEPARATE_BUILD= simple
+CONFIGURE_STYLE=gnu
+MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build-aux ${WRKSRC}/libcharset/build-aux
+CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
+ --enable-static \
+ --enable-extra-encodings \
+ --disable-nls
+MAKE_FLAGS= INSTALL_DATA=cp
pre-configure:
- @cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} make -f Makefile.devel
lib/aliases.h
+ @cd ${WRKSRC}; \
+ ${SETENV} ${CONFIGURE_ENV} make -f Makefile.devel lib/aliases.h
.include <bsd.port.mk>
-
-.if ${NO_SHARED_LIBS:L} == "no"
-CONFIGURE_ENV+= LIBTOOL_FLAGS="-fPIC -DPIC"
-.endif
-
Index: distinfo
===================================================================
RCS file: /cvs/ports/converters/libiconv/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 5 Apr 2007 15:37:48 -0000 1.6
+++ distinfo 24 May 2008 16:30:36 -0000
@@ -1,5 +1,5 @@
-MD5 (libiconv-1.9.2.tar.gz) = a8MANlBTyBWxC4AKIeC8fg==
-RMD160 (libiconv-1.9.2.tar.gz) = q32v7Evm/2MHTYpuCO6z5dXHzKY=
-SHA1 (libiconv-1.9.2.tar.gz) = QQkPV+9jiq9THJZCVsyRc15GQ48=
-SHA256 (libiconv-1.9.2.tar.gz) = /bcmxdN2HUwVaecCt0z5Vh3AfGpfSK8+P9GGhfUNSQw=
-SIZE (libiconv-1.9.2.tar.gz) = 3919945
+MD5 (libiconv-1.12.tar.gz) = wr4oJZV1FTWmGK4O3rj2SA==
+RMD160 (libiconv-1.12.tar.gz) = dKY8GiljrBcpwax63+yP05emhb0=
+SHA1 (libiconv-1.12.tar.gz) = pXONffu9AcSejOAm6k/6DwGvAXk=
+SHA256 (libiconv-1.12.tar.gz) = qZ4kT9eLq7leo8mlyIuWSZTtqh0V/Y3eW0BngB4j8M0=
+SIZE (libiconv-1.12.tar.gz) = 4513309
Index: patches/patch-aclocal_m4
===================================================================
RCS file: patches/patch-aclocal_m4
diff -N patches/patch-aclocal_m4
--- patches/patch-aclocal_m4 16 Apr 2005 21:10:22 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-aclocal_m4,v 1.1 2005/04/16 21:10:22 espie Exp $
---- aclocal.m4.orig Mon Apr 11 13:47:20 2005
-+++ aclocal.m4 Mon Apr 11 13:50:46 2005
-@@ -9209,6 +9209,10 @@ AC_DEFUN([AC_MBSTATE_T],
- [mbstate_t x; return sizeof x;],
- ac_cv_type_mbstate_t=yes,
- ac_cv_type_mbstate_t=no)])
-+ if test $am_cv_type_mbstate_t = yes; then
-+ AC_DEFINE(HAVE_TYPE_MBSTATE_T, 1,
-+ [Define if <wchar.h> defines a mb_state_t type.])
-+ fi
- if test $ac_cv_type_mbstate_t = no; then
- AC_DEFINE(mbstate_t, int,
- [Define to a type if <wchar.h> does not define.])
Index: patches/patch-lib_Makefile_in
===================================================================
RCS file: patches/patch-lib_Makefile_in
diff -N patches/patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in 25 Aug 2007 13:51:08 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-$OpenBSD: patch-lib_Makefile_in,v 1.10 2007/08/25 13:51:08 naddy Exp $
---- lib/Makefile.in.orig Sun May 18 16:19:16 2003
-+++ lib/Makefile.in Wed Aug 1 18:35:06 2007
-@@ -26,7 +26,7 @@ LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
- LIBTOOL_LINK = $(LIBTOOL) --mode=link
- LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
- LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
--CP = cp
-+CP = @CP@
- MV = mv
- LN = @LN@
- LN_S = @LN_S@
-@@ -55,8 +55,10 @@ OBJECTS = iconv.lo localcharset.lo relocatable.lo
-
- all : @PLUGLIB@ libiconv.la
-
-+libiconv_la_LDFLAGS=-version-info $(LIBICONV_VERSION_INFO) -no-undefined
-+
- libiconv.la : $(OBJECTS)
-- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libiconv.la -rpath $(libdir)
-version-info $(LIBICONV_VERSION_INFO) -no-undefined $(OBJECTS)
-+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libiconv.la -rpath $(libdir)
$(libiconv_la_LDFLAGS) $(OBJECTS)
-
- libiconv_plug.so : [EMAIL PROTECTED]@.so
- $(RM) libiconv_plug.so
-@@ -89,19 +91,19 @@ libiconv_plug_osf.so : $(SOURCES)
- fi
-
- iconv.lo : $(srcdir)/iconv.c $(srcdir)/converters.h $(srcdir)/encodings.def
$(srcdir)/encodings_aix.def $(srcdir)/encodings_osf1.def
$(srcdir)/encodings_dos.def $(srcdir)/encodings_local.def $(srcdir)/aliases.h
$(srcdir)/aliases_aix.h $(srcdir)/aliases_osf1.h $(srcdir)/aliases_dos.h
$(srcdir)/flags.h
-- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) -c
$(srcdir)/iconv.c
-+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS)
$(LIBTOOL_FLAGS) -c $(srcdir)/iconv.c
-
- localcharset.lo : $(srcdir)/../libcharset/lib/localcharset.c
$(srcdir)/relocatable.h
-- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) -c
$(srcdir)/../libcharset/lib/localcharset.c
-+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS)
$(LIBTOOL_FLAGS) -c $(srcdir)/../libcharset/lib/localcharset.c
-
- relocatable.lo : $(srcdir)/relocatable.c $(srcdir)/relocatable.h
-- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) -c
$(srcdir)/relocatable.c
-+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS)
$(LIBTOOL_FLAGS) -c $(srcdir)/relocatable.c
-
- # Installs the library and include files only. Typically called with only
- # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
- install-lib : all force
- if [ ! -d $(libdir) ] ; then $(mkinstalldirs) $(libdir) ; fi
-- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(libdir)/libiconv.la
-+ $(LIBTOOL_INSTALL) $(CP) libiconv.la $(libdir)/libiconv.la
-
- install : all force
- if [ ! -d $(DESTDIR)$(prefix) ] ; then $(mkinstalldirs)
$(DESTDIR)$(prefix) ; fi
Index: patches/patch-lib_iconv_c
===================================================================
RCS file: /cvs/ports/converters/libiconv/patches/patch-lib_iconv_c,v
retrieving revision 1.2
diff -u -r1.2 patch-lib_iconv_c
--- patches/patch-lib_iconv_c 25 Aug 2007 13:51:08 -0000 1.2
+++ patches/patch-lib_iconv_c 24 May 2008 16:30:36 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-lib_iconv_c,v 1.2 2007/08/25 13:51:08 naddy Exp $
---- lib/iconv.c.orig Thu May 22 21:17:40 2003
-+++ lib/iconv.c Wed Aug 1 18:35:03 2007
-@@ -406,7 +406,7 @@ iconv_t iconv_open (const char* tocode, const char* fr
+--- lib/iconv.c.orig Mon Apr 23 23:24:57 2007
++++ lib/iconv.c Wed May 21 17:48:40 2008
+@@ -431,7 +431,7 @@ iconv_t iconv_open (const char* tocode, const char* fr
/* Initialize additional fields. */
if (from_wchar != to_wchar) {
struct wchar_conv_struct * wcd = (struct wchar_conv_struct *) cd;
Index: patches/patch-lib_loop_wchar_h
===================================================================
RCS file: /cvs/ports/converters/libiconv/patches/patch-lib_loop_wchar_h,v
retrieving revision 1.1
diff -u -r1.1 patch-lib_loop_wchar_h
--- patches/patch-lib_loop_wchar_h 16 Apr 2005 21:10:22 -0000 1.1
+++ patches/patch-lib_loop_wchar_h 24 May 2008 16:30:36 -0000
@@ -6,7 +6,7 @@
# endif
#else
-# ifndef mbstate_t
-+# if !HAVE_TYPE_MBSTATE_T
++# if !HAVE_MBSTATE_T
+# ifndef mbstate_t
typedef int mbstate_t;
+# endif
Index: patches/patch-lib_relocatable_c
===================================================================
RCS file: /cvs/ports/converters/libiconv/patches/patch-lib_relocatable_c,v
retrieving revision 1.1
diff -u -r1.1 patch-lib_relocatable_c
--- patches/patch-lib_relocatable_c 25 Aug 2007 13:51:08 -0000 1.1
+++ patches/patch-lib_relocatable_c 24 May 2008 16:30:36 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-lib_relocatable_c,v 1.1 2007/08/25 13:51:08 naddy Exp $
---- lib/relocatable.c.orig Fri Aug 1 18:24:10 2003
-+++ lib/relocatable.c Wed Aug 1 19:31:16 2007
-@@ -429,15 +429,19 @@ relocate (const char *pathname)
+--- lib/relocatable.c.orig Tue Oct 31 14:48:27 2006
++++ lib/relocatable.c Wed May 21 17:55:51 2008
+@@ -448,15 +448,19 @@ relocate (const char *pathname)
{
/* pathname starts with orig_prefix. */
const char *pathname_tail = &pathname[orig_prefix_len];
Index: patches/patch-libcharset_Makefile_in
===================================================================
RCS file: patches/patch-libcharset_Makefile_in
diff -N patches/patch-libcharset_Makefile_in
--- patches/patch-libcharset_Makefile_in 28 Dec 2007 14:12:53 -0000
1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-libcharset_Makefile_in,v 1.5 2007/12/28 14:12:53 espie Exp $
---- libcharset/Makefile.in.orig Wed Apr 23 13:29:22 2003
-+++ libcharset/Makefile.in Fri Dec 28 15:10:47 2007
-@@ -33,11 +33,11 @@ all : include/libcharset.h include/localcharset.h forc
- cd lib && $(MAKE) all
-
- include/libcharset.h :
-- if [ ! -d include ] ; then mkdir include ; fi
-+ if [ ! -d include ] ; then mkdir -p include ; fi
- $(CP) $(srcdir)/include/libcharset.h.in include/libcharset.h
-
- include/localcharset.h :
-- if [ ! -d include ] ; then mkdir include ; fi
-+ if [ ! -d include ] ; then mkdir -p include ; fi
- $(CP) $(srcdir)/include/localcharset.h.in include/localcharset.h
-
- # Installs the library and include files only. Typically called with only
-@@ -45,8 +45,8 @@ include/localcharset.h :
- install-lib : all force
- cd lib && $(MAKE) install-lib libdir='$(libdir)'
includedir='$(includedir)'
- $(mkinstalldirs) $(includedir)
-- $(INSTALL_DATA) include/libcharset.h $(includedir)/libcharset.h
-- $(INSTALL_DATA) include/localcharset.h $(includedir)/localcharset.h
-+ $(CP) include/libcharset.h $(includedir)/libcharset.h
-+ $(CP) include/localcharset.h $(includedir)/localcharset.h
-
- install : include/libcharset.h include/localcharset.h force
- cd lib && $(MAKE) install prefix='$(prefix)'
exec_prefix='$(exec_prefix)' libdir='$(libdir)'
Index: patches/patch-libcharset_lib_Makefile_in
===================================================================
RCS file: patches/patch-libcharset_lib_Makefile_in
diff -N patches/patch-libcharset_lib_Makefile_in
--- patches/patch-libcharset_lib_Makefile_in 25 Aug 2007 13:51:08 -0000
1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-$OpenBSD: patch-libcharset_lib_Makefile_in,v 1.7 2007/08/25 13:51:08 naddy Exp
$
---- libcharset/lib/Makefile.in.orig Mon Apr 14 15:51:06 2003
-+++ libcharset/lib/Makefile.in Wed Aug 1 18:35:06 2007
-@@ -26,6 +26,7 @@ LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
- LIBTOOL_LINK = $(LIBTOOL) --mode=link
- LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
- LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
-+CP = cp
- RM = rm -f
-
- # Programs used by "make install":
-@@ -53,8 +54,10 @@ OBJECTS = localcharset.lo relocatable.lo
-
- all : libcharset.la charset.alias ref-add.sed ref-del.sed
-
-+libcharset_la_LDFLAGS=-version-info $(LIBCHARSET_VERSION_INFO) -no-undefined
-+
- libcharset.la : $(OBJECTS)
-- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libcharset.la -rpath $(libdir)
-version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS)
-+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libcharset.la -rpath $(libdir)
$(libcharset_la_LDFLAGS) $(OBJECTS)
-
- localcharset.lo : $(srcdir)/localcharset.c
- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c
$(srcdir)/localcharset.c
-@@ -78,11 +81,11 @@ ref-del.sed : $(srcdir)/ref-del.sin
- # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
- install-lib : all force
- $(mkinstalldirs) $(libdir)
-- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
-+ $(LIBTOOL_INSTALL) $(CP) libcharset.la $(libdir)/libcharset.la
- test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
- || orig=charset.alias; \
- sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
-- $(INSTALL_DATA) $(libdir)/t-charset.alias $(libdir)/charset.alias; \
-+ $(CP) $(libdir)/t-charset.alias $(libdir)/charset.alias; \
- rm -f $(libdir)/t-charset.alias
-
- # The following is needed in order to install a simple file in $(libdir)
Index: patches/patch-libcharset_lib_localcharset_c
===================================================================
RCS file:
/cvs/ports/converters/libiconv/patches/patch-libcharset_lib_localcharset_c,v
retrieving revision 1.1
diff -u -r1.1 patch-libcharset_lib_localcharset_c
--- patches/patch-libcharset_lib_localcharset_c 25 Aug 2007 13:51:08 -0000
1.1
+++ patches/patch-libcharset_lib_localcharset_c 24 May 2008 16:30:36 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-libcharset_lib_localcharset_c,v 1.1 2007/08/25 13:51:08 naddy
Exp $
---- libcharset/lib/localcharset.c.orig Fri Jun 27 14:08:47 2003
-+++ libcharset/lib/localcharset.c Wed Aug 1 19:32:53 2007
-@@ -186,8 +186,9 @@ get_charset_aliases ()
- res_size = 0;
+--- libcharset/lib/localcharset.c.orig Wed Oct 18 13:55:49 2006
++++ libcharset/lib/localcharset.c Wed May 21 17:55:51 2008
+@@ -194,8 +194,9 @@ get_charset_aliases (void)
+ free (old_res_ptr);
break;
}
- strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/converters/libiconv/patches/patch-src_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 24 Dec 2003 00:08:02 -0000 1.3
+++ patches/patch-src_Makefile_in 24 May 2008 16:30:36 -0000
@@ -1,11 +1,20 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2003/12/24 00:08:02 brad Exp $
---- src/Makefile.in.orig 2003-04-24 06:48:06.000000000 -0400
-+++ src/Makefile.in 2003-12-21 13:36:54.000000000 -0500
-@@ -53,7 +53,6 @@ top_builddir = ..
+--- src/Makefile.in.orig Mon May 28 00:15:52 2007
++++ src/Makefile.in Wed May 21 19:40:43 2008
+@@ -63,7 +63,6 @@ OBJECTS_RES_no =
# without internationalization and not linked with libintl.
- all : iconv_no_i18n [EMAIL PROTECTED]@
+ all : iconv_no_i18n [EMAIL PROTECTED]@ $([EMAIL PROTECTED]@)
- test `ls -ld . | sed -e 's/^d\(.........\).*/\1/'` = rwxrwxrwx || chmod
777 .
# This is the temporary iconv executable, without internationalization.
- iconv_no_i18n : [EMAIL PROTECTED]@ ../lib/libiconv.la
+ iconv_no_i18n : [EMAIL PROTECTED]@ ../lib/libiconv.la $([EMAIL PROTECTED]@)
+@@ -104,7 +103,7 @@ install : all force
+ if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs)
$(DESTDIR)$(bindir) ; fi
+ case "@host_os@" in \
+ hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) [EMAIL PROTECTED]@
../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $([EMAIL
PROTECTED]@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi`
-o iconv;; \
+- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) [EMAIL
PROTECTED]@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@
$([EMAIL PROTECTED]@) -o iconv;; \
++ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) [EMAIL
PROTECTED]@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $([EMAIL
PROTECTED]@) -o iconv;; \
+ esac
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv
$(DESTDIR)$(bindir)/iconv
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/converters/libiconv/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 23 Apr 2005 14:40:42 -0000 1.7
+++ pkg/PLIST 24 May 2008 16:30:36 -0000
@@ -9,13 +9,14 @@
lib/libcharset.la
lib/libiconv.a
lib/libiconv.la
[EMAIL PROTECTED]
@man man/man1/iconv.1
@man man/man3/iconv.3
@man man/man3/iconv_close.3
@man man/man3/iconv_open.3
[EMAIL PROTECTED] man/man3/iconvctl.3
share/doc/libiconv/
share/doc/libiconv/iconv.1.html
share/doc/libiconv/iconv.3.html
share/doc/libiconv/iconv_close.3.html
share/doc/libiconv/iconv_open.3.html
+share/doc/libiconv/iconvctl.3.html
--
Christian "naddy" Weisgerber [EMAIL PROTECTED]
