Fixed wrong use of WRKSRC.

7 files changed, 27 insertions, 25 deletions

diff --git a/devel/hptools/Makefile b/devel/hptools/Makefile
index 2d87fe95056..5aa7bbfc0cf 100644
--- a/devel/hptools/Makefile
+++ b/devel/hptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:25 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/11/03 20:20:12 rillig Exp $
 #
 
 DISTNAME=	hptools-src-3.0.8
@@ -16,14 +16,16 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 LICENSE=	hptools-license
 
-WRKSRC=		${WRKDIR}/Hptools/support
+WRKSRC=		${WRKDIR}/Hptools
 GNU_CONFIGURE=	YES
+CONFIGURE_DIRS=	support
+BUILD_DIRS=	support
 
 post-build:
-	${CHMOD} ${SHAREMODE} ${WRKSRC}/../doc/*
+	${CHMOD} ${SHAREMODE} ${WRKSRC}/doc/*
 
 post-install:
-	cd ${WRKSRC}/.. \
+	cd ${WRKSRC} \
 	&& ${PAX} -rw -pam -s ',^doc,hptools,g' doc ${PREFIX}/share/doc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/hptools/distinfo b/devel/hptools/distinfo
index 4652c328348..4b79e45680d 100644
--- a/devel/hptools/distinfo
+++ b/devel/hptools/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:16 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/11/03 20:20:12 rillig Exp $
 
 SHA1 (hptools-src-3.0.8.tar.gz) = a0e8b934eeb2f83d858c4aa67d52779d69e51608
 RMD160 (hptools-src-3.0.8.tar.gz) = 392933086276132a37f68a92295b5628b5b104b5
 Size (hptools-src-3.0.8.tar.gz) = 438065 bytes
-SHA1 (patch-aa) = e311d10f2c10a08c03aab93891ea7dbe9924f763
-SHA1 (patch-ab) = 1ce7fbb60a1f6ab4877c0298a72596cb773b23e4
-SHA1 (patch-ac) = e1a7e026ab75df83601da555d350a03e05622a60
-SHA1 (patch-ad) = 65e49a4c80080731ef19fbe8fb6542f93c3ffd79
-SHA1 (patch-ae) = 8b57a5c56cde0dd7e777e1a77cc938894e0d92f9
+SHA1 (patch-aa) = 6dbad4f3f5081ef8e9affc8577e46be1af861973
+SHA1 (patch-ab) = edb1167b3e66efba7cbcf3c455a2c5dbad26e83f
+SHA1 (patch-ac) = 11c47b1ced2d16eb3795b1d69c527a6206ad0637
+SHA1 (patch-ad) = e22ddd54dffb57df60ea14b68c1aaff45e39aaa1
+SHA1 (patch-ae) = 7d851fffd798a40d0bb18a569dddc04d3abccc64
diff --git a/devel/hptools/patches/patch-aa b/devel/hptools/patches/patch-aa
index 2c0fcc3b019..ca444e7529f 100644
--- a/devel/hptools/patches/patch-aa
+++ b/devel/hptools/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1 2004/05/07 01:50:15 danw Exp $
+$NetBSD: patch-aa,v 1.2 2005/11/03 20:20:12 rillig Exp $
 
---- ../rplcomp/masd.c.orig	Sat Mar 13 00:47:19 2004
-+++ ../rplcomp/masd.c	Sat Mar 13 00:47:25 2004
+--- rplcomp/masd.c.orig	Sat Mar 13 00:47:19 2004
++++ rplcomp/masd.c	Sat Mar 13 00:47:25 2004
 @@ -11,9 +11,6 @@
  #else
  #  include <strings.h>
diff --git a/devel/hptools/patches/patch-ab b/devel/hptools/patches/patch-ab
index 4c1395d9a3f..63e05f1d55d 100644
--- a/devel/hptools/patches/patch-ab
+++ b/devel/hptools/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1 2004/05/07 01:50:15 danw Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/03 20:20:12 rillig Exp $
 
---- ../rplcomp/defer.c.orig	Sat Mar 13 00:47:14 2004
-+++ ../rplcomp/defer.c	Sat Mar 13 00:47:19 2004
+--- rplcomp/defer.c.orig	Sat Mar 13 00:47:14 2004
++++ rplcomp/defer.c	Sat Mar 13 00:47:19 2004
 @@ -11,9 +11,6 @@
  #else
  #  include <strings.h>
diff --git a/devel/hptools/patches/patch-ac b/devel/hptools/patches/patch-ac
index c982bfb52e0..8773df0ce24 100644
--- a/devel/hptools/patches/patch-ac
+++ b/devel/hptools/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2004/05/07 01:50:15 danw Exp $
+$NetBSD: patch-ac,v 1.2 2005/11/03 20:20:12 rillig Exp $
 
---- ../common/envfile.c.orig	Sat Mar 13 00:46:43 2004
-+++ ../common/envfile.c	Sat Mar 13 00:46:58 2004
+--- common/envfile.c.orig	Sat Mar 13 00:46:43 2004
++++ common/envfile.c	Sat Mar 13 00:46:58 2004
 @@ -10,9 +10,6 @@
  #else
  #  include <strings.h>
diff --git a/devel/hptools/patches/patch-ad b/devel/hptools/patches/patch-ad
index 00a5378ace7..6963ab41de6 100644
--- a/devel/hptools/patches/patch-ad
+++ b/devel/hptools/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2004/05/07 01:50:15 danw Exp $
+$NetBSD: patch-ad,v 1.2 2005/11/03 20:20:12 rillig Exp $
 
---- ../include/sasm.h.orig	Sat Mar 13 00:46:58 2004
-+++ ../include/sasm.h	Sat Mar 13 00:47:07 2004
+--- include/sasm.h.orig	Sat Mar 13 00:46:58 2004
++++ include/sasm.h	Sat Mar 13 00:47:07 2004
 @@ -16,9 +16,6 @@
  #else
  #  include <strings.h>
diff --git a/devel/hptools/patches/patch-ae b/devel/hptools/patches/patch-ae
index 8183d367bba..2589ec8121c 100644
--- a/devel/hptools/patches/patch-ae
+++ b/devel/hptools/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2004/05/07 01:50:15 danw Exp $
+$NetBSD: patch-ae,v 1.2 2005/11/03 20:20:12 rillig Exp $
 
---- ../include/sload.h.orig	Sat Mar 13 00:47:08 2004
-+++ ../include/sload.h	Sat Mar 13 00:47:14 2004
+--- include/sload.h.orig	Sat Mar 13 00:47:08 2004
++++ include/sload.h	Sat Mar 13 00:47:14 2004
 @@ -21,9 +21,6 @@
  #else
  #  include <strings.h>