summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorwiz <wiz>2004-04-23 18:07:06 +0000
committerwiz <wiz>2004-04-23 18:07:06 +0000
commite7448a7154eff7fd7be0d24317262ee4714edebf (patch)
tree4cfcc0ca4aef3015ac18a55176cd2b809a660d1e /devel
parentdfe1875f4240085261bf9e5f989e0558773039ce (diff)
downloadpkgsrc-e7448a7154eff7fd7be0d24317262ee4714edebf.tar.gz
Fix bogus DIST_SUBDIR, which broke installation on 1.5* and 2.*.
From Robert Elz in PR 25255.
Diffstat (limited to 'devel')
-rw-r--r--devel/cvsup-bin/Makefile5
-rw-r--r--devel/cvsup-gui-bin/Makefile5
2 files changed, 6 insertions, 4 deletions
diff --git a/devel/cvsup-bin/Makefile b/devel/cvsup-bin/Makefile
index 4a041f60d96..a51fc2105d6 100644
--- a/devel/cvsup-bin/Makefile
+++ b/devel/cvsup-bin/Makefile
@@ -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 @@ WRKSRC= ${WRKDIR}
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 --git a/devel/cvsup-gui-bin/Makefile b/devel/cvsup-gui-bin/Makefile
index 0ddf80c2843..28804bf6576 100644
--- a/devel/cvsup-gui-bin/Makefile
+++ b/devel/cvsup-gui-bin/Makefile
@@ -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 @@ DEPENDS+= cvsup-bin-[0-9]*:../../devel/cvsup-bin
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