4 files changed, 185 insertions, 232 deletions

diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile
index fd73f8fa2f58..67d9dbb109d5 100644
--- a/japanese/jed/Makefile
+++ b/japanese/jed/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jed
 PORTVERSION=	${VERSION}.j${JP_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese editors
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.kondara.org/~g/slang/
@@ -19,8 +19,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A SLang-based text editor (w/ Japanese support)
 
-LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang \
-		${LIBDEP_CANNA}
+LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang
 
 VERSION=	0.99.8
 JP_VERSION=	067
@@ -35,28 +34,27 @@ MAN1=		jed.1 rgrep.1
 INFO=		jed
 .endif
 
-JED_ROOT=	${PREFIX}/lib/jed
+JED_ROOT=	${DATADIR}
 BINSTUFF=	jed rgrep
 
+OPTIONS=	CANNA	"Canna support"	on \
+		X11	"X11 support"	on
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_CANNA)
 CONFIGURE_ARGS+=	--with-canna=no
 .else
 CONFIGURE_ARGS+=	--with-canna=yes
-LIBDEP_CANNA=		canna.1:${PORTSDIR}/japanese/canna-lib
+LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/canna-lib
 .endif
 
 .if defined(WITHOUT_X11)
-WITHOUT_XJED=	yes
-.endif
-
-.if defined(WITHOUT_XJED) || defined(XJED_BROKEN)
-PLIST_SUB=	XJED_ENTRY="@comment xjed is not installed"
+PLIST_SUB=	X11="@comment "
 .else
 USE_XORG=	x11 xext
 BINSTUFF+=	xjed
-PLIST_SUB=	XJED_ENTRY="bin/xjed"
+PLIST_SUB=	X11="bin/xjed"
 .endif
 
 _OBJDIR=	${WRKSRC}/src/${ARCH}objs
@@ -64,46 +62,39 @@ _DOCDIR=	${WRKSRC}/doc
 _INFODIR=	${WRKSRC}/info
 _LIBDIR=	${WRKSRC}/lib
 
-pre-fetch:
-.if !defined(WITHOUT_CANNA)
-	@${ECHO_MSG} "To build this port without Canna, define \"WITHOUT_CANNA\"."
-.endif
-.if !defined(WITHOUT_XJED)
-.if defined(XJED_BROKEN)
-	@${ECHO_MSG} "Sorry, I will not build xjed since it is broken on 3.x-STABLE for the present."
-.else
-	@${ECHO_MSG} "To build this port without xjed, define \"WITHOUT_XJED\"."
-.endif
-.endif
+PORTDOCS= abbrev.txt color.txt dfa.txt edt.txt emacs.txt fold.txt	\
+	hooks.txt ide-mode.txt jed_faq.txt jedfuns.txt libfuns.txt	\
+	menus.txt mouse.txt pc-keys.txt program.txt rgrep.txt		\
+	rmail.txt script.txt slangfun.txt syntax.txt undo.txt wjed.txt	\
+	wordstar.txt xjed.txt yankpop.txt README jed.tex jed-j.doc
 
 post-extract:
 	@cd ${WRKDIR} && ${MV} *.sl ${_LIBDIR}/
+	@${CP} ${WRKSRC}/jed-j.doc ${_DOCDIR}/
 
 post-patch:
 	@${RM} ${_INFODIR}/*.orig
 
 do-install:
-	@${MKDIR} ${JED_ROOT}
-.for d in bin doc lib lib/colors lib/tm
-	@${MKDIR} ${JED_ROOT}/${d}
-.endfor
-.for f in ${BINSTUFF}
-	${INSTALL_PROGRAM} ${_OBJDIR}/${f} ${PREFIX}/bin/
-.endfor
+	${MKDIR} ${JED_ROOT}
+	cd ${JED_ROOT} && ${MKDIR} bin lib lib/colors lib/tm
+	cd ${_OBJDIR} && ${INSTALL_PROGRAM} ${BINSTUFF} ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${_OBJDIR}/getmail ${JED_ROOT}/bin/
-	${INSTALL_DATA} ${_LIBDIR}/*.sl ${_LIBDIR}/*.dat ${_LIBDIR}/*.hlp ${_LIBDIR}/jed.rc ${JED_ROOT}/lib/
+	${INSTALL_DATA} ${_LIBDIR}/*.sl \
+		${_LIBDIR}/*.dat \
+		${_LIBDIR}/*.hlp \
+		${_LIBDIR}/jed.rc \
+		${JED_ROOT}/lib/
 	${INSTALL_DATA} ${_LIBDIR}/colors/* ${JED_ROOT}/lib/colors/
 	${INSTALL_DATA} ${_LIBDIR}/tm/* ${JED_ROOT}/lib/tm/
-.for f in ${MAN1}
-	${INSTALL_MAN} ${_DOCDIR}/${f} ${PREFIX}/man/man1/
-.endfor
+	cd ${_DOCDIR} && ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${_INFODIR}/jed.info ${PREFIX}/info/
 	${INSTALL_DATA} ${_INFODIR}/jed.1in ${PREFIX}/info/jed.info-1
 	${INSTALL_DATA} ${_INFODIR}/jed.2in ${PREFIX}/info/jed.info-2
 	${INSTALL_DATA} ${_INFODIR}/jed.3in ${PREFIX}/info/jed.info-3
-	@${MKDIR} ${JED_ROOT}/doc/
-	${INSTALL_DATA} ${_DOCDIR}/README ${_DOCDIR}/*.txt ${_DOCDIR}/jed.tex ${WRKSRC}/jed-j.doc ${JED_ROOT}/doc/
+	${MKDIR} ${DOCSDIR}
+	cd ${_DOCDIR} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 post-install:
diff --git a/japanese/jed/pkg-descr b/japanese/jed/pkg-descr
index a6c033d968a2..9fddfa1db503 100644
--- a/japanese/jed/pkg-descr
+++ b/japanese/jed/pkg-descr
@@ -7,15 +7,5 @@ programmable in the language S-Lang, which can look like
 Forth or C, depending on your preferences.
 
 WWW:	http://space.mit.edu/~davis/jed/
-
-For the latest information, take a look at:
-
-	http://www.kondara.org/~g/jed.html
-
-Japanese translation of JED documents can be found at:
-
-	http://www.dsl.tutics.tut.ac.jp/~kawamoto/jed/jed.html
-
-Have fun!
-
-Akinori MUSHA aka knu <knu@idaemons.org>
+WWW:	http://www.kondara.org/~g/jed.html
+WWW:	http://www.dsl.tutics.tut.ac.jp/~kawamoto/jed/jed.html
diff --git a/japanese/jed/pkg-message b/japanese/jed/pkg-message
index 01df13117250..98ac916b4969 100644
--- a/japanese/jed/pkg-message
+++ b/japanese/jed/pkg-message
@@ -1,7 +1,7 @@
 ************************************************************
 Quickstart:
-	cp ${PREFIX}/lib/jed/lib/jed.rc ~/.jedrc
+	cp ${PREFIX}/share/jed/lib/jed.rc ~/.jedrc
 	jed ~/.jedrc
 
-Read ${PREFIX}/lib/jed/doc/jed-j.doc for details.
+Read ${PREFIX}/share/doc/jed/jed-j.doc for details.
 ************************************************************
diff --git a/japanese/jed/pkg-plist b/japanese/jed/pkg-plist
index 1f274cf54c9a..9de62031f255 100644
--- a/japanese/jed/pkg-plist
+++ b/japanese/jed/pkg-plist
@@ -1,185 +1,157 @@
+@comment $FreeBSD$
 bin/jed
 bin/rgrep
-%%XJED_ENTRY%%
-lib/jed/bin/getmail
-%%PORTDOCS%%lib/jed/doc/abbrev.txt
-%%PORTDOCS%%lib/jed/doc/color.txt
-%%PORTDOCS%%lib/jed/doc/dfa.txt
-%%PORTDOCS%%lib/jed/doc/edt.txt
-%%PORTDOCS%%lib/jed/doc/emacs.txt
-%%PORTDOCS%%lib/jed/doc/fold.txt
-%%PORTDOCS%%lib/jed/doc/hooks.txt
-%%PORTDOCS%%lib/jed/doc/ide-mode.txt
-%%PORTDOCS%%lib/jed/doc/jed_faq.txt
-%%PORTDOCS%%lib/jed/doc/jedfuns.txt
-%%PORTDOCS%%lib/jed/doc/libfuns.txt
-%%PORTDOCS%%lib/jed/doc/menus.txt
-%%PORTDOCS%%lib/jed/doc/mouse.txt
-%%PORTDOCS%%lib/jed/doc/pc-keys.txt
-%%PORTDOCS%%lib/jed/doc/program.txt
-%%PORTDOCS%%lib/jed/doc/rgrep.txt
-%%PORTDOCS%%lib/jed/doc/rmail.txt
-%%PORTDOCS%%lib/jed/doc/script.txt
-%%PORTDOCS%%lib/jed/doc/slangfun.txt
-%%PORTDOCS%%lib/jed/doc/syntax.txt
-%%PORTDOCS%%lib/jed/doc/undo.txt
-%%PORTDOCS%%lib/jed/doc/wjed.txt
-%%PORTDOCS%%lib/jed/doc/wordstar.txt
-%%PORTDOCS%%lib/jed/doc/xjed.txt
-%%PORTDOCS%%lib/jed/doc/yankpop.txt
-%%PORTDOCS%%lib/jed/doc/README
-%%PORTDOCS%%lib/jed/doc/jed.tex
-%%PORTDOCS%%lib/jed/doc/jed-j.doc
-lib/jed/lib/colors/README
-lib/jed/lib/colors/black1.sl
-lib/jed/lib/colors/black2.sl
-lib/jed/lib/colors/black3.sl
-lib/jed/lib/colors/blue1.sl
-lib/jed/lib/colors/blue2.sl
-lib/jed/lib/colors/default1.sl
-lib/jed/lib/colors/white1.sl
-lib/jed/lib/tm/linuxdoc.tm
-lib/jed/lib/abbrev.sl
-lib/jed/lib/abbrmisc.sl
-lib/jed/lib/acompile.sl
-lib/jed/lib/ashell.sl
-lib/jed/lib/backups.sl
-lib/jed/lib/bibtex.sl
-lib/jed/lib/binary.sl
-lib/jed/lib/bookmark.sl
-lib/jed/lib/brief.sl
-lib/jed/lib/buf.sl
-lib/jed/lib/bufed.sl
-lib/jed/lib/bytecomp.sl
-lib/jed/lib/cal.sl
-lib/jed/lib/canna.sl
-lib/jed/lib/cmisc.sl
-lib/jed/lib/cmode.sl
-lib/jed/lib/compat.sl
-lib/jed/lib/compile.sl
-lib/jed/lib/ctags.sl
-lib/jed/lib/dabbrev.sl
-lib/jed/lib/dcl.sl
-lib/jed/lib/digraph.sl
-lib/jed/lib/dired.sl
-lib/jed/lib/dispesc.sl
-lib/jed/lib/dos437.sl
-lib/jed/lib/dos850.sl
-lib/jed/lib/edt.sl
-lib/jed/lib/emacs.sl
-lib/jed/lib/emacsmsc.sl
-lib/jed/lib/emul.sl
-lib/jed/lib/f90.sl
-lib/jed/lib/ff90.sl
-lib/jed/lib/filter.sl
-lib/jed/lib/folding.sl
-lib/jed/lib/fortran.sl
-lib/jed/lib/help.sl
-lib/jed/lib/hooks.sl
-lib/jed/lib/html.sl
-lib/jed/lib/ide.sl
-lib/jed/lib/idl.sl
-lib/jed/lib/info.sl
-lib/jed/lib/isearch.sl
-lib/jed/lib/iso-lat2.sl
-lib/jed/lib/iso-lat3.sl
-lib/jed/lib/iso-latin.sl
-lib/jed/lib/iso2xxx.sl
-lib/jed/lib/ispell.sl
-lib/jed/lib/japanese.sl
-lib/jed/lib/javamode.sl
-lib/jed/lib/jedhelp.sl
-lib/jed/lib/jp-samp.sl
-lib/jed/lib/keycode.sl
-lib/jed/lib/krconv.sl
-lib/jed/lib/latex.sl
-lib/jed/lib/latex209.sl
-lib/jed/lib/linux.sl
-lib/jed/lib/lisp.sl
-lib/jed/lib/ltx-math.sl
-lib/jed/lib/macro.sl
-lib/jed/lib/mail.sl
-lib/jed/lib/mailalias.sl
-lib/jed/lib/man.sl
-lib/jed/lib/maple.sl
-lib/jed/lib/matlab.sl
-lib/jed/lib/menu.sl
-lib/jed/lib/menus.sl
-lib/jed/lib/mime.sl
-lib/jed/lib/mini.sl
-lib/jed/lib/misc.sl
-lib/jed/lib/mkdoc.sl
-lib/jed/lib/mktex.sl
-lib/jed/lib/modehook.sl
-lib/jed/lib/modeinfo.sl
-lib/jed/lib/most.sl
-lib/jed/lib/mouse.sl
-lib/jed/lib/mousex.sl
-lib/jed/lib/mswmouse.sl
-lib/jed/lib/mutekeys.sl
-lib/jed/lib/nroff.sl
-lib/jed/lib/occur.sl
-lib/jed/lib/os.sl
-lib/jed/lib/perl.sl
-lib/jed/lib/pipe.sl
-lib/jed/lib/popups.sl
-lib/jed/lib/preparse.sl
-lib/jed/lib/pscript.sl
-lib/jed/lib/pushmode.sl
-lib/jed/lib/pymode.sl
-lib/jed/lib/rcs.sl
-lib/jed/lib/regexp.sl
-lib/jed/lib/register.sl
-lib/jed/lib/replace.sl
-lib/jed/lib/rmail.sl
-lib/jed/lib/rot13.sl
-lib/jed/lib/ruby.sl
-lib/jed/lib/search.sl
-lib/jed/lib/seldisp.sl
-lib/jed/lib/sendmail.sl
-lib/jed/lib/sgml.sl
-lib/jed/lib/shell.sl
-lib/jed/lib/shmode.sl
-lib/jed/lib/site.sl
-lib/jed/lib/skk.sl
-lib/jed/lib/slmode.sl
-lib/jed/lib/sort.sl
-lib/jed/lib/sortmisc.sl
-lib/jed/lib/spicemod.sl
-lib/jed/lib/srchmisc.sl
-lib/jed/lib/syntax.sl
-lib/jed/lib/tabs.sl
-lib/jed/lib/tclmode.sl
-lib/jed/lib/tex.sl
-lib/jed/lib/texcom.sl
-lib/jed/lib/textmac.sl
-lib/jed/lib/tiasm.sl
-lib/jed/lib/tm2sgml.sl
-lib/jed/lib/tmisc.sl
-lib/jed/lib/tpascal.sl
-lib/jed/lib/untab.sl
-lib/jed/lib/util.sl
-lib/jed/lib/verilog.sl
-lib/jed/lib/vhdlmode.sl
-lib/jed/lib/vmshelp.sl
-lib/jed/lib/wmark.sl
-lib/jed/lib/wmenu.sl
-lib/jed/lib/wordstar.sl
-lib/jed/lib/yankpop.sl
-lib/jed/lib/ltx-comp.dat
-lib/jed/lib/aboutjed.hlp
-lib/jed/lib/cpright.hlp
-lib/jed/lib/edt.hlp
-lib/jed/lib/emacs.hlp
-lib/jed/lib/generic.hlp
-lib/jed/lib/ide.hlp
-lib/jed/lib/jed.hlp
-lib/jed/lib/simple.hlp
-lib/jed/lib/wordstar.hlp
-lib/jed/lib/jed.rc
-@dirrm lib/jed/bin
-@dirrm lib/jed/lib/tm
-@dirrm lib/jed/lib/colors
-@dirrm lib/jed/lib
-%%PORTDOCS%%@dirrm lib/jed/doc
-@dirrm lib/jed
+%%X11%%
+%%DATADIR%%/bin/getmail
+%%DATADIR%%/lib/colors/README
+%%DATADIR%%/lib/colors/black1.sl
+%%DATADIR%%/lib/colors/black2.sl
+%%DATADIR%%/lib/colors/black3.sl
+%%DATADIR%%/lib/colors/blue1.sl
+%%DATADIR%%/lib/colors/blue2.sl
+%%DATADIR%%/lib/colors/default1.sl
+%%DATADIR%%/lib/colors/white1.sl
+%%DATADIR%%/lib/tm/linuxdoc.tm
+%%DATADIR%%/lib/abbrev.sl
+%%DATADIR%%/lib/abbrmisc.sl
+%%DATADIR%%/lib/acompile.sl
+%%DATADIR%%/lib/ashell.sl
+%%DATADIR%%/lib/backups.sl
+%%DATADIR%%/lib/bibtex.sl
+%%DATADIR%%/lib/binary.sl
+%%DATADIR%%/lib/bookmark.sl
+%%DATADIR%%/lib/brief.sl
+%%DATADIR%%/lib/buf.sl
+%%DATADIR%%/lib/bufed.sl
+%%DATADIR%%/lib/bytecomp.sl
+%%DATADIR%%/lib/cal.sl
+%%DATADIR%%/lib/canna.sl
+%%DATADIR%%/lib/cmisc.sl
+%%DATADIR%%/lib/cmode.sl
+%%DATADIR%%/lib/compat.sl
+%%DATADIR%%/lib/compile.sl
+%%DATADIR%%/lib/ctags.sl
+%%DATADIR%%/lib/dabbrev.sl
+%%DATADIR%%/lib/dcl.sl
+%%DATADIR%%/lib/digraph.sl
+%%DATADIR%%/lib/dired.sl
+%%DATADIR%%/lib/dispesc.sl
+%%DATADIR%%/lib/dos437.sl
+%%DATADIR%%/lib/dos850.sl
+%%DATADIR%%/lib/edt.sl
+%%DATADIR%%/lib/emacs.sl
+%%DATADIR%%/lib/emacsmsc.sl
+%%DATADIR%%/lib/emul.sl
+%%DATADIR%%/lib/f90.sl
+%%DATADIR%%/lib/ff90.sl
+%%DATADIR%%/lib/filter.sl
+%%DATADIR%%/lib/folding.sl
+%%DATADIR%%/lib/fortran.sl
+%%DATADIR%%/lib/help.sl
+%%DATADIR%%/lib/hooks.sl
+%%DATADIR%%/lib/html.sl
+%%DATADIR%%/lib/ide.sl
+%%DATADIR%%/lib/idl.sl
+%%DATADIR%%/lib/info.sl
+%%DATADIR%%/lib/isearch.sl
+%%DATADIR%%/lib/iso-lat2.sl
+%%DATADIR%%/lib/iso-lat3.sl
+%%DATADIR%%/lib/iso-latin.sl
+%%DATADIR%%/lib/iso2xxx.sl
+%%DATADIR%%/lib/ispell.sl
+%%DATADIR%%/lib/japanese.sl
+%%DATADIR%%/lib/javamode.sl
+%%DATADIR%%/lib/jedhelp.sl
+%%DATADIR%%/lib/jp-samp.sl
+%%DATADIR%%/lib/keycode.sl
+%%DATADIR%%/lib/krconv.sl
+%%DATADIR%%/lib/latex.sl
+%%DATADIR%%/lib/latex209.sl
+%%DATADIR%%/lib/linux.sl
+%%DATADIR%%/lib/lisp.sl
+%%DATADIR%%/lib/ltx-math.sl
+%%DATADIR%%/lib/macro.sl
+%%DATADIR%%/lib/mail.sl
+%%DATADIR%%/lib/mailalias.sl
+%%DATADIR%%/lib/man.sl
+%%DATADIR%%/lib/maple.sl
+%%DATADIR%%/lib/matlab.sl
+%%DATADIR%%/lib/menu.sl
+%%DATADIR%%/lib/menus.sl
+%%DATADIR%%/lib/mime.sl
+%%DATADIR%%/lib/mini.sl
+%%DATADIR%%/lib/misc.sl
+%%DATADIR%%/lib/mkdoc.sl
+%%DATADIR%%/lib/mktex.sl
+%%DATADIR%%/lib/modehook.sl
+%%DATADIR%%/lib/modeinfo.sl
+%%DATADIR%%/lib/most.sl
+%%DATADIR%%/lib/mouse.sl
+%%DATADIR%%/lib/mousex.sl
+%%DATADIR%%/lib/mswmouse.sl
+%%DATADIR%%/lib/mutekeys.sl
+%%DATADIR%%/lib/nroff.sl
+%%DATADIR%%/lib/occur.sl
+%%DATADIR%%/lib/os.sl
+%%DATADIR%%/lib/perl.sl
+%%DATADIR%%/lib/pipe.sl
+%%DATADIR%%/lib/popups.sl
+%%DATADIR%%/lib/preparse.sl
+%%DATADIR%%/lib/pscript.sl
+%%DATADIR%%/lib/pushmode.sl
+%%DATADIR%%/lib/pymode.sl
+%%DATADIR%%/lib/rcs.sl
+%%DATADIR%%/lib/regexp.sl
+%%DATADIR%%/lib/register.sl
+%%DATADIR%%/lib/replace.sl
+%%DATADIR%%/lib/rmail.sl
+%%DATADIR%%/lib/rot13.sl
+%%DATADIR%%/lib/ruby.sl
+%%DATADIR%%/lib/search.sl
+%%DATADIR%%/lib/seldisp.sl
+%%DATADIR%%/lib/sendmail.sl
+%%DATADIR%%/lib/sgml.sl
+%%DATADIR%%/lib/shell.sl
+%%DATADIR%%/lib/shmode.sl
+%%DATADIR%%/lib/site.sl
+%%DATADIR%%/lib/skk.sl
+%%DATADIR%%/lib/slmode.sl
+%%DATADIR%%/lib/sort.sl
+%%DATADIR%%/lib/sortmisc.sl
+%%DATADIR%%/lib/spicemod.sl
+%%DATADIR%%/lib/srchmisc.sl
+%%DATADIR%%/lib/syntax.sl
+%%DATADIR%%/lib/tabs.sl
+%%DATADIR%%/lib/tclmode.sl
+%%DATADIR%%/lib/tex.sl
+%%DATADIR%%/lib/texcom.sl
+%%DATADIR%%/lib/textmac.sl
+%%DATADIR%%/lib/tiasm.sl
+%%DATADIR%%/lib/tm2sgml.sl
+%%DATADIR%%/lib/tmisc.sl
+%%DATADIR%%/lib/tpascal.sl
+%%DATADIR%%/lib/untab.sl
+%%DATADIR%%/lib/util.sl
+%%DATADIR%%/lib/verilog.sl
+%%DATADIR%%/lib/vhdlmode.sl
+%%DATADIR%%/lib/vmshelp.sl
+%%DATADIR%%/lib/wmark.sl
+%%DATADIR%%/lib/wmenu.sl
+%%DATADIR%%/lib/wordstar.sl
+%%DATADIR%%/lib/yankpop.sl
+%%DATADIR%%/lib/ltx-comp.dat
+%%DATADIR%%/lib/aboutjed.hlp
+%%DATADIR%%/lib/cpright.hlp
+%%DATADIR%%/lib/edt.hlp
+%%DATADIR%%/lib/emacs.hlp
+%%DATADIR%%/lib/generic.hlp
+%%DATADIR%%/lib/ide.hlp
+%%DATADIR%%/lib/jed.hlp
+%%DATADIR%%/lib/simple.hlp
+%%DATADIR%%/lib/wordstar.hlp
+%%DATADIR%%/lib/jed.rc
+@dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%/lib/tm
+@dirrm %%DATADIR%%/lib/colors
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%