Update to 2.2.0 (2007). Changes:

    - Fix handling of MS-DOS reserved names.  Besides handling names like
      "con", we also need to handle "con.foo.txt".
    - Auto-detect and handle "bad Mac" archives.
    - Added "kNuValIgnoreLZW2Len" flag, which enables NuLib2 to handle
      archives created by an unknown but badly broken program.

    - Switched from GPL to BSD license.

8 files changed, 35 insertions, 43 deletions

diff --git a/archivers/nulib2/Makefile b/archivers/nulib2/Makefile
index a6e5889debd..6ffef0d078b 100644
--- a/archivers/nulib2/Makefile
+++ b/archivers/nulib2/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.21 2012/09/11 19:46:58 asau Exp $
+# $NetBSD: Makefile,v 1.22 2014/09/13 11:10:58 shattered Exp $
 #
 
-DISTNAME=	nulibdist-203
-PKGNAME=	nulib2-2.0.3
-PKGREVISION=	1
+DISTNAME=	nulibdist-220
+PKGNAME=	nulib2-2.2.0
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.nulib.com/downloads/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.nulib.com/
 COMMENT=	Handles Apple II ShrinkIt (NuFX) file/disk archives
+LICENSE=	modified-bsd
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/archivers/nulib2/distinfo b/archivers/nulib2/distinfo
index 70258e03eec..1468421c2d0 100644
--- a/archivers/nulib2/distinfo
+++ b/archivers/nulib2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2011/09/03 21:45:03 dholland Exp $
+$NetBSD: distinfo,v 1.13 2014/09/13 11:10:58 shattered Exp $
 
-SHA1 (nulibdist-203.tar.gz) = c7a9bde218e0a115424dfc2e3d7234ee7faa9b8e
-RMD160 (nulibdist-203.tar.gz) = 84c6eadd64749cfdc11fda74a552072bce1b04db
-Size (nulibdist-203.tar.gz) = 394129 bytes
-SHA1 (patch-aa) = 19b3f9c99d4567d537992ccfc3798e8594e7ab87
-SHA1 (patch-ab) = 822f41e50035b98832a543634f5ab11c4a301d30
-SHA1 (patch-ac) = f18040d7a469aedec2351f514bfd63073a345463
-SHA1 (patch-ad) = e9fa5edf63d97d485a0425ad4bf019aaf217eb37
-SHA1 (patch-ae) = 08132fa91060bc45090b392d13c14e4fe73ab336
-SHA1 (patch-af) = b5da775e73b32678e13a9b77a806d6777a31395a
+SHA1 (nulibdist-220.tar.gz) = 8b8ca835d4e3e3d8a5e1ae9830fdfd0ed0bb07e3
+RMD160 (nulibdist-220.tar.gz) = a6b0d5bd0d0d413741fd1d46da80ef699f084321
+Size (nulibdist-220.tar.gz) = 390564 bytes
+SHA1 (patch-aa) = b7fe0d23e1c22c67e48e0db5b7fc905756322717
+SHA1 (patch-ab) = 645a9c68d0b712ebc4d64284681a6168d66e4522
+SHA1 (patch-ac) = 17499d8a0c60e98282fc441723e10a01e2a644ec
+SHA1 (patch-ad) = 3793ac2fb1eb67472091c5a902c56d1483e0dd04
+SHA1 (patch-ae) = fb51aefedecd63dcb8c298111652a1782a70d511
+SHA1 (patch-af) = 7caa9a570f5bec136f555e01ca86a6c4c591a7a3
diff --git a/archivers/nulib2/patches/patch-aa b/archivers/nulib2/patches/patch-aa
index bfa7bf9892a..aeb6593d9fc 100644
--- a/archivers/nulib2/patches/patch-aa
+++ b/archivers/nulib2/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2011/09/03 21:45:03 dholland Exp $
+$NetBSD: patch-aa,v 1.5 2014/09/13 11:10:58 shattered Exp $
 
---- nulib2-203/configure.orig	2004-10-11 16:55:23.000000000 -0400
-+++ nulib2-203/configure
+--- nulib2-220/configure.orig	2004-10-11 16:55:23.000000000 -0400
++++ nulib2-220/configure
 @@ -1,4 +1,6 @@
  #! /bin/sh
 +# XXX - until pkgsrc has a sane way to invoke multiple "configure" scripts
diff --git a/archivers/nulib2/patches/patch-ab b/archivers/nulib2/patches/patch-ab
index 8f6e439c137..fa587e8b55c 100644
--- a/archivers/nulib2/patches/patch-ab
+++ b/archivers/nulib2/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.7 2011/09/03 21:45:03 dholland Exp $
+$NetBSD: patch-ab,v 1.8 2014/09/13 11:10:58 shattered Exp $
 
---- nulib2-203/Makefile.in.orig	2004-10-12 00:25:19.000000000 +0200
-+++ nulib2-203/Makefile.in
+--- nulib2-220/Makefile.in.orig	2004-10-12 00:25:19.000000000 +0200
++++ nulib2-220/Makefile.in
 @@ -69,14 +69,18 @@ LIB_PRODUCT	= libnufx.a
  # Build stuff
  #
  
 -all: $(PRODUCT)
 +# XXX - until pkgsrc has a sane way to invoke multiple "build" targets
-+../nufxlib-203/libnufx.a:
-+	cd ../nufxlib-203 && $(MAKE)
++../nufxlib-220/libnufx.a:
++	cd ../nufxlib-220 && $(MAKE)
 +
-+all: ../nufxlib-203/libnufx.a $(PRODUCT)
++all: ../nufxlib-220/libnufx.a $(PRODUCT)
  	@true
  
  install: $(PRODUCT)
diff --git a/archivers/nulib2/patches/patch-ac b/archivers/nulib2/patches/patch-ac
index 0b5344079fd..568fec01813 100644
--- a/archivers/nulib2/patches/patch-ac
+++ b/archivers/nulib2/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.5 2011/09/03 21:45:03 dholland Exp $
+$NetBSD: patch-ac,v 1.6 2014/09/13 11:10:58 shattered Exp $
 
---- nufxlib-203/Makefile.in.orig	Mon May 22 20:15:37 2000
-+++ nufxlib-203/Makefile.in
+--- nufxlib-220/Makefile.in.orig	Mon May 22 20:15:37 2000
++++ nufxlib-220/Makefile.in
 @@ -88,10 +88,10 @@
  # The build date is approximate, the build flags are accurate so long
  # as they were changed by touching the makefile.
diff --git a/archivers/nulib2/patches/patch-ad b/archivers/nulib2/patches/patch-ad
index ef3600b7110..69569fa5fff 100644
--- a/archivers/nulib2/patches/patch-ad
+++ b/archivers/nulib2/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2011/09/03 21:45:03 dholland Exp $
+$NetBSD: patch-ad,v 1.3 2014/09/13 11:10:58 shattered Exp $
 
---- nufxlib-203/configure.orig	2004-11-28 23:37:10.000000000 -0500
-+++ nufxlib-203/configure
+--- nufxlib-220/configure.orig	2004-11-28 23:37:10.000000000 -0500
++++ nufxlib-220/configure
 @@ -4059,10 +4059,6 @@ elif test "$host_os" = "beos"; then
          SHARE_FLAGS='-nostartfiles -Xlinker -soname="$@"'
  fi
diff --git a/archivers/nulib2/patches/patch-ae b/archivers/nulib2/patches/patch-ae
index 25a823a4b0d..e3b17f40f89 100644
--- a/archivers/nulib2/patches/patch-ae
+++ b/archivers/nulib2/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.3 2011/09/03 21:45:03 dholland Exp $
+$NetBSD: patch-ae,v 1.4 2014/09/13 11:10:58 shattered Exp $
 
 - don't declare "kNufxLibName" extern as it's file-static in one source file
 - fix gcc/C99 inline mess
 
---- nufxlib-203/NufxLibPriv.h.orig	2004-03-10 21:05:39.000000000 +0000
-+++ nufxlib-203/NufxLibPriv.h
+--- nufxlib-220/NufxLibPriv.h.orig	2004-03-10 21:05:39.000000000 +0000
++++ nufxlib-220/NufxLibPriv.h
 @@ -557,7 +557,11 @@ ushort Nu_CalcCRC16(ushort seed, const u
  #ifdef __Crc16_c__      /* just doing "static inline" warns def-but-not-used */
   #define CRC_INLINE /**/
@@ -17,14 +17,6 @@ $NetBSD: patch-ae,v 1.3 2011/09/03 21:45:03 dholland Exp $
  #endif
  #if defined(inline) && !defined(__Crc16_c__)    /* somebody ovrd inline def? */
  ushort Nu_UpdateCRC16(uchar val, ushort crc);
-@@ -673,7 +677,6 @@ NuError Nu_ExpandLZW(NuArchive* pArchive
-     const NuThread* pThread, FILE* infp, NuFunnel* pFunnel, ushort* pThreadCrc);
- 
- /* MiscUtils.c */
--extern const char* kNufxLibName;
- extern NuCallback gNuGlobalErrorMessageHandler;
- const char* Nu_StrError(NuError err);
- void Nu_ReportError(NuArchive* pArchive, const char* file, int line,
 @@ -811,7 +814,11 @@ NuError Nu_ExpandHuffmanSQ(NuArchive* pA
  #ifdef __Thread_c__
   #define THREAD_INLINE  /**/
diff --git a/archivers/nulib2/patches/patch-af b/archivers/nulib2/patches/patch-af
index 2371ff867a0..5a4af28290d 100644
--- a/archivers/nulib2/patches/patch-af
+++ b/archivers/nulib2/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 2011/09/03 21:45:03 dholland Exp $
+$NetBSD: patch-af,v 1.3 2014/09/13 11:10:58 shattered Exp $
 
---- nufxlib-203/SysDefs.h.orig	2004-03-10 13:05:51.000000000 -0800
-+++ nufxlib-203/SysDefs.h
+--- nufxlib-220/SysDefs.h.orig	2004-03-10 13:05:51.000000000 -0800
++++ nufxlib-220/SysDefs.h
 @@ -108,7 +108,6 @@
  #endif