diff options
author | alepulver <alepulver@FreeBSD.org> | 2007-02-09 22:53:32 +0800 |
---|---|---|
committer | alepulver <alepulver@FreeBSD.org> | 2007-02-09 22:53:32 +0800 |
commit | e14d590170370162dec668c5e5444ad886991401 (patch) | |
tree | a9f7abe8194332e35a891529bf400ebba0ff1f7b | |
parent | 40e0ced9477687ce891a60439415a774c84bb5ac (diff) | |
download | freebsd-ports-graphics-e14d590170370162dec668c5e5444ad886991401.tar.gz freebsd-ports-graphics-e14d590170370162dec668c5e5444ad886991401.tar.zst freebsd-ports-graphics-e14d590170370162dec668c5e5444ad886991401.zip |
- Add CONFLICTS between net/mpd and lang/mpd.
Reported by: "Daniel O'Connor" <doconnor@gsoft.com.au>
-rw-r--r-- | lang/mpd/Makefile | 1 | ||||
-rw-r--r-- | net/mpd/Makefile | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lang/mpd/Makefile b/lang/mpd/Makefile index e92f5ab23c1..b343a3fc9ea 100644 --- a/lang/mpd/Makefile +++ b/lang/mpd/Makefile @@ -20,6 +20,7 @@ ONLY_FOR_ARCHS= alpha i386 ONLY_FOR_ARCHS_REASON= uses assembly code for the target machine # net/mpd +CONFLICTS= mpd-[^1]* NO_LATEST_LINK= yes USE_GMAKE= yes diff --git a/net/mpd/Makefile b/net/mpd/Makefile index 1c81374b949..ac67af504d9 100644 --- a/net/mpd/Makefile +++ b/net/mpd/Makefile @@ -16,6 +16,9 @@ DIST_SUBDIR= mpd MAINTAINER= ports@FreeBSD.org COMMENT= Multi-link PPP daemon based on netgraph(4) +# lang/mpd +CONFLICTS= mpd-[^3]* + MTREE_FILE= ${FILESDIR}/mpd.mtree MAN8= mpd.8 MANCOMPRESSED= maybe |