Index: editors/bitmap/Makefile
===================================================================
RCS file: /import/FreeBSD-CVS/ports/editors/bitmap/Makefile,v
retrieving revision 1.36
diff -u -p -u -r1.36 Makefile
--- editors/bitmap/Makefile	5 Feb 2010 11:36:18 -0000	1.36
+++ editors/bitmap/Makefile	10 Feb 2010 17:12:12 -0000
@@ -17,6 +17,8 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	Bitmap-mule, Package to use bitmap in Emacs
 
+CONFLICTS=	bitmap-1.*
+
 # ports version
 BITMAP_VER=		${BITMAP_MVER}${BITMAP_SNAP_PREFIX}${BITMAP_SNAP}
 # distfile version