Niklas Poslovski
2023-06-17 ae1a0f5c5397d633d15b736b15269f23e1b2995c
udunits: Update to 2.2.28

2 files added
4 files modified
72 ■■■■■ changed files
components/scientific/udunits/Makefile 28 ●●●● patch | view | raw | blame | history
components/scientific/udunits/manifests/sample-manifest.p5m 7 ●●●● patch | view | raw | blame | history
components/scientific/udunits/patches/solaris-support.patch 21 ●●●●● patch | view | raw | blame | history
components/scientific/udunits/pkg5 1 ●●●● patch | view | raw | blame | history
components/scientific/udunits/test/results-all.master 9 ●●●●● patch | view | raw | blame | history
components/scientific/udunits/udunits.p5m 6 ●●●●● patch | view | raw | blame | history
components/scientific/udunits/Makefile
@@ -10,37 +10,35 @@
#
# Copyright 2017 Dariusz Sendkowski
# Copyright 2023 Niklas Poslovski
#
USE_DEFAULT_TEST_TRANSFORMS = yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=           udunits
COMPONENT_VERSION=        2.2.25
COMPONENT_REVISION=       1
COMPONENT_VERSION=        2.2.28
#COMPONENT_REVISION=       1
COMPONENT_FMRI=           library/udunits
COMPONENT_SUMMARY=    A C-based package for the programatic handling of units of physical quantities.
COMPONENT_PROJECT_URL=   http://www.unidata.ucar.edu/software/udunits/
COMPONENT_SUMMARY=    A C-based package for the programatic handling of units of physical quantities.
COMPONENT_PROJECT_URL=   https://www.unidata.ucar.edu/software/udunits/
COMPONENT_CLASSIFICATION= System/Libraries
COMPONENT_SRC=            $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=        $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= sha256:ad486f8f45cba915ac74a38dd15f96a661a1803287373639c17e5a9b59bfd540
COMPONENT_ARCHIVE_URL= ftp://ftp.unidata.ucar.edu/pub/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
COMPONENT_LICENSE=       UCAR
COMPONENT_ARCHIVE_HASH= sha256:590baec83161a3fd62c00efa66f6113cec8a7c461e3f61a5182167e0cc5d579e
COMPONENT_ARCHIVE_URL= https://downloads.unidata.ucar.edu/$(COMPONENT_NAME)/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_LICENSE=       UCAR
COMPONENT_LICENSE_FILE= COPYRIGHT
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
include $(WS_MAKE_RULES)/common.mk
CFLAGS+= -std=c99 $(CPP_XPG6MODE)
CONFIGURE_OPTIONS+= --disable-static
build:        $(BUILD_32_and_64)
unexport SHELLOPTS
install:    $(INSTALL_32_and_64)
test:        $(NO_TESTS)
# Auto-generated dependencies
REQUIRED_PACKAGES += library/expat
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/math
components/scientific/udunits/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
# Copyright 2017 <contributor>
# Copyright 2023 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,7 +23,6 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/bin/$(MACH64)/udunits2
file path=usr/bin/udunits2
file path=usr/include/converter.h
file path=usr/include/udunits.h
@@ -30,9 +30,6 @@
link path=usr/lib/$(MACH64)/libudunits2.so target=libudunits2.so.0.1.0
link path=usr/lib/$(MACH64)/libudunits2.so.0 target=libudunits2.so.0.1.0
file path=usr/lib/$(MACH64)/libudunits2.so.0.1.0
link path=usr/lib/libudunits2.so target=libudunits2.so.0.1.0
link path=usr/lib/libudunits2.so.0 target=libudunits2.so.0.1.0
file path=usr/lib/libudunits2.so.0.1.0
file path=usr/share/doc/udunits/CHANGE_LOG
file path=usr/share/doc/udunits/COPYRIGHT
file path=usr/share/doc/udunits/README
components/scientific/udunits/patches/solaris-support.patch
New file
@@ -0,0 +1,21 @@
diff -Nru udunits-2.2.28.orig/lib/xml.c udunits-2.2.28/lib/xml.c
--- udunits-2.2.28.orig/lib/xml.c    2020-12-07 19:37:03.000000000 +0100
+++ udunits-2.2.28/lib/xml.c    2023-06-17 16:05:05.517340848 +0200
@@ -38,7 +38,7 @@
 #endif
 #include <sys/stat.h>
 #include <sys/types.h>
-#if defined(__linux__)
+#if defined(__linux__) || defined(__sun)
 #include <dlfcn.h>
 #elif defined(__APPLE__)
 #define _DARWIN_C_SOURCE
@@ -2137,7 +2137,7 @@
     if (absXmlPathname[0] == 0) {
         const char* prefix = NULL; // Installation directory
-#       if defined(__APPLE__) || defined(__linux__)
+#       if defined(__APPLE__) || defined(__linux__) || defined(__sun)
             Dl_info     info;
             const char  sep = '/'; // Pathname component separator
             char        buf[PATH_MAX];
components/scientific/udunits/pkg5
@@ -1,6 +1,5 @@
{
    "dependencies": [
        "SUNWcs",
        "library/expat",
        "system/library",
        "system/library/math"
components/scientific/udunits/test/results-all.master
New file
@@ -0,0 +1,9 @@
PASS: testUnits
PASS: testUnits-1
# TOTAL: 2
# PASS:  2
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
components/scientific/udunits/udunits.p5m
@@ -11,9 +11,11 @@
#
# Copyright 2017 Dariusz Sendkowski
# Copyright 2023 Niklas Poslovski
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,7 +24,6 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/bin/$(MACH64)/udunits2
file path=usr/bin/udunits2
file path=usr/include/converter.h
file path=usr/include/udunits.h
@@ -30,9 +31,6 @@
link path=usr/lib/$(MACH64)/libudunits2.so target=libudunits2.so.0.1.0
link path=usr/lib/$(MACH64)/libudunits2.so.0 target=libudunits2.so.0.1.0
file path=usr/lib/$(MACH64)/libudunits2.so.0.1.0
link path=usr/lib/libudunits2.so target=libudunits2.so.0.1.0
link path=usr/lib/libudunits2.so.0 target=libudunits2.so.0.1.0
file path=usr/lib/libudunits2.so.0.1.0
file path=usr/share/doc/udunits/CHANGE_LOG
file path=usr/share/doc/udunits/COPYRIGHT
file path=usr/share/doc/udunits/README