Fixed invalid use of WRKSRC.

5 files changed, 20 insertions, 20 deletions

diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile
index d4988d9fb71..a937808793e 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/19 17:40:22 kristerw Exp $
+# $NetBSD: Makefile,v 1.21 2005/11/03 21:24:29 rillig Exp $
 #
 
 DISTNAME=	vigor-0.016
@@ -12,17 +12,17 @@ COMMENT=	nvi with excessive online "help"
 
 CONFLICTS+=	nvi-[0-9]*
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/build
-
 GNU_CONFIGURE=	yes
+CONFIGURE_DIRS=	build
+CONFIGURE_ENV+=	TCLCONFIG_SH=${TCLCONFIG_SH:Q}
+CONFIGURE_ENV+=	vi_cv_path_shell=${TOOLS_SH:Q}
 CONFIGURE_ARGS+=--with-x
 #		--enable-perlinterp \
 #		--disable-curses \
 #		--disable-db \
 #		--disable-re
-CONFIGURE_ENV+=	TCLCONFIG_SH=${TCLCONFIG_SH:Q}
-CONFIGURE_ENV+=	vi_cv_path_shell="${TOOLS_SH}"
 USE_TOOLS+=	sh
+BUILD_DIRS=	${CONFIGURE_DIRS}
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
@@ -30,10 +30,10 @@ USE_TOOLS+=	sh
 .if exists(/usr/include/sys/queue.h)
 # this file obscures the system header
 post-patch:
-	${RM} -f ${WRKSRC}/../include/sys/queue.h
+	${RM} -f ${WRKSRC}/include/sys/queue.h
 .endif
 
 post-build:
-	nroff -mandoc ${WRKSRC}/../docs/USD.doc/vi.man/vi.1 >${WRKSRC}/../docs/USD.doc/vi.man/vi.0
+	nroff -mandoc ${WRKSRC}/docs/USD.doc/vi.man/vi.1 >${WRKSRC}/docs/USD.doc/vi.man/vi.0
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vigor/distinfo b/editors/vigor/distinfo
index 4cc07b863f3..90d7dced4e4 100644
--- a/editors/vigor/distinfo
+++ b/editors/vigor/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 17:15:13 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/11/03 21:24:29 rillig Exp $
 
 SHA1 (vigor-0.016.tar.gz) = cbbd7db8226421b86c50799178033c4248753706
 RMD160 (vigor-0.016.tar.gz) = 52cf417f85560b46f140d6f1093133eccbd2fc43
 Size (vigor-0.016.tar.gz) = 1108486 bytes
-SHA1 (patch-aa) = 2e50c3612956840ee2cea7b6c2b508bef60ea270
-SHA1 (patch-ab) = 4663f03370620fdf622c276a82102bb17a306661
-SHA1 (patch-ac) = e264e04341f41be2387a6125342bb4a2957e5035
+SHA1 (patch-aa) = 2ea52fe10dff6f2445ca0fd870065103b11b59cd
+SHA1 (patch-ab) = 2016eb247f7f747ca80041fac2ad15709f7e7a80
+SHA1 (patch-ac) = ab9924eaa775f17f9c51c1129a9cf2932035b9ab
diff --git a/editors/vigor/patches/patch-aa b/editors/vigor/patches/patch-aa
index 1dfa563962b..b17e26a8371 100644
--- a/editors/vigor/patches/patch-aa
+++ b/editors/vigor/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2001/11/15 23:40:33 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2005/11/03 21:24:29 rillig Exp $
 
---- Makefile.in.orig	Wed May  3 04:28:02 2000
-+++ Makefile.in
+--- build/Makefile.in.orig	Wed May  3 04:28:02 2000
++++ build/Makefile.in
 @@ -84,28 +84,16 @@
  	[ -d $(mandir)/cat1 ] || \
  	    ($(mkdir) $(mandir)/cat1 && $(chmod) $(dmode) $(mandir)/cat1)
diff --git a/editors/vigor/patches/patch-ab b/editors/vigor/patches/patch-ab
index a93f73e28fa..b5c7e99b00b 100644
--- a/editors/vigor/patches/patch-ab
+++ b/editors/vigor/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2005/01/22 02:35:44 minskim Exp $
+$NetBSD: patch-ab,v 1.5 2005/11/03 21:24:29 rillig Exp $
 
---- configure.orig	2000-05-02 21:27:53.000000000 -0500
-+++ configure
+--- build/configure.orig	2000-05-02 21:27:53.000000000 -0500
++++ build/configure
 @@ -1852,10 +1852,11 @@ else
    echo "$ac_t""no" 1>&6
  fi
diff --git a/editors/vigor/patches/patch-ac b/editors/vigor/patches/patch-ac
index bfed6885e26..b3a28ae9a1a 100644
--- a/editors/vigor/patches/patch-ac
+++ b/editors/vigor/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2005/01/22 02:35:44 minskim Exp $
+$NetBSD: patch-ac,v 1.2 2005/11/03 21:24:29 rillig Exp $
 
---- configure.in.orig	2000-05-02 21:27:52.000000000 -0500
-+++ configure.in
+--- build/configure.in.orig	2000-05-02 21:27:52.000000000 -0500
++++ build/configure.in
 @@ -243,7 +243,8 @@ dnl Make sure we can find a Tcl/Tk inter
  LIBOBJS="tcl.o $LIBOBJS"
  dnl GNU/Linux Tcl requires -ldl