From 92ed1520feb673fea6cea9b5f765ac3120515030 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 18 Aug 2017 21:04:51 +0000 Subject: Version 2.0.3 (released 2017-07-24) [beta] ** %IDN2_USE_STD3_ASCII_RULES disabled by default. Previously we were eliminating non-STD3 characters from domain strings such as _443._tcp.example.com, or IPs 1.2.3.4/24 provided to libidn2 functions. That was an unexpected regression for applications switching from libidn and thus it is no longer applied by default. Use %IDN2_USE_STD3_ASCII_RULES to enable that behavior again. ** Fix several documentation issues ** Fix build issues ** Modernize gtk-doc build infrastructure. --- devel/libidn2/Makefile | 18 ++++++++---------- devel/libidn2/buildlink3.mk | 3 ++- devel/libidn2/distinfo | 12 ++++++------ devel/libidn2/patches/patch-configure | 16 ++++++++++++++++ devel/libidn2/patches/patch-src_Makefile.in | 15 --------------- 5 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 devel/libidn2/patches/patch-configure delete mode 100644 devel/libidn2/patches/patch-src_Makefile.in (limited to 'devel') diff --git a/devel/libidn2/Makefile b/devel/libidn2/Makefile index 11f2e768f48..a09eea3f8b3 100644 --- a/devel/libidn2/Makefile +++ b/devel/libidn2/Makefile @@ -1,22 +1,20 @@ -# $NetBSD: Makefile,v 1.2 2017/07/22 02:33:00 schmonz Exp $ +# $NetBSD: Makefile,v 1.3 2017/08/18 21:04:51 adam Exp $ -DISTNAME= libidn2-2.0.0 -PKGREVISION= 1 +DISTNAME= libidn2-2.0.3 CATEGORIES= devel -MASTER_SITES= https://alpha.gnu.org/gnu/libidn/ -EXTRACT_SUFX= .tar.xz +MASTER_SITES= ${MASTER_SITE_GNU:=libidn/} +EXTRACT_SUFX= .tar.lz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.gnu.org/software/libidn/ COMMENT= Convert internationalized domain names to/from ASCII Encoding LICENSE= gnu-gpl-v2 -GNU_CONFIGURE= yes -INFO_FILES= yes -USE_LIBTOOL= yes -USE_TOOLS+= pkg-config - +USE_LIBTOOL= yes +USE_TOOLS+= pkg-config +GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= libidn2.pc.in +INFO_FILES= yes .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/devel/libidn2/buildlink3.mk b/devel/libidn2/buildlink3.mk index 405ad29f093..1a1b6c065ec 100644 --- a/devel/libidn2/buildlink3.mk +++ b/devel/libidn2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/08/17 13:49:15 schmonz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2017/08/18 21:04:51 adam Exp $ BUILDLINK_TREE+= libidn2 @@ -9,6 +9,7 @@ BUILDLINK_API_DEPENDS.libidn2+= libidn2>=2.0.0 BUILDLINK_PKGSRCDIR.libidn2?= ../../devel/libidn2 .include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../textproc/libunistring/buildlink3.mk" .endif # LIBIDN2_BUILDLINK3_MK diff --git a/devel/libidn2/distinfo b/devel/libidn2/distinfo index 00d9261ed30..39218b8798f 100644 --- a/devel/libidn2/distinfo +++ b/devel/libidn2/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2017/07/22 02:33:00 schmonz Exp $ +$NetBSD: distinfo,v 1.3 2017/08/18 21:04:51 adam Exp $ -SHA1 (libidn2-2.0.0.tar.xz) = b276cf927598aa3a226cc3ee503d1668d4a56eb3 -RMD160 (libidn2-2.0.0.tar.xz) = 7c004341c6d98ce19d151a6e6218b663f0410e2e -SHA512 (libidn2-2.0.0.tar.xz) = 0cc199f05526edebb385cd7ca3bafca341e31cc76ef0efe7e63a07ff1d2830d9d33004dfc51aa245b42fdf0de7eeb807fd18255f58cc2b086e1155beaa738502 -Size (libidn2-2.0.0.tar.xz) = 1257908 bytes -SHA1 (patch-src_Makefile.in) = 7456c6c0d3d9669a760df4353c95aef5ddff8f13 +SHA1 (libidn2-2.0.3.tar.lz) = 9d14eb06f71e153adf7566e51f74d5244946d07d +RMD160 (libidn2-2.0.3.tar.lz) = 6b6304837a5b0bc7037c2dd701317ef47f799b0e +SHA512 (libidn2-2.0.3.tar.lz) = 823ec3ec43cddaa4b309e68aea32c89fce5f029fe2589f3f3f1468b0d8e781b69494c7fa55d05d9d8b39599272cc086a0d36464cfa8ce438ed78eb52f90d09ec +Size (libidn2-2.0.3.tar.lz) = 1168506 bytes +SHA1 (patch-configure) = 2f5ae4cb148b2d3a389063d3fdac8fd5033210ac diff --git a/devel/libidn2/patches/patch-configure b/devel/libidn2/patches/patch-configure new file mode 100644 index 00000000000..a5036db34be --- /dev/null +++ b/devel/libidn2/patches/patch-configure @@ -0,0 +1,16 @@ +$NetBSD: patch-configure,v 1.1 2017/08/18 21:04:51 adam Exp $ + +It is not necessary to have 'ronn'; the documentation is already generated. + +--- configure.orig 2017-08-18 20:55:34.000000000 +0000 ++++ configure +@@ -28323,9 +28323,6 @@ $as_echo "no" >&6; } + fi + + +- if test "$ac_cv_prog_RONN" = ":"; then +- as_fn_error $? "You need the 'ronn' tool to generate the idn2.1 man page" "$LINENO" 5 +- fi + # Extract the first word of "makeinfo", so it can be a program name with args. + set dummy makeinfo; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff --git a/devel/libidn2/patches/patch-src_Makefile.in b/devel/libidn2/patches/patch-src_Makefile.in deleted file mode 100644 index aa43eb35e2e..00000000000 --- a/devel/libidn2/patches/patch-src_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_Makefile.in,v 1.1 2017/07/22 02:33:00 schmonz Exp $ - -Don't install "idn2_noinstall". - ---- src/Makefile.in.orig 2017-03-29 15:27:01.000000000 +0000 -+++ src/Makefile.in -@@ -104,7 +104,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - @HAVE_LIBUNISTRING_FALSE@am__append_1 = -I$(top_srcdir)/unistring/ -I$(top_builddir)/unistring/ --bin_PROGRAMS = idn2$(EXEEXT) idn2_noinstall$(EXEEXT) -+bin_PROGRAMS = idn2$(EXEEXT) # idn2_noinstall$(EXEEXT) - @HAVE_LIBUNISTRING_FALSE@am__append_2 = ../unistring/libunistring.la - subdir = src - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -- cgit v1.2.3