Index: head/dns/idnkit/Makefile =================================================================== --- head/dns/idnkit/Makefile (revision 455743) +++ head/dns/idnkit/Makefile (revision 455744) @@ -1,37 +1,42 @@ # Created by: Akinori MUSHA aka knu # $FreeBSD$ PORTNAME= idnkit PORTVERSION= 1.0 PORTREVISION= 7 CATEGORIES= dns MASTER_SITES= http://www.nic.ad.jp/ja/idn/idnkit/download/sources/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= Library to handle internationalized domain names +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 CONFIGURE_ARGS= ${ICONV_CONFIGURE_BASE} \ --enable-runidn \ --enable-extra-ace USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS post-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|mode=link $$(LD)|mode=link $$(CC)|' post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/ja (cd ${WRKSRC} && ${INSTALL_DATA} ChangeLog NEWS README \ ${STAGEDIR}${DOCSDIR}) ${INSTALL_DATA} ${WRKSRC}/README.ja ${STAGEDIR}${DOCSDIR}/ja .include Index: head/dns/idnkit/files/patch-configure =================================================================== --- head/dns/idnkit/files/patch-configure (revision 455743) +++ head/dns/idnkit/files/patch-configure (revision 455744) @@ -1,69 +1,69 @@ ---- configure.orig +--- configure.orig 2003-03-10 23:53:20 UTC +++ configure -@@ -762,14 +762,14 @@ +@@ -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 @@ +@@ -2633,7 +2633,37 @@ fi ac_cv_flavor_gethostbyaddr=unknown else cat > conftest.$ac_ext < + #include + #include + #include + struct hostent *gethostbyaddr(const void *addr, int len, int type) { + return NULL; + } + int main() { + (void)gethostbyaddr(NULL, 0, 0); + return 0; + } + +EOF +if { (eval echo configure:2664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_flavor_gethostbyaddr=freebsd6 +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -fr conftest* +fi + + if test "$cross_compiling" = yes; then + ac_cv_flavor_gethostbyaddr=unknown +else + cat > conftest.$ac_ext < -@@ -2675,6 +2705,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' ;; + freebsd6) + ac_cv_type_ghba_addr_t='const void *' + ac_cv_type_ghba_addrlen_t='int' + ;; traditional | none) ac_cv_type_ghba_addr_t='const char *' ac_cv_type_ghba_addrlen_t='int' Index: head/dns/idnkit/files/patch-libtool22 =================================================================== --- head/dns/idnkit/files/patch-libtool22 (revision 455743) +++ head/dns/idnkit/files/patch-libtool22 (revision 455744) @@ -1,20 +1,50 @@ ---- 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@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 \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) $(LITELIB).la \ $(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) - $(LIBTOOL) $(INSTALL_DATA) $(LIB).la \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIB).la \ $(DESTDIR)$(libdir)/$(LIB).la -[ -f $(DESTDIR)$(libdir)/$(LIB).a ] \ && $(RANLIB) $(DESTDIR)$(libdir)/$(LIB).a Index: head/dns/idnkit/files/patch-tools__runidn__resolver.c =================================================================== --- head/dns/idnkit/files/patch-tools__runidn__resolver.c (revision 455743) +++ head/dns/idnkit/files/patch-tools__runidn__resolver.c (revision 455744) @@ -1,13 +1,12 @@ 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 int -ENTRY(gethostbyaddr_r)(GHBA_ADDR_T addr, GHBA_ADDRLEN_T len, int type, +ENTRY(gethostbyaddr_r)(GHBA_ADDR_T addr, socklen_t len, int type, struct hostent *result, char *buffer, size_t buflen, struct hostent **rp, int *errp)