Update to 2.0.3. Changelog:

2004/10/11  ***** v2.0.3 shipped *****

2004/09/25  fadden
    - Fixed: attempting to add files after deleting *all* entries in an
      archive would fail.
    - Removed use of a "ushort" from NufxLib.h.

2004/09/20  fadden
    - Corrected behavior after flush when original archive can't be
      deleted.

2004/09/09  fadden
    - Added header offset and junk offset to NuGetAttr.

2004/08/22  fadden
    - Fixed obscure bug when recompressing a GSHK-added zero-length file
      when "fake threads" is enabled.

2004/03/10  ***** v2.0.2 shipped *****

2004/03/09  fadden
    - Set access permissions based on umask when extracting a "locked"
      file.  My thanks to Matthew Fischer for sending a patch.
    - Reject archives with a MasterEOF == 48, not <= 48.  There are
      some otherwise valid archives created by an old version of ShrinkIt
      that have MasterEOF==0.

2003/10/16  ***** v2.0.1 shipped *****

2003/10/16  fadden
    - Added workaround for bad HFS option lists created by GSHK.
    - Added junk-skipping feature.  Up to 1024 bytes of crud (e.g.
      MacBinary headers or HTTP remnants) will be searched for evidence
      of an archive.

2003/06/19  sheppy
    - Added support for resource forks and file and aux types when built
      for Mac OS X.

6 files changed, 56 insertions, 31 deletions

diff --git a/archivers/nulib2/Makefile b/archivers/nulib2/Makefile
index 2a28622fe11..129f58d9b23 100644
--- a/archivers/nulib2/Makefile
+++ b/archivers/nulib2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/09/28 22:05:57 tv Exp $
+# $NetBSD: Makefile,v 1.12 2004/11/29 04:50:34 tv Exp $
 #
 
-DISTNAME=	nulibdist-200
-PKGNAME=	nulib2-2.0.0
+DISTNAME=	nulibdist-203
+PKGNAME=	nulib2-2.0.3
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.nulib.com/downloads/
 
@@ -12,12 +12,13 @@ COMMENT=	Handles Apple II ShrinkIt (NuFX) file/disk archives
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=		${WRKDIR}/nulib2-200
+WRKSRC=		${WRKDIR}/${DISTNAME:S/dist/2/}
 USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--cache-file=${WRKDIR}/config.cache
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../mk/bsd.prefs.mk"
 
-# nulib2 needs this to identify a Unixlike system
 CFLAGS+=	-D__unix__
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/nulib2/distinfo b/archivers/nulib2/distinfo
index 8aec0ee5012..109762f5f9e 100644
--- a/archivers/nulib2/distinfo
+++ b/archivers/nulib2/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2004/07/19 12:50:58 wiz Exp $
+$NetBSD: distinfo,v 1.7 2004/11/29 04:50:35 tv Exp $
 
-SHA1 (nulibdist-200.tar.gz) = 28161027b618c872b961d69fd0e2152b03c8e459
-Size (nulibdist-200.tar.gz) = 352217 bytes
-SHA1 (patch-aa) = f1b27fddc92f84ca8ab1404fb3fe75861ba10eda
-SHA1 (patch-ab) = ad760bbe9eb4ced32089f9e7b0c249a8c4cc6c23
-SHA1 (patch-ac) = 07c64805720413366871c152b3f06657f102c2da
+SHA1 (nulibdist-203.tar.gz) = c7a9bde218e0a115424dfc2e3d7234ee7faa9b8e
+Size (nulibdist-203.tar.gz) = 394129 bytes
+SHA1 (patch-aa) = a8c05f177ec5e08dc1bb8968be3febb3586d57a1
+SHA1 (patch-ab) = 013f1e8681f0ac5d7f5757df7ed703bb27a3216c
+SHA1 (patch-ac) = 51460a4003c40f68ed19431afc02aa1607f482ef
+SHA1 (patch-ad) = e537bbc19b3edfbabac1e61859dca29b068c36e5
diff --git a/archivers/nulib2/patches/patch-aa b/archivers/nulib2/patches/patch-aa
index 7318c29c27b..68aef379c5e 100644
--- a/archivers/nulib2/patches/patch-aa
+++ b/archivers/nulib2/patches/patch-aa
@@ -1,14 +1,22 @@
-$NetBSD: patch-aa,v 1.2 2003/07/15 09:36:46 agc Exp $
+$NetBSD: patch-aa,v 1.3 2004/11/29 04:50:35 tv Exp $
 
---- configure.orig	Sat Mar 10 21:41:17 2001
-+++ configure	Sat Mar 10 21:42:16 2001
-@@ -7,6 +7,9 @@
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- 
+--- configure.orig	2004-10-11 16:55:23.000000000 -0400
++++ configure
+@@ -1,4 +1,6 @@
+ #! /bin/sh
 +# XXX - until pkgsrc has a sane way to invoke multiple "configure" scripts
-+(cd ../nufxlib-200 && ./configure ${1+$@})
-+
- # Defaults:
- ac_help=
- ac_default_prefix=/usr/local
++(cd ../nufxlib-2* && ./configure "$@")
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.57.
+ #
+@@ -4367,10 +4369,6 @@ if test "$host_os" = "beos"; then
+     fi
+ fi
+ 
+-if test "$host_vendor" = "apple" -a ${host_os:0:6} = "darwin"; then
+-    echo "checking for Mac OS X... yes, adding -framework Carbon"
+-    LIBS="$LIBS -framework Carbon"
+-fi
+ 
+ 
+ if test "$host_cpu" = "powerpc" -a "$host_os" = "beos"; then
diff --git a/archivers/nulib2/patches/patch-ab b/archivers/nulib2/patches/patch-ab
index 77ae3bfbc37..381e507a5e1 100644
--- a/archivers/nulib2/patches/patch-ab
+++ b/archivers/nulib2/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2003/07/15 09:36:46 agc Exp $
+$NetBSD: patch-ab,v 1.5 2004/11/29 04:50:35 tv Exp $
 
 --- Makefile.in.orig	Mon May 22 20:42:57 2000
 +++ Makefile.in
@@ -8,10 +8,10 @@ $NetBSD: patch-ab,v 1.4 2003/07/15 09:36:46 agc Exp $
  
 -all: $(PRODUCT)
 +# XXX - until pkgsrc has a sane way to invoke multiple "build" targets
-+../nufxlib-200/libnufx.a:
-+	cd ../nufxlib-200 && $(MAKE)
++../nufxlib-203/libnufx.a:
++	cd ../nufxlib-203 && $(MAKE)
 +
-+all: ../nufxlib-200/libnufx.a $(PRODUCT)
++all: ../nufxlib-203/libnufx.a $(PRODUCT)
  	@true
  
  install: $(PRODUCT)
diff --git a/archivers/nulib2/patches/patch-ac b/archivers/nulib2/patches/patch-ac
index e6e11f3d8c0..29e842e1dcd 100644
--- a/archivers/nulib2/patches/patch-ac
+++ b/archivers/nulib2/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2003/07/15 09:36:46 agc Exp $
+$NetBSD: patch-ac,v 1.4 2004/11/29 04:50:35 tv Exp $
 
---- ../nufxlib-200/Makefile.in.orig	Mon May 22 20:15:37 2000
-+++ ../nufxlib-200/Makefile.in
+--- ../nufxlib-203/Makefile.in.orig	Mon May 22 20:15:37 2000
++++ ../nufxlib-203/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
new file mode 100644
index 00000000000..9d46aa2d000
--- /dev/null
+++ b/archivers/nulib2/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2004/11/29 04:50:35 tv Exp $
+
+--- ../nufxlib-203/configure.orig	2004-11-28 23:37:10.000000000 -0500
++++ ../nufxlib-203/configure
+@@ -4059,10 +4059,6 @@ elif test "$host_os" = "beos"; then
+         SHARE_FLAGS='-nostartfiles -Xlinker -soname="$@"'
+ fi
+ 
+-if test "$host_vendor" = "apple" -a ${host_os:0:6} = "darwin"; then
+-    echo "checking for Mac OS X... yes, adding -framework Carbon"
+-    LIBS="$LIBS -framework Carbon"
+-fi
+ 
+ 
+