math/udunits: update to udunits2 v2.2.26.

The UDUNITS-2 package differs from the previous UDUNITS package in the
following ways:

    Support for non-ASCII characters. The original UDUNITS package only
    supports the ASCII character set. The UDUNITS-2 package supports
    the following character sets: ASCII, ISO 8859-1 (Latin 1), and the
    UTF-8 encoding of ISO 10646 (Unicode). This means that unit string
    specifications like "µ°F·Ω⁻¹" are now supported (your viewer
    must support UTF-8 to display this string correctly).

    Support for logarithmic units. The unit string specification
    "0.1 lg(re 1 mW)" specifies a deciBel unit with a one milliwatt
    reference level.  Meteorologists should note that the unit "dBZ"
    (i.e., "0.1 lg(re um^3)") is now supported.

    Persistent value converters. It is now possible to obtain a converter
    data-object, which can be used to convert numeric values in one
    unit to numeric values in another, compatible unit. The values can
    be float, double, or one-dimensional arrays of floats or doubles.

    Improved API. Due to the above changes, it was not possible to keep
    the application programming interface of the original UDUNITS
    package.  Beginning with version 2.1.0, however, the package
    contains a thin UDUNITS API to the UDUNITS-2 library, so code
    written to the original API can simply be recompiled and relinked
    against the new package.  Because the original UDUNITS API uses the
    "utUnit" data-structure and the UDUNITS-2 API uses pointers to
    "ut_unit" data-structures, a small memory-leak is possible in code
    that creates many units.  This leak can be avoided by calling the
    new method utFree(utUnit*) when the unit is no longer needed.

    XML unit database. The unit database is encoded using human-readable
    XML rather than a custom format. The XML parser included in the
    package supports an <import> element to allow easy and convenient
    customization.

One thing that has not changed is that all unit string specifications
understood by the original UDUNITS package are also understood by the
new UDUNITS-2 package.

9 files changed, 51 insertions, 143 deletions

diff --git a/math/udunits/DESCR b/math/udunits/DESCR
index 470f5f872f5..16e5291cd3e 100644
--- a/math/udunits/DESCR
+++ b/math/udunits/DESCR
@@ -1,8 +1,13 @@
-The Unidata units library, udunits, supports conversion of unit
-specifications between formatted and binary forms, arithmetic
-manipulation of unit specifications, and conversion of values between
-compatible scales of measurement.
+A C library for units of physical quantities and a unit-definition and
+value-conversion utility.
 
-The udunits package consists of the library, a unit conversion
-program, and a Perl module which provides an interface to the udunits
-library.
+This package provides support for units of physical quantities. Its main
+components are:
+    1) A C library, "libudunits2", for:
+        a) Obtaining a binary representation of a unit;
+        b) Manipulating units arithmetically; and
+        c) Obtaining a converter of numeric values between compatible units;
+    2) A utility, "udunits2", for
+        a) Obtaining the definition of a unit; and
+        b) Converting a numeric value between compatible units; and
+    3) An extensive database of units.
diff --git a/math/udunits/Makefile b/math/udunits/Makefile
index c1329bb663a..24386497550 100644
--- a/math/udunits/Makefile
+++ b/math/udunits/Makefile
@@ -1,37 +1,18 @@
-# $NetBSD: Makefile,v 1.40 2019/08/11 13:21:52 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2020/08/08 21:55:54 brook Exp $
 
-DISTNAME=		udunits-1.12.1
-PKGREVISION=		12
+DISTNAME=		udunits-2.2.26
 CATEGORIES=		math devel
 MASTER_SITES=		ftp://ftp.unidata.ucar.edu/pub/udunits/
-EXTRACT_SUFX=		.tar.Z
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		bacon@NetBSD.org
 HOMEPAGE=		https://www.unidata.ucar.edu/software/udunits/
 COMMENT=		Library and program for manipulating units of physical quantities
+LICENSE=		ucar-license
 
-MAKE_JOBS_SAFE=		no
-
-USE_TOOLS+=		perl soelim
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}/src
-
+USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-
-CPPFLAGS+=		-Df2cFortran -Dunix
-PERL5_CONFIGURE=	no
-PERL5_PACKLIST=		auto/UDUNITS/.packlist
-
-EGDIR=			${PREFIX}/share/examples/udunits
-CONF_FILES=		${EGDIR}/udunits.dat ${PKG_SYSCONFDIR}/udunits.dat
-
-INSTALL_MAKE_FLAGS+=	MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} \
-			BINDIR=${DESTDIR}${PREFIX}/bin \
-			INCDIR=${DESTDIR}${PREFIX}/include \
-			LIBDIR=${DESTDIR}${PREFIX}/lib
-
-post-install:
-	${RM} -rf ${WRKSRC}/perl/blib/lib
+INFO_FILES=		yes
+USE_LANGUAGES+=		c
 
-.include "../../lang/perl5/module.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/udunits/PLIST b/math/udunits/PLIST
index 9c56ec9d209..3ff56ddb2cd 100644
--- a/math/udunits/PLIST
+++ b/math/udunits/PLIST
@@ -1,12 +1,24 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:05:50 joerg Exp $
-bin/udunits
+@comment $NetBSD: PLIST,v 1.6 2020/08/08 21:55:54 brook Exp $
+bin/udunits2
+include/converter.h
 include/udunits.h
-include/udunits.inc
-lib/libudport.a
-lib/libudunits.a
-man/man1/udunits.1
-man/man1/udunitsperl.1
-man/man3/udunits.3
-man/man3/udunits.3f
-man/man3f/udunits.3f
-share/examples/udunits/udunits.dat
+include/udunits2.h
+info/udunits2.info
+info/udunits2lib.info
+info/udunits2prog.info
+lib/libudunits2.la
+share/doc/udunits/CHANGE_LOG
+share/doc/udunits/COPYRIGHT
+share/doc/udunits/README
+share/doc/udunits/udunits2-accepted.xml
+share/doc/udunits/udunits2-base.xml
+share/doc/udunits/udunits2-common.xml
+share/doc/udunits/udunits2-derived.xml
+share/doc/udunits/udunits2-prefixes.xml
+share/doc/udunits/udunits2.xml
+share/udunits/udunits2-accepted.xml
+share/udunits/udunits2-base.xml
+share/udunits/udunits2-common.xml
+share/udunits/udunits2-derived.xml
+share/udunits/udunits2-prefixes.xml
+share/udunits/udunits2.xml
diff --git a/math/udunits/buildlink3.mk b/math/udunits/buildlink3.mk
index 01324f03be4..ba268f8bfb1 100644
--- a/math/udunits/buildlink3.mk
+++ b/math/udunits/buildlink3.mk
@@ -1,14 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:59 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2020/08/08 21:55:54 brook Exp $
 
 BUILDLINK_TREE+=	udunits
 
 .if !defined(UDUNITS_BUILDLINK3_MK)
 UDUNITS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.udunits+=	udunits>=1.11.7
+BUILDLINK_API_DEPENDS.udunits+=	udunits>=2.2.26
 BUILDLINK_PKGSRCDIR.udunits?=	../../math/udunits
-BUILDLINK_DEPMETHOD.udunits?=	build
-BUILDLINK_FILES.udunits=	include/udunits.inc
-.endif # UDUNITS_BUILDLINK3_MK
+.endif	# UDUNITS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-udunits
diff --git a/math/udunits/distinfo b/math/udunits/distinfo
index 21a094b5459..798fc9dd906 100644
--- a/math/udunits/distinfo
+++ b/math/udunits/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.15 2015/11/03 23:33:45 agc Exp $
+$NetBSD: distinfo,v 1.16 2020/08/08 21:55:54 brook Exp $
 
-SHA1 (udunits-1.12.1.tar.Z) = ee37ca61eb1dcf34165b7573cc1645824bd6968d
-RMD160 (udunits-1.12.1.tar.Z) = fb2f0442673ca47d302782c84ce37b8da1e16535
-SHA512 (udunits-1.12.1.tar.Z) = 816e0f43f785029c4e7829712807c62401650801942cdbd4e60ccb5076784c7be8fa37b75ca02877f4f86e2d0e0849ced8a77f2347e7bb6ad57e16346f2e5c09
-Size (udunits-1.12.1.tar.Z) = 365873 bytes
-SHA1 (patch-aa) = 6d98bef47df79538f3ef1fe99c405f854f2e2bda
-SHA1 (patch-ab) = 9a98e048499d38f8dedba6fb1a169e178dbd77ba
-SHA1 (patch-ac) = 370c742a13fc8642b2a1c5260ac84a1d1345c047
-SHA1 (patch-ad) = d48978bd66d9ef691cd9c70b057a7e5d8a802fb6
+SHA1 (udunits-2.2.26.tar.gz) = 714332946db3d71faca228436eb9f024b0f269f4
+RMD160 (udunits-2.2.26.tar.gz) = 275c5f5f2a4df94eb357659b6d9160de74bfc8f7
+SHA512 (udunits-2.2.26.tar.gz) = 9e5320454646458ac40ba0855b6b8e12f7edbdb4b9a6c687a4c38ad07400e2e0c0f7968069885f83eb73da64886e1c6dd1e462ebc23205df849c3a460cedb640
+Size (udunits-2.2.26.tar.gz) = 1227596 bytes
diff --git a/math/udunits/patches/patch-aa b/math/udunits/patches/patch-aa
deleted file mode 100644
index f2ceff14128..00000000000
--- a/math/udunits/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2010/02/04 14:56:21 joerg Exp $
-
---- port/master.mk.in.orig	Wed Nov 25 17:26:56 1998
-+++ port/master.mk.in
-@@ -351,7 +351,7 @@ dummy_incdir $(INCDIR):
- ############################################################################
- # `etc/' files:
- ############################################################################
--ETCDIR	= $(prefix)/etc
-+ETCDIR	= ${DESTDIR}@datadir@/examples/udunits
- ETCFILE	= dummy-etcfile		# to silence GNU make(1)
- 
- installed_etcfiles:
-@@ -387,7 +387,7 @@ MANUAL		= dummy-manual	# to slience GNU 
- WHATIS		= @WHATIS@
- # The following macro should be empty on systems that don't
- # allow users to create their own manual-page indexes.
--MAKEWHATIS_CMD	= @MAKEWHATIS_CMD@
-+#MAKEWHATIS_CMD	= @MAKEWHATIS_CMD@
- 
- installed_manuals:	FORCE
- 	@if [ -n "$(MANUALS)" ]; then \
diff --git a/math/udunits/patches/patch-ab b/math/udunits/patches/patch-ab
deleted file mode 100644
index 998dca5ccc4..00000000000
--- a/math/udunits/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/12/24 17:21:04 jmmv Exp $
-
---- lib/Makefile.in.orig	Wed Apr 30 23:49:58 1997
-+++ lib/Makefile.in
-@@ -7,7 +7,7 @@
- LIBRARY		= udunits
- 
- FLEX		= /usr/local/gnu/bin/flex
--cpp_path	= -DUT_DEFAULT_PATH='"$(prefix)/etc/udunits.dat"'
-+cpp_path	= -DUT_DEFAULT_PATH='"@sysconfdir@/udunits.dat"'
- CPPFLAGS	= -I../port/misc -I../port/cfortran $(cpp_path) @CPPFLAGS@
- CFLAGS		= @CFLAGS@
- 
diff --git a/math/udunits/patches/patch-ac b/math/udunits/patches/patch-ac
deleted file mode 100644
index 489554a5aab..00000000000
--- a/math/udunits/patches/patch-ac
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2010/11/26 11:29:08 obache Exp $
-
---- configure.orig	2003-08-29 11:53:25.000000000 -0400
-+++ configure	2008-08-17 02:59:48.000000000 -0400
-@@ -2094,8 +2094,9 @@ echo "configure:2093: checking for (void
- #line 2095 "configure"
- #include "confdefs.h"
- 
-+double val;
- int main() {
--(void)sin(0.0);
-+return sin(val);
- ; return 0; }
- EOF
- if { (eval echo configure:2102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -2141,8 +2142,9 @@ echo "configure:2140: checking for (void
- #line 2142 "configure"
- #include "confdefs.h"
- 
-+double val;
- int main() {
--(void)sin(0.0);
-+return sin(val);
- ; return 0; }
- EOF
- if { (eval echo configure:2149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -5398,6 +5400,9 @@ echo "configure:5396: checking for posit
-         HP-UX)
-             picflag=+z
-             ;;
-+	NetBSD|FreeBSD|OpenBSD|DragonFly|Linux|SunOS)
-+	    picflag=-fPIC
-+	    ;;
-     esac
-     case "$picflag" in
-         '')
diff --git a/math/udunits/patches/patch-ad b/math/udunits/patches/patch-ad
deleted file mode 100644
index f771e9bd0a1..00000000000
--- a/math/udunits/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/08/08 18:13:13 jlam Exp $
-
---- Makefile.in.orig	2003-08-29 14:27:07.000000000 -0400
-+++ Makefile.in
-@@ -68,7 +68,7 @@ $(MANUALS) dummy:
- @PERL_DISTCLEAN@ dummy:	perl/Makefile
- 
- perl/Makefile:		perl/Makefile.PL
--	-cd perl && $(PERL) Makefile.PL
-+	-cd perl && $(PERL) Makefile.PL INSTALLDIRS=vendor
- 
- install:	whatis
-