8 files changed, 29 insertions, 28 deletions
diff --git a/archivers/nulib2/Makefile b/archivers/nulib2/Makefile
index de018b04afa..3495f1909f0 100644
--- a/archivers/nulib2/Makefile
+++ b/archivers/nulib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/06/30 00:07:09 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2011/09/03 21:45:03 dholland Exp $
 #
 
 DISTNAME=	nulibdist-203
@@ -15,8 +15,9 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=		no
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/dist/2/}
-GNU_CONFIGURE=	yes
+WRKSRC=			${WRKDIR}
+CONFIGURE_DIRS=		${WRKDIR}/${DISTNAME:S/dist/2/}
+GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/archivers/nulib2/distinfo b/archivers/nulib2/distinfo
index c03196ccf77..70258e03eec 100644
--- a/archivers/nulib2/distinfo
+++ b/archivers/nulib2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.11 2011/09/03 21:39:09 dholland Exp $
+$NetBSD: distinfo,v 1.12 2011/09/03 21:45:03 dholland Exp $
 
 SHA1 (nulibdist-203.tar.gz) = c7a9bde218e0a115424dfc2e3d7234ee7faa9b8e
 RMD160 (nulibdist-203.tar.gz) = 84c6eadd64749cfdc11fda74a552072bce1b04db
 Size (nulibdist-203.tar.gz) = 394129 bytes
-SHA1 (patch-aa) = a8c05f177ec5e08dc1bb8968be3febb3586d57a1
-SHA1 (patch-ab) = fe70386516a18837589986143d4c0fbdd1082baa
-SHA1 (patch-ac) = 51460a4003c40f68ed19431afc02aa1607f482ef
-SHA1 (patch-ad) = e537bbc19b3edfbabac1e61859dca29b068c36e5
-SHA1 (patch-ae) = 18890ec7d754060abfe8dee37ed9cb8ab58eb139
-SHA1 (patch-af) = 681d4d1a66a70c879b85377c1b86fd2fa60666d8
+SHA1 (patch-aa) = 19b3f9c99d4567d537992ccfc3798e8594e7ab87
+SHA1 (patch-ab) = 822f41e50035b98832a543634f5ab11c4a301d30
+SHA1 (patch-ac) = f18040d7a469aedec2351f514bfd63073a345463
+SHA1 (patch-ad) = e9fa5edf63d97d485a0425ad4bf019aaf217eb37
+SHA1 (patch-ae) = 08132fa91060bc45090b392d13c14e4fe73ab336
+SHA1 (patch-af) = b5da775e73b32678e13a9b77a806d6777a31395a
diff --git a/archivers/nulib2/patches/patch-aa b/archivers/nulib2/patches/patch-aa
index 68aef379c5e..bfa7bf9892a 100644
--- a/archivers/nulib2/patches/patch-aa
+++ b/archivers/nulib2/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2004/11/29 04:50:35 tv Exp $
+$NetBSD: patch-aa,v 1.4 2011/09/03 21:45:03 dholland Exp $
 
---- configure.orig	2004-10-11 16:55:23.000000000 -0400
-+++ configure
+--- nulib2-203/configure.orig	2004-10-11 16:55:23.000000000 -0400
++++ nulib2-203/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 9257070b38a..8f6e439c137 100644
--- a/archivers/nulib2/patches/patch-ab
+++ b/archivers/nulib2/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.6 2009/02/10 00:01:55 joerg Exp $
+$NetBSD: patch-ab,v 1.7 2011/09/03 21:45:03 dholland Exp $
 
---- Makefile.in.orig	2004-10-12 00:25:19.000000000 +0200
-+++ Makefile.in
+--- nulib2-203/Makefile.in.orig	2004-10-12 00:25:19.000000000 +0200
++++ nulib2-203/Makefile.in
 @@ -69,14 +69,18 @@ LIB_PRODUCT	= libnufx.a
  # Build stuff
  #
diff --git a/archivers/nulib2/patches/patch-ac b/archivers/nulib2/patches/patch-ac
index 29e842e1dcd..0b5344079fd 100644
--- a/archivers/nulib2/patches/patch-ac
+++ b/archivers/nulib2/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.4 2004/11/29 04:50:35 tv Exp $
+$NetBSD: patch-ac,v 1.5 2011/09/03 21:45:03 dholland Exp $
 
---- ../nufxlib-203/Makefile.in.orig	Mon May 22 20:15:37 2000
-+++ ../nufxlib-203/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
index 9d46aa2d000..ef3600b7110 100644
--- a/archivers/nulib2/patches/patch-ad
+++ b/archivers/nulib2/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2004/11/29 04:50:35 tv Exp $
+$NetBSD: patch-ad,v 1.2 2011/09/03 21:45:03 dholland Exp $
 
---- ../nufxlib-203/configure.orig	2004-11-28 23:37:10.000000000 -0500
-+++ ../nufxlib-203/configure
+--- 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
diff --git a/archivers/nulib2/patches/patch-ae b/archivers/nulib2/patches/patch-ae
index 6a7daef8ee3..25a823a4b0d 100644
--- a/archivers/nulib2/patches/patch-ae
+++ b/archivers/nulib2/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.2 2011/09/03 21:39:09 dholland Exp $
+$NetBSD: patch-ae,v 1.3 2011/09/03 21:45:03 dholland 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-203/NufxLibPriv.h.orig	2004-03-10 21:05:39.000000000 +0000
++++ nufxlib-203/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 /**/
diff --git a/archivers/nulib2/patches/patch-af b/archivers/nulib2/patches/patch-af
index c6beb7e47da..2371ff867a0 100644
--- a/archivers/nulib2/patches/patch-af
+++ b/archivers/nulib2/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1 2005/10/31 05:34:07 minskim Exp $
+$NetBSD: patch-af,v 1.2 2011/09/03 21:45:03 dholland Exp $
 
---- ../nufxlib-203/SysDefs.h.orig	2004-03-10 13:05:51.000000000 -0800
-+++ ../nufxlib-203/SysDefs.h
+--- nufxlib-203/SysDefs.h.orig	2004-03-10 13:05:51.000000000 -0800
++++ nufxlib-203/SysDefs.h
 @@ -108,7 +108,6 @@
  #endif