[pkgsrc/trunk]: pkgsrc/devel Fix bogus DIST_SUBDIR, which broke installation ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3bf4ec54a08d
branches:  trunk
changeset: 473703:3bf4ec54a08d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Apr 23 18:07:06 2004 +0000

description:
Fix bogus DIST_SUBDIR, which broke installation on 1.5* and 2.*.
>From Robert Elz in PR 25255.

diffstat:

 devel/cvsup-bin/Makefile     |  5 +++--
 devel/cvsup-gui-bin/Makefile |  5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r b936eb0df028 -r 3bf4ec54a08d devel/cvsup-bin/Makefile
--- a/devel/cvsup-bin/Makefile  Fri Apr 23 17:25:28 2004 +0000
+++ b/devel/cvsup-bin/Makefile  Fri Apr 23 18:07:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/03/22 03:52:06 kristerw Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/23 18:07:06 wiz Exp $
 
 DISTNAME=      cvsup-static-16.1.h
 PKGNAME=       ${DISTNAME:C/static/bin/}
@@ -14,7 +14,8 @@
 NO_CONFIGURE=  yes
 NO_BUILD=      yes
 ONLY_FOR_PLATFORM=     NetBSD-1.[5-9]*-i386 NetBSD-[2-9]*-i386
-DIST_SUBDIR=   cvsup-${MACHINE_ARCH}-${OS_VERSION:C/(...).*/\1/}
+# remove on next update -- see PR 25255 for details
+DIST_SUBDIR=   cvsup-i386-1.6
 
 CONFLICTS=     cvsup-[0-9]* cvsup-gui-[0-9]*
 
diff -r b936eb0df028 -r 3bf4ec54a08d devel/cvsup-gui-bin/Makefile
--- a/devel/cvsup-gui-bin/Makefile      Fri Apr 23 17:25:28 2004 +0000
+++ b/devel/cvsup-gui-bin/Makefile      Fri Apr 23 18:07:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/03/22 03:52:06 kristerw Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/23 18:07:06 wiz Exp $
 
 DISTNAME=      cvsup-gui-static-16.1.h
 PKGNAME=       ${DISTNAME:C/static/bin/}
@@ -15,7 +15,8 @@
 WRKSRC=                ${WRKDIR}
 NO_CONFIGURE=  yes
 NO_BUILD=      yes
-DIST_SUBDIR=   cvsup-${MACHINE_ARCH}-${OS_VERSION:C/(...).*/\1/}
+# remove on next update -- see PR 25255 for details
+DIST_SUBDIR=   cvsup-i386-1.6
 
 ONLY_FOR_PLATFORM=      NetBSD-1.[5-9]*-i386 NetBSD-[2-9]*-i386