summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/szip/Makefile8
-rw-r--r--archivers/szip/distinfo14
-rw-r--r--archivers/szip/patches/patch-aa21
-rw-r--r--archivers/szip/patches/patch-config_gnu-flags4
4 files changed, 26 insertions, 21 deletions
diff --git a/archivers/szip/Makefile b/archivers/szip/Makefile
index 089cf4b95a5..3c88db78827 100644
--- a/archivers/szip/Makefile
+++ b/archivers/szip/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2019/11/02 22:54:27 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2020/03/01 01:20:44 mef Exp $
-DISTNAME= szip-2.1
-PKGREVISION= 3
+DISTNAME= szip-2.1.1
CATEGORIES= archivers
-MASTER_SITES= ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/
+#ASTER_SITES= ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/
+MASTER_SITES= https://support.hdfgroup.org/ftp/lib-external/szip/2.1.1/src/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://www.hdfgroup.org/doc_resource/SZIP/
diff --git a/archivers/szip/distinfo b/archivers/szip/distinfo
index 568a67b324c..47549dd12df 100644
--- a/archivers/szip/distinfo
+++ b/archivers/szip/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2017/03/23 17:06:45 joerg Exp $
+$NetBSD: distinfo,v 1.12 2020/03/01 01:20:44 mef Exp $
-SHA1 (szip-2.1nb3/szip-2.1.tar.gz) = d241c9acc26426a831765d660b683b853b83c131
-RMD160 (szip-2.1nb3/szip-2.1.tar.gz) = 058d85cbbc9893bdda64e4c4ee967a773ae85e3a
-SHA512 (szip-2.1nb3/szip-2.1.tar.gz) = ea91b877bb061fe6c96988a3c4b705e101a6950e34e9be53d6a57455c6a625be0afa60f4a3cfdd09649205b9f8586cc25ea60fe07a8131579acf3826b35fb749
-Size (szip-2.1nb3/szip-2.1.tar.gz) = 383968 bytes
-SHA1 (patch-aa) = 5ce7e2507ca8731fe06145c1334f031ee24277dc
-SHA1 (patch-config_gnu-flags) = 07058864b2ad18b10b250d5462d9c7b5cc187491
+SHA1 (szip-2.1.1nb3/szip-2.1.1.tar.gz) = 434931cfe47e9b0730ea85fa5e25477bafd9704a
+RMD160 (szip-2.1.1nb3/szip-2.1.1.tar.gz) = 3e6baaab7bf96fbc538154de59bba3902193ebab
+SHA512 (szip-2.1.1nb3/szip-2.1.1.tar.gz) = ada6406efb096cd8a2daf8f9217fe9111a96dcae87e29d1c31f58ddd2ad2aa7bac03f23c7205dc9360f3b62d259461759330c7189ef0c2fe559704b1ea9d40dd
+Size (szip-2.1.1nb3/szip-2.1.1.tar.gz) = 415774 bytes
+SHA1 (patch-aa) = 8238b142d96f51526aee8513911425ad524810e8
+SHA1 (patch-config_gnu-flags) = cb9c40e294ef8d2f419595f3365b04ed7d7fecd7
diff --git a/archivers/szip/patches/patch-aa b/archivers/szip/patches/patch-aa
index b1137dfc485..fea815c7538 100644
--- a/archivers/szip/patches/patch-aa
+++ b/archivers/szip/patches/patch-aa
@@ -1,13 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2008/09/08 08:59:22 adam Exp $
+$NetBSD: patch-aa,v 1.3 2020/03/01 01:20:45 mef Exp $
---- examples/Makefile.in.orig 2007-05-14 22:51:22.000000000 +0200
-+++ examples/Makefile.in
-@@ -175,7 +175,7 @@ top_builddir = @top_builddir@
+On DragonFly at least, -lm is needed for brust_szip. It doesn't hurt on
+other platforms, so just add it.
+
+--- test/Makefile.in.orig 2017-01-14 05:40:26.000000000 +0900
++++ test/Makefile.in 2020-03-01 10:15:25.756240983 +0900
+@@ -499,7 +499,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test
- burst_szip_SOURCES = burst_szip.c
--burst_szip_LDADD = ../test/libmcgill.la ../src/libsz.la
-+burst_szip_LDADD = ../test/libmcgill.la ../src/libsz.la -lm
- burst_szip_DEPENDENCIES = ../test/libmcgill.la ../src/libsz.la
+ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test
+ burst_szip_SOURCES = burst_szip.c mcgill.c
+-burst_szip_LDADD = ../src/libsz.la
++burst_szip_LDADD = ../src/libsz.la -lm
+ burst_szip_DEPENDENCIES = ../src/libsz.la
example_SOURCES = example.c
example_LDADD = ../src/libsz.la
diff --git a/archivers/szip/patches/patch-config_gnu-flags b/archivers/szip/patches/patch-config_gnu-flags
index db3efe875dd..99c5db49523 100644
--- a/archivers/szip/patches/patch-config_gnu-flags
+++ b/archivers/szip/patches/patch-config_gnu-flags
@@ -1,4 +1,6 @@
-$NetBSD: patch-config_gnu-flags,v 1.1 2012/01/11 14:20:21 hans Exp $
+$NetBSD: patch-config_gnu-flags,v 1.2 2020/03/01 01:20:45 mef Exp $
+
+Fix build with gcc46.
--- config/gnu-flags.orig 2005-03-04 22:37:52.000000000 +0100
+++ config/gnu-flags 2011-12-28 13:09:28.722283206 +0100