Update to latest NetBSD -current sources rather than being built from

ancient sources predating a move in the repo.

Source does not maintain a CHANGELOG. It is anticipated that most changes
are build related, though PR/42651 is also addressed by this.

9 files changed, 22 insertions, 93 deletions

diff --git a/doc/CHANGES-2010 b/doc/CHANGES-2010
index a7a18fc74d4..af2f96f557f 100644
--- a/doc/CHANGES-2010
+++ b/doc/CHANGES-2010
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2010,v 1.2112 2010/06/04 16:16:39 sborrill Exp $
+$NetBSD: CHANGES-2010,v 1.2113 2010/06/04 16:24:55 sborrill Exp $
 
 Changes to the packages collection and infrastructure in 2010:
 
@@ -2838,3 +2838,5 @@ Changes to the packages collection and infrastructure in 2010:
 	Moved devel/netbsd-iscsi-initiator to net/netbsd-iscsi-initiator [sborrill 2010-06-04]
 	Moved devel/netbsd-iscsi-target to net/netbsd-iscsi-target [sborrill 2010-06-04]
 	Added devel/netbsd-iscsi-lib version 20100416 [sborrill 2010-06-04]
+	Updated net/netbsd-iscsi-initiator to 20100416 [sborrill 2010-06-04]
+	Updated net/netbsd-iscsi-target to 20100416 [sborrill 2010-06-04]
diff --git a/net/netbsd-iscsi-initiator/Makefile b/net/netbsd-iscsi-initiator/Makefile
index e6ad626ab26..f7056979536 100644
--- a/net/netbsd-iscsi-initiator/Makefile
+++ b/net/netbsd-iscsi-initiator/Makefile
@@ -1,27 +1,15 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/06/04 16:07:51 sborrill Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/04 16:24:55 sborrill Exp $
 
-DISTNAME=	netbsd-iscsi-20080207
 PKGNAME=	${DISTNAME:C/-iscsi/-iscsi-initiator/}
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_BACKUP}
-
-MAINTAINER=	agc@NetBSD.org
-HOMEPAGE=	http://www.alistaircrooks.co.uk/software.html
+CATEGORIES=	net
 COMMENT=	NetBSD's iSCSI initiator (per iSCSI RFC 3720)
 
-GNU_CONFIGURE=	yes
-CONFIGURE_DIRS=	src
-BUILD_TARGET=	all-initiator
-
-AUTO_MKDIRS=			yes
+BUILD_DIRS+=	${WRKSRC}/src/initiator
+DISTINFO_FILE=	${.CURDIR}/../../devel/netbsd-iscsi-lib/distinfo
+PATCHDIR=	${.CURDIR}/../../devel/netbsd-iscsi-lib/patches
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+.include "../../devel/netbsd-iscsi-lib/Makefile.common"
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/iscsifs ${DESTDIR}${PREFIX}/sbin/iscsifs
-	${INSTALL_MAN} ${WRKSRC}/src/iscsifs.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/iscsifs.8
-
-.include "../../mk/fuse.buildlink3.mk"
+.include "../../devel/netbsd-iscsi-lib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netbsd-iscsi-initiator/PLIST b/net/netbsd-iscsi-initiator/PLIST
index a4faac9781b..bd273e463e3 100644
--- a/net/netbsd-iscsi-initiator/PLIST
+++ b/net/netbsd-iscsi-initiator/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/06/04 16:07:51 sborrill Exp $
-man/man8/iscsifs.8
-sbin/iscsifs
+@comment $NetBSD: PLIST,v 1.2 2010/06/04 16:24:55 sborrill Exp $
+bin/iscsi-initiator
+man/man8/iscsi-initiator.8
diff --git a/net/netbsd-iscsi-initiator/distinfo b/net/netbsd-iscsi-initiator/distinfo
deleted file mode 100644
index 0fe990619d4..00000000000
--- a/net/netbsd-iscsi-initiator/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/06/04 16:07:51 sborrill Exp $
-
-SHA1 (netbsd-iscsi-20080207.tar.gz) = afe6ca2fdf46ce6dfed341dfd05aeb597584ae0f
-RMD160 (netbsd-iscsi-20080207.tar.gz) = 62417a6c7bebf95257054f96990a7009f515c064
-Size (netbsd-iscsi-20080207.tar.gz) = 249607 bytes
-SHA1 (patch-aa) = c97a1b97456cf2d11415ab22175c564baa9aae14
diff --git a/net/netbsd-iscsi-initiator/patches/patch-aa b/net/netbsd-iscsi-initiator/patches/patch-aa
deleted file mode 100644
index 68735eaa7a5..00000000000
--- a/net/netbsd-iscsi-initiator/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/06/04 16:07:51 sborrill Exp $
-
---- src/Makefile.in.orig	2006-06-03 00:39:22.000000000 +0000
-+++ src/Makefile.in
-@@ -16,9 +16,9 @@
- SYSCONFDIR=@sysconfdir@
- 
- CC= @CC@
--PTHREAD_FLAGS= -pthread
--PTHREAD_LDFLAGS= -pthread
--PTHREAD_LIBS= -lpthread
-+PTHREAD_FLAGS?= -pthread
-+PTHREAD_LDFLAGS?= -pthread
-+PTHREAD_LIBS?= -lpthread
- GCC_CFLAGS= -Wall -Wstrict-prototypes -fno-strict-aliasing -fno-common -Wno-trigraphs
- COMMON_CFLAGS += -DCONFIG_ISCSI_DEBUG -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
- COMMON_CFLAGS += -DHAVE_CONFIG_H
diff --git a/net/netbsd-iscsi-target/Makefile b/net/netbsd-iscsi-target/Makefile
index c35919003c6..13252189a33 100644
--- a/net/netbsd-iscsi-target/Makefile
+++ b/net/netbsd-iscsi-target/Makefile
@@ -1,29 +1,15 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/06/04 16:07:27 sborrill Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/04 16:24:56 sborrill Exp $
 
-DISTNAME=	netbsd-iscsi-20080207
 PKGNAME=	${DISTNAME:C/-iscsi/-iscsi-target/}
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_BACKUP}
-
-MAINTAINER=	agc@NetBSD.org
-HOMEPAGE=	http://www.alistaircrooks.co.uk/software.html
+CATEGORIES=	net
 COMMENT=	NetBSD's iSCSI target (per iSCSI RFC 3720)
 
-CONFLICTS+=	netbsd-iscsi>0
-
-GNU_CONFIGURE=	yes
-CONFIGURE_DIRS=	src
-
-AUTO_MKDIRS=		yes
+BUILD_DIRS+=	${WRKSRC}/src/target
+DISTINFO_FILE=	${.CURDIR}/../../devel/netbsd-iscsi-lib/distinfo
+PATCHDIR=	${.CURDIR}/../../devel/netbsd-iscsi-lib/patches
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/iscsi-target ${DESTDIR}${PREFIX}/sbin/iscsi-target
-	${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${DESTDIR}${PREFIX}/share/doc/iscsi/FAQ
-	${INSTALL_MAN} ${WRKSRC}/src/iscsi-target.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/iscsi-target.8
-	${INSTALL_MAN} ${WRKSRC}/src/targets.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/targets.5
+.include "../../devel/netbsd-iscsi-lib/Makefile.common"
 
+.include "../../devel/netbsd-iscsi-lib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netbsd-iscsi-target/PLIST b/net/netbsd-iscsi-target/PLIST
index 37d70933202..7cea71343b6 100644
--- a/net/netbsd-iscsi-target/PLIST
+++ b/net/netbsd-iscsi-target/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/06/04 16:07:27 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/06/04 16:24:56 sborrill Exp $
+bin/iscsi-target
 man/man5/targets.5
 man/man8/iscsi-target.8
-sbin/iscsi-target
-share/doc/iscsi/FAQ
diff --git a/net/netbsd-iscsi-target/distinfo b/net/netbsd-iscsi-target/distinfo
deleted file mode 100644
index 235eddec1e7..00000000000
--- a/net/netbsd-iscsi-target/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/06/04 16:07:27 sborrill Exp $
-
-SHA1 (netbsd-iscsi-20080207.tar.gz) = afe6ca2fdf46ce6dfed341dfd05aeb597584ae0f
-RMD160 (netbsd-iscsi-20080207.tar.gz) = 62417a6c7bebf95257054f96990a7009f515c064
-Size (netbsd-iscsi-20080207.tar.gz) = 249607 bytes
-SHA1 (patch-aa) = c97a1b97456cf2d11415ab22175c564baa9aae14
diff --git a/net/netbsd-iscsi-target/patches/patch-aa b/net/netbsd-iscsi-target/patches/patch-aa
deleted file mode 100644
index b13c6127138..00000000000
--- a/net/netbsd-iscsi-target/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/06/04 16:07:27 sborrill Exp $
-
---- src/Makefile.in.orig	2006-06-03 00:39:22.000000000 +0000
-+++ src/Makefile.in
-@@ -16,9 +16,9 @@
- SYSCONFDIR=@sysconfdir@
- 
- CC= @CC@
--PTHREAD_FLAGS= -pthread
--PTHREAD_LDFLAGS= -pthread
--PTHREAD_LIBS= -lpthread
-+PTHREAD_FLAGS?= -pthread
-+PTHREAD_LDFLAGS?= -pthread
-+PTHREAD_LIBS?= -lpthread
- GCC_CFLAGS= -Wall -Wstrict-prototypes -fno-strict-aliasing -fno-common -Wno-trigraphs
- COMMON_CFLAGS += -DCONFIG_ISCSI_DEBUG -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
- COMMON_CFLAGS += -DHAVE_CONFIG_H