Fixed wrong use of WRKSRC.

8 files changed, 26 insertions, 25 deletions

diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile
index 4b0bf67f538..1ad42534edf 100644
--- a/graphics/hp2xx/Makefile
+++ b/graphics/hp2xx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:56 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/11/03 22:09:28 rillig Exp $
 #
 
 DISTNAME=	hp2xx-3.4.4
@@ -10,12 +10,12 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/hp2xx/hp2xx.html
 COMMENT=	HPGL converter and previewer
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/sources
+BUILD_DIRS=	sources
 USE_MAKEINFO=	YES
 INFO_FILES=	hp2xx.info
 
 post-extract:
-	${CP} ${WRKSRC}/../makes/generic.mak ${WRKSRC}/Makefile
+	${CP} ${WRKSRC}/makes/generic.mak ${WRKSRC}/sources/Makefile
 
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/hp2xx/distinfo b/graphics/hp2xx/distinfo
index 9a032829c15..2aacce0d066 100644
--- a/graphics/hp2xx/distinfo
+++ b/graphics/hp2xx/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 08:45:07 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/11/03 22:09:28 rillig Exp $
 
 SHA1 (hp2xx-3.4.4.tar.gz) = a168cbce5e0cea3859b404b9cbad372bd246af91
 RMD160 (hp2xx-3.4.4.tar.gz) = 61befd1a3a3aaa717826fec632dacc01e017edb8
 Size (hp2xx-3.4.4.tar.gz) = 610330 bytes
-SHA1 (patch-ab) = a878f1fcdce47ef06a66fa9287245c5eab84c978
-SHA1 (patch-ad) = 25f67fbec1fbc6a0e5989564f352033469342224
-SHA1 (patch-ae) = a89f476bd97d954de4bf33c6167704753f58a8f6
+SHA1 (patch-ab) = cd71203243efacaad0e4696e48ed859282725bb9
+SHA1 (patch-ad) = 82c123c227c7566e73137cda38f6807830e6cc5c
+SHA1 (patch-ae) = 30c3647e73c2e1fa2c417cc584809ec93c9efcf4
diff --git a/graphics/hp2xx/patches/patch-ab b/graphics/hp2xx/patches/patch-ab
index 404fb064f30..45e586d358d 100644
--- a/graphics/hp2xx/patches/patch-ab
+++ b/graphics/hp2xx/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.7 2004/11/28 15:12:11 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.8 2005/11/03 22:09:28 rillig Exp $
 
---- Makefile.orig	Sat Nov 27 23:52:19 2004
-+++ Makefile
+--- sources/Makefile.orig	Sat Nov 27 23:52:19 2004
++++ sources/Makefile
 @@ -28,13 +28,13 @@ SHELL    = /bin/sh
  
  CHMOD    = chmod
diff --git a/graphics/hp2xx/patches/patch-ad b/graphics/hp2xx/patches/patch-ad
index e78cfc9f479..33df84b6789 100644
--- a/graphics/hp2xx/patches/patch-ad
+++ b/graphics/hp2xx/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.4 2004/11/28 15:12:11 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.5 2005/11/03 22:09:28 rillig Exp $
 
---- getopt.c.orig	Sat Jun 21 15:31:51 2003
-+++ getopt.c
+--- sources/getopt.c.orig	Sat Jun 21 15:31:51 2003
++++ sources/getopt.c
 @@ -56,6 +56,8 @@ void Eprintf(const char *, ...);
  #endif
  
diff --git a/graphics/hp2xx/patches/patch-ae b/graphics/hp2xx/patches/patch-ae
index 1752329d72c..b19e76201dd 100644
--- a/graphics/hp2xx/patches/patch-ae
+++ b/graphics/hp2xx/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.5 2004/11/28 15:12:11 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.6 2005/11/03 22:09:28 rillig Exp $
 
---- ../doc/hp2xxinf.tex.orig	Sat Jun 21 15:41:16 2003
-+++ ../doc/hp2xxinf.tex
+--- doc/hp2xxinf.tex.orig	Sat Jun 21 15:41:16 2003
++++ doc/hp2xxinf.tex
 @@ -39,8 +39,7 @@
  @ifinfo
  @format
diff --git a/graphics/wmphoto/Makefile b/graphics/wmphoto/Makefile
index d7a6f85c2a6..1627eae0d20 100644
--- a/graphics/wmphoto/Makefile
+++ b/graphics/wmphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:07 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/11/03 22:12:35 rillig Exp $
 #
 
 DISTNAME=	wmphoto-0.3a
@@ -9,15 +9,15 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.dcc.uchile.cl/~amartoq/wmphoto/
 COMMENT=	Dock-app that can show you a photo
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/wmphoto
+BUILD_DIRS=	wmphoto
 USE_X11BASE=	YES
 USE_TOOLS+=	gmake
 MAKE_ENV+=	X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmphoto
-	${INSTALL_DATA} ${WRKSRC}/../README ${PREFIX}/share/doc/wmphoto
-	${INSTALL_DATA} ${WRKSRC}/../HINTS ${PREFIX}/share/doc/wmphoto
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmphoto
+	${INSTALL_DATA} ${WRKSRC}/HINTS ${PREFIX}/share/doc/wmphoto
 
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/wmphoto/distinfo b/graphics/wmphoto/distinfo
index be9f8c1e348..830110686e7 100644
--- a/graphics/wmphoto/distinfo
+++ b/graphics/wmphoto/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 08:45:14 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/11/03 22:12:36 rillig Exp $
 
 SHA1 (wmphoto-0.3a.tar.gz) = dbec1ddd49671bc915b6e9ce37462247557f7fb9
 RMD160 (wmphoto-0.3a.tar.gz) = 64b0006b90d187ec01da32f1bc9b7607d19f4330
 Size (wmphoto-0.3a.tar.gz) = 19320 bytes
-SHA1 (patch-aa) = 53c1d2817e36b8cee04572edca295d0555e1e853
+SHA1 (patch-aa) = 952c53a00cb6a73e4b780e9d643144c394c7d6af
diff --git a/graphics/wmphoto/patches/patch-aa b/graphics/wmphoto/patches/patch-aa
index 1b61e7ab284..6421e111609 100644
--- a/graphics/wmphoto/patches/patch-aa
+++ b/graphics/wmphoto/patches/patch-aa
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/27 13:35:09 agc Exp $
---- Makefile.orig	Wed Mar 28 10:09:18 2001
-+++ Makefile	Wed Mar 28 10:15:59 2001
+$NetBSD: patch-aa,v 1.2 2005/11/03 22:12:36 rillig Exp $
+
+--- wmphoto/Makefile.orig	Wed Mar 28 10:09:18 2001
++++ wmphoto/Makefile	Wed Mar 28 10:15:59 2001
 @@ -1,19 +1,8 @@
  # wmphoto Makefile