4 files changed, 117 insertions, 69 deletions

diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index bcda37b815bb..87a35fd5d8ba 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -6,32 +6,28 @@
 #
 
 PORTNAME=	jed
-PORTVERSION=	0.98.7
+PORTVERSION=	0.99.14
 CATEGORIES=	editors
-MASTER_SITES=	ftp://space.mit.edu/pub/davis/jed/v0.98/
-DISTNAME=	${PORTNAME}0.98-7
+MASTER_SITES=	ftp://space.mit.edu/pub/davis/jed/v${PORTVERSION:R}/
+DISTNAME=	${PORTNAME}-B${PORTVERSION:R}-${PORTVERSION:E}
 
-PATCH_SITES=	ftp://space.mit.edu/pub/davis/jed/v0.98/
-PATCHFILES=	BUGS
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=	eric@cybernut.com
+MAINTAINER=	s_bschmi@ira.uka.de
 
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 
-USE_XLIB=	yes
 
-.if !defined(NO_XJED)
+.if !defined(WITHOUT_X11)
+USE_XLIB=	yes
 XJED=	xjed
+PLIST_SUB+=  	NOXJED=""
+.else
+PLIST_SUB+=		NOXJED="@comment "
 .endif
 
 DIST_SUBDIR=	jed
 GNU_CONFIGURE=	yes
-PATCH_DIST_ARGS=	-d ${WRKSRC}/src --quiet -E ${PATCH_DIST_STRIP}
-CONFIGURE_ENV=	JED_ROOT=${PREFIX}/lib/jed
+CONFIGURE_ENV+=	JED_ROOT=${PREFIX}/lib/jed
 ALL_TARGET=	all getmail ${XJED}
-INSTALL_TARGET=	install
-WRKSRC=		${WRKDIR}/jed
 MAN1=		jed.1 rgrep.1
 
 pre-install:
@@ -41,16 +37,19 @@ post-install:
 	strip ${PREFIX}/bin/jed
 	strip ${PREFIX}/bin/rgrep
 	strip ${PREFIX}/lib/jed/bin/getmail
-.if defined(XJED)
-	strip ${PREFIX}/bin/xjed
-.endif
+.for f in ${XJED}
+	strip ${PREFIX}/bin/$f
+.endfor
 	${CP} -R ${WRKSRC}/lib/* ${PREFIX}/lib/jed/lib
-	${INSTALL_DATA} ${WRKSRC}/info/jed.* ${PREFIX}/info
+	-${RM} ${PREFIX}/lib/jed/info/*
 	-${RMDIR} ${PREFIX}/lib/jed/info
+	-${RM} ${PREFIX}/lib/jed/doc/txt/*
+	-${RMDIR} ${PREFIX}/lib/jed/doc/txt
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/jed
-	${INSTALL_DATA} ${WRKSRC}/doc/README ${WRKSRC}/doc/*.txt \
+	${INSTALL_DATA} ${WRKSRC}/doc/txt/*.txt \
 		${PREFIX}/share/doc/jed
+	${INSTALL_DATA} ${WRKSRC}/info/jed.* ${PREFIX}/info
 	install-info --section="Miscellaneous" \
 		--entry="* JED: (jed).			JED editor documentation." \
 		${PREFIX}/info/jed.info ${PREFIX}/info/dir
diff --git a/editors/jed/distinfo b/editors/jed/distinfo
index f55b4899f56c..676dbe0e08b6 100644
--- a/editors/jed/distinfo
+++ b/editors/jed/distinfo
@@ -1,2 +1 @@
-MD5 (jed/jed0.98-7.tar.gz) = 868a0003cc169fbd559273085c838d78
-MD5 (jed/BUGS) = 4298e5377716887b755e2b7809a051b1
+MD5 (jed/jed-B0.99-14.tar.gz) = 15d5f560e6f74ac2a406f20a21fff340
diff --git a/editors/jed/files/patch-aa b/editors/jed/files/patch-aa
index 82a6a36400ef..722be981ef0e 100644
--- a/editors/jed/files/patch-aa
+++ b/editors/jed/files/patch-aa
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	Tue Oct 13 19:12:49 1998
-+++ src/Makefile.in	Tue Oct 13 19:13:55 1998
-@@ -121,7 +121,7 @@
+--- src/Makefile.in.orig	Tue Apr 10 01:54:31 2001
++++ src/Makefile.in	Tue Apr 10 01:56:43 2001
+@@ -143,7 +143,7 @@
  rgrep: $(OBJDIR)/rgrep
  	@echo rgrep created in $(OBJDIR)
  $(OBJDIR)/rgrep: $(OBJDIR)/vfile.o $(OBJDIR)/rgrep.o
--	cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) -L$(SLANG_LIB_DIR) -lslang
-+	cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) -L$(SLANG_LIB_DIR) -lslang $(TERMCAP_LIB)
+-	cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(SLANG_LIB) -lslang
++	cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(SLANG_LIB) -lslang $(TERMCAP_LIB)
  #
  getmail: $(OBJDIR)/getmail
  	@echo getmail created in $(OBJDIR)
diff --git a/editors/jed/pkg-plist b/editors/jed/pkg-plist
index 20f6707f873e..85b62d20ec59 100644
--- a/editors/jed/pkg-plist
+++ b/editors/jed/pkg-plist
@@ -1,17 +1,33 @@
 bin/jed
 bin/rgrep
-bin/xjed
-@unexec install-info --delete --section="Miscellaneous" --entry="* JED: (jed).			JED editor documentation." %D/info/jed.info %D/info/dir
-info/jed.1in
-info/jed.2in
-info/jed.3in
-info/jed.info
-@exec install-info --section="Miscellaneous" --entry="* JED: (jed).			JED editor documentation." %D/info/jed.info %D/info/dir
+%%NOXJED%%bin/xjed
+%%PORTDOCS%%@unexec install-info --delete --section="Miscellaneous" --entry="* JED: (jed).			JED editor documentation." %D/info/jed.info %D/info/dir
+%%PORTDOCS%%info/jed.1in
+%%PORTDOCS%%info/jed.2in
+%%PORTDOCS%%info/jed.3in
+%%PORTDOCS%%info/jed.info
+%%PORTDOCS%%@exec install-info --section="Miscellaneous" --entry="* JED: (jed).			JED editor documentation." %D/info/jed.info %D/info/dir
 lib/jed/bin/getmail
+lib/jed/doc/manual/jed.tex
+lib/jed/doc/README
+lib/jed/lib/colors/Xjed/elegant.sl
+lib/jed/lib/colors/Xjed/pastel0.sl
+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/blue3.sl
+lib/jed/lib/colors/default1.sl
+lib/jed/lib/colors/white1.sl
+lib/jed/lib/colors/README
+lib/jed/lib/tm/linuxdoc.tm
 lib/jed/lib/abbrev.sl
 lib/jed/lib/abbrmisc.sl
 lib/jed/lib/acompile.sl
+lib/jed/lib/aprocess.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
@@ -20,64 +36,73 @@ lib/jed/lib/buf.sl
 lib/jed/lib/bufed.sl
 lib/jed/lib/bytecomp.sl
 lib/jed/lib/cal.sl
+lib/jed/lib/chglog.sl
 lib/jed/lib/cmisc.sl
 lib/jed/lib/cmode.sl
+lib/jed/lib/comments.sl
 lib/jed/lib/compat.sl
 lib/jed/lib/compile.sl
-lib/jed/lib/cpright.hlp
+lib/jed/lib/compress.sl
 lib/jed/lib/ctags.sl
+lib/jed/lib/cua.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/docbook.sl
 lib/jed/lib/dos437.sl
 lib/jed/lib/dos850.sl
-lib/jed/lib/edt.hlp
+lib/jed/lib/dos852.sl
 lib/jed/lib/edt.sl
-lib/jed/lib/emacs.hlp
 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/generic.hlp
 lib/jed/lib/help.sl
+lib/jed/lib/history.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/javamode.sl
-lib/jed/lib/jed.hlp
-lib/jed/lib/jed.rc
+lib/jed/lib/jed.sl
 lib/jed/lib/jedhelp.sl
+lib/jed/lib/jedusage.sl
 lib/jed/lib/keycode.sl
+lib/jed/lib/keydefs.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-comp.dat
 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/minued.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
@@ -87,21 +112,25 @@ lib/jed/lib/nroff.sl
 lib/jed/lib/occur.sl
 lib/jed/lib/os.sl
 lib/jed/lib/perl.sl
+lib/jed/lib/php.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/recent.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/search.sl
+lib/jed/lib/seldisp.sl
 lib/jed/lib/sendmail.sl
 lib/jed/lib/shell.sl
 lib/jed/lib/shmode.sl
-lib/jed/lib/simple.hlp
 lib/jed/lib/site.sl
 lib/jed/lib/slmode.sl
 lib/jed/lib/sort.sl
@@ -114,7 +143,8 @@ lib/jed/lib/tclmode.sl
 lib/jed/lib/tex.sl
 lib/jed/lib/texcom.sl
 lib/jed/lib/textmac.sl
-lib/jed/lib/tm/linuxdoc.tm
+lib/jed/lib/textmode.sl
+lib/jed/lib/tiasm.sl
 lib/jed/lib/tm2sgml.sl
 lib/jed/lib/tmisc.sl
 lib/jed/lib/tpascal.sl
@@ -122,39 +152,59 @@ lib/jed/lib/untab.sl
 lib/jed/lib/util.sl
 lib/jed/lib/verilog.sl
 lib/jed/lib/vhdlmode.sl
-lib/jed/lib/vms_shell.com
 lib/jed/lib/vmshelp.sl
+lib/jed/lib/win1250.sl
 lib/jed/lib/wmark.sl
 lib/jed/lib/wmenu.sl
-lib/jed/lib/wordstar.hlp
 lib/jed/lib/wordstar.sl
 lib/jed/lib/yankpop.sl
-share/doc/jed/README
-share/doc/jed/abbrev.txt
-share/doc/jed/color.txt
-share/doc/jed/dfa.txt
-share/doc/jed/edt.txt
-share/doc/jed/emacs.txt
-share/doc/jed/fold.txt
-share/doc/jed/hooks.txt
-share/doc/jed/jed_faq.txt
-share/doc/jed/jedfuns.txt
-share/doc/jed/mouse.txt
-share/doc/jed/pc-keys.txt
-share/doc/jed/program.txt
-share/doc/jed/rgrep.txt
-share/doc/jed/rmail.txt
-share/doc/jed/script.txt
-share/doc/jed/slangfun.txt
-share/doc/jed/syntax.txt
-share/doc/jed/undo.txt
-share/doc/jed/wjed.txt
-share/doc/jed/wordstar.txt
-share/doc/jed/xjed.txt
-share/doc/jed/yankpop.txt
+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
+lib/jed/lib/vms_shell.com
+lib/jed/lib/jed.conf
+lib/jed/lib/README
+%%PORTDOCS%%share/doc/jed/abbrev.txt
+%%PORTDOCS%%share/doc/jed/color.txt
+%%PORTDOCS%%share/doc/jed/compile.txt
+%%PORTDOCS%%share/doc/jed/dfa.txt
+%%PORTDOCS%%share/doc/jed/edt.txt
+%%PORTDOCS%%share/doc/jed/emacs.txt
+%%PORTDOCS%%share/doc/jed/filelock.txt
+%%PORTDOCS%%share/doc/jed/fold.txt
+%%PORTDOCS%%share/doc/jed/hooks.txt
+%%PORTDOCS%%share/doc/jed/ide-mode.txt
+%%PORTDOCS%%share/doc/jed/jed_faq.txt
+%%PORTDOCS%%share/doc/jed/jedfuns.txt
+%%PORTDOCS%%share/doc/jed/libfuns.txt
+%%PORTDOCS%%share/doc/jed/linux-keys.txt
+%%PORTDOCS%%share/doc/jed/menus.txt
+%%PORTDOCS%%share/doc/jed/mouse.txt
+%%PORTDOCS%%share/doc/jed/pc-keys.txt
+%%PORTDOCS%%share/doc/jed/program.txt
+%%PORTDOCS%%share/doc/jed/rgrep.txt
+%%PORTDOCS%%share/doc/jed/rmail.txt
+%%PORTDOCS%%share/doc/jed/script.txt
+%%PORTDOCS%%share/doc/jed/syntax.txt
+%%PORTDOCS%%share/doc/jed/undo.txt
+%%PORTDOCS%%share/doc/jed/wjed.txt
+%%PORTDOCS%%share/doc/jed/wordstar.txt
+%%PORTDOCS%%share/doc/jed/xjed.txt
+%%PORTDOCS%%share/doc/jed/yankpop.txt
 @dirrm lib/jed/bin
 @dirrm lib/jed/lib/tm
+@dirrm lib/jed/lib/colors/Xjed
+@dirrm lib/jed/lib/colors
 @dirrm lib/jed/lib
+@dirrm lib/jed/doc/manual
 @dirrm lib/jed/doc
 @dirrm lib/jed
-@dirrm share/doc/jed
+%%PORTDOCS%%@dirrm share/doc/jed