aboutsummaryrefslogtreecommitdiffstats
path: root/japanese
diff options
context:
space:
mode:
authortimur <timur@FreeBSD.org>2009-08-02 07:44:59 +0800
committertimur <timur@FreeBSD.org>2009-08-02 07:44:59 +0800
commitbed3f2419fe4cf01b95795129f56493c6daa241b (patch)
treea23599a1f0b556f4d5a40202a02c2ba4cbab7ab5 /japanese
parent85154e097ad3f1eb0ab9c8fbf9c218664aeeaf06 (diff)
downloadfreebsd-ports-gnome-bed3f2419fe4cf01b95795129f56493c6daa241b.tar.gz
freebsd-ports-gnome-bed3f2419fe4cf01b95795129f56493c6daa241b.tar.zst
freebsd-ports-gnome-bed3f2419fe4cf01b95795129f56493c6daa241b.zip
Fix CONFLICTS
Diffstat (limited to 'japanese')
-rw-r--r--japanese/samba3/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/japanese/samba3/Makefile b/japanese/samba3/Makefile
index 1c858f49a429..5ea9184b9bf9 100644
--- a/japanese/samba3/Makefile
+++ b/japanese/samba3/Makefile
@@ -17,7 +17,7 @@ PATCH_DIST_STRIP= -p0
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Japanese Samba
-CONFLICTS= ja-samba-2.* samba-2.* samba-3.0.* sharity-light-1.*
+CONFLICTS= samba-3.* samba4-* tdb-1.*
SAMBA_PORT= samba3