diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2011-07-05 15:54:48 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2011-07-05 15:54:48 +0800 |
| commit | 5f684f1f4519a03439111ed67e727981faa84082 (patch) | |
| tree | 44c3dfe5da9a23238fa5d3a556667f7eb89a7e74 /net | |
| parent | 59e843cbdfac4e7120a8d33501554a1a5451cc9a (diff) | |
| download | freebsd-ports-gnome-5f684f1f4519a03439111ed67e727981faa84082.tar.gz freebsd-ports-gnome-5f684f1f4519a03439111ed67e727981faa84082.tar.zst freebsd-ports-gnome-5f684f1f4519a03439111ed67e727981faa84082.zip | |
- Fix CONFLICTS: net/coda6_client was mistakenly affected
- Bump PORTREVISION for PLIST change
Notified by: Benjamin Kaduk <kaduk@mit.edu>
Diffstat (limited to 'net')
| -rw-r--r-- | net/coda6_client/Makefile | 2 | ||||
| -rw-r--r-- | net/coda6_server/Makefile | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/net/coda6_client/Makefile b/net/coda6_client/Makefile index 5da94afae239..d3e14e76f51a 100644 --- a/net/coda6_client/Makefile +++ b/net/coda6_client/Makefile @@ -4,6 +4,8 @@ # # $FreeBSD$ +PORTREVISION= 2 + COMMENT= Client programs for a replicated high-performance network file system MASTERDIR= ${.CURDIR}/../coda6_server diff --git a/net/coda6_server/Makefile b/net/coda6_server/Makefile index 6b9285315950..3be810de8d83 100644 --- a/net/coda6_server/Makefile +++ b/net/coda6_server/Makefile @@ -6,7 +6,7 @@ PORTNAME= coda PORTVERSION= 6.9.4 -PORTREVISION= 1 +PORTREVISION?= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/coda/src/ \ ftp://ftp.planetmirror.com/pub/coda/src/ \ @@ -21,8 +21,6 @@ LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp \ rpc2.9:${PORTSDIR}/devel/rpc2 \ rvmlwp.3:${PORTSDIR}/devel/rvm -CONFLICTS= openafs-[0-9]* - USE_GMAKE= yes GNU_CONFIGURE= yes @@ -31,6 +29,8 @@ CONFIGURE_ARGS+= --enable-${CODA_SUITE} CODA_SUITE?= server .if ${CODA_SUITE} == server +CONFLICTS= openafs-[0-9]* + MAN5= backuplogs.5 \ dumpfile.5 \ dumplist.5 \ |