diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 14316eef39a..32d4d10e8fe 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2007/04/13 14:50:06 sturm Exp $
+# $OpenBSD: Makefile,v 1.13 2007/08/03 17:42:45 bernd Exp $
 
 COMMENT=	"tools to talk to GSM cellular phones"	
 
 VERSION=	0.6.14
 DISTNAME=	gnokii-${VERSION}
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	comms x11
 SHARED_LIBS +=	gnokii               2.7      # .3.0
 
diff --git a/comms/gnokii/pkg/PLIST b/comms/gnokii/pkg/PLIST
index 82392481c8f..0cfd926654a 100644
--- a/comms/gnokii/pkg/PLIST
+++ b/comms/gnokii/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2006/10/21 11:29:47 robert Exp $
+@comment $OpenBSD: PLIST,v 1.4 2007/08/03 17:42:45 bernd Exp $
+@conflict smstools-*
 %%SHARED%%
 !%%no_x11%%
 bin/gnokii
diff --git a/comms/smstools/Makefile b/comms/smstools/Makefile
index c315fc93b2d..691dcab5e1a 100644
--- a/comms/smstools/Makefile
+++ b/comms/smstools/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2007/07/18 11:03:34 jasper Exp $
+# $OpenBSD: Makefile,v 1.2 2007/08/03 17:42:45 bernd Exp $
 
 COMMENT=		gateway to send and receive SMS through GSM mobile phones
 
 V=			3.0.9
 DISTNAME=		smstools3-${V}
-PKGNAME=		smstools-${V}
+PKGNAME=		smstools-${V}p0
 
 CATEGORIES=		comms
 
diff --git a/comms/smstools/pkg/PLIST b/comms/smstools/pkg/PLIST
index bdf2f55b200..b9e6a89984c 100644
--- a/comms/smstools/pkg/PLIST
+++ b/comms/smstools/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/07/18 11:03:34 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.2 2007/08/03 17:42:45 bernd Exp $
+@conflict gnokii-*
 @newgroup _smsd:590
 @newuser _smsd:590:_smsd:daemon:smsd user:/nonexistent:/sbin/nologin
 bin/sendsms
diff --git a/productivity/devtodo/Makefile b/productivity/devtodo/Makefile
index caebcb81cfd..c770140240f 100644
--- a/productivity/devtodo/Makefile
+++ b/productivity/devtodo/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2006/11/03 22:18:41 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2007/08/03 17:42:45 bernd Exp $
 
 COMMENT=		"reminder/task program aimed at developers"
 
 DISTNAME=		devtodo-0.1.17
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 CATEGORIES=		productivity devel
 
 HOMEPAGE=		http://swapoff.org/DevTodo/
diff --git a/productivity/devtodo/pkg/PLIST b/productivity/devtodo/pkg/PLIST
index 8c4ccde5994..7a0e8a3285f 100644
--- a/productivity/devtodo/pkg/PLIST
+++ b/productivity/devtodo/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.6 2005/08/09 18:50:45 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.7 2007/08/03 17:42:45 bernd Exp $
 @conflict tdl-*
+@conflict openmotif-demos-*
 bin/devtodo
 bin/tda
 bin/tdd
diff --git a/sysutils/tree/Makefile b/sysutils/tree/Makefile
index 56986a7413c..5f924bfef82 100644
--- a/sysutils/tree/Makefile
+++ b/sysutils/tree/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2006/06/26 18:09:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.2 2007/08/03 17:42:45 bernd Exp $
 
 COMMENT=	"print ascii formatted tree of a directory structure"
 
 DISTNAME=	tree-0.61
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	sysutils
 
 HOMEPAGE=	http://spootnik.org/tree/
diff --git a/sysutils/tree/pkg/PLIST b/sysutils/tree/pkg/PLIST
index aa2b81321c5..59bbe14082e 100644
--- a/sysutils/tree/pkg/PLIST
+++ b/sysutils/tree/pkg/PLIST
@@ -1,3 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2006/06/26 18:09:00 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.2 2007/08/03 17:42:45 bernd Exp $
+@conflict openmotif-demos-*
 bin/tree
 man/man1/tree.0
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 7e4757c08f6..ef018f64a8d 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2007/07/18 21:41:05 mbalmer Exp $
+# $OpenBSD: Makefile,v 1.30 2007/08/03 17:42:45 bernd Exp $
 
 COMMENT-main=		Motif toolkit
 COMMENT-demos=		Motif toolkit demos
@@ -6,7 +6,7 @@ COMMENT-demos=		Motif toolkit demos
 VERSION=		2.3.0
 DISTNAME=		openmotif-${VERSION}
 PKGNAME-main=		openmotif-${VERSION}
-PKGNAME-demos=		openmotif-demos-${VERSION}
+PKGNAME-demos=		openmotif-demos-${VERSION}p0
 
 SHARED_LIBS=		Mrm	4.0	\
 			Uil	4.0	\
diff --git a/x11/openmotif/pkg/PLIST-demos b/x11/openmotif/pkg/PLIST-demos
index 6857a837754..153fa6c3f12 100644
--- a/x11/openmotif/pkg/PLIST-demos
+++ b/x11/openmotif/pkg/PLIST-demos
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST-demos,v 1.4 2007/07/18 21:41:06 mbalmer Exp $
+@comment $OpenBSD: PLIST-demos,v 1.5 2007/08/03 17:42:45 bernd Exp $
+@conflict devtodo-*
+@conflict tree-*
 bin/DNDDemo
 bin/airport
 bin/autopopups