diff options
| author | linimon <linimon@FreeBSD.org> | 2004-03-10 15:46:51 +0800 |
|---|---|---|
| committer | linimon <linimon@FreeBSD.org> | 2004-03-10 15:46:51 +0800 |
| commit | 213601855ead238104a6b5dc68c50b4c67877209 (patch) | |
| tree | 8e16f6bc4bfbae8b1320aa76c95b96ee1cedb3f2 /net | |
| parent | 2a0edd0704cdf34fbd2778ec6461d5f24b22d199 (diff) | |
| download | freebsd-ports-gnome-213601855ead238104a6b5dc68c50b4c67877209.tar.gz freebsd-ports-gnome-213601855ead238104a6b5dc68c50b4c67877209.tar.zst freebsd-ports-gnome-213601855ead238104a6b5dc68c50b4c67877209.zip | |
Fix up some conflicts issues: there was an edge case where samba-devel
conflicted with itself (only shows up in edge cases); there was a case
where two ports in japanese/ installed smbfs man pages -- but one
installed very old ones. This seems to be the best conclusion from
the following convoluted PR:
PR: ports/59599
Submitted by: Koop Mast <einekoai@chello.nl>
Reviewed by: eik, trevor, dwcjr, nakaji, at various times
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba-devel/Makefile | 2 | ||||
| -rw-r--r-- | net/samba3/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile index c2fad7923f6d..d4fe86947e94 100644 --- a/net/samba-devel/Makefile +++ b/net/samba-devel/Makefile @@ -28,7 +28,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/:S/.a/a/} MAINTAINER= timur@gnu.org COMMENT= A free SMB and CIFS client and server for UNIX -CONFLICTS= ja-samba-2.* samba-3.* sharity-light-1.* samba-libsmbclient-3.* +CONFLICTS= ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.* OPTIONS= CUPS "With CUPS printing support" on \ LDAP "With LDAP support" on \ diff --git a/net/samba3/Makefile b/net/samba3/Makefile index c2fad7923f6d..d4fe86947e94 100644 --- a/net/samba3/Makefile +++ b/net/samba3/Makefile @@ -28,7 +28,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/:S/.a/a/} MAINTAINER= timur@gnu.org COMMENT= A free SMB and CIFS client and server for UNIX -CONFLICTS= ja-samba-2.* samba-3.* sharity-light-1.* samba-libsmbclient-3.* +CONFLICTS= ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.* OPTIONS= CUPS "With CUPS printing support" on \ LDAP "With LDAP support" on \ |