diff options
author | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2005-09-21 05:33:21 +0000 |
---|---|---|
committer | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2005-09-21 05:33:21 +0000 |
commit | 58d075783bd8eb16fe1f5d67c2706a96bfd29ba3 (patch) | |
tree | dcf3fba6ab495835c700964c20f2cbc05181f91c | |
parent | 139040b983172801b20f15f553dfd537a1c02e0f (diff) |
make cvsup and -without-gui CONFLICTS each other.
maintainer timeout for 2 weeks.
Notes
Notes:
svn path=/head/; revision=143264
-rw-r--r-- | net/cvsup-without-gui/Makefile | 1 | ||||
-rw-r--r-- | net/cvsup/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/cvsup-without-gui/Makefile b/net/cvsup-without-gui/Makefile index 9163a4c701ac..9a8eff1d352e 100644 --- a/net/cvsup-without-gui/Makefile +++ b/net/cvsup-without-gui/Makefile @@ -7,5 +7,6 @@ MASTERDIR= ${.CURDIR}/../cvsup WITHOUT_X11= yes +CONFLICTS= cvsup-[0-9]* .include "${MASTERDIR}/Makefile" diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile index 3a172fabad56..2cdd137d7c1e 100644 --- a/net/cvsup/Makefile +++ b/net/cvsup/Makefile @@ -16,6 +16,7 @@ DISTNAME= cvsup-snap-${PORTVERSION} MAINTAINER= jdp@FreeBSD.org COMMENT?= General network file distribution system optimized for CVS (GUI version) +CONFLICTS?= cvsup-without-gui-[0-9]* ONLY_FOR_ARCHS= alpha amd64 i386 sparc64 .include <bsd.port.pre.mk> |