Attachment #31845 for bug #52893

View | Details | Raw Unified | Return to bug 52893
Collapse All | Expand All




#

PORTNAME=	libiconv
PORTVERSION=	1.9.1
PORTREVISION=	2
CATEGORIES=	converters devel
MASTER_SITES=	${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	gnome@FreeBSD.org
COMMENT=	A character set conversion library

USE_REINPLACE=	yes
USE_LIBTOOL=	yes
LIBTOOLFILES=	configure libcharset/configure
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS=	--enable-static \
		--without-libintl-prefix
INSTALLS_SHLIB=	yes

MAN1=		iconv.1
MAN3=		iconv.3 iconv_open.3 iconv_close.3

post-patch:
	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h

.include <bsd.port.mk>
.if ${OSVERSION} < 430000
BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
GPERF=	${LOCALBASE}/bin/gperf
.else
GPERF=	/usr/bin/gperf
.endif

pre-build:
	@cd ${WRKSRC} ; ${GPERF} -t -L ANSI-C -H aliases_hash -N aliases_lookup -G -W aliases -7 -C -k '1,3-11,$$' -i 1 lib/aliases.gperf > lib/aliases.h

.include <bsd.port.post.mk>

Line 1 Link Here

(-)converters/libiconv/distinfo (-1 / +1 lines)
1	MD5 (libiconv-1.8.tar.gz) = fd2a95a4b79fbdc8ea55ad093a8bb6cf	1	MD5 (libiconv-1.9.1.tar.gz) = 0c99a05e0c3c153bac1c960f78711155





$FreeBSD$

--- Makefile.in.orig	Wed Apr 23 20:29:22 2003
+++ Makefile.in	Fri May 30 02:17:30 2003
@@ -34,10 +34,10 @@
 	cd src && $(MAKE) all
 	cd po && $(MAKE) all
 	cd man && $(MAKE) all
-	if test -d tests; then cd tests && $(MAKE) all; fi
+#	if test -d tests; then cd tests && $(MAKE) all; fi
 
 lib/localcharset.h :
-	builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib"
+	builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" sysconfdir="$$builddir/lib"
 
 # Installs the library and include files only. Typically called with only
 # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.




--- Makefile.in.orig	Tue Apr 30 10:23:47 2002
+++ Makefile.in	Sun Oct 27 22:11:16 2002
@@ -27,12 +27,12 @@
 SHELL = /bin/sh
 
 all : force
-	builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib"
+	builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" sysconfdir="$$builddir/lib"
 	cd lib && $(MAKE) all
 	cd src && $(MAKE) all
 	cd po && $(MAKE) all
 	cd man && $(MAKE) all
-	if test -d tests; then cd tests && $(MAKE) all; fi
+	#if test -d tests; then cd tests && $(MAKE) all; fi
 
 # Installs the library and include files only. Typically called with only
 # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.




--- man/Makefile.in.orig	Mon May 21 08:34:42 2001
+++ man/Makefile.in	Sun Oct 27 22:09:17 2002
@@ -10,7 +10,7 @@
 local_prefix = /usr/local
 exec_prefix = @exec_prefix@
 mandir = @mandir@
-docdir = $(prefix)/doc/libiconv
+docdir = $(prefix)/share/doc/libiconv
 htmldir = $(docdir)
 
 # Programs used by "make":
@@ -35,7 +35,6 @@
 	cd $(srcdir) && for f in *.1 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; done
 	if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
 	cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; done
-	if [ ! -d $(DESTDIR)$(prefix)/doc ] ; then mkdir $(DESTDIR)$(prefix)/doc ; fi
 	if [ ! -d $(DESTDIR)$(docdir) ] ; then mkdir $(DESTDIR)$(docdir) ; fi
 	if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
 	cd $(srcdir) && for f in *.html ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f ; done
@@ -45,7 +44,6 @@
 	if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi
 	if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then mkdir $(DESTDIR)$(mandir)/man1 ; fi
 	if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
-	if [ ! -d $(DESTDIR)$(prefix)/doc ] ; then mkdir $(DESTDIR)$(prefix)/doc ; fi
 	if [ ! -d $(DESTDIR)$(docdir) ] ; then mkdir $(DESTDIR)$(docdir) ; fi
 	if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
 

Lines 1-11 Link Here

(-)converters/libiconv/files/patch-ad (-11 lines)
1	--- lib/Makefile.in.orig Sat Jun 15 14:42:20 2002
2	+++ lib/Makefile.in Sat Jun 15 14:42:27 2002
3	@@ -39,7 +39,7 @@
4
5	# Before making a release, change this according to the libtool documentation,
6	# section "Library interface versions".
7	-LIBICONV_VERSION_INFO = 3:0:1
8	+LIBICONV_VERSION_INFO = 3
9
10	# Needed by $(LIBTOOL).
11	top_builddir = ..




--- libcharset/lib/Makefile.in.orig	Wed Jun 27 18:56:56 2001
+++ libcharset/lib/Makefile.in	Sat Apr 27 15:57:01 2002
@@ -10,6 +10,7 @@
 local_prefix = /usr/local
 exec_prefix = @exec_prefix@
 libdir = @libdir@
+sysconfdir = $(exec_prefix)/libdata
 
 # Programs used by "make":
 CC = @CC@
@@ -38,7 +39,7 @@
 
 # Before making a release, change this according to the libtool documentation,
 # section "Library interface versions".
-LIBCHARSET_VERSION_INFO = 1:0:0
+LIBCHARSET_VERSION_INFO = 1
 
 # Needed by $(LIBTOOL).
 top_builddir = ..
@@ -53,7 +54,7 @@
 	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS)
 
 localcharset.lo : $(srcdir)/localcharset.c
-	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H -DLIBDIR=\"$(libdir)\" -c $(srcdir)/localcharset.c
+	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H -DLIBDIR=\"$(sysconfdir)\" -c $(srcdir)/localcharset.c
 
 charset.alias: $(srcdir)/config.charset
 	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
@@ -72,11 +73,12 @@
 install-lib : all force
 	$(MKINSTALLDIRS) $(libdir)
 	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
-	test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
+	$(MKINSTALLDIRS) $(sysconfdir)
+	test -f $(sysconfdir)/charset.alias && orig=$(sysconfdir)/charset.alias \
 	                                || orig=charset.alias; \
-	sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
-	$(INSTALL_DATA) $(libdir)/t-charset.alias $(libdir)/charset.alias; \
-	rm -f $(libdir)/t-charset.alias
+	sed -f ref-add.sed $$orig > $(sysconfdir)/t-charset.alias; \
+	$(INSTALL_DATA) $(sysconfdir)/t-charset.alias $(sysconfdir)/charset.alias; \
+	rm -f $(sysconfdir)/t-charset.alias
 
 # The following is needed in order to install a simple file in $(libdir)
 # which is shared with other installed packages. We use a list of referencing
@@ -88,15 +90,16 @@
 install : all force
 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
-	if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-	  sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
-	  $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
-	  rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
+	$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)
+	if test -f $(DESTDIR)$(sysconfdir)/charset.alias; then \
+	  sed -f ref-add.sed $(DESTDIR)$(sysconfdir)/charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
+	  $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
+	  rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
 	else \
 	  if test @GLIBC21@ = no; then \
-	    sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
-	    $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
-	    rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
+	    sed -f ref-add.sed charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
+	    $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
+	    rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
 	  fi ; \
 	fi
 





$FreeBSD: ports/converters/libiconv/files/patch-configure,v 1.1 2002/04/30 08:07:33 sobomax Exp $

--- configure.orig	Fri May 23 05:19:20 2003
+++ configure	Fri May 30 11:22:14 2003
@@ -1905,7 +1905,6 @@
 
 
 
-test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
 
 
 ac_ext=c
@@ -19236,6 +19235,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"





$FreeBSD: ports/converters/libiconv/files/patch-include::iconv.h.in,v 1.2 2002/06/16 19:11:11 marcus Exp $

--- include/iconv.h.in.orig	Thu May 23 07:48:42 2002
+++ include/iconv.h.in	Sat Jun 15 14:04:11 2002
@@ -21,6 +21,11 @@
 #ifndef _LIBICONV_H
 #define _LIBICONV_H
 
+#ifdef __FreeBSD__
+#define LIBICONV_PLUG
+#endif
+
+
 #define _LIBICONV_VERSION 0x0108    /* version number: (major<<8) + minor */
 extern int _libiconv_version;       /* Likewise */
 
@@ -68,6 +73,8 @@
    encoding `tocode'. */
 #ifndef LIBICONV_PLUG
 #define iconv_open libiconv_open
+#else
+#define libiconv_open iconv_open
 #endif
 extern iconv_t iconv_open (const char* tocode, const char* fromcode);
 
@@ -78,17 +85,21 @@
    Decrements `*outbytesleft' and increments `*outbuf' by the same amount. */
 #ifndef LIBICONV_PLUG
 #define iconv libiconv
+#else
+#define libiconv iconv
 #endif
 extern size_t iconv (iconv_t cd, @ICONV_CONST@ char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft);
 
 /* Frees resources allocated for conversion descriptor `cd'. */
 #ifndef LIBICONV_PLUG
 #define iconv_close libiconv_close
+#else
+#define libiconv_close iconv_close
 #endif
 extern int iconv_close (iconv_t cd);
 
 
-#ifndef LIBICONV_PLUG
+#if !defined(LIBICONV_PLUG) || defined(__FreeBSD__)
 
 /* Nonstandard extensions. */
 





$FreeBSD$

--- lib/Makefile.in.orig	Sun May 18 23:19:16 2003
+++ lib/Makefile.in	Fri May 30 02:20:37 2003
@@ -44,7 +44,7 @@
 
 # Before making a release, change this according to the libtool documentation,
 # section "Library interface versions".
-LIBICONV_VERSION_INFO = 4:0:2
+LIBICONV_VERSION_INFO = 4
 
 # Needed by $(LIBTOOL).
 top_builddir = ..





$FreeBSD: ports/converters/libiconv/files/patch-lib::iconv.c,v 1.1 2002/03/18 09:43:24 sobomax Exp $

--- lib/iconv.c.orig	Sat May 26 03:25:09 2001
+++ lib/iconv.c	Sun Mar 17 15:47:32 2002
@@ -176,6 +176,13 @@
 }
 #endif
 
+#undef libiconv_open
+
+iconv_t libiconv_open (const char* tocode, const char* fromcode)
+{
+  return (iconv_open(tocode, fromcode));
+}
+
 iconv_t iconv_open (const char* tocode, const char* fromcode)
 {
   struct conv_struct * cd;
@@ -358,6 +365,15 @@
   return (iconv_t)(-1);
 }
 
+#undef libiconv
+
+size_t libiconv (iconv_t icd,
+		 ICONV_CONST char* * inbuf, size_t *inbytesleft,
+		 char* * outbuf, size_t *outbytesleft)
+{
+  return (iconv(icd, inbuf, inbytesleft, outbuf, outbytesleft));
+}
+
 size_t iconv (iconv_t icd,
               ICONV_CONST char* * inbuf, size_t *inbytesleft,
               char* * outbuf, size_t *outbytesleft)
@@ -371,6 +387,13 @@
                                    outbuf,outbytesleft);
 }
 
+#undef libiconv_close
+
+int libiconv_close (iconv_t icd)
+{
+  return (iconv_close(icd));
+}
+
 int iconv_close (iconv_t icd)
 {
   conv_t cd = (conv_t) icd;
@@ -378,7 +401,7 @@
   return 0;
 }
 
-#ifndef LIBICONV_PLUG
+#if !defined(LIBICONV_PLUG) || defined(__FreeBSD__)
 
 int iconvctl (iconv_t icd, int request, void* argument)
 {





$FreeBSD$

--- lib/loop_unicode.h.orig	Wed Apr 16 19:08:22 2003
+++ lib/loop_unicode.h	Fri May 30 02:43:29 2003
@@ -53,7 +53,7 @@
       outptr = backup_outptr;
       outleft = backup_outleft;
       if (sub_outcount != RET_ILUNI)
-        return RET_TOOSMALL;
+        return sub_outcount;
     }
   }
   {
@@ -97,7 +97,7 @@
           outptr = backup_outptr;
           outleft = backup_outleft;
           if (sub_outcount != RET_ILUNI)
-            return RET_TOOSMALL;
+            return sub_outcount;
         }
         if (last)
           break;
@@ -148,7 +148,7 @@
       outptr = backup_outptr;
       outleft = backup_outleft;
       if (sub_outcount != RET_ILUNI)
-        return RET_TOOSMALL;
+        return sub_outcount;
     }
   }
   return RET_ILUNI;




--- lib/aliases.gperf.orig	Wed May 29 10:16:47 2002
+++ lib/aliases.gperf	Mon Oct 14 12:31:58 2002
@@ -12,6 +12,7 @@
 US, ei_ascii
 CSASCII, ei_ascii
 UTF-8, ei_utf8
+UTF8, ei_utf8
 UCS-2, ei_ucs2
 ISO-10646-UCS-2, ei_ucs2
 CSUNICODE, ei_ucs2
@@ -43,6 +44,7 @@
 JAVA, ei_java
 ISO-8859-1, ei_iso8859_1
 ISO_8859-1, ei_iso8859_1
+ISO8859-1, ei_iso8859_1
 ISO_8859-1:1987, ei_iso8859_1
 ISO-IR-100, ei_iso8859_1
 CP819, ei_iso8859_1
@@ -52,6 +54,7 @@
 CSISOLATIN1, ei_iso8859_1
 ISO-8859-2, ei_iso8859_2
 ISO_8859-2, ei_iso8859_2
+ISO8859-2, ei_iso8859_2
 ISO_8859-2:1987, ei_iso8859_2
 ISO-IR-101, ei_iso8859_2
 LATIN2, ei_iso8859_2
@@ -59,6 +62,7 @@
 CSISOLATIN2, ei_iso8859_2
 ISO-8859-3, ei_iso8859_3
 ISO_8859-3, ei_iso8859_3
+ISO8859-3, ei_iso8859_3
 ISO_8859-3:1988, ei_iso8859_3
 ISO-IR-109, ei_iso8859_3
 LATIN3, ei_iso8859_3
@@ -66,6 +70,7 @@
 CSISOLATIN3, ei_iso8859_3
 ISO-8859-4, ei_iso8859_4
 ISO_8859-4, ei_iso8859_4
+ISO8859-4, ei_iso8859_4
 ISO_8859-4:1988, ei_iso8859_4
 ISO-IR-110, ei_iso8859_4
 LATIN4, ei_iso8859_4
@@ -73,12 +78,14 @@
 CSISOLATIN4, ei_iso8859_4
 ISO-8859-5, ei_iso8859_5
 ISO_8859-5, ei_iso8859_5
+ISO8859-5, ei_iso8859_5
 ISO_8859-5:1988, ei_iso8859_5
 ISO-IR-144, ei_iso8859_5
 CYRILLIC, ei_iso8859_5
 CSISOLATINCYRILLIC, ei_iso8859_5
 ISO-8859-6, ei_iso8859_6
 ISO_8859-6, ei_iso8859_6
+ISO8859-6, ei_iso8859_6
 ISO_8859-6:1987, ei_iso8859_6
 ISO-IR-127, ei_iso8859_6
 ECMA-114, ei_iso8859_6
@@ -87,6 +94,7 @@
 CSISOLATINARABIC, ei_iso8859_6
 ISO-8859-7, ei_iso8859_7
 ISO_8859-7, ei_iso8859_7
+ISO8859-7, ei_iso8859_7
 ISO_8859-7:1987, ei_iso8859_7
 ISO-IR-126, ei_iso8859_7
 ECMA-118, ei_iso8859_7
@@ -96,12 +104,14 @@
 CSISOLATINGREEK, ei_iso8859_7
 ISO-8859-8, ei_iso8859_8
 ISO_8859-8, ei_iso8859_8
+ISO8859-8, ei_iso8859_8
 ISO_8859-8:1988, ei_iso8859_8
 ISO-IR-138, ei_iso8859_8
 HEBREW, ei_iso8859_8
 CSISOLATINHEBREW, ei_iso8859_8
 ISO-8859-9, ei_iso8859_9
 ISO_8859-9, ei_iso8859_9
+ISO8859-9, ei_iso8859_9
 ISO_8859-9:1989, ei_iso8859_9
 ISO-IR-148, ei_iso8859_9
 LATIN5, ei_iso8859_9
@@ -109,6 +119,7 @@
 CSISOLATIN5, ei_iso8859_9
 ISO-8859-10, ei_iso8859_10
 ISO_8859-10, ei_iso8859_10
+ISO8859-10, ei_iso8859_10
 ISO_8859-10:1992, ei_iso8859_10
 ISO-IR-157, ei_iso8859_10
 LATIN6, ei_iso8859_10
@@ -116,11 +127,13 @@
 CSISOLATIN6, ei_iso8859_10
 ISO-8859-13, ei_iso8859_13
 ISO_8859-13, ei_iso8859_13
+ISO8859-13, ei_iso8859_13
 ISO-IR-179, ei_iso8859_13
 LATIN7, ei_iso8859_13
 L7, ei_iso8859_13
 ISO-8859-14, ei_iso8859_14
 ISO_8859-14, ei_iso8859_14
+ISO8859-14, ei_iso8859_14
 ISO_8859-14:1998, ei_iso8859_14
 ISO-IR-199, ei_iso8859_14
 LATIN8, ei_iso8859_14
@@ -128,10 +141,12 @@
 ISO-CELTIC, ei_iso8859_14
 ISO-8859-15, ei_iso8859_15
 ISO_8859-15, ei_iso8859_15
+ISO8859-15, ei_iso8859_15
 ISO_8859-15:1998, ei_iso8859_15
 ISO-IR-203, ei_iso8859_15
 ISO-8859-16, ei_iso8859_16
 ISO_8859-16, ei_iso8859_16
+ISO8859-16, ei_iso8859_16
 ISO_8859-16:2000, ei_iso8859_16
 ISO-IR-226, ei_iso8859_16
 KOI8-R, ei_koi8_r
@@ -253,12 +268,12 @@
 CHINESE, ei_gb2312
 ISO-IR-165, ei_isoir165
 CN-GB-ISOIR165, ei_isoir165
-KSC_5601, ei_ksc5601
-KS_C_5601-1987, ei_ksc5601
-KS_C_5601-1989, ei_ksc5601
-ISO-IR-149, ei_ksc5601
-CSKSC56011987, ei_ksc5601
-KOREAN, ei_ksc5601
+KSC_5601, ei_euc_kr
+KS_C_5601-1987, ei_euc_kr
+KS_C_5601-1989, ei_euc_kr
+ISO-IR-149, ei_euc_kr
+CSKSC56011987, ei_euc_kr
+KOREAN, ei_euc_kr
 EUC-JP, ei_euc_jp
 EUCJP, ei_euc_jp
 EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE, ei_euc_jp




--- lib/loop_unicode.h.orig	Mon May  6 06:17:43 2002
+++ lib/loop_unicode.h	Sat Jun 15 14:07:14 2002
@@ -52,8 +52,7 @@
       cd->ostate = backup_state;
       outptr = backup_outptr;
       outleft = backup_outleft;
-      if (sub_outcount < 0)
-        return RET_TOOSMALL;
+      return sub_outcount;
     }
   }
   {
@@ -96,8 +95,7 @@
           cd->ostate = backup_state;
           outptr = backup_outptr;
           outleft = backup_outleft;
-          if (sub_outcount < 0)
-            return RET_TOOSMALL;
+	  return sub_outcount;
         }
         if (last)
           break;
@@ -144,8 +142,7 @@
       cd->ostate = backup_state;
       outptr = backup_outptr;
       outleft = backup_outleft;
-      if (sub_outcount != RET_ILUNI)
-        return RET_TOOSMALL;
+      return sub_outcount;
     }
   }
   return RET_ILUNI;





$FreeBSD$

--- libcharset/Makefile.in.orig	Wed Apr 23 20:29:22 2003
+++ libcharset/Makefile.in	Fri May 30 02:45:08 2003
@@ -43,7 +43,7 @@
 # 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
-	cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)'
+	cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)' sysconfdir='$(sysconfdir)'
 	$(mkinstalldirs) $(includedir)
 	$(INSTALL_DATA) include/libcharset.h $(includedir)/libcharset.h
 	$(INSTALL_DATA) include/localcharset.h $(includedir)/localcharset.h





$FreeBSD$

--- libcharset/lib/Makefile.in.orig	Mon Apr 14 22:51:06 2003
+++ libcharset/lib/Makefile.in	Fri May 30 02:28:19 2003
@@ -10,6 +10,7 @@
 local_prefix = /usr/local
 exec_prefix = @exec_prefix@
 libdir = @libdir@
+sysconfdir = $(exec_prefix)/libdata
 
 # Programs used by "make":
 CC = @CC@
@@ -17,7 +18,7 @@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. -I../include
-DEFS = -DLIBDIR=\"$(libdir)\" \
+DEFS = -DLIBDIR=\"$(sysconfdir)\" \
 -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
 -Dset_relocation_prefix=libcharset_set_relocation_prefix \
 -Drelocate=libcharset_relocate @DEFS@
@@ -42,7 +43,7 @@
 
 # Before making a release, change this according to the libtool documentation,
 # section "Library interface versions".
-LIBCHARSET_VERSION_INFO = 1:0:0
+LIBCHARSET_VERSION_INFO = 1
 
 # Needed by $(LIBTOOL).
 top_builddir = ..
@@ -79,11 +80,12 @@
 install-lib : all force
 	$(mkinstalldirs) $(libdir)
 	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
-	test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
+	$(mkinstalldirs) $(sysconfdir)
+	test -f $(sysconfdir)/charset.alias && orig=$(sysconfdir)/charset.alias \
 	                                || orig=charset.alias; \
-	sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
-	$(INSTALL_DATA) $(libdir)/t-charset.alias $(libdir)/charset.alias; \
-	rm -f $(libdir)/t-charset.alias
+	sed -f ref-add.sed $$orig > $(sysconfdir)/t-charset.alias; \
+	$(INSTALL_DATA) $(sysconfdir)/t-charset.alias $(sysconfdir)/charset.alias; \
+	rm -f $(sysconfdir)/t-charset.alias
 
 # The following is needed in order to install a simple file in $(libdir)
 # which is shared with other installed packages. We use a list of referencing
@@ -95,15 +97,16 @@
 install : all force
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
 	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
-	if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-	  sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
-	  $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
-	  rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
+	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+	if test -f $(DESTDIR)$(sysconfdir)/charset.alias; then \
+	  sed -f ref-add.sed $(DESTDIR)$(sysconfdir)/charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
+	  $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
+	  rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
 	else \
 	  if test @GLIBC21@ = no; then \
-	    sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
-	    $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
-	    rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
+	    sed -f ref-add.sed charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
+	    $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
+	    rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
 	  fi ; \
 	fi
 

Lines 1-11 Link Here

(-)converters/libiconv/files/patch-libcharset_Makefile.in (-11 lines)
1	--- libcharset/Makefile.in.orig Mon May 21 23:48:37 2001
2	+++ libcharset/Makefile.in Sat Apr 6 21:25:39 2002
3	@@ -38,7 +38,7 @@
4	# Installs the library and include files only. Typically called with only
5	# $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
6	install-lib : all force
7	- cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)'
8	+ cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)' sysconfdir='$(sysconfdir)'
9	$(MKINSTALLDIRS) $(includedir)
10	$(INSTALL_DATA) include/libcharset.h $(includedir)/libcharset.h
11

Lines 1-11 Link Here

(-)converters/libiconv/files/patch-src_Makefile.in (-11 lines)
1	--- src/Makefile.in.orig Sat Jun 15 14:25:55 2002
2	+++ src/Makefile.in Sat Jun 15 14:26:05 2002
3	@@ -77,7 +77,7 @@
4	if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then mkdir $(DESTDIR)$(exec_prefix) ; fi
5	if [ ! -d $(DESTDIR)$(bindir) ] ; then mkdir $(DESTDIR)$(bindir) ; fi
6	case "@host_os@" in \
7	- hpux*) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
8	+ hpux\|freebsd) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
9	*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
10	esac
11	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv




bin/iconv
include/iconv.h
include/libcharset.h
include/localcharset.h
lib/libcharset.a
lib/libcharset.so
lib/libcharset.so.1
lib/libiconv.a
lib/libiconv.so
lib/libiconv.so.4
libdata/charset.alias
share/doc/libiconv/iconv.1.html
share/doc/libiconv/iconv.3.html

Return to bug 52893

Lines 6-13 Link Here

(-)converters/libiconv/Makefile (-15 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= libiconv	8	PORTNAME= libiconv
9	PORTVERSION= 1.8	9	PORTVERSION= 1.9.1
10	PORTREVISION= 2
11	CATEGORIES= converters devel	10	CATEGORIES= converters devel
12	MASTER_SITES= ${MASTER_SITE_GNU}	11	MASTER_SITES= ${MASTER_SITE_GNU}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 15-22 Link Here
15	MAINTAINER= gnome@FreeBSD.org	14	MAINTAINER= gnome@FreeBSD.org
16	COMMENT= A character set conversion library	15	COMMENT= A character set conversion library
17		16
		17	USE_REINPLACE= yes
18	USE_LIBTOOL= yes	18	USE_LIBTOOL= yes
19	LIBTOOLFILES= configure libcharset/configure	19	LIBTOOLFILES= configure libcharset/configure
		20	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
20	CONFIGURE_ARGS= --enable-static \	21	CONFIGURE_ARGS= --enable-static \
21	--without-libintl-prefix	22	--without-libintl-prefix
22	INSTALLS_SHLIB= yes	23	INSTALLS_SHLIB= yes
Lines 24-40 Link Here
24	MAN1= iconv.1	25	MAN1= iconv.1
25	MAN3= iconv.3 iconv_open.3 iconv_close.3	26	MAN3= iconv.3 iconv_open.3 iconv_close.3
26		27
27	.include <bsd.port.pre.mk>	28	post-patch:
		29	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
28		30
29	# gperf 2.7.2 required	31	.include <bsd.port.mk>
30	.if ${OSVERSION} < 430000
31	BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
32	GPERF= ${LOCALBASE}/bin/gperf
33	.else
34	GPERF= /usr/bin/gperf
35	.endif
36
37	pre-build:
38	@cd ${WRKSRC} ; ${GPERF} -t -L ANSI-C -H aliases_hash -N aliases_lookup -G -W aliases -7 -C -k '1,3-11,$$' -i 1 lib/aliases.gperf > lib/aliases.h
39
40	.include <bsd.port.post.mk>

Line 0 Link Here

(-)converters/libiconv/files/patch-Makefile.in (+18 lines)
	1
	2	$FreeBSD$
	3
	4	--- Makefile.in.orig Wed Apr 23 20:29:22 2003
	5	+++ Makefile.in Fri May 30 02:17:30 2003
	6	@@ -34,10 +34,10 @@
	7	cd src && $(MAKE) all
	8	cd po && $(MAKE) all
	9	cd man && $(MAKE) all
	10	- if test -d tests; then cd tests && $(MAKE) all; fi
	11	+# if test -d tests; then cd tests && $(MAKE) all; fi
	12
	13	lib/localcharset.h :
	14	- builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib"
	15	+ builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" sysconfdir="$$builddir/lib"
	16
	17	# Installs the library and include files only. Typically called with only
	18	# $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.

Lines 1-17 Link Here

(-)converters/libiconv/files/patch-aa (-17 lines)
1	--- Makefile.in.orig Tue Apr 30 10:23:47 2002
2	+++ Makefile.in Sun Oct 27 22:11:16 2002
3	@@ -27,12 +27,12 @@
4	SHELL = /bin/sh
5
6	all : force
7	- builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib"
8	+ builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" sysconfdir="$$builddir/lib"
9	cd lib && $(MAKE) all
10	cd src && $(MAKE) all
11	cd po && $(MAKE) all
12	cd man && $(MAKE) all
13	- if test -d tests; then cd tests && $(MAKE) all; fi
14	+ #if test -d tests; then cd tests && $(MAKE) all; fi
15
16	# Installs the library and include files only. Typically called with only
17	# $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.

Lines 1-27 Link Here

(-)converters/libiconv/files/patch-ac (-27 lines)
1	--- man/Makefile.in.orig Mon May 21 08:34:42 2001
2	+++ man/Makefile.in Sun Oct 27 22:09:17 2002
3	@@ -10,7 +10,7 @@
4	local_prefix = /usr/local
5	exec_prefix = @exec_prefix@
6	mandir = @mandir@
7	-docdir = $(prefix)/doc/libiconv
8	+docdir = $(prefix)/share/doc/libiconv
9	htmldir = $(docdir)
10
11	# Programs used by "make":
12	@@ -35,7 +35,6 @@
13	cd $(srcdir) && for f in *.1 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; done
14	if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
15	cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; done
16	- if [ ! -d $(DESTDIR)$(prefix)/doc ] ; then mkdir $(DESTDIR)$(prefix)/doc ; fi
17	if [ ! -d $(DESTDIR)$(docdir) ] ; then mkdir $(DESTDIR)$(docdir) ; fi
18	if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
19	cd $(srcdir) && for f in *.html ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f ; done
20	@@ -45,7 +44,6 @@
21	if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi
22	if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then mkdir $(DESTDIR)$(mandir)/man1 ; fi
23	if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
24	- if [ ! -d $(DESTDIR)$(prefix)/doc ] ; then mkdir $(DESTDIR)$(prefix)/doc ; fi
25	if [ ! -d $(DESTDIR)$(docdir) ] ; then mkdir $(DESTDIR)$(docdir) ; fi
26	if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
27

Lines 1-69 Link Here

(-)converters/libiconv/files/patch-ae (-69 lines)
1	--- libcharset/lib/Makefile.in.orig Wed Jun 27 18:56:56 2001
2	+++ libcharset/lib/Makefile.in Sat Apr 27 15:57:01 2002
3	@@ -10,6 +10,7 @@
4	local_prefix = /usr/local
5	exec_prefix = @exec_prefix@
6	libdir = @libdir@
7	+sysconfdir = $(exec_prefix)/libdata
8
9	# Programs used by "make":
10	CC = @CC@
11	@@ -38,7 +39,7 @@
12
13	# Before making a release, change this according to the libtool documentation,
14	# section "Library interface versions".
15	-LIBCHARSET_VERSION_INFO = 1:0:0
16	+LIBCHARSET_VERSION_INFO = 1
17
18	# Needed by $(LIBTOOL).
19	top_builddir = ..
20	@@ -53,7 +54,7 @@
21	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS)
22
23	localcharset.lo : $(srcdir)/localcharset.c
24	- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H -DLIBDIR=\"$(libdir)\" -c $(srcdir)/localcharset.c
25	+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H -DLIBDIR=\"$(sysconfdir)\" -c $(srcdir)/localcharset.c
26
27	charset.alias: $(srcdir)/config.charset
28	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
29	@@ -72,11 +73,12 @@
30	install-lib : all force
31	$(MKINSTALLDIRS) $(libdir)
32	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
33	- test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
34	+ $(MKINSTALLDIRS) $(sysconfdir)
35	+ test -f $(sysconfdir)/charset.alias && orig=$(sysconfdir)/charset.alias \
36	\|\| orig=charset.alias; \
37	- sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
38	- $(INSTALL_DATA) $(libdir)/t-charset.alias $(libdir)/charset.alias; \
39	- rm -f $(libdir)/t-charset.alias
40	+ sed -f ref-add.sed $$orig > $(sysconfdir)/t-charset.alias; \
41	+ $(INSTALL_DATA) $(sysconfdir)/t-charset.alias $(sysconfdir)/charset.alias; \
42	+ rm -f $(sysconfdir)/t-charset.alias
43
44	# The following is needed in order to install a simple file in $(libdir)
45	# which is shared with other installed packages. We use a list of referencing
46	@@ -88,15 +90,16 @@
47	install : all force
48	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
49	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
50	- if test -f $(DESTDIR)$(libdir)/charset.alias; then \
51	- sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
52	- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
53	- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
54	+ $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)
55	+ if test -f $(DESTDIR)$(sysconfdir)/charset.alias; then \
56	+ sed -f ref-add.sed $(DESTDIR)$(sysconfdir)/charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
57	+ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
58	+ rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
59	else \
60	if test @GLIBC21@ = no; then \
61	- sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
62	- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
63	- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
64	+ sed -f ref-add.sed charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
65	+ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
66	+ rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
67	fi ; \
68	fi
69

Lines 1-9 Link Here

(-)converters/libiconv/files/patch-configure (-3 / +11 lines)
1		1
2	$FreeBSD: ports/converters/libiconv/files/patch-configure,v 1.1 2002/04/30 08:07:33 sobomax Exp $	2	$FreeBSD: ports/converters/libiconv/files/patch-configure,v 1.1 2002/04/30 08:07:33 sobomax Exp $
3		3
4	--- configure 2002/04/30 07:59:47 1.1	4	--- configure.orig Fri May 23 05:19:20 2003
5	+++ configure 2002/04/30 08:00:22	5	+++ configure Fri May 30 11:22:14 2003
6	@@ -5256,6 +5256,7 @@	6	@@ -1905,7 +1905,6 @@
		7
		8
		9
		10	-test "$mandir" != '${prefix}/man' \|\| mandir='${datadir}/man'
		11
		12
		13	ac_ext=c
		14	@@ -19236,6 +19235,7 @@
7		15
8	# This can be used to rebuild libtool when needed	16	# This can be used to rebuild libtool when needed
9	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"	17	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"

Lines 1-49 Link Here

(-)converters/libiconv/files/patch-include::iconv.h.in (-49 lines)
1
2	$FreeBSD: ports/converters/libiconv/files/patch-include::iconv.h.in,v 1.2 2002/06/16 19:11:11 marcus Exp $
3
4	--- include/iconv.h.in.orig Thu May 23 07:48:42 2002
5	+++ include/iconv.h.in Sat Jun 15 14:04:11 2002
6	@@ -21,6 +21,11 @@
7	#ifndef _LIBICONV_H
8	#define _LIBICONV_H
9
10	+#ifdef __FreeBSD__
11	+#define LIBICONV_PLUG
12	+#endif
13	+
14	+
15	#define _LIBICONV_VERSION 0x0108 /* version number: (major<<8) + minor */
16	extern int _libiconv_version; /* Likewise */
17
18	@@ -68,6 +73,8 @@
19	encoding `tocode'. */
20	#ifndef LIBICONV_PLUG
21	#define iconv_open libiconv_open
22	+#else
23	+#define libiconv_open iconv_open
24	#endif
25	extern iconv_t iconv_open (const char* tocode, const char* fromcode);
26
27	@@ -78,17 +85,21 @@
28	Decrements `outbytesleft' and increments `outbuf' by the same amount. */
29	#ifndef LIBICONV_PLUG
30	#define iconv libiconv
31	+#else
32	+#define libiconv iconv
33	#endif
34	extern size_t iconv (iconv_t cd, @ICONV_CONST@ char* * inbuf, size_t inbytesleft, char * outbuf, size_t *outbytesleft);
35
36	/* Frees resources allocated for conversion descriptor `cd'. */
37	#ifndef LIBICONV_PLUG
38	#define iconv_close libiconv_close
39	+#else
40	+#define libiconv_close iconv_close
41	#endif
42	extern int iconv_close (iconv_t cd);
43
44
45	-#ifndef LIBICONV_PLUG
46	+#if !defined(LIBICONV_PLUG) \|\| defined(__FreeBSD__)
47
48	/* Nonstandard extensions. */
49

Line 0 Link Here

(-)converters/libiconv/files/patch-lib::Makefile.in (+14 lines)
	1
	2	$FreeBSD$
	3
	4	--- lib/Makefile.in.orig Sun May 18 23:19:16 2003
	5	+++ lib/Makefile.in Fri May 30 02:20:37 2003
	6	@@ -44,7 +44,7 @@
	7
	8	# Before making a release, change this according to the libtool documentation,
	9	# section "Library interface versions".
	10	-LIBICONV_VERSION_INFO = 4:0:2
	11	+LIBICONV_VERSION_INFO = 4
	12
	13	# Needed by $(LIBTOOL).
	14	top_builddir = ..

Lines 1-58 Link Here

(-)converters/libiconv/files/patch-lib::iconv.c (-58 lines)
1
2	$FreeBSD: ports/converters/libiconv/files/patch-lib::iconv.c,v 1.1 2002/03/18 09:43:24 sobomax Exp $
3
4	--- lib/iconv.c.orig Sat May 26 03:25:09 2001
5	+++ lib/iconv.c Sun Mar 17 15:47:32 2002
6	@@ -176,6 +176,13 @@
7	}
8	#endif
9
10	+#undef libiconv_open
11	+
12	+iconv_t libiconv_open (const char* tocode, const char* fromcode)
13	+{
14	+ return (iconv_open(tocode, fromcode));
15	+}
16	+
17	iconv_t iconv_open (const char* tocode, const char* fromcode)
18	{
19	struct conv_struct * cd;
20	@@ -358,6 +365,15 @@
21	return (iconv_t)(-1);
22	}
23
24	+#undef libiconv
25	+
26	+size_t libiconv (iconv_t icd,
27	+ ICONV_CONST char* * inbuf, size_t *inbytesleft,
28	+ char* * outbuf, size_t *outbytesleft)
29	+{
30	+ return (iconv(icd, inbuf, inbytesleft, outbuf, outbytesleft));
31	+}
32	+
33	size_t iconv (iconv_t icd,
34	ICONV_CONST char* * inbuf, size_t *inbytesleft,
35	char* * outbuf, size_t *outbytesleft)
36	@@ -371,6 +387,13 @@
37	outbuf,outbytesleft);
38	}
39
40	+#undef libiconv_close
41	+
42	+int libiconv_close (iconv_t icd)
43	+{
44	+ return (iconv_close(icd));
45	+}
46	+
47	int iconv_close (iconv_t icd)
48	{
49	conv_t cd = (conv_t) icd;
50	@@ -378,7 +401,7 @@
51	return 0;
52	}
53
54	-#ifndef LIBICONV_PLUG
55	+#if !defined(LIBICONV_PLUG) \|\| defined(__FreeBSD__)
56
57	int iconvctl (iconv_t icd, int request, void* argument)
58	{

Line 0 Link Here

(-)converters/libiconv/files/patch-lib::loop-unicode.h (+32 lines)
	1
	2	$FreeBSD$
	3
	4	--- lib/loop_unicode.h.orig Wed Apr 16 19:08:22 2003
	5	+++ lib/loop_unicode.h Fri May 30 02:43:29 2003
	6	@@ -53,7 +53,7 @@
	7	outptr = backup_outptr;
	8	outleft = backup_outleft;
	9	if (sub_outcount != RET_ILUNI)
	10	- return RET_TOOSMALL;
	11	+ return sub_outcount;
	12	}
	13	}
	14	{
	15	@@ -97,7 +97,7 @@
	16	outptr = backup_outptr;
	17	outleft = backup_outleft;
	18	if (sub_outcount != RET_ILUNI)
	19	- return RET_TOOSMALL;
	20	+ return sub_outcount;
	21	}
	22	if (last)
	23	break;
	24	@@ -148,7 +148,7 @@
	25	outptr = backup_outptr;
	26	outleft = backup_outleft;
	27	if (sub_outcount != RET_ILUNI)
	28	- return RET_TOOSMALL;
	29	+ return sub_outcount;
	30	}
	31	}
	32	return RET_ILUNI;

Lines 1-134 Link Here

(-)converters/libiconv/files/patch-lib_aliases.gperf (-134 lines)
1	--- lib/aliases.gperf.orig Wed May 29 10:16:47 2002
2	+++ lib/aliases.gperf Mon Oct 14 12:31:58 2002
3	@@ -12,6 +12,7 @@
4	US, ei_ascii
5	CSASCII, ei_ascii
6	UTF-8, ei_utf8
7	+UTF8, ei_utf8
8	UCS-2, ei_ucs2
9	ISO-10646-UCS-2, ei_ucs2
10	CSUNICODE, ei_ucs2
11	@@ -43,6 +44,7 @@
12	JAVA, ei_java
13	ISO-8859-1, ei_iso8859_1
14	ISO_8859-1, ei_iso8859_1
15	+ISO8859-1, ei_iso8859_1
16	ISO_8859-1:1987, ei_iso8859_1
17	ISO-IR-100, ei_iso8859_1
18	CP819, ei_iso8859_1
19	@@ -52,6 +54,7 @@
20	CSISOLATIN1, ei_iso8859_1
21	ISO-8859-2, ei_iso8859_2
22	ISO_8859-2, ei_iso8859_2
23	+ISO8859-2, ei_iso8859_2
24	ISO_8859-2:1987, ei_iso8859_2
25	ISO-IR-101, ei_iso8859_2
26	LATIN2, ei_iso8859_2
27	@@ -59,6 +62,7 @@
28	CSISOLATIN2, ei_iso8859_2
29	ISO-8859-3, ei_iso8859_3
30	ISO_8859-3, ei_iso8859_3
31	+ISO8859-3, ei_iso8859_3
32	ISO_8859-3:1988, ei_iso8859_3
33	ISO-IR-109, ei_iso8859_3
34	LATIN3, ei_iso8859_3
35	@@ -66,6 +70,7 @@
36	CSISOLATIN3, ei_iso8859_3
37	ISO-8859-4, ei_iso8859_4
38	ISO_8859-4, ei_iso8859_4
39	+ISO8859-4, ei_iso8859_4
40	ISO_8859-4:1988, ei_iso8859_4
41	ISO-IR-110, ei_iso8859_4
42	LATIN4, ei_iso8859_4
43	@@ -73,12 +78,14 @@
44	CSISOLATIN4, ei_iso8859_4
45	ISO-8859-5, ei_iso8859_5
46	ISO_8859-5, ei_iso8859_5
47	+ISO8859-5, ei_iso8859_5
48	ISO_8859-5:1988, ei_iso8859_5
49	ISO-IR-144, ei_iso8859_5
50	CYRILLIC, ei_iso8859_5
51	CSISOLATINCYRILLIC, ei_iso8859_5
52	ISO-8859-6, ei_iso8859_6
53	ISO_8859-6, ei_iso8859_6
54	+ISO8859-6, ei_iso8859_6
55	ISO_8859-6:1987, ei_iso8859_6
56	ISO-IR-127, ei_iso8859_6
57	ECMA-114, ei_iso8859_6
58	@@ -87,6 +94,7 @@
59	CSISOLATINARABIC, ei_iso8859_6
60	ISO-8859-7, ei_iso8859_7
61	ISO_8859-7, ei_iso8859_7
62	+ISO8859-7, ei_iso8859_7
63	ISO_8859-7:1987, ei_iso8859_7
64	ISO-IR-126, ei_iso8859_7
65	ECMA-118, ei_iso8859_7
66	@@ -96,12 +104,14 @@
67	CSISOLATINGREEK, ei_iso8859_7
68	ISO-8859-8, ei_iso8859_8
69	ISO_8859-8, ei_iso8859_8
70	+ISO8859-8, ei_iso8859_8
71	ISO_8859-8:1988, ei_iso8859_8
72	ISO-IR-138, ei_iso8859_8
73	HEBREW, ei_iso8859_8
74	CSISOLATINHEBREW, ei_iso8859_8
75	ISO-8859-9, ei_iso8859_9
76	ISO_8859-9, ei_iso8859_9
77	+ISO8859-9, ei_iso8859_9
78	ISO_8859-9:1989, ei_iso8859_9
79	ISO-IR-148, ei_iso8859_9
80	LATIN5, ei_iso8859_9
81	@@ -109,6 +119,7 @@
82	CSISOLATIN5, ei_iso8859_9
83	ISO-8859-10, ei_iso8859_10
84	ISO_8859-10, ei_iso8859_10
85	+ISO8859-10, ei_iso8859_10
86	ISO_8859-10:1992, ei_iso8859_10
87	ISO-IR-157, ei_iso8859_10
88	LATIN6, ei_iso8859_10
89	@@ -116,11 +127,13 @@
90	CSISOLATIN6, ei_iso8859_10
91	ISO-8859-13, ei_iso8859_13
92	ISO_8859-13, ei_iso8859_13
93	+ISO8859-13, ei_iso8859_13
94	ISO-IR-179, ei_iso8859_13
95	LATIN7, ei_iso8859_13
96	L7, ei_iso8859_13
97	ISO-8859-14, ei_iso8859_14
98	ISO_8859-14, ei_iso8859_14
99	+ISO8859-14, ei_iso8859_14
100	ISO_8859-14:1998, ei_iso8859_14
101	ISO-IR-199, ei_iso8859_14
102	LATIN8, ei_iso8859_14
103	@@ -128,10 +141,12 @@
104	ISO-CELTIC, ei_iso8859_14
105	ISO-8859-15, ei_iso8859_15
106	ISO_8859-15, ei_iso8859_15
107	+ISO8859-15, ei_iso8859_15
108	ISO_8859-15:1998, ei_iso8859_15
109	ISO-IR-203, ei_iso8859_15
110	ISO-8859-16, ei_iso8859_16
111	ISO_8859-16, ei_iso8859_16
112	+ISO8859-16, ei_iso8859_16
113	ISO_8859-16:2000, ei_iso8859_16
114	ISO-IR-226, ei_iso8859_16
115	KOI8-R, ei_koi8_r
116	@@ -253,12 +268,12 @@
117	CHINESE, ei_gb2312
118	ISO-IR-165, ei_isoir165
119	CN-GB-ISOIR165, ei_isoir165
120	-KSC_5601, ei_ksc5601
121	-KS_C_5601-1987, ei_ksc5601
122	-KS_C_5601-1989, ei_ksc5601
123	-ISO-IR-149, ei_ksc5601
124	-CSKSC56011987, ei_ksc5601
125	-KOREAN, ei_ksc5601
126	+KSC_5601, ei_euc_kr
127	+KS_C_5601-1987, ei_euc_kr
128	+KS_C_5601-1989, ei_euc_kr
129	+ISO-IR-149, ei_euc_kr
130	+CSKSC56011987, ei_euc_kr
131	+KOREAN, ei_euc_kr
132	EUC-JP, ei_euc_jp
133	EUCJP, ei_euc_jp
134	EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE, ei_euc_jp

Lines 1-32 Link Here

(-)converters/libiconv/files/patch-lib_loop-unicode.h (-32 lines)
1	--- lib/loop_unicode.h.orig Mon May 6 06:17:43 2002
2	+++ lib/loop_unicode.h Sat Jun 15 14:07:14 2002
3	@@ -52,8 +52,7 @@
4	cd->ostate = backup_state;
5	outptr = backup_outptr;
6	outleft = backup_outleft;
7	- if (sub_outcount < 0)
8	- return RET_TOOSMALL;
9	+ return sub_outcount;
10	}
11	}
12	{
13	@@ -96,8 +95,7 @@
14	cd->ostate = backup_state;
15	outptr = backup_outptr;
16	outleft = backup_outleft;
17	- if (sub_outcount < 0)
18	- return RET_TOOSMALL;
19	+ return sub_outcount;
20	}
21	if (last)
22	break;
23	@@ -144,8 +142,7 @@
24	cd->ostate = backup_state;
25	outptr = backup_outptr;
26	outleft = backup_outleft;
27	- if (sub_outcount != RET_ILUNI)
28	- return RET_TOOSMALL;
29	+ return sub_outcount;
30	}
31	}
32	return RET_ILUNI;

Line 0 Link Here

(-)converters/libiconv/files/patch-libcharset::Makefile.in (+14 lines)
	1
	2	$FreeBSD$
	3
	4	--- libcharset/Makefile.in.orig Wed Apr 23 20:29:22 2003
	5	+++ libcharset/Makefile.in Fri May 30 02:45:08 2003
	6	@@ -43,7 +43,7 @@
	7	# Installs the library and include files only. Typically called with only
	8	# $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
	9	install-lib : all force
	10	- cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)'
	11	+ cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)' sysconfdir='$(sysconfdir)'
	12	$(mkinstalldirs) $(includedir)
	13	$(INSTALL_DATA) include/libcharset.h $(includedir)/libcharset.h
	14	$(INSTALL_DATA) include/localcharset.h $(includedir)/localcharset.h

Line 0 Link Here

(-)converters/libiconv/files/patch-libcharset::lib::Makefile.in (+72 lines)
		1
		2	$FreeBSD$
		3
		4	--- libcharset/lib/Makefile.in.orig Mon Apr 14 22:51:06 2003
		5	+++ libcharset/lib/Makefile.in Fri May 30 02:28:19 2003
		6	@@ -10,6 +10,7 @@
		7	local_prefix = /usr/local
		8	exec_prefix = @exec_prefix@
		9	libdir = @libdir@
		10	+sysconfdir = $(exec_prefix)/libdata
		11
		12	# Programs used by "make":
		13	CC = @CC@
		14	@@ -17,7 +18,7 @@
		15	CPPFLAGS = @CPPFLAGS@
		16	LDFLAGS = @LDFLAGS@
		17	INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. -I../include
		18	-DEFS = -DLIBDIR=\"$(libdir)\" \
		19	+DEFS = -DLIBDIR=\"$(sysconfdir)\" \
		20	-DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
		21	-Dset_relocation_prefix=libcharset_set_relocation_prefix \
		22	-Drelocate=libcharset_relocate @DEFS@
		23	@@ -42,7 +43,7 @@
		24
		25	# Before making a release, change this according to the libtool documentation,
		26	# section "Library interface versions".
		27	-LIBCHARSET_VERSION_INFO = 1:0:0
		28	+LIBCHARSET_VERSION_INFO = 1
		29
		30	# Needed by $(LIBTOOL).
		31	top_builddir = ..
		32	@@ -79,11 +80,12 @@
		33	install-lib : all force
		34	$(mkinstalldirs) $(libdir)
		35	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
		36	- test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
		37	+ $(mkinstalldirs) $(sysconfdir)
		38	+ test -f $(sysconfdir)/charset.alias && orig=$(sysconfdir)/charset.alias \
		39	\|\| orig=charset.alias; \
		40	- sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
		41	- $(INSTALL_DATA) $(libdir)/t-charset.alias $(libdir)/charset.alias; \
		42	- rm -f $(libdir)/t-charset.alias
		43	+ sed -f ref-add.sed $$orig > $(sysconfdir)/t-charset.alias; \
		44	+ $(INSTALL_DATA) $(sysconfdir)/t-charset.alias $(sysconfdir)/charset.alias; \
		45	+ rm -f $(sysconfdir)/t-charset.alias
		46
		47	# The following is needed in order to install a simple file in $(libdir)
		48	# which is shared with other installed packages. We use a list of referencing
		49	@@ -95,15 +97,16 @@
		50	install : all force
		51	$(mkinstalldirs) $(DESTDIR)$(libdir)
		52	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
		53	- if test -f $(DESTDIR)$(libdir)/charset.alias; then \
		54	- sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
		55	- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
		56	- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
		57	+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
		58	+ if test -f $(DESTDIR)$(sysconfdir)/charset.alias; then \
		59	+ sed -f ref-add.sed $(DESTDIR)$(sysconfdir)/charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
		60	+ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
		61	+ rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
		62	else \
		63	if test @GLIBC21@ = no; then \
		64	- sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
65	- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
66	- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
67	+ sed -f ref-add.sed charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
68	+ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
69	+ rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
70	fi ; \
71	fi
72

Lines 1-12 Link Here

(-)converters/libiconv/pkg-plist (-1 / +2 lines)
1	bin/iconv	1	bin/iconv
2	include/iconv.h	2	include/iconv.h
3	include/libcharset.h	3	include/libcharset.h
		4	include/localcharset.h
4	lib/libcharset.a	5	lib/libcharset.a
5	lib/libcharset.so	6	lib/libcharset.so
6	lib/libcharset.so.1	7	lib/libcharset.so.1
7	lib/libiconv.a	8	lib/libiconv.a
8	lib/libiconv.so	9	lib/libiconv.so
9	lib/libiconv.so.3	10	lib/libiconv.so.4
10	libdata/charset.alias	11	libdata/charset.alias
11	share/doc/libiconv/iconv.1.html	12	share/doc/libiconv/iconv.1.html
12	share/doc/libiconv/iconv.3.html	13	share/doc/libiconv/iconv.3.html