[pkgsrc/trunk]: pkgsrc Fixed wrong usage of WRKSRC.

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a3eacf1f8f49
branches:  trunk
changeset: 502277:a3eacf1f8f49
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Nov 03 20:01:20 2005 +0000

description:
Fixed wrong usage of WRKSRC.

diffstat:

 comms/snooper/Makefile            |   8 +++++---
 comms/snooper/distinfo            |   4 ++--
 comms/snooper/patches/patch-aa    |   6 +++---
 converters/uulib/Makefile         |  13 +++++++------
 converters/uulib/distinfo         |   4 ++--
 converters/uulib/patches/patch-aa |   6 +++---
 6 files changed, 22 insertions(+), 19 deletions(-)

diffs (118 lines):

diff -r 5cd92bdebc59 -r a3eacf1f8f49 comms/snooper/Makefile
--- a/comms/snooper/Makefile    Thu Nov 03 19:59:39 2005 +0000
+++ b/comms/snooper/Makefile    Thu Nov 03 20:01:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:08 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/11/03 20:01:20 rillig Exp $
 
 DISTNAME=      snooper-19991202
 PKGREVISION=   1
@@ -9,11 +9,13 @@
 MAINTAINER=    itojun%itojun.org@localhost
 COMMENT=       Serial line protocol analyzer (need two serial interfaces)
 
-WRKSRC=                ${WRKDIR}/snooper/build
+WRKSRC=                ${WRKDIR}/snooper
 GNU_CONFIGURE= yes
+CONFIGURE_DIRS=        build
+BUILD_DIRS=    build
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snooper
-       ${INSTALL_DATA} ${WRKSRC}/../README ${PREFIX}/share/doc/snooper
+       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/snooper
 
 .include "../../mk/bsd.pkg.mk"
diff -r 5cd92bdebc59 -r a3eacf1f8f49 comms/snooper/distinfo
--- a/comms/snooper/distinfo    Thu Nov 03 19:59:39 2005 +0000
+++ b/comms/snooper/distinfo    Thu Nov 03 20:01:20 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 16:05:31 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/11/03 20:01:20 rillig Exp $
 
 SHA1 (snooper-19991202.tar.gz) = d6aba20cd14449d7b126f393cdb219fd627b7777
 RMD160 (snooper-19991202.tar.gz) = 52d61dea95cac246afd5815bc32f31448f9c757b
 Size (snooper-19991202.tar.gz) = 38239 bytes
-SHA1 (patch-aa) = 669aef2501d5a055116ea71082e20f1101537637
+SHA1 (patch-aa) = c7acf77a2c47bed8eb228f136457bfeb82eceb1f
diff -r 5cd92bdebc59 -r a3eacf1f8f49 comms/snooper/patches/patch-aa
--- a/comms/snooper/patches/patch-aa    Thu Nov 03 19:59:39 2005 +0000
+++ b/comms/snooper/patches/patch-aa    Thu Nov 03 20:01:20 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1 2004/06/29 23:42:46 recht Exp $
+$NetBSD: patch-aa,v 1.2 2005/11/03 20:01:20 rillig Exp $
 
---- ../src/scrn.c.orig 1998-08-12 16:32:02.000000000 +0200
-+++ ../src/scrn.c      2004-06-30 01:38:04.000000000 +0200
+--- src/scrn.c.orig    1998-08-12 16:32:02.000000000 +0200
++++ src/scrn.c 2004-06-30 01:38:04.000000000 +0200
 @@ -33,7 +33,7 @@
  #ifdef TIOCGWINSZ
                        struct winsize win;
diff -r 5cd92bdebc59 -r a3eacf1f8f49 converters/uulib/Makefile
--- a/converters/uulib/Makefile Thu Nov 03 19:59:39 2005 +0000
+++ b/converters/uulib/Makefile Thu Nov 03 20:01:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/09/28 20:52:18 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2005/11/03 20:05:54 rillig Exp $
 #
 
 DISTNAME=       uudeview-0.5.20
@@ -12,10 +12,11 @@
 COMMENT=       Library for uu/xx/Base64/BinHex de-/encoding
 
 # "kdesupport-2.1b" included "uu" library.
-CONFLICTS=     kdesupport-2.1b
+CONFLICTS+=    kdesupport-2.1b
 
-WRKSRC=                ${WRKDIR}/${DISTNAME}/uulib
 GNU_CONFIGURE= yes
+CONFIGURE_DIRS=        uulib
+BUILD_DIRS=    uulib
 USE_LIBTOOL=   yes
 
 BUILD_TARGET=  libuu.la
@@ -29,14 +30,14 @@
 INSTALLATION_DIRS=     include lib man/man3
 
 do-install:
-       ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libuu.la ${PREFIX}/lib
-       ${INSTALL_DATA} ${WRKSRC}/uudeview.h ${PREFIX}/include
+       ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/uulib/libuu.la ${PREFIX}/lib
+       ${INSTALL_DATA} ${WRKSRC}/uulib/uudeview.h ${PREFIX}/include
        ${SED} -e 's|FUNKYTOKENHERE|${PREFIX}|g' \
                < ${FILESDIR}/uulib.3 > ${WRKSRC}/uulib.3
        ${INSTALL_MAN} ${WRKSRC}/uulib.3 ${PREFIX}/man/man3
        @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uulib
 .for docfile in ${DOCFILES}
-       @${INSTALL_MAN} ${WRKSRC}/../${docfile} ${PREFIX}/share/doc/uulib
+       @${INSTALL_MAN} ${WRKSRC}/${docfile} ${PREFIX}/share/doc/uulib
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff -r 5cd92bdebc59 -r a3eacf1f8f49 converters/uulib/distinfo
--- a/converters/uulib/distinfo Thu Nov 03 19:59:39 2005 +0000
+++ b/converters/uulib/distinfo Thu Nov 03 20:01:20 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 16:12:35 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/11/03 20:05:54 rillig Exp $
 
 SHA1 (uudeview-0.5.20.tar.gz) = 2c6ab7d355b545218bd0877d598bd5327d9fd125
 RMD160 (uudeview-0.5.20.tar.gz) = 9bb52fa3ad4979383ff16d1e8d8a302c5c794c66
 Size (uudeview-0.5.20.tar.gz) = 261574 bytes
-SHA1 (patch-aa) = abdf06e9088a519eb56d3b052bc2f96e72db15fd
+SHA1 (patch-aa) = 8ea37995ef4426bcd008246b1465ad5428da7bd8
diff -r 5cd92bdebc59 -r a3eacf1f8f49 converters/uulib/patches/patch-aa
--- a/converters/uulib/patches/patch-aa Thu Nov 03 19:59:39 2005 +0000
+++ b/converters/uulib/patches/patch-aa Thu Nov 03 20:01:20 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2004/04/08 01:13:20 fredb Exp $
+$NetBSD: patch-aa,v 1.5 2005/11/03 20:05:54 rillig Exp $
 
---- Makefile.in.orig   2002-03-11 03:15:46.000000000 -0600
-+++ Makefile.in
+--- uulib/Makefile.in.orig     2002-03-11 03:15:46.000000000 -0600
++++ uulib/Makefile.in
 @@ -19,7 +19,7 @@ SHELL        =       /bin/sh
  #
  # If you don't have the GNU C compiler installed, set CC=cc here