[Midnightbsd-cvs] mports [23717] trunk/converters/libiconv: build as midnightbsd.

[laffer1 at midnightbsd.org]

Revision: 23717
          http://svnweb.midnightbsd.org/mports/?rev=23717
Author:   laffer1
Date:     2018-08-17 14:25:15 -0400 (Fri, 17 Aug 2018)
Log Message:
-----------
build as midnightbsd.

Modified Paths:
--------------
    trunk/converters/libiconv/Makefile
    trunk/converters/libiconv/files/patch-include-iconv.h.in
    trunk/converters/libiconv/files/patch-src__Makefile.in

Modified: trunk/converters/libiconv/Makefile
===================================================================
--- trunk/converters/libiconv/Makefile	2018-08-17 17:44:35 UTC (rev 23716)
+++ trunk/converters/libiconv/Makefile	2018-08-17 18:25:15 UTC (rev 23717)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libiconv
 PORTVERSION=	1.14
-PORTREVISION=	11
+PORTREVISION=	13
 CATEGORIES=	converters devel
 MASTER_SITES=	GNU
 
@@ -13,8 +13,11 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static \
+		--enable-shared \
 		--disable-nls \
 		--docdir=${DOCSDIR} \
+		--host=${ARCH}-portbld-midnightbsd1.0 \
+		--target=${ARCH}-portbld-midnightbsd1.0 \
 		am_cv_func_iconv=no
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
@@ -43,7 +46,8 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
-	@${REINPLACE_CMD} -e 's:gawk:awk:g' ${WRKSRC}/configure \
+	@${REINPLACE_CMD} -e 's:gawk:awk:g'   \
+		${WRKSRC}/configure \
 		${WRKSRC}/libcharset/configure \
 		${WRKSRC}/preload/configure
 

Modified: trunk/converters/libiconv/files/patch-include-iconv.h.in
===================================================================
--- trunk/converters/libiconv/files/patch-include-iconv.h.in	2018-08-17 17:44:35 UTC (rev 23716)
+++ trunk/converters/libiconv/files/patch-include-iconv.h.in	2018-08-17 18:25:15 UTC (rev 23717)
@@ -36,8 +36,14 @@
  extern int iconvctl (iconv_t cd, int request, void* argument);
  
  /* Hook performed after every successful conversion of a Unicode character. */
-@@ -212,7 +217,9 @@ struct iconv_fallbacks {
+@@ -210,9 +215,15 @@ struct iconv_fallbacks {
+ #define ICONV_SET_DISCARD_ILSEQ   4  /* const int *argument */
+ #define ICONV_SET_HOOKS           5  /* const struct iconv_hooks *argument */
  #define ICONV_SET_FALLBACKS       6  /* const struct iconv_fallbacks *argument */
++#ifdef LIBICONV_PLUG
++#define ICONV_GET_ILSEQ_INVALID 128
++#define ICONV_SET_ILSEQ_INVALID 129
++#endif
  
  /* Listing of locale independent encodings. */
 +#ifndef LIBICONV_PLUG
@@ -46,7 +52,7 @@
  extern void iconvlist (int (*do_one) (unsigned int namescount,
                                        const char * const * names,
                                        void* data),
-@@ -224,6 +231,7 @@ extern const char * iconv_canonicalize (
+@@ -224,6 +235,7 @@ extern const char * iconv_canonicalize (const char * n
  
  /* Support for relocatable packages.  */
  
@@ -54,7 +60,7 @@
  /* Sets the original and the current installation prefix of the package.
     Relocation simply replaces a pathname starting with the original prefix
     by the corresponding pathname with the current prefix instead.  Both
-@@ -231,12 +239,12 @@ extern const char * iconv_canonicalize (
+@@ -231,12 +243,12 @@ extern const char * iconv_canonicalize (const char * n
     instead of "/").  */
  extern void libiconv_set_relocation_prefix (const char *orig_prefix,
                                              const char *curr_prefix);

Modified: trunk/converters/libiconv/files/patch-src__Makefile.in
===================================================================
--- trunk/converters/libiconv/files/patch-src__Makefile.in	2018-08-17 17:44:35 UTC (rev 23716)
+++ trunk/converters/libiconv/files/patch-src__Makefile.in	2018-08-17 18:25:15 UTC (rev 23717)
@@ -8,11 +8,12 @@
  
  # This is the temporary iconv executable, without internationalization.
  iconv_no_i18n$(EXEEXT) : iconv_no_i18n. at OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_ at WOE32@)
-@@ -113,6 +112,7 @@
+@@ -113,7 +112,7 @@
  	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
  	case "@host_os@" in \
  	  hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_ at WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
-+	  freebsd*|midnightbsd*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv;; \
- 	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv$(EXEEXT);; \
+-	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv$(EXEEXT);; \
++	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv$(EXEEXT);; \
  	esac
  	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
+