diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile index 62096bcfe470..9b38f20f206a 100644 --- a/devel/libidn/Makefile +++ b/devel/libidn/Makefile @@ -1,60 +1,60 @@ # New ports collection makefile for: libidn # Date created: 19.06.2003 # Whom: Kirill Ponomarew # # $FreeBSD$ # PORTNAME= libidn -PORTVERSION= 0.3.3 -PORTREVISION= 1 +PORTVERSION= 0.3.4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU_ALPHA} \ http://josefsson.org/libidn/releases/ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= krion@FreeBSD.org COMMENT= Internationalized Domain Names command line tool LIB_DEPENDS= iconv:${PORTSDIR}/converters/libiconv BUILD_DEPENDS= gengetopt:${PORTSDIR}/devel/gengetopt USE_LIBTOOL= yes GNU_CONFIGURE= yes +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes USE_GETOPT_LONG= yes USE_GNOME= gnomehack INFO= libidn CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" .if exists(${LOCALBASE}/bin/emacs) PLIST_SUB+= EMACS="" EMACSDIR=share/emacs .elif exists(${LOCALBASE}/bin/xemacs) PLIST_SUB+= EMACS="" EMACSDIR=lib/xemacs .else PLIST_SUB+= EMACS="@comment " EMACSDIR="" .endif MAN1= idn.1 MAN3= idna_to_ascii_4i.3 idna_to_ascii_4z.3 idna_to_ascii_8z.3 \ idna_to_ascii_lz.3 idna_to_unicode_44i.3 idna_to_unicode_4z4z.3 \ idna_to_unicode_8z4z.3 idna_to_unicode_8z8z.3 idna_to_unicode_8zlz.3 \ idna_to_unicode_lzlz.3 punycode_decode.3 punycode_encode.3 \ stringprep.3 stringprep_check_version.3 stringprep_convert.3 \ stringprep_locale_charset.3 stringprep_locale_to_utf8.3 \ stringprep_profile.3 stringprep_ucs4_nfkc_normalize.3 \ stringprep_ucs4_to_utf8.3 stringprep_unichar_to_utf8.3 \ stringprep_utf8_nfkc_normalize.3 stringprep_utf8_to_locale.3 \ stringprep_utf8_to_ucs4.3 stringprep_utf8_to_unichar.3 \ stringprep_4i.3 stringprep_4zi.3 post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for i in README FAQ ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif .include diff --git a/devel/libidn/distinfo b/devel/libidn/distinfo index 34d2fb8263f9..656e901b09f2 100644 --- a/devel/libidn/distinfo +++ b/devel/libidn/distinfo @@ -1 +1 @@ -MD5 (libidn-0.3.3.tar.gz) = aae37748904f8fe944b01de4461b0034 +MD5 (libidn-0.3.4.tar.gz) = 0b2e1df28f86cdeb3b8e34770b652342 diff --git a/devel/libidn/files/patch-configure b/devel/libidn/files/patch-configure deleted file mode 100644 index 988fda9f1352..000000000000 --- a/devel/libidn/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Fri Jul 25 17:30:46 2003 -+++ configure Fri Jul 25 17:31:45 2003 -@@ -7788,6 +7788,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/devel/libidn/files/patch-ltmain.sh b/devel/libidn/files/patch-ltmain.sh new file mode 100644 index 000000000000..6970f3e4a727 --- /dev/null +++ b/devel/libidn/files/patch-ltmain.sh @@ -0,0 +1,15 @@ +--- ltmain.sh.orig Sun Nov 9 20:11:04 2003 ++++ ltmain.sh Sun Nov 9 20:12:16 2003 +@@ -5668,10 +5668,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/dns/libidn/Makefile b/dns/libidn/Makefile index 62096bcfe470..9b38f20f206a 100644 --- a/dns/libidn/Makefile +++ b/dns/libidn/Makefile @@ -1,60 +1,60 @@ # New ports collection makefile for: libidn # Date created: 19.06.2003 # Whom: Kirill Ponomarew # # $FreeBSD$ # PORTNAME= libidn -PORTVERSION= 0.3.3 -PORTREVISION= 1 +PORTVERSION= 0.3.4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU_ALPHA} \ http://josefsson.org/libidn/releases/ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= krion@FreeBSD.org COMMENT= Internationalized Domain Names command line tool LIB_DEPENDS= iconv:${PORTSDIR}/converters/libiconv BUILD_DEPENDS= gengetopt:${PORTSDIR}/devel/gengetopt USE_LIBTOOL= yes GNU_CONFIGURE= yes +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes USE_GETOPT_LONG= yes USE_GNOME= gnomehack INFO= libidn CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" .if exists(${LOCALBASE}/bin/emacs) PLIST_SUB+= EMACS="" EMACSDIR=share/emacs .elif exists(${LOCALBASE}/bin/xemacs) PLIST_SUB+= EMACS="" EMACSDIR=lib/xemacs .else PLIST_SUB+= EMACS="@comment " EMACSDIR="" .endif MAN1= idn.1 MAN3= idna_to_ascii_4i.3 idna_to_ascii_4z.3 idna_to_ascii_8z.3 \ idna_to_ascii_lz.3 idna_to_unicode_44i.3 idna_to_unicode_4z4z.3 \ idna_to_unicode_8z4z.3 idna_to_unicode_8z8z.3 idna_to_unicode_8zlz.3 \ idna_to_unicode_lzlz.3 punycode_decode.3 punycode_encode.3 \ stringprep.3 stringprep_check_version.3 stringprep_convert.3 \ stringprep_locale_charset.3 stringprep_locale_to_utf8.3 \ stringprep_profile.3 stringprep_ucs4_nfkc_normalize.3 \ stringprep_ucs4_to_utf8.3 stringprep_unichar_to_utf8.3 \ stringprep_utf8_nfkc_normalize.3 stringprep_utf8_to_locale.3 \ stringprep_utf8_to_ucs4.3 stringprep_utf8_to_unichar.3 \ stringprep_4i.3 stringprep_4zi.3 post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for i in README FAQ ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif .include diff --git a/dns/libidn/distinfo b/dns/libidn/distinfo index 34d2fb8263f9..656e901b09f2 100644 --- a/dns/libidn/distinfo +++ b/dns/libidn/distinfo @@ -1 +1 @@ -MD5 (libidn-0.3.3.tar.gz) = aae37748904f8fe944b01de4461b0034 +MD5 (libidn-0.3.4.tar.gz) = 0b2e1df28f86cdeb3b8e34770b652342 diff --git a/dns/libidn/files/patch-configure b/dns/libidn/files/patch-configure deleted file mode 100644 index 988fda9f1352..000000000000 --- a/dns/libidn/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Fri Jul 25 17:30:46 2003 -+++ configure Fri Jul 25 17:31:45 2003 -@@ -7788,6 +7788,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/dns/libidn/files/patch-ltmain.sh b/dns/libidn/files/patch-ltmain.sh new file mode 100644 index 000000000000..6970f3e4a727 --- /dev/null +++ b/dns/libidn/files/patch-ltmain.sh @@ -0,0 +1,15 @@ +--- ltmain.sh.orig Sun Nov 9 20:11:04 2003 ++++ ltmain.sh Sun Nov 9 20:12:16 2003 +@@ -5668,10 +5668,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"