diff --git a/cad/chipmunk/Makefile b/cad/chipmunk/Makefile
index a2c233203f2..0f2909ff424 100644
--- a/cad/chipmunk/Makefile
+++ b/cad/chipmunk/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2009/08/10 06:30:30 kili Exp $
+# $OpenBSD: Makefile,v 1.11 2010/10/23 18:35:23 sthen Exp $
 
 COMMENT=	electronic CAD system
 
-PKGNAME=	chipmunk-1.57p1
+PKGNAME=	chipmunk-1.57
+REVISION=	1
 DISTNAME=	psys-1.57
 DISTFILES=	psys-1.57.tar.gz webdoc1.46.tar.gz log-5.61.tar.gz \
 		view-1.13.tar.gz until-1.13.tar.gz wol-1.13.tar.gz \
@@ -18,6 +19,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+
 WANTLIB=		X11 c m pthread-stubs xcb
 
 #MASTER_SITES=	http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index 9056e831ddf..efae95613a0 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2010/10/18 16:57:47 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2010/10/23 18:35:23 sthen Exp $
 
 COMMENT=		Gnu Circuit Analysis Package
 
 DISTNAME=		gnucap-0.35
-PKGNAME=		${DISTNAME}p0
+REVISION=		0
 CATEGORIES=		cad
 
 HOMEPAGE=		http://www.gnucap.org/
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index dfff64aacc7..a19dc5fb75b 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/10/19 19:45:54 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2010/10/23 18:35:23 sthen Exp $
 
 COMMENT-main=	circuit drawing and schematic capture
 COMMENT-docs=	documentation for the kicad library of components
@@ -6,7 +6,8 @@ COMMENT-docs=	documentation for the kicad library of components
 V=		2007-01-15
 DISTNAME=	kicad-sources-${V}
 PKGNAME=	kicad-20070115
-PKGNAME-main=	kicad-20070115p0
+PKGNAME-main=	kicad-20070115
+REVISION-main=	0
 PKGNAME-docs=	kicad-docs-20070115
 
 CATEGORIES=	cad
diff --git a/cad/klogic/Makefile b/cad/klogic/Makefile
index 7180ac07234..da40f61f34f 100644
--- a/cad/klogic/Makefile
+++ b/cad/klogic/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2010/09/12 16:49:09 jasper Exp $
+# $OpenBSD: Makefile,v 1.19 2010/10/23 18:35:23 sthen Exp $
 
 SHARED_ONLY=	Yes
 COMMENT= 	logic circuit simulator for KDE
 
 DISTNAME=	klogic-1.6
-PKGNAME=	${DISTNAME}p4
+REVISION=	4
 CATEGORIES=	cad education x11 x11/kde
 
 MASTER_SITES=	http://distfiles.nl/
@@ -15,11 +15,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	art_lgpl_2 jpeg kwalletclient ICE SM X11 Xext \
-		Xrender c m png pthread stdc++ util z idn \
-		Xau Xdmcp fam rpcsvc pthread-stubs xcb
+WANTLIB += art_lgpl_2 jpeg kwalletclient ICE SM X11 Xext
+WANTLIB += Xrender c m png pthread stdc++ util z idn
+WANTLIB += Xau Xdmcp fam rpcsvc pthread-stubs xcb
+WANTLIB += kdecore DCOP kdefx kdesu kdeui kio
 
-LIB_DEPENDS=	kdecore.>=4,DCOP,kdefx,kdesu,kdeui,kio::x11/kde/libs3
+LIB_DEPENDS=	::x11/kde/libs3
 
 MODULES=	x11/kde devel/gettext
 
diff --git a/cad/necpp/Makefile b/cad/necpp/Makefile
index ebd64a3e235..542108ec6f2 100644
--- a/cad/necpp/Makefile
+++ b/cad/necpp/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2010/01/23 10:29:45 landry Exp $
+# $OpenBSD: Makefile,v 1.7 2010/10/23 18:35:23 sthen Exp $
 
 COMMENT=	NEC2++ antenna simulator
 
 DISTNAME=	necpp-1.2.3
-PKGNAME=	${DISTNAME}p2
+REVISION=	2
 CATEGORIES=    	cad hamradio
 
 HOMEPAGE=	http://elec.otago.ac.nz/w/index.php/Necpp
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 71e4e284d39..a1d0243962f 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2010/07/06 22:25:53 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2010/10/23 18:35:23 sthen Exp $
 
 COMMENT=	Qt-based 2D CAD system
 
 V=		2.0.5.0
 DISTNAME=	qcad-${V}-1-community.src
-PKGNAME=	qcad-${V}p1
+PKGNAME=	qcad-${V}
+REVISION=	1
 CATEGORIES=	cad graphics
 
 HOMEPAGE=	http://www.ribbonsoft.com/qcad.html
@@ -14,6 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+
 WANTLIB=		X11 Xext c m pthread stdc++
 
 MASTER_SITES=	http://www.ribbonsoft.com/archives/qcad/
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 8e294845042..3facdb81b8b 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.25 2010/10/18 16:57:47 espie Exp $
+# $OpenBSD: Makefile,v 1.26 2010/10/23 18:35:23 sthen Exp $
 
 COMMENT=	Simulation Program for Integrated Circuit Electronics
 
 V=			3f5
 DISTNAME=		spice${V}
-PKGNAME=		spice-${V}p3
+PKGNAME=		spice-${V}
+REVISION=		3
 CATEGORIES=     	cad
 
 # BSD
@@ -12,6 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+
 WANTLIB=		X11 Xaw Xext Xmu Xt c m pthread-stubs termlib xcb
 
 MASTER_SITES=		http://embedded.eecs.berkeley.edu/pubs/downloads/spice/