diff options
| -rw-r--r-- | editors/muggy/Makefile | 5 | ||||
| -rw-r--r-- | editors/muggy/pkg-plist | 2 | ||||
| -rw-r--r-- | graphics/jgv/Makefile | 5 | ||||
| -rw-r--r-- | graphics/jgv/pkg-plist | 2 | ||||
| -rw-r--r-- | japanese/jgv/Makefile | 1 | ||||
| -rw-r--r-- | japanese/muggy/Makefile | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/editors/muggy/Makefile b/editors/muggy/Makefile index 9c2fcf54a0ab..4f6095b632ee 100644 --- a/editors/muggy/Makefile +++ b/editors/muggy/Makefile @@ -20,7 +20,7 @@ COMMENT= A simple text editor for the X on TkStep RUN_DEPENDS= ${RUN_DEP_LIST} LIB_DEPENDS= ${LIB_DEP_LIST} -BROKEN= Incomplete pkg-plist +CONFLICTS?= ja-muggy-[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 editors/muggy and japanese/muggy. -# But editors/muggy and japanese/muggy are mutually exclusive and -# SHOULD NOT BE INSTALLED SIMULTANEOUSLY! TKSTEPVERSION= 8.0 PIXMAPPATH?= ${PREFIX}/share/WindowMaker/Pixmaps LANGUAGE?= diff --git a/editors/muggy/pkg-plist b/editors/muggy/pkg-plist index 16642dadebef..df04fb7dcc08 100644 --- a/editors/muggy/pkg-plist +++ b/editors/muggy/pkg-plist @@ -24,6 +24,8 @@ JDE/Muggy/modules/Undo.m/new.tcl JDE/Muggy/modules/Undo.m/textundo.tcl bin/Muggy.app %%PIXMAP_PATH%%/Muggy.xpm +@dirrm %%PIXMAP_PATH%% +@dirrm share/WindowMaker @dirrm JDE/Muggy/bin @dirrm JDE/Muggy/contrib @dirrm JDE/Muggy/defaults diff --git a/graphics/jgv/Makefile b/graphics/jgv/Makefile index 5c3c368d79d0..b227be0d0526 100644 --- a/graphics/jgv/Makefile +++ b/graphics/jgv/Makefile @@ -20,7 +20,7 @@ COMMENT= A graphic viewer with various image types RUN_DEPENDS= ${RUN_DEP_LIST} LIB_DEPENDS= ${LIB_DEP_LIST} -BROKEN= Incomplete pkg-plist +CONFLICTS?= ja-jgv-[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 graphics/jgv and japanese/jgv. -# But graphics/jgv and japanese/jgv are mutually exclusive and -# SHOULD NOT BE INSTALLED SIMULTANEOUSLY! TKSTEPVERSION= 8.0 PIXMAPPATH?= ${PREFIX}/share/WindowMaker/Pixmaps LANGUAGE?= diff --git a/graphics/jgv/pkg-plist b/graphics/jgv/pkg-plist index e0040b8d265d..fce71659170b 100644 --- a/graphics/jgv/pkg-plist +++ b/graphics/jgv/pkg-plist @@ -19,6 +19,8 @@ JDE/JGV/menu/menu.ja JDE/JGV/modules/PrefJGV.m bin/JGV.app %%PIXMAP_PATH%%/JGV.xpm +@dirrm %%PIXMAP_PATH%% +@dirrm share/WindowMaker @dirrm JDE/JGV/bin @dirrm JDE/JGV/defaults @dirrm JDE/JGV/docs diff --git a/japanese/jgv/Makefile b/japanese/jgv/Makefile index dd64cea45435..463791350a23 100644 --- a/japanese/jgv/Makefile +++ b/japanese/jgv/Makefile @@ -9,5 +9,6 @@ CATEGORIES= japanese LANGUAGE= Japanese MASTERDIR= ${.CURDIR}/../../graphics/jgv +CONFLICTS= jgv-[0-9]* .include "${MASTERDIR}/Makefile" diff --git a/japanese/muggy/Makefile b/japanese/muggy/Makefile index 8101400e52a1..de7dc58a098f 100644 --- a/japanese/muggy/Makefile +++ b/japanese/muggy/Makefile @@ -11,4 +11,6 @@ CATEGORIES= japanese MASTERDIR= ${.CURDIR}/../../editors/muggy +CONFLICTS= muggy-[0-9]* + .include "${MASTERDIR}/Makefile" |