sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Mark CONFLICTS between net/openafs and net/coda6_server: both install sbin/backup

Browse source 
- Bump PORTREVISION for PLIST change

PR:		ports/158584
Submitted by:	Ben Kaduk <kaduk@mit.edu> (maintainer of net/openafs)
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2011-07-04 02:48:03 +00:00
parent f3342f93f3
commit ceefe009f7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=277025
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/coda6_server/Makefile
View file

@ -6,6 +6,7 @@
PORTNAME= coda PORTNAME= coda
PORTVERSION= 6.9.4 PORTVERSION= 6.9.4
PORTREVISION= 1
CATEGORIES= net CATEGORIES= net
MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/coda/src/ \ MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/coda/src/ \
ftp://ftp.planetmirror.com/pub/coda/src/ \ ftp://ftp.planetmirror.com/pub/coda/src/ \
@ -20,6 +21,8 @@ LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp \
rpc2.9:${PORTSDIR}/devel/rpc2 \ rpc2.9:${PORTSDIR}/devel/rpc2 \
rvmlwp.3:${PORTSDIR}/devel/rvm rvmlwp.3:${PORTSDIR}/devel/rvm
CONFLICTS= openafs-[0-9]*
USE_GMAKE= yes USE_GMAKE= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes

4
net/openafs/Makefile
View file

@ -8,7 +8,7 @@
PORTNAME= openafs PORTNAME= openafs
DISTVERSION= 1.6.0pre6 DISTVERSION= 1.6.0pre6
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= net kld CATEGORIES= net kld
MASTER_SITES= http://dl.central.org/dl/openafs/candidate/${DISTVERSION}/:openafs \ MASTER_SITES= http://dl.central.org/dl/openafs/candidate/${DISTVERSION}/:openafs \
http://dl.openafs.org/dl/openafs/candidate/${DISTVERSION}/:openafs \ http://dl.openafs.org/dl/openafs/candidate/${DISTVERSION}/:openafs \
@ -81,7 +81,7 @@ PLIST_SUB+= FUSE=""
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
CONFLICTS= heimdal-[0-9]* CONFLICTS= coda-server-6.[0-9]* heimdal-[0-9]*
.include "Makefile.man" .include "Makefile.man"