diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2012-06-04 12:06:57 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2012-06-04 12:06:57 +0000 |
| commit | a19cb90061f4351e6b469c66c91c582502e9f5df (patch) | |
| tree | d0d0a90ae7d95260adb39813e76636cc9559511a | |
| parent | Convert to use new options framework. (diff) | |
- Register conflicts in my ports
Reported by: http://ketas.si.pri.ee/ports-conflictchecks/
Notes
Notes:
svn path=/head/; revision=298351
| -rw-r--r-- | audio/aacplusenc/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/todo/Makefile | 2 | ||||
| -rw-r--r-- | devel/devtodo/Makefile | 2 | ||||
| -rw-r--r-- | devel/tdl/Makefile | 2 | ||||
| -rw-r--r-- | mail/popular/Makefile | 2 | ||||
| -rw-r--r-- | palm/synce-librapi2/Makefile | 2 | ||||
| -rw-r--r-- | www/pserv/Makefile | 2 |
7 files changed, 14 insertions, 0 deletions
diff --git a/audio/aacplusenc/Makefile b/audio/aacplusenc/Makefile index 76637fc35599..96d8acec3520 100644 --- a/audio/aacplusenc/Makefile +++ b/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) diff --git a/deskutils/todo/Makefile b/deskutils/todo/Makefile index f7462caebfd7..cbb7cf8ca97c 100644 --- a/deskutils/todo/Makefile +++ b/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 diff --git a/devel/devtodo/Makefile b/devel/devtodo/Makefile index b2d83e4938f0..db92e23bbd1e 100644 --- a/devel/devtodo/Makefile +++ b/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 diff --git a/devel/tdl/Makefile b/devel/tdl/Makefile index d49938a31ae9..fcb14f4578ad 100644 --- a/devel/tdl/Makefile +++ b/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} diff --git a/mail/popular/Makefile b/mail/popular/Makefile index 86ba1e7d404e..998927375df3 100644 --- a/mail/popular/Makefile +++ b/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 diff --git a/palm/synce-librapi2/Makefile b/palm/synce-librapi2/Makefile index e9ef45b6f143..7954ab8e4ffc 100644 --- a/palm/synce-librapi2/Makefile +++ b/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 diff --git a/www/pserv/Makefile b/www/pserv/Makefile index afb930298795..c038bfd84f15 100644 --- a/www/pserv/Makefile +++ b/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 |