CVS commit: pkgsrc

["Brook Milligan" <brook%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   brook
Date:           Sat Aug  8 21:55:54 UTC 2020

Modified Files:
        pkgsrc/math/udunits: DESCR Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/licenses: ucar-license
Removed Files:
        pkgsrc/math/udunits/patches: patch-aa patch-ab patch-ac patch-ad

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/licenses/ucar-license
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/udunits/DESCR
cvs rdiff -u -r1.40 -r1.41 pkgsrc/math/udunits/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/udunits/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/udunits/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/math/udunits/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/math/udunits/patches/patch-aa
cvs rdiff -u -r1.1 -r0 pkgsrc/math/udunits/patches/patch-ab \
    pkgsrc/math/udunits/patches/patch-ad
cvs rdiff -u -r1.4 -r0 pkgsrc/math/udunits/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/udunits/DESCR
diff -u pkgsrc/math/udunits/DESCR:1.1 pkgsrc/math/udunits/DESCR:1.2
--- pkgsrc/math/udunits/DESCR:1.1       Thu Nov  1 00:34:25 2001
+++ pkgsrc/math/udunits/DESCR   Sat Aug  8 21:55:54 2020
@@ -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.

Index: pkgsrc/math/udunits/Makefile
diff -u pkgsrc/math/udunits/Makefile:1.40 pkgsrc/math/udunits/Makefile:1.41
--- pkgsrc/math/udunits/Makefile:1.40   Sun Aug 11 13:21:52 2019
+++ pkgsrc/math/udunits/Makefile        Sat Aug  8 21:55:54 2020
@@ -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@localhost
+MAINTAINER=            bacon%NetBSD.org@localhost
 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"

Index: pkgsrc/math/udunits/PLIST
diff -u pkgsrc/math/udunits/PLIST:1.5 pkgsrc/math/udunits/PLIST:1.6
--- pkgsrc/math/udunits/PLIST:1.5       Sun Jun 14 18:05:50 2009
+++ pkgsrc/math/udunits/PLIST   Sat Aug  8 21:55:54 2020
@@ -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

Index: pkgsrc/math/udunits/buildlink3.mk
diff -u pkgsrc/math/udunits/buildlink3.mk:1.6 pkgsrc/math/udunits/buildlink3.mk:1.7
--- pkgsrc/math/udunits/buildlink3.mk:1.6       Fri Mar 20 19:24:59 2009
+++ pkgsrc/math/udunits/buildlink3.mk   Sat Aug  8 21:55:54 2020
@@ -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

Index: pkgsrc/math/udunits/distinfo
diff -u pkgsrc/math/udunits/distinfo:1.15 pkgsrc/math/udunits/distinfo:1.16
--- pkgsrc/math/udunits/distinfo:1.15   Tue Nov  3 23:33:45 2015
+++ pkgsrc/math/udunits/distinfo        Sat Aug  8 21:55:54 2020
@@ -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

Added files:

Index: pkgsrc/licenses/ucar-license
diff -u /dev/null pkgsrc/licenses/ucar-license:1.1
--- /dev/null   Sat Aug  8 21:55:55 2020
+++ pkgsrc/licenses/ucar-license        Sat Aug  8 21:55:54 2020
@@ -0,0 +1,32 @@
+Copyright 2014 University Corporation for Atmospheric Research and contributors.
+All rights reserved.
+
+This software was developed by the Unidata Program Center of the
+University Corporation for Atmospheric Research (UCAR)
+<http://www.unidata.ucar.edu>.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+   1) Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+   2) Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+   3) Neither the names of the development group, the copyright holders, nor the
+      names of contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+   4) This license shall terminate automatically and you may no longer exercise
+      any of the rights granted to you by this license as of the date you
+      commence an action, including a cross-claim or counterclaim, against
+      the copyright holders or any contributor alleging that this software
+      infringes a patent. This termination provision shall not apply for an
+      action alleging patent infringement by combinations of this software with
+      other software or hardware.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS
+OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.