diff options
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 \ |