Fixed pkglint warnings.

4 files changed, 14 insertions, 15 deletions

diff --git a/devel/netbsd-iscsi/Makefile b/devel/netbsd-iscsi/Makefile
index d8fc2ce602a..cebeef91461 100644
--- a/devel/netbsd-iscsi/Makefile
+++ b/devel/netbsd-iscsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/05/27 21:32:30 agc Exp $
+# $NetBSD: Makefile,v 1.14 2006/06/17 16:52:27 rillig Exp $
 
 DISTNAME=	netbsd-iscsi-20060527
 CATEGORIES=	devel
@@ -8,17 +8,16 @@ MAINTAINER=	agc@NetBSD.org
 HOMEPAGE=	http://www.alistaircrooks.co.uk/software.html
 COMMENT=	NetBSD's iSCSI target (per iSCSI RFC 3720)
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-
 GNU_CONFIGURE=	yes
+CONFIGURE_DIRS=	src
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/iscsi-target ${PREFIX}/sbin/iscsi-target
-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/iscsi-harness ${PREFIX}/sbin/iscsi-harness
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/iscsi-target ${PREFIX}/sbin/iscsi-target
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/iscsi-harness ${PREFIX}/sbin/iscsi-harness
 	${INSTALL_DATA_DIR} ${PREFIX}/share/iscsi
-	${INSTALL_DATA} ${WRKSRC}/../doc/FAQ ${PREFIX}/share/iscsi/FAQ
-	${INSTALL_MAN} ${WRKSRC}/iscsi-target.8 ${PREFIX}/man/man8/iscsi-target.8
-	${INSTALL_MAN} ${WRKSRC}/targets.5 ${PREFIX}/man/man5/targets.5
+	${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${PREFIX}/share/iscsi/FAQ
+	${INSTALL_MAN} ${WRKSRC}/src/iscsi-target.8 ${PREFIX}/man/man8/iscsi-target.8
+	${INSTALL_MAN} ${WRKSRC}/src/targets.5 ${PREFIX}/man/man5/targets.5
 
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/devel/netbsd-iscsi/PLIST b/devel/netbsd-iscsi/PLIST
index 5b8403e0af6..54f02b267ba 100644
--- a/devel/netbsd-iscsi/PLIST
+++ b/devel/netbsd-iscsi/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/09 16:49:07 agc Exp $
-man/man8/iscsi-target.8
+@comment $NetBSD: PLIST,v 1.2 2006/06/17 16:52:27 rillig Exp $
 man/man5/targets.5
+man/man8/iscsi-target.8
 sbin/iscsi-harness
 sbin/iscsi-target
 share/iscsi/FAQ
diff --git a/devel/netbsd-iscsi/distinfo b/devel/netbsd-iscsi/distinfo
index 8dd6f36fef3..1fc68e93c14 100644
--- a/devel/netbsd-iscsi/distinfo
+++ b/devel/netbsd-iscsi/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2006/06/03 00:46:43 joerg Exp $
+$NetBSD: distinfo,v 1.14 2006/06/17 16:52:27 rillig Exp $
 
 SHA1 (netbsd-iscsi-20060527.tar.gz) = 8d560437f4c90dc3bd44e66d804fe7871ead4d75
 RMD160 (netbsd-iscsi-20060527.tar.gz) = 7119939e22bb26857267675535c3cc9c14bef7e1
 Size (netbsd-iscsi-20060527.tar.gz) = 237784 bytes
-SHA1 (patch-aa) = 497ecee57e2d1c9ceb4921fa8a1e4fae20eeeef3
+SHA1 (patch-aa) = e86b7400cc472a31a5cf2457924af3d7d5c4b0c3
diff --git a/devel/netbsd-iscsi/patches/patch-aa b/devel/netbsd-iscsi/patches/patch-aa
index 8072e1be011..d16955cf287 100644
--- a/devel/netbsd-iscsi/patches/patch-aa
+++ b/devel/netbsd-iscsi/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1 2006/06/03 00:46:43 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2006/06/17 16:52:27 rillig Exp $
 
---- Makefile.in.orig	2006-06-03 00:39:22.000000000 +0000
-+++ Makefile.in
+--- src/Makefile.in.orig	2006-06-03 00:39:22.000000000 +0000
++++ src/Makefile.in
 @@ -16,9 +16,9 @@ MANDIR=$(prefix)/man
  SYSCONFDIR=@sysconfdir@