Import of pkgsrc-2013Q2

converters/recode/patches/patch-aa

@@ -0,0 +1,42 @@
+$NetBSD: patch-aa,v 1.3 2011/08/26 08:13:44 wiz Exp $
+
+date: 2009/03/04 08:44:13;  author: yyamano;  state: Exp;
+Make this build on Mac OS X.
+
+--- lib/Makefile.in.orig	2001-01-22 10:14:14.000000000 -0800
++++ lib/Makefile.in
+@@ -108,7 +108,11 @@ AUTOMAKE_OPTIONS = gnits
+ 
+ noinst_LIBRARIES = libreco.a
+ noinst_HEADERS = error.h getopt.h gettext.h pathmax.h xstring.h
++.if ${OPSYS} == "Darwin"
++libreco_a_SOURCES = error.c xstrdup.c
++.else
+ libreco_a_SOURCES = error.c getopt.c getopt1.c xstrdup.c
++.endif
+ 
+ EXTRA_DIST = alloca.c gettext.c malloc.c realloc.c strtol.c strtoul.c
+ 
+@@ -128,7 +132,11 @@ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+ libreco_a_DEPENDENCIES =  @ALLOCA@ @LIBOBJS@
++.if ${OPSYS} == "Darwin"
++libreco_a_OBJECTS =  error.o xstrdup.o
++.else
+ libreco_a_OBJECTS =  error.o getopt.o getopt1.o xstrdup.o
++.endif
+ AR = ar
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -256,8 +264,10 @@ distdir: $(DISTFILES)
+ 	  fi; \
+ 	done
+ error.o: error.c ../config.h error.h
++.if ${OPSYS} != "Darwin"
+ getopt.o: getopt.c ../config.h
+ getopt1.o: getopt1.c ../config.h getopt.h
++.endif
+ xstrdup.o: xstrdup.c ../config.h
+ 
+ info-am:

converters/recode/patches/patch-libiconv_aliases.h

@@ -0,0 +1,12 @@
+$NetBSD: patch-libiconv_aliases.h,v 1.1 2012/04/19 21:02:11 joerg Exp $
+
+--- libiconv/aliases.h.orig	2012-04-19 13:47:17.000000000 +0000
++++ libiconv/aliases.h
+@@ -66,6 +66,7 @@ aliases_hash (register const char *str, 
+   return hval + asso_values[(unsigned char) str[len - 1]];
+ }
+ 
++static 
+ #ifdef __GNUC__
+ __inline
+ #endif

converters/recode/patches/patch-src_Makefile_in

@@ -0,0 +1,51 @@
+$NetBSD: patch-src_Makefile_in,v 1.1 2011/12/20 17:22:25 dholland Exp $
+
+Include lib/error.c in librecode.so, or else librecode.so ends up with
+an undefined symbol "error". Fix mostly from PR 32253.
+
+--- src/Makefile.in.orig	2001-01-22 18:14:16.000000000 +0000
++++ src/Makefile.in
+@@ -129,7 +129,7 @@ L_SURFACES = 
+ recode_SOURCES = main.c freeze.c mixed.c
+ recode_LDADD = librecode.la ../lib/libreco.a
+ 
+-librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c recode.c request.c strip-pool.c task.c xmalloc.c $(C_STEPS)
++librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c recode.c request.c strip-pool.c task.c xmalloc.c error.c $(C_STEPS)
+ 
+ librecode_la_LDFLAGS = -version-info 0:0:0
+ 
+@@ -165,7 +165,7 @@ ebcdic$U.lo ibmpc$U.lo iconqnx$U.lo lat1
+ strip-data$U.lo testdump$U.lo ucs$U.lo utf16$U.lo utf7$U.lo utf8$U.lo \
+ varia$U.lo vn$U.lo flat$U.lo html$U.lo lat1ltex$U.lo lat1txte$U.lo \
+ rfc1345$U.lo texinfo$U.lo base64$U.lo dump$U.lo endline$U.lo \
+-permut$U.lo quoted$U.lo
++permut$U.lo quoted$U.lo error$U.lo
+ PROGRAMS =  $(bin_PROGRAMS)
+ 
+ recode_OBJECTS =  main$U.o freeze$U.o mixed$U.o
+@@ -419,6 +419,8 @@ vn_.c: vn.c $(ANSI2KNR)
+ 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/vn.c; then echo $(srcdir)/vn.c; else echo vn.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > vn_.c
+ xmalloc_.c: xmalloc.c $(ANSI2KNR)
+ 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xmalloc.c; then echo $(srcdir)/xmalloc.c; else echo xmalloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xmalloc_.c
++error_.c: error.c $(ANSI2KNR)
++	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/error.c; then echo $(srcdir)/error.c; else echo error.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > error_.c
+ african_.o african_.lo afrtran_.o afrtran_.lo applemac_.o applemac_.lo \
+ argmatch_.o argmatch_.lo atarist_.o atarist_.lo bangbang_.o \
+ bangbang_.lo base64_.o base64_.lo cdcnos_.o cdcnos_.lo charname_.o \
+@@ -435,7 +437,7 @@ request_.o request_.lo rfc1345_.o rfc134
+ strip-data_.lo strip-pool_.o strip-pool_.lo task_.o task_.lo \
+ testdump_.o testdump_.lo texinfo_.o texinfo_.lo ucs_.o ucs_.lo utf16_.o \
+ utf16_.lo utf7_.o utf7_.lo utf8_.o utf8_.lo varia_.o varia_.lo vn_.o \
+-vn_.lo xmalloc_.o xmalloc_.lo : $(ANSI2KNR)
++vn_.lo xmalloc_.o xmalloc_.lo error_.lo : $(ANSI2KNR)
+ 
+ install-man1:
+ 	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+@@ -690,6 +692,7 @@ varia.lo varia.o : varia.c common.h ../c
+ vn.lo vn.o : vn.c common.h ../config.h xalloc.h argmatch.h \
+ 	../lib/error.h recodext.h recode.h
+ xmalloc.lo xmalloc.o : xmalloc.c ../config.h ../lib/error.h xalloc.h
++error.lo error.o : ../lib/error.h
+ 
+ info-am:
+ info: info-am

converters/recode/patches/patch-src_recodext.h

@@ -0,0 +1,21 @@
+$NetBSD: patch-src_recodext.h,v 1.1 2011/08/26 08:13:44 wiz Exp $
+
+Fix gcc-4.5 problem:
+In file included from common.h:140:0,
+                 from charname.c:20:
+recodext.h:221:5: error: width of 'ignore' exceeds its type
+
+See also
+https://github.com/pinard/Recode/commit/a34dfd2257f412dff59f2ad7f714252fa200028e#src/recodext.h
+
+--- src/recodext.h.orig	2001-01-04 14:36:54.000000000 +0000
++++ src/recodext.h
+@@ -218,7 +218,7 @@ struct recode_symbol
+     enum recode_symbol_type type : 3;
+ 
+     /* Non zero if this one should be ignored.  */
+-    bool ignore : 2;
++    bool ignore : 1;
+   };
+ 
+ struct recode_surface_list