- Register conflicts in my ports

Reported by:	http://ketas.si.pri.ee/ports-conflictchecks/

audio/aacplusenc/Makefile

@@ -18,6 +18,8 @@ USE_GMAKE=	yes
 
 RESTRICTED=	unclear legal status, probably need licenses from 3GPP, Via Licensing and Coding Technologies
 
+CONFLICTS=	libaacplus-[0-9]*
+
 PLIST_FILES=	bin/aacplusenc
 
 .if defined(WITHOUT_FFTW3)

deskutils/todo/Makefile

@@ -17,6 +17,8 @@ COMMENT=	Todo.txt Manager
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
+CONFLICTS=	devtodo-[0-9]*
+
 OPTIONS_DEFINE=	BASH
 BASH_DESC=	Install programmable completions for Bash
 

devel/devtodo/Makefile

@@ -14,6 +14,8 @@ MASTER_SITES=	http://swapoff.org/files/devtodo/
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Tool to effectively maintain todo lists aimed at developers
 
+CONFLICTS=	tdl-[0-9]* todo-[0-9]*
+
 GNU_CONFIGURE=	yes
 
 # Note: without this define util/regex.c doesn't compile due to redeclaration

devel/tdl/Makefile

@@ -13,6 +13,8 @@ MASTER_SITES=	http://www.rpcurnow.force9.co.uk/tdl/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	To-do list manager
 
+CONFLICTS=	devtodo-[0-9]*
+
 HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}

mail/popular/Makefile

@@ -16,6 +16,8 @@ COMMENT=	Suite of programs for setting up large POP3 server systems
 
 BUILD_DEPENDS=	${SITE_PERL}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
 
+CONFLICTS=	pserv-[0-9]* synce-librapi2-[0-9]*
+
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes

palm/synce-librapi2/Makefile

@@ -15,6 +15,8 @@ COMMENT?=	Utilities/libraries to make RAPI calls on WinCE devices
 
 LIB_DEPENDS+=	synce.0:${PORTSDIR}/palm/synce-libsynce
 
+CONFLICTS=	popular-[0-9]*
+
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes

www/pserv/Makefile

@@ -16,6 +16,8 @@ COMMENT=	A portable and small webserver written in C
 
 GNU_CONFIGURE=	yes
 
+CONFLICTS=	popular-[0-9]*
+
 OPTIONS=	LOG "Enable logging" on \
 		PHP "Enable PHP support" on