summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--japanese/linux-JM/Makefile2
-rw-r--r--net/samba-devel/Makefile2
-rw-r--r--net/samba3/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/japanese/linux-JM/Makefile b/japanese/linux-JM/Makefile
index 209d6bc397fe..c5529e8488b9 100644
--- a/japanese/linux-JM/Makefile
+++ b/japanese/linux-JM/Makefile
@@ -35,7 +35,7 @@ MANPAGES_OTHERS= \
mpg123 \
ncftp netatalk \
rdate \
- smbfs sudo \
+ sudo \
uudeview \
wu-ftpd
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 \