From a2295043cccf3d5be849ec9f3e908b3ebce597df Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Wed, 6 Dec 2006 17:43:31 +0000
Subject: [PATCH] - remove substitutions in PKGNAME

talked with and ok jasper@
---
 comms/malsync/Makefile            | 7 ++++---
 devel/nspr/Makefile               | 4 ++--
 devel/py-orbit/Makefile           | 7 ++++---
 games/childsplay-plugins/Makefile | 7 ++++---
 games/spacehulk/Makefile          | 4 ++--
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/comms/malsync/Makefile b/comms/malsync/Makefile
index 28608c5d36d..63afa9905bb 100644
--- a/comms/malsync/Makefile
+++ b/comms/malsync/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.27 2006/11/18 17:32:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2006/12/06 17:43:31 ajacoutot Exp $
 
 COMMENT=	"command line tool to synchronize Palm pilot to AvantGo"
 
-DISTNAME=	malsync_2.2.0.src
-PKGNAME=	${DISTNAME:S/_/-/:S/.src//}
+V=		2.2.0
+DISTNAME=	malsync_${V}.src
+PKGNAME=	malsync-${V}
 CATEGORIES=	comms palm
 
 MASTER_SITES=	http://www.obsd.fr/OpenBSD/distfiles/ \
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 1c09cb90e87..8137e1e715f 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2006/11/30 16:53:53 kurt Exp $
+# $OpenBSD: Makefile,v 1.18 2006/12/06 17:43:31 ajacoutot Exp $
 # $FreeBSD: /repoman/r/pcvs/ports/devel/nspr/Makefile,v 1.13 2003/12/13 21:30:19 peter Exp $
 
 ONLY_FOR_ARCHS=	alpha amd64 arm i386 powerpc sparc sparc64
@@ -9,7 +9,7 @@ COMMENT-docs=		"HTML Documentation for NSPR"
 VER=			4.6.4
 DISTNAME=		nspr-${VER}
 PKGNAME-main=		${DISTNAME}p1
-PKGNAME-docs=		${DISTNAME:S/-/-docs-/}
+PKGNAME-docs=		nspr-docs-${VER}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			nspr-reference${EXTRACT_SUFX}:0
 
diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile
index 329ae64f39a..70046bec947 100644
--- a/devel/py-orbit/Makefile
+++ b/devel/py-orbit/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2006/11/26 13:39:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2006/12/06 17:43:31 ajacoutot Exp $
 
 COMMENT=	"ORBit2 Python bindings"
 
-DISTNAME=	pyorbit-2.14.1
-PKGNAME=	${DISTNAME:S/py/py-/}p0
+V=		2.14.1
+DISTNAME=	pyorbit-${V}
+PKGNAME=	py-orbit-${V}p0
 CATEGORIES=	devel
 
 HOMEPAGE=	http://www.pygtk.org/
diff --git a/games/childsplay-plugins/Makefile b/games/childsplay-plugins/Makefile
index 4d224a47ba0..1b5191c9c54 100644
--- a/games/childsplay-plugins/Makefile
+++ b/games/childsplay-plugins/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2006/11/20 18:31:53 bernd Exp $
+# $OpenBSD: Makefile,v 1.3 2006/12/06 17:43:31 ajacoutot Exp $
 
 COMMENT=	"additional games modules for childsplay"
 
-DISTNAME=	childsplay_plugins-0.84
-PKGNAME=	${DISTNAME:S/_/-/}p0
+V=		0.84
+DISTNAME=	childsplay_plugins-${V}
+PKGNAME=	childsplay-plugins-${V}p0
 EXTRACT_SUFX=	.tgz
 
 CATEGORIES=	games education
diff --git a/games/spacehulk/Makefile b/games/spacehulk/Makefile
index 1fef93493f8..f5ad77744c6 100644
--- a/games/spacehulk/Makefile
+++ b/games/spacehulk/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2006/10/27 12:53:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2006/12/06 17:43:31 ajacoutot Exp $
 
 COMMENT=	"total conversion of the Space Hulk board game"
 
 DISTNAME=	spacehulk-1.5-beta1
-PKGNAME=	${DISTNAME:S/-beta1/beta1/}p1
+PKGNAME=	spacehulk-1.5beta1p1
 CATEGORIES=	games x11
 
 HOMEPAGE=	http://r.vinot.free.fr/spacehulk/