- Unbreak: Fix plist

- Register CONFLICTS

3 files changed, 4 insertions, 4 deletions

diff --git a/japanese/binder/Makefile b/japanese/binder/Makefile
index 63aa0fe976fd..a80ba9fc2f47 100644
--- a/japanese/binder/Makefile
+++ b/japanese/binder/Makefile
@@ -9,5 +9,6 @@ CATEGORIES=	japanese
 
 LANGUAGE=	Japanese
 MASTERDIR=	${.CURDIR}/../../x11-fm/binder
+CONFLICTS=	binder-[0-9]*
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/x11-fm/binder/Makefile b/x11-fm/binder/Makefile
index 3f30eaf25399..4786db046123 100644
--- a/x11-fm/binder/Makefile
+++ b/x11-fm/binder/Makefile
@@ -20,7 +20,7 @@ COMMENT=	A file manager on X window with TkStep
 RUN_DEPENDS=	${RUN_DEP_LIST}
 LIB_DEPENDS=	${LIB_DEP_LIST}
 
-BROKEN=		Incomplete pkg-plist
+CONFLICTS?=	ja-binder-[0-9]*
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
@@ -31,9 +31,6 @@ SCRIPTS_ENV=	LANG=C LN=${LN} REINPLACE_CMD="${REINPLACE_CMD}" \
 		LANGUAGE=${LANGUAGE} VERSION=${TKSTEPVERSION}
 PLIST_SUB=	PIXMAP_PATH=${PIXMAPPATH:S@^${PREFIX}/@@}
 
-# This port is for both x11-fm/binder and japanese/binder.
-# But x11-fm/binder and japanese/binder are mutually exclusive and
-# SHOULD NOT BE INSTALLED SIMULTANEOUSLY!
 TKSTEPVERSION=	8.0
 PIXMAPPATH?=	${PREFIX}/share/WindowMaker/Pixmaps
 LANGUAGE?=
diff --git a/x11-fm/binder/pkg-plist b/x11-fm/binder/pkg-plist
index 70d63fdbec89..4b0c564a9c3c 100644
--- a/x11-fm/binder/pkg-plist
+++ b/x11-fm/binder/pkg-plist
@@ -1,5 +1,7 @@
 %%PIXMAP_PATH%%/Binder.xpm
 %%PIXMAP_PATH%%/DiskHardDrive.xpm
+@dirrm %%PIXMAP_PATH%%
+@dirrm share/WindowMaker
 JDE/Binder/bin/Binder.app
 JDE/Binder/bin/Processes.app
 JDE/Binder/defaults/Binder