[Midnightbsd-cvs] mports [24130] trunk/dns/idnkit: fix build

[laffer1 at midnightbsd.org]

Revision: 24130
          http://svnweb.midnightbsd.org/mports/?rev=24130
Author:   laffer1
Date:     2018-09-03 12:28:51 -0400 (Mon, 03 Sep 2018)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/dns/idnkit/Makefile
    trunk/dns/idnkit/files/patch-configure
    trunk/dns/idnkit/files/patch-libtool22
    trunk/dns/idnkit/files/patch-tools__runidn__resolver.c

Modified: trunk/dns/idnkit/Makefile
===================================================================
--- trunk/dns/idnkit/Makefile	2018-09-03 16:27:13 UTC (rev 24129)
+++ trunk/dns/idnkit/Makefile	2018-09-03 16:28:51 UTC (rev 24130)
@@ -10,8 +10,10 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Library to handle internationalized domain names
 
-LICENSE=	other
-#bsd 4 ish
+LICENSE=	JPNIC
+LICENSE_NAME=	Japan Network Information Center license
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		iconv libtool
 GNU_CONFIGURE=	yes

Modified: trunk/dns/idnkit/files/patch-configure
===================================================================
--- trunk/dns/idnkit/files/patch-configure	2018-09-03 16:27:13 UTC (rev 24129)
+++ trunk/dns/idnkit/files/patch-configure	2018-09-03 16:28:51 UTC (rev 24130)
@@ -1,8 +1,23 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig	Tue Mar 11 08:53:20 2003
-+++ configure	Sun Sep  3 21:07:20 2006
-@@ -2633,7 +2644,37 @@
+--- configure.orig	2003-03-10 23:53:20 UTC
++++ configure
+@@ -762,14 +762,14 @@ yes)
+ 	libiconv=$prefix
+     fi
+     ICONVINC="-I$libiconv/include"
+-    ICONVLIB="-L$libiconv/lib -R$libiconv/lib -liconv"
++    ICONVLIB="-L$libiconv/lib -liconv"
+     ;;
+ *)
+     if test "$liteonly" = yes ; then
+ 	{ echo "configure: error: you can't set iconv options at all when you set value \"yes\" to --enable-liteonly, because lite library does not have iconv support." 1>&2; exit 1; }
+     fi
+     ICONVINC="-I$libiconv/include"
+-    ICONVLIB="-L$libiconv/lib -R$libiconv/lib -liconv"
++    ICONVLIB="-L$libiconv/lib -liconv"
+     ;;
+ esac
+ 
+@@ -2633,7 +2633,37 @@ fi
    ac_cv_flavor_gethostbyaddr=unknown
  else
    cat > conftest.$ac_ext <<EOF
@@ -41,7 +56,7 @@
  #include "confdefs.h"
  
      #include <stddef.h>
-@@ -2675,6 +2716,10 @@
+@@ -2675,6 +2705,10 @@ echo "$ac_t""$ac_cv_flavor_gethostbyaddr
  	ac_cv_type_ghba_addr_t='const char *'
  	ac_cv_type_ghba_addrlen_t='size_t'
  	;;

Modified: trunk/dns/idnkit/files/patch-libtool22
===================================================================
--- trunk/dns/idnkit/files/patch-libtool22	2018-09-03 16:27:13 UTC (rev 24129)
+++ trunk/dns/idnkit/files/patch-libtool22	2018-09-03 16:28:51 UTC (rev 24130)
@@ -1,7 +1,37 @@
---- lib/Makefile.in.orig	2009-07-13 16:56:33.000000000 -0500
-+++ lib/Makefile.in	2009-07-13 16:57:14.000000000 -0500
-@@ -241,7 +241,7 @@
+--- lib/Makefile.in.orig	2003-03-12 16:14:41 UTC
++++ lib/Makefile.in
+@@ -196,12 +196,12 @@ all: all-localdir all-subdirs
+ @LITEONLY_FALSE at all-localdir: $(LIB).la $(LITELIB).la $(SAMPLES)
  
+ $(LIB).la: $(OBJS)
+-	$(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ \
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ \
+ 	    -version-info $(LIB_CURRENT):$(LIB_REVISION):$(LIB_AGE) \
+ 	    -rpath $(libdir) $(OBJS)
+ 
+ $(TESTLIB).la: $(OBJS)
+-	$(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ \
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ \
+ 	    -version-info $(LIB_CURRENT):$(LIB_REVISION):$(LIB_AGE) \
+ 	    -rpath $(libdir) $(OBJS)
+ 
+@@ -219,12 +219,12 @@ resconflite.lo: resconf.c
+ 	    -c $(srcdir)/resconf.c
+ 
+ $(LITELIB).la: $(LITELIB_OBJS)
+-	$(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ \
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ \
+ 	    -version-info $(LIB_CURRENT):$(LIB_REVISION):$(LIB_AGE) \
+ 	    -rpath $(libdir) $(LITELIB_OBJS)
+ 
+ $(TESTLITELIB).la: $(LITELIB_OBJS)
+-	$(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ \
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ \
+ 	    -version-info $(LIB_CURRENT):$(LIB_REVISION):$(LIB_AGE) \
+ 	    -rpath $(libdir) $(LITELIB_OBJS)
+ 
+@@ -241,7 +241,7 @@ install: install-localdir install-subdir
+ 
  install-common:
  	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 -	$(LIBTOOL) $(INSTALL_DATA) $(LITELIB).la \
@@ -9,7 +39,7 @@
  	    $(DESTDIR)$(libdir)/$(LITELIB).la
  	-[ -f $(DESTDIR)$(libdir)/$(LITELIB).a ] \
  	    && $(RANLIB) $(DESTDIR)$(libdir)/$(LITELIB).a
-@@ -262,7 +262,7 @@
+@@ -262,7 +262,7 @@ install-common:
  
  install-nolite:
  	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)

Modified: trunk/dns/idnkit/files/patch-tools__runidn__resolver.c
===================================================================
--- trunk/dns/idnkit/files/patch-tools__runidn__resolver.c	2018-09-03 16:27:13 UTC (rev 24129)
+++ trunk/dns/idnkit/files/patch-tools__runidn__resolver.c	2018-09-03 16:28:51 UTC (rev 24130)
@@ -1,7 +1,6 @@
 Index: tools/runidn/resolver.c
-diff -u -p tools/runidn/resolver.c.orig tools/runidn/resolver.c
---- tools/runidn/resolver.c.orig	Fri Nov 29 23:26:57 2002
-+++ tools/runidn/resolver.c	Sun Sep  3 21:20:21 2006
+--- tools/runidn/resolver.c.orig	2002-11-29 14:26:57 UTC
++++ tools/runidn/resolver.c
 @@ -726,7 +726,7 @@ ENTRY(gethostbyname2_r)(const char *name
  
  #ifdef HAVE_GETHOSTBYADDR_R