--- net/libiscsi/distinfo	2017-02-25 16:20:19.577422000 +0100
+++ net/libiscsi/distinfo	2017-02-25 11:17:46.906010000 +0100
@@ -0,0 +1,2 @@ 
+SHA256 (sahlberg-libiscsi-1.18.0_GH0.tar.gz) = 464d104e12533dc11f0dd7662cbc2f01c132f94aa4f5bd519e3413ef485830e8
+SIZE (sahlberg-libiscsi-1.18.0_GH0.tar.gz) = 271603
--- net/libiscsi/Makefile	2017-02-25 16:20:19.581827000 +0100
+++ net/libiscsi/Makefile	2017-02-25 11:48:07.679981000 +0100
@@ -0,0 +1,25 @@ 
+# Created by: M. Birgmeier
+# $FreeBSD$
+
+PORTNAME=	libiscsi
+DISTVERSION=	1.18.0
+CATEGORIES=	net
+
+MAINTAINER=	la5lbtyi@aon.at
+COMMENT=	Client-side library to implement the iSCSI protocol
+
+LICENSE_COMB=	multi
+LICENSE=	LGPL21+ GPLv2+
+LICENSE_FILE=	${WRKSRC}/LICENSE ${WRKSRC}/LICENCE-LGPL-2.1.txt ${WRKSRC}/LICENCE-GPL-2.txt
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	sahlberg
+
+USES=		autoreconf:build libtool:build pathfix
+
+GNU_CONFIGURE=	yes
+
+pre-configure:
+	@(cd ${WRKSRC} && ./autogen.sh)
+
+.include <bsd.port.mk>
--- net/libiscsi/pkg-descr	2017-02-25 16:20:19.586191000 +0100
+++ net/libiscsi/pkg-descr	2017-02-25 11:16:06.214226000 +0100
@@ -0,0 +1,8 @@ 
+Libiscsi is a client-side library to implement the iSCSI protocol
+that can be used to access the resources of an iSCSI target.
+
+The library is fully asynchronous with regards to iSCSI commands
+and SCSI tasks, but a synchronous layer is also provided for ease
+of use for simpler applications.
+
+https://github.com/sahlberg/libiscsi
--- net/libiscsi/pkg-plist	2017-02-25 16:20:19.590576000 +0100
+++ net/libiscsi/pkg-plist	2017-02-25 11:48:32.314931000 +0100
@@ -0,0 +1,16 @@ 
+bin/iscsi-inq
+bin/iscsi-ls
+bin/iscsi-perf
+bin/iscsi-readcapacity16
+bin/iscsi-swp
+include/iscsi/iscsi.h
+include/iscsi/scsi-lowlevel.h
+lib/libiscsi.so.8.0.0
+lib/libiscsi.so.8
+lib/libiscsi.so
+lib/libiscsi.a
+libdata/pkgconfig/libiscsi.pc
+man/man1/iscsi-swp.1.gz
+man/man1/iscsi-test-cu.1.gz
+man/man1/iscsi-inq.1.gz
+man/man1/iscsi-ls.1.gz
--- emulators/qemu-sbruno/Makefile	2017-02-23 18:31:49.329724000 +0100
+++ emulators/qemu-sbruno/Makefile	2017-02-25 11:54:06.495447000 +0100
@@ -30,7 +30,7 @@ 
 
 OPTIONS_DEFINE=	SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \
 		CDROM_DMA PCAP USBREDIR X86_TARGETS BSD_USER \
-		STATIC_LINK DOCS
+		STATIC_LINK DOCS ISCSI
 SAMBA_DESC=		samba dependency (for -smb)
 GNUTLS_DESC=		gnutls dependency (vnc encryption)
 SASL_DESC=		cyrus-sasl dependency (vnc encryption)
@@ -42,7 +42,8 @@ 
 X86_TARGETS_DESC=	Don't build non-x86 system targets
 BSD_USER_DESC=		Also build bsd-user targets (for testing)
 STATIC_LINK_DESC=	Statically link the executables
-OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP
+ISCSI_DESC=		libiscsi dependency (iSCSI client for emulated drives)
+OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP ISCSI
 
 .if !defined(QEMU_USER_STATIC)
 CONFLICTS_INSTALL=	qemu-[0-9]* qemu-devel-*
@@ -166,6 +167,12 @@ 
 LIB_DEPENDS+=	libsasl2.so:security/cyrus-sasl2
 .endif
 
+.if empty(PORT_OPTIONS:MISCSI)
+CONFIGURE_ARGS+=	--disable-libiscsi
+.else
+LIB_DEPENDS+=	libiscsi.so:net/libiscsi
+.endif
+
 .if empty(PORT_OPTIONS:MJPEG)
 CONFIGURE_ARGS+=	--disable-vnc-jpeg
 .else