Shared routines used by both netbsd-iscsi-initiator and netbsd-iscsi-target.

Part of updating both packages to the code used in netbsd-current and then
used as a basis for further development.

8 files changed, 102 insertions, 0 deletions

diff --git a/devel/netbsd-iscsi-lib/DESCR b/devel/netbsd-iscsi-lib/DESCR
new file mode 100644
index 00000000000..26f22cb6fee
--- /dev/null
+++ b/devel/netbsd-iscsi-lib/DESCR
@@ -0,0 +1,5 @@
+iSCSI is an IETF standard (RFC 3720) for remote access to block-level
+storage.  It can be thought of as similar to NFS, except that an NFS
+server exports files.
+
+This is the NetBSD libiscsi library use by both the target and initiator.
diff --git a/devel/netbsd-iscsi-lib/Makefile b/devel/netbsd-iscsi-lib/Makefile
new file mode 100644
index 00000000000..be05db36fff
--- /dev/null
+++ b/devel/netbsd-iscsi-lib/Makefile
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $
+
+PKGNAME=	${DISTNAME:C/-iscsi/-iscsi-lib/}
+CATEGORIES=	devel
+COMMENT=	NetBSD's iSCSI library (per iSCSI RFC 3720)
+
+BUILD_DIRS+=	${WRKSRC}/src/lib
+
+.include "Makefile.common"
+
+post-install:
+	${INSTALL_DATA}	${WRKSRC}/include/iscsi.h ${DESTDIR}${PREFIX}/include
+	
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/netbsd-iscsi-lib/Makefile.common b/devel/netbsd-iscsi-lib/Makefile.common
new file mode 100644
index 00000000000..cbbf394f960
--- /dev/null
+++ b/devel/netbsd-iscsi-lib/Makefile.common
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile.common,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $
+# Included by:
+# net/netbsd-iscsi-target/Makefile
+# net/netbsd-iscsi-initiator/Makefile
+
+DISTNAME=	netbsd-iscsi-20100416
+MASTER_SITES=	${MASTER_SITE_BACKUP}
+
+MAINTAINER=	agc@NetBSD.org
+HOMEPAGE=	http://www.alistaircrooks.co.uk/software.html
+LICENSE=	modified-bsd
+
+GNU_CONFIGURE=	yes
+
+AUTO_MKDIRS=		yes
+
+PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/devel/netbsd-iscsi-lib/PLIST b/devel/netbsd-iscsi-lib/PLIST
new file mode 100644
index 00000000000..877352e5905
--- /dev/null
+++ b/devel/netbsd-iscsi-lib/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $
+include/iscsi.h
+lib/libiscsi.la
+man/man3/libiscsi.3
diff --git a/devel/netbsd-iscsi-lib/buildlink3.mk b/devel/netbsd-iscsi-lib/buildlink3.mk
new file mode 100644
index 00000000000..23a4a61ede2
--- /dev/null
+++ b/devel/netbsd-iscsi-lib/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $
+
+BUILDLINK_TREE+=	netbsd-iscsi-lib
+
+.if !defined(NETBSD_ISCSI_LIB_BUILDLINK3_MK)
+NETBSD_ISCSI_LIB_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.netbsd-iscsi-lib+=	netbsd-iscsi-lib>=20100416
+BUILDLINK_ABI_DEPENDS.netbsd-iscsi-lib+=	netbsd-iscsi-lib>=20100416
+BUILDLINK_PKGSRCDIR.netbsd-iscsi-lib?=	../../devel/netbsd-iscsi-lib
+.endif # NETBSD_ISCSI_LIB_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-netbsd-iscsi-lib
diff --git a/devel/netbsd-iscsi-lib/distinfo b/devel/netbsd-iscsi-lib/distinfo
new file mode 100644
index 00000000000..6e6d5480094
--- /dev/null
+++ b/devel/netbsd-iscsi-lib/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $
+
+SHA1 (netbsd-iscsi-20100416.tar.gz) = ab8a94f26520f8a1ff7484efa80aa3c0ecfe1c40
+RMD160 (netbsd-iscsi-20100416.tar.gz) = 1bac1a7fdcc8d1df7dd3c32b8fb940933057ba61
+Size (netbsd-iscsi-20100416.tar.gz) = 539715 bytes
+SHA1 (patch-ab) = d769048053104c03739a7ff3f77280ef1357e23c
+SHA1 (patch-ac) = 6e2131c0e992c750aec272da5f88d7b99324898e
diff --git a/devel/netbsd-iscsi-lib/patches/patch-ab b/devel/netbsd-iscsi-lib/patches/patch-ab
new file mode 100644
index 00000000000..3c830ad7182
--- /dev/null
+++ b/devel/netbsd-iscsi-lib/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $
+
+--- src/target/Makefile.in.orig	2010-04-16 20:16:12.000000000 +0100
++++ src/target/Makefile.in	2010-04-16 20:16:32.000000000 +0100
+@@ -51,7 +51,7 @@
+ PROGRAMS = $(bin_PROGRAMS)
+ am_iscsi_target_OBJECTS = iscsi_target-iscsi-target.$(OBJEXT)
+ iscsi_target_OBJECTS = $(am_iscsi_target_OBJECTS)
+-iscsi_target_DEPENDENCIES = ../lib/libiscsi.la
++iscsi_target_DEPENDENCIES =
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+ depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
+ am__depfiles_maybe = depfiles
+@@ -210,7 +210,7 @@
+ AM_CFLAGS = $(WARNCFLAGS) -pthread
+ iscsi_target_SOURCES = iscsi-target.c
+ iscsi_target_CPPFLAGS = -I$(top_srcdir)/include
+-iscsi_target_LDADD = ../lib/libiscsi.la -lpthread
++iscsi_target_LDADD = -liscsi -lpthread
+ man8_MANS = iscsi-target.8
+ man5_MANS = targets.5
+ dist_man_MANS = iscsi-target.8 targets.5
diff --git a/devel/netbsd-iscsi-lib/patches/patch-ac b/devel/netbsd-iscsi-lib/patches/patch-ac
new file mode 100644
index 00000000000..2b3e4e39ab0
--- /dev/null
+++ b/devel/netbsd-iscsi-lib/patches/patch-ac
@@ -0,0 +1,20 @@
+--- src/initiator/Makefile.in.orig	2010-04-16 20:26:17.000000000 +0100
++++ src/initiator/Makefile.in	2010-04-16 20:28:51.000000000 +0100
+@@ -53,7 +53,7 @@
+ 	iscsi_initiator-libkmod.$(OBJEXT) \
+ 	iscsi_initiator-virtdir.$(OBJEXT)
+ iscsi_initiator_OBJECTS = $(am_iscsi_initiator_OBJECTS)
+-iscsi_initiator_DEPENDENCIES = ../lib/libiscsi.la
++iscsi_initiator_DEPENDENCIES =
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+ depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
+ am__depfiles_maybe = depfiles
+@@ -211,7 +211,7 @@
+ AM_CFLAGS = $(WARNCFLAGS)
+ iscsi_initiator_SOURCES = iscsi-initiator.c libkmod.c virtdir.c
+ iscsi_initiator_CPPFLAGS = -I$(top_srcdir)/include
+-iscsi_initiator_LDADD = ../lib/libiscsi.la -lrefuse
++iscsi_initiator_LDADD = -liscsi -lrefuse
+ man8_MANS = iscsi-initiator.8
+ dist_man_MANS = iscsi-initiator.8
+ all: all-am