diff options
| -rw-r--r-- | misc/seizedesktop/Makefile | 11 | ||||
| -rw-r--r-- | misc/seizedesktop/pkg-descr | 3 | ||||
| -rw-r--r-- | misc/seizedesktop/scripts/post-install | 11 | ||||
| -rw-r--r-- | x11-fm/binder/Makefile | 12 | ||||
| -rw-r--r-- | x11-fm/binder/pkg-descr | 3 | ||||
| -rw-r--r-- | x11-fm/binder/scripts/post-install | 11 |
6 files changed, 2 insertions, 49 deletions
diff --git a/misc/seizedesktop/Makefile b/misc/seizedesktop/Makefile index ce3a753740c9..a0ef1a1c1461 100644 --- a/misc/seizedesktop/Makefile +++ b/misc/seizedesktop/Makefile @@ -7,7 +7,7 @@ PORTNAME= seizedesktop PORTVERSION= 0.1a -CATEGORIES+= misc windowmaker tkstep80 +CATEGORIES= misc windowmaker tkstep80 MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= kiri DISTNAME= SeizeDesktop-${PORTVERSION} @@ -27,18 +27,9 @@ REINPLACE_ARGS= SCRIPTS_ENV= LANG=C LN=${LN} REINPLACE_CMD='${REINPLACE_CMD}' \ LANGUAGE=${LANGUAGE} VERSION=${TKSTEPVERSION} -# This port is for both misc/seizedesktop and japanese/seizedesktop. -# But misc/seizedesktop and japanese/seizedesktop are mutually exclusive and -# SHOULD NOT BE INSTALLED SIMULTANEOUSLY! TKSTEPVERSION= 8.0 -LANGUAGE?= -.if (${LANGUAGE} == "Japanese") -RUN_DEP_LIST= ${LOCALBASE}/lib/tkstep8.0jp/tkstep.tcl:${PORTSDIR}/japanese/tkstep80 -IGNORE= unsupported: ja-libimg no longer available -.else RUN_DEP_LIST= ${LOCALBASE}/lib/tkstep8.0/tkstep.tcl:${PORTSDIR}/x11-toolkits/tkstep80 LIB_DEP_LIST= img.1:${PORTSDIR}/graphics/libimg -.endif do-install: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTNAME}.tar.gz \ diff --git a/misc/seizedesktop/pkg-descr b/misc/seizedesktop/pkg-descr index 9a0932961869..1d722ffd5599 100644 --- a/misc/seizedesktop/pkg-descr +++ b/misc/seizedesktop/pkg-descr @@ -1,7 +1,4 @@ The SeizeDesktop is like a customizer of desktop screen environment. -Note that both x11-toolkits/seizedesktop and japanese/seizedesktop -are mutually exclusive and SHOULD NOT BE INSTALLED SIMULTANEOUSLY! - -KIRIYAMA Kazuhiko <kiri@FreeBSD.org> diff --git a/misc/seizedesktop/scripts/post-install b/misc/seizedesktop/scripts/post-install index d770a5394f35..8b4f7c6626af 100644 --- a/misc/seizedesktop/scripts/post-install +++ b/misc/seizedesktop/scripts/post-install @@ -2,17 +2,6 @@ installdir=${PREFIX}/JDE/SeizeDesktop; export installdir -case ${LANGUAGE} in - Japanese) - for f in SeizeDesktop.app PrefDesktop.app; do - ${REINPLACE_CMD} -i "" -E -e \ - "s/^(exec[[:space:]]+)wishstep[[:space:]]*([[:space:]]+.*)\$/\1wishstep${VERSION}jp\2/" \ - ${installdir}/bin/${f} - done - ;; - *) - ;; -esac for f in SeizeDesktop SeizeDesktop.app PrefDesktop.app; do case ${f} in SeizeDesktop.app|PrefDesktop.app) diff --git a/x11-fm/binder/Makefile b/x11-fm/binder/Makefile index 7675b361bc8e..d3cbd0942515 100644 --- a/x11-fm/binder/Makefile +++ b/x11-fm/binder/Makefile @@ -7,7 +7,7 @@ PORTNAME= binder PORTVERSION= 1.3 -CATEGORIES+= ${CATEGORY_LIST} +CATEGORIES= x11-fm windowmaker tkstep80 MASTER_SITES= http://www.aaa-int.or.jp/~jfactory/JDE/dist/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= kiri @@ -20,8 +20,6 @@ COMMENT= A file manager on X window with TkStep RUN_DEPENDS= ${RUN_DEP_LIST} LIB_DEPENDS= ${LIB_DEP_LIST} -CONFLICTS?= ja-binder-[0-9]* - NO_WRKSUBDIR= yes NO_BUILD= yes USE_X_PREFIX= yes @@ -33,16 +31,8 @@ PLIST_SUB= PIXMAP_PATH=${PIXMAPPATH:S@^${PREFIX}/@@} TKSTEPVERSION= 8.0 PIXMAPPATH?= ${PREFIX}/share/WindowMaker/Pixmaps -LANGUAGE?= -.if (${LANGUAGE} == "Japanese") -CATEGORY_LIST= x11-fm windowmaker tkstep80 japanese -RUN_DEP_LIST= ${LOCALBASE}/lib/tkstep8.0jp/tkstep.tcl:${PORTSDIR}/japanese/tkstep80 -IGNORE= unsupported: ja-libimg no longer available -.else -CATEGORY_LIST= x11-fm windowmaker tkstep80 RUN_DEP_LIST= ${LOCALBASE}/lib/tkstep8.0/tkstep.tcl:${PORTSDIR}/x11-toolkits/tkstep80 LIB_DEP_LIST= img.1:${PORTSDIR}/graphics/libimg -.endif do-install: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTNAME}.tar.gz \ diff --git a/x11-fm/binder/pkg-descr b/x11-fm/binder/pkg-descr index a87f3653c220..2945d675947b 100644 --- a/x11-fm/binder/pkg-descr +++ b/x11-fm/binder/pkg-descr @@ -1,8 +1,5 @@ The Binder is a file manager program that was made for the JDE desktop enviropment on X Window System. -Note that both x11-fm/binder and japanese/binder are mutually exclusive and -SHOULD NOT BE INSTALLED SIMULTANEOUSLY! - -KIRIYAMA Kazuhiko <kiri@FreeBSD.org> diff --git a/x11-fm/binder/scripts/post-install b/x11-fm/binder/scripts/post-install index 86752cc9a17a..37fc460e68e2 100644 --- a/x11-fm/binder/scripts/post-install +++ b/x11-fm/binder/scripts/post-install @@ -2,17 +2,6 @@ installdir=${PREFIX}/JDE/Binder; export installdir -case ${LANGUAGE} in - Japanese) - for f in bin/Binder.app bin/Processes.app misc/Mounter/Mounter.app; do - ${REINPLACE_CMD} -i "" -E -e \ - "s/^(exec[[:space:]]+)wishstep[[:space:]]*([[:space:]]+.*)\$/\1wishstep${VERSION}jp\2/" \ - ${installdir}/${f} - done - ;; - *) - ;; -esac for f in Binder Binder.app Processes.app Mounter.app shortcut; do case ${f} in Binder.app|Processes.app) |