aboutsummaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorTrevor Johnson <trevor@FreeBSD.org>2003-11-25 16:12:19 +0000
committerTrevor Johnson <trevor@FreeBSD.org>2003-11-25 16:12:19 +0000
commit1d9e7cf28de0ecc761850a84ef2a74961fc9546f (patch)
treea0f2f4e4a5bc4ad6f45d3062a1e6d1e928817797 /japanese
parent2830eb5a462209e20f30d7799a35d1c9d393e732 (diff)
downloadports-1d9e7cf28de0ecc761850a84ef2a74961fc9546f.tar.gz
ports-1d9e7cf28de0ecc761850a84ef2a74961fc9546f.zip
Notes
Diffstat (limited to 'japanese')
-rw-r--r--japanese/linux-JM/Makefile2
-rw-r--r--japanese/samba/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/japanese/linux-JM/Makefile b/japanese/linux-JM/Makefile
index 01d90cc90fac..d4e2a62731e1 100644
--- a/japanese/linux-JM/Makefile
+++ b/japanese/linux-JM/Makefile
@@ -14,6 +14,8 @@ DISTFILES= ${DISTFILES_GNU} ${DISTFILES_OTHERS}
MAINTAINER= sada@FreeBSD.org
COMMENT= Japanese translated man pages by JM Project
+CONFLICTS= ja-samba-2.*
+
DIST_SUBDIR= ${PORTNAME}
MANSECS= 1 3 4 5 8
NO_MTREE= yes
diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index ebdc93ef821b..a6b361effffa 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -20,6 +20,8 @@ DISTNAME= ${PORTNAME}-${SAMBA_VERSION}-ja-${SAMBA_JA_VERSION}
MAINTAINER= nakaji@jp.FreeBSD.org
COMMENT= A free SMB and CIFS client and server for UNIX
+CONFLICTS= samba-2.2.* samba-3.0.* sharity-light-1.*
+
SAMBA_VERSION= 2.2.8a
SAMBA_JA_VERSION= 1.1