Use jed/Makefile.common. -> Upgrade to 0.99.16, for details see jed update.

7 files changed, 21 insertions, 312 deletions

diff --git a/editors/xjed/MESSAGE b/editors/xjed/MESSAGE
deleted file mode 100644
index 92c4e3b1c37..00000000000
--- a/editors/xjed/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:29:58 wiz Exp $
-
-You might want to have a look at ${PREFIX}/share/jed/lib/* and
-install a file defaults.sl for site defaults there.
-
-===========================================================================
diff --git a/editors/xjed/Makefile b/editors/xjed/Makefile
index 6132668fed6..08291d5fdb5 100644
--- a/editors/xjed/Makefile
+++ b/editors/xjed/Makefile
@@ -1,30 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/04/05 21:39:41 wiz Exp $
 #
+PKGNAME=		xjed-0.99.16
+.include "../jed/Makefile.common"
+COMMENT=		Extensible folding editor with Emacs/WordStar/EDT emulations, X11 version
 
-DISTNAME=		jed-B0.99-15
-PKGNAME=		xjed-0.99.15
-WRKSRC=			${WRKDIR}/jed-B0.99-15
-CATEGORIES=		editors
-MASTER_SITES=		ftp://space.mit.edu/pub/davis/jed/v0.99/ \
-			ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/
-
-MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://space.mit.edu/~davis/jed.html
-COMMENT=		X11-based text editor, extensible through S-Lang functions
-
-USE_BUILDLINK2=		# defined
-USE_X11=		# defined
-GNU_CONFIGURE=		# defined
+USE_X11=		yes
 CONFIGURE_ARGS+=	--with-x
 
-post-install:
-	@cd ${WRKSRC};							\
-		for dir in lib info doc; do				\
-			${ECHO} "Installing $$dir files";		\
-			${PAX} -rwpe $$dir ${PREFIX}/share/xjed;	\
-		done
-	${RM} -f ${PREFIX}/share/xjed/doc/jed.1 ${PREFIX}/share/xjed/doc/rgrep.1
-	${RMDIR} ${PREFIX}/share/xjed/bin
+ALL_TARGET=		xjed
+
+MESSAGE=		${.CURDIR}/../jed/MESSAGE
+PLIST_SRC=		${.CURDIR}/../jed/PLIST
+PLIST_SRC+=		${.CURDIR}/PLIST.xjed
 
-.include "../../devel/libslang/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xjed/PLIST b/editors/xjed/PLIST
deleted file mode 100644
index b78268293f9..00000000000
--- a/editors/xjed/PLIST
+++ /dev/null
@@ -1,249 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/07 12:04:34 wiz Exp $
-bin/jed
-bin/xjed
-bin/rgrep
-man/man1/jed.1
-man/man1/rgrep.1
-share/xjed/doc/README
-share/xjed/doc/manual/jed.1
-share/xjed/doc/manual/jed.tex
-share/xjed/doc/manual/rgrep.1
-share/xjed/doc/tm/Makefile
-share/xjed/doc/tm/README
-share/xjed/doc/tm/jedfuns.tm
-share/xjed/doc/tm/quickref.tm
-share/xjed/doc/tm/rtl/abbrev.tm
-share/xjed/doc/tm/rtl/blocal.tm
-share/xjed/doc/tm/rtl/buffer.tm
-share/xjed/doc/tm/rtl/color.tm
-share/xjed/doc/tm/rtl/eval.tm
-share/xjed/doc/tm/rtl/file.tm
-share/xjed/doc/tm/rtl/hidden.tm
-share/xjed/doc/tm/rtl/hooks.tm
-share/xjed/doc/tm/rtl/info.tm
-share/xjed/doc/tm/rtl/insdel.tm
-share/xjed/doc/tm/rtl/keys.tm
-share/xjed/doc/tm/rtl/mark.tm
-share/xjed/doc/tm/rtl/menu.tm
-share/xjed/doc/tm/rtl/message.tm
-share/xjed/doc/tm/rtl/mini.tm
-share/xjed/doc/tm/rtl/misc.tm
-share/xjed/doc/tm/rtl/mouse.tm
-share/xjed/doc/tm/rtl/move.tm
-share/xjed/doc/tm/rtl/process.tm
-share/xjed/doc/tm/rtl/rect.tm
-share/xjed/doc/tm/rtl/region.tm
-share/xjed/doc/tm/rtl/search.tm
-share/xjed/doc/tm/rtl/syntax.tm
-share/xjed/doc/tm/rtl/terminal.tm
-share/xjed/doc/tm/rtl/tm-sort.sl
-share/xjed/doc/tm/rtl/userinfo.tm
-share/xjed/doc/tm/rtl/whatelse.sl
-share/xjed/doc/tm/rtl/window.tm
-share/xjed/doc/tm/rtl/xjed.tm
-share/xjed/doc/txt/abbrev.txt
-share/xjed/doc/txt/color.txt
-share/xjed/doc/txt/compile.txt
-share/xjed/doc/txt/dfa.txt
-share/xjed/doc/txt/edt.txt
-share/xjed/doc/txt/emacs.txt
-share/xjed/doc/txt/filelock.txt
-share/xjed/doc/txt/fold.txt
-share/xjed/doc/txt/hooks.txt
-share/xjed/doc/txt/ide-mode.txt
-share/xjed/doc/txt/jed_faq.txt
-share/xjed/doc/txt/jedfuns.txt
-share/xjed/doc/txt/libfuns.txt
-share/xjed/doc/txt/linux-keys.txt
-share/xjed/doc/txt/menus.txt
-share/xjed/doc/txt/mouse.txt
-share/xjed/doc/txt/pc-keys.txt
-share/xjed/doc/txt/program.txt
-share/xjed/doc/txt/rgrep.txt
-share/xjed/doc/txt/rmail.txt
-share/xjed/doc/txt/script.txt
-share/xjed/doc/txt/syntax.txt
-share/xjed/doc/txt/undo.txt
-share/xjed/doc/txt/wjed.txt
-share/xjed/doc/txt/wordstar.txt
-share/xjed/doc/txt/xjed.txt
-share/xjed/doc/txt/yankpop.txt
-share/xjed/info/dir.info
-share/xjed/info/info.info
-share/xjed/info/jed.1in
-share/xjed/info/jed.2in
-share/xjed/info/jed.3in
-share/xjed/info/jed.info
-share/xjed/lib/README
-share/xjed/lib/abbrev.sl
-share/xjed/lib/abbrmisc.sl
-share/xjed/lib/aboutjed.hlp
-share/xjed/lib/acompile.sl
-share/xjed/lib/aprocess.sl
-share/xjed/lib/ashell.sl
-share/xjed/lib/backups.sl
-share/xjed/lib/bibtex.sl
-share/xjed/lib/binary.sl
-share/xjed/lib/bookmark.sl
-share/xjed/lib/brief.sl
-share/xjed/lib/buf.sl
-share/xjed/lib/bufed.sl
-share/xjed/lib/bytecomp.sl
-share/xjed/lib/cal.sl
-share/xjed/lib/chglog.sl
-share/xjed/lib/cmisc.sl
-share/xjed/lib/cmode.sl
-share/xjed/lib/colors/README
-share/xjed/lib/colors/Xjed/elegant.sl
-share/xjed/lib/colors/Xjed/pastel0.sl
-share/xjed/lib/colors/black1.sl
-share/xjed/lib/colors/black2.sl
-share/xjed/lib/colors/black3.sl
-share/xjed/lib/colors/blue1.sl
-share/xjed/lib/colors/blue2.sl
-share/xjed/lib/colors/blue3.sl
-share/xjed/lib/colors/default1.sl
-share/xjed/lib/colors/white1.sl
-share/xjed/lib/comments.sl
-share/xjed/lib/compat.sl
-share/xjed/lib/compile.sl
-share/xjed/lib/compress.sl
-share/xjed/lib/cpright.hlp
-share/xjed/lib/ctags.sl
-share/xjed/lib/cua.sl
-share/xjed/lib/dabbrev.sl
-share/xjed/lib/dcl.sl
-share/xjed/lib/digraph.sl
-share/xjed/lib/dired.sl
-share/xjed/lib/docbook.sl
-share/xjed/lib/dos437.sl
-share/xjed/lib/dos850.sl
-share/xjed/lib/dos852.sl
-share/xjed/lib/edt.hlp
-share/xjed/lib/edt.sl
-share/xjed/lib/emacs.hlp
-share/xjed/lib/emacs.sl
-share/xjed/lib/emacsmsc.sl
-share/xjed/lib/emul.sl
-share/xjed/lib/f90.sl
-share/xjed/lib/ff90.sl
-share/xjed/lib/filter.sl
-share/xjed/lib/folding.sl
-share/xjed/lib/fortran.sl
-share/xjed/lib/generic.hlp
-share/xjed/lib/help.sl
-share/xjed/lib/history.sl
-share/xjed/lib/hooks.sl
-share/xjed/lib/html.sl
-share/xjed/lib/ide.hlp
-share/xjed/lib/ide.sl
-share/xjed/lib/idl.sl
-share/xjed/lib/info.sl
-share/xjed/lib/isearch.sl
-share/xjed/lib/iso-lat2.sl
-share/xjed/lib/iso-lat3.sl
-share/xjed/lib/iso-latin.sl
-share/xjed/lib/iso2xxx.sl
-share/xjed/lib/ispell.sl
-share/xjed/lib/javamode.sl
-share/xjed/lib/jed.conf
-share/xjed/lib/jed.hlp
-share/xjed/lib/jed.rc
-share/xjed/lib/jed.sl
-share/xjed/lib/jedhelp.sl
-share/xjed/lib/jedusage.sl
-share/xjed/lib/keycode.sl
-share/xjed/lib/keydefs.sl
-share/xjed/lib/krconv.sl
-share/xjed/lib/latex.sl
-share/xjed/lib/latex209.sl
-share/xjed/lib/linux.sl
-share/xjed/lib/lisp.sl
-share/xjed/lib/ltx-comp.dat
-share/xjed/lib/ltx-math.sl
-share/xjed/lib/macro.sl
-share/xjed/lib/mail.sl
-share/xjed/lib/mailalias.sl
-share/xjed/lib/man.sl
-share/xjed/lib/maple.sl
-share/xjed/lib/matlab.sl
-share/xjed/lib/menu.sl
-share/xjed/lib/menus.sl
-share/xjed/lib/mime.sl
-share/xjed/lib/mini.sl
-share/xjed/lib/minued.sl
-share/xjed/lib/misc.sl
-share/xjed/lib/mkdoc.sl
-share/xjed/lib/mktex.sl
-share/xjed/lib/modehook.sl
-share/xjed/lib/modeinfo.sl
-share/xjed/lib/most.sl
-share/xjed/lib/mouse.sl
-share/xjed/lib/mousex.sl
-share/xjed/lib/mswmouse.sl
-share/xjed/lib/mutekeys.sl
-share/xjed/lib/nroff.sl
-share/xjed/lib/occur.sl
-share/xjed/lib/os.sl
-share/xjed/lib/perl.sl
-share/xjed/lib/php.sl
-share/xjed/lib/pipe.sl
-share/xjed/lib/popups.sl
-share/xjed/lib/preparse.sl
-share/xjed/lib/pscript.sl
-share/xjed/lib/pushmode.sl
-share/xjed/lib/pymode.sl
-share/xjed/lib/rcs.sl
-share/xjed/lib/recent.sl
-share/xjed/lib/regexp.sl
-share/xjed/lib/register.sl
-share/xjed/lib/replace.sl
-share/xjed/lib/rmail.sl
-share/xjed/lib/rot13.sl
-share/xjed/lib/search.sl
-share/xjed/lib/seldisp.sl
-share/xjed/lib/sendmail.sl
-share/xjed/lib/shell.sl
-share/xjed/lib/shmode.sl
-share/xjed/lib/simple.hlp
-share/xjed/lib/site.sl
-share/xjed/lib/slmode.sl
-share/xjed/lib/sort.sl
-share/xjed/lib/sortmisc.sl
-share/xjed/lib/spicemod.sl
-share/xjed/lib/srchmisc.sl
-share/xjed/lib/syntax.sl
-share/xjed/lib/tabs.sl
-share/xjed/lib/tclmode.sl
-share/xjed/lib/tex.sl
-share/xjed/lib/texcom.sl
-share/xjed/lib/textmac.sl
-share/xjed/lib/textmode.sl
-share/xjed/lib/tiasm.sl
-share/xjed/lib/tm/linuxdoc.tm
-share/xjed/lib/tm2sgml.sl
-share/xjed/lib/tmisc.sl
-share/xjed/lib/tpascal.sl
-share/xjed/lib/untab.sl
-share/xjed/lib/util.sl
-share/xjed/lib/verilog.sl
-share/xjed/lib/vhdlmode.sl
-share/xjed/lib/vms_shell.com
-share/xjed/lib/vmshelp.sl
-share/xjed/lib/win1250.sl
-share/xjed/lib/wmark.sl
-share/xjed/lib/wmenu.sl
-share/xjed/lib/wordstar.hlp
-share/xjed/lib/wordstar.sl
-share/xjed/lib/yankpop.sl
-@dirrm share/xjed/lib/tm
-@dirrm share/xjed/lib/colors/Xjed
-@dirrm share/xjed/lib/colors/
-@dirrm share/xjed/lib
-@dirrm share/xjed/doc/txt
-@dirrm share/xjed/doc/tm/rtl
-@dirrm share/xjed/doc/tm
-@dirrm share/xjed/doc/manual
-@dirrm share/xjed/doc
-@dirrm share/xjed/info
-@dirrm share/xjed
diff --git a/editors/xjed/PLIST.xjed b/editors/xjed/PLIST.xjed
new file mode 100644
index 00000000000..6aedb169d5b
--- /dev/null
+++ b/editors/xjed/PLIST.xjed
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.xjed,v 1.1 2003/04/05 21:39:41 wiz Exp $
+bin/xjed
diff --git a/editors/xjed/distinfo b/editors/xjed/distinfo
index 7ec57115965..f8765dbb255 100644
--- a/editors/xjed/distinfo
+++ b/editors/xjed/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/09/21 12:02:50 jlam Exp $
+$NetBSD: distinfo,v 1.3 2003/04/05 21:39:42 wiz Exp $
 
-SHA1 (jed-B0.99-15.tar.gz) = dfcb1b5ea0330666e919a83a3ebf01b4444d2e07
-Size (jed-B0.99-15.tar.gz) = 833835 bytes
-SHA1 (patch-aa) = 0436416e5a51a8293c00ed964c239222ab48c140
-SHA1 (patch-ab) = 430976979d57e25ec924bfa9870bb8d035828a83
+SHA1 (jed-0.99-16.tar.bz2) = 34649571fb5caa61314553c10db2e15ebf248d82
+Size (jed-0.99-16.tar.bz2) = 667623 bytes
+SHA1 (patch-ab) = d7c8edfb2f45f9aa73082d04c91fa4f33e3f9b26
diff --git a/editors/xjed/patches/patch-aa b/editors/xjed/patches/patch-aa
deleted file mode 100644
index 293a689bf75..00000000000
--- a/editors/xjed/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/09/21 12:02:50 jlam Exp $
-
---- configure.orig	Tue Oct  9 10:15:13 2001
-+++ configure	Tue Oct  9 10:16:30 2001
-@@ -2576,7 +2576,7 @@
-                  /usr/share/lib/terminfo \
- 		 /usr/local/lib/terminfo"
- 
--TERMCAP=-ltermcap
-+TERMCAP=-lcurses
- 
- echo $ac_n "checking for Terminfo""... $ac_c" 1>&6
- echo "configure:2583: checking for Terminfo" >&5
diff --git a/editors/xjed/patches/patch-ab b/editors/xjed/patches/patch-ab
index f1a4590e7a2..6d290c408ba 100644
--- a/editors/xjed/patches/patch-ab
+++ b/editors/xjed/patches/patch-ab
@@ -1,27 +1,18 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/07/23 14:26:54 agc Exp $
+$NetBSD: patch-ab,v 1.2 2003/04/05 21:39:43 wiz Exp $
 
---- src/Makefile.in.orig	Tue Oct  9 10:22:43 2001
-+++ src/Makefile.in	Tue Oct  9 10:24:34 2001
+--- src/Makefile.in.orig	Sun Oct 20 08:55:30 2002
++++ src/Makefile.in
 @@ -13,8 +13,7 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
  #JED_ROOT = $(HOME)/src/jed# <--- make sure # is at end of file!!
 -#JED_ROOT = $(prefix)/jed# <--- make sure # is at end of file!!
 -JED_ROOT = @JED_ROOT@# <--- make sure # is at end of file!!
-+JED_ROOT = $(prefix)/share/xjed# <--- make sure # is at end of file!!
++JED_ROOT = $(prefix)/share/jed# <--- make sure # is at end of file!!
  BIN_DIR = @bindir@
  MAN_DIR = @mandir@/man1
  INSTALL		= @INSTALL@
-@@ -117,7 +116,7 @@
- all: jed rgrep
- 
- 
--jed: $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/jed
-+jed: $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/jed $(OBJDIR)/xjed
- 	@echo jed created in $(OBJDIR)
- $(OBJDIR)/jed: $(OBJS) $(OBJDIR)/display.o $(OBJGPMMOUSEO)
- 	cd $(OBJDIR); $(CC) $(OFILES) display.o $(GPMMOUSEO) \
-@@ -154,7 +153,7 @@
+@@ -158,7 +157,7 @@
  rgrep: $(OBJDIR)/rgrep
  	@echo rgrep created in $(OBJDIR)
  $(OBJDIR)/rgrep: $(OBJDIR)/vfile.o $(OBJDIR)/rgrep.o