From 1cad919fc7164208ef2b202fe8589ad788b9ac7b Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 14 Sep 2001 22:48:27 +0000 Subject: Update to 0.99.14, provided by Scott Barron in pkg/13734. Changes are too many too list here. --- editors/jed/Makefile | 12 +-- editors/jed/distinfo | 11 +-- editors/jed/patches/patch-aa | 39 +++----- editors/jed/patches/patch-ab | 40 ++++---- editors/jed/patches/patch-ac | 14 --- editors/jed/pkg/DESCR | 2 +- editors/jed/pkg/PLIST | 227 +++++++++++++++++++++++++++++-------------- 7 files changed, 201 insertions(+), 144 deletions(-) delete mode 100644 editors/jed/patches/patch-ac (limited to 'editors/jed') diff --git a/editors/jed/Makefile b/editors/jed/Makefile index 46b40339b9d..4fc7538cd01 100644 --- a/editors/jed/Makefile +++ b/editors/jed/Makefile @@ -1,21 +1,21 @@ -# $NetBSD: Makefile,v 1.12 2001/02/16 14:40:50 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/09/14 22:48:27 wiz Exp $ # -DISTNAME= jed0.98-7 -PKGNAME= jed-0.98.7 +DISTNAME= jed-B0.99-14 +PKGNAME= jed-0.99.14 CATEGORIES= editors -MASTER_SITES= ftp://space.mit.edu/pub/davis/jed/v0.98/ \ +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/%7Edavis/jed.html -COMMENT= Texteditor with many features, extensible through S-Lang functions +COMMENT= Text editor with many features, extensible through S-Lang functions DEPENDS+= libslang-*:../../devel/libslang GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-X -WRKSRC= ${WRKDIR}/jed +WRKSRC= ${WRKDIR}/jed-B0.99-14 .include "../../mk/bsd.pkg.mk" diff --git a/editors/jed/distinfo b/editors/jed/distinfo index d06d3c796e7..349d81b369e 100644 --- a/editors/jed/distinfo +++ b/editors/jed/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:01:01 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/09/14 22:48:27 wiz Exp $ -SHA1 (jed0.98-7.tar.gz) = c6040b97971a63ff61c9ffee71a3c6ca16200509 -Size (jed0.98-7.tar.gz) = 674853 bytes -SHA1 (patch-aa) = 7f472d0452193d3c7a4c74fed2da949955ae19de -SHA1 (patch-ab) = 6aa2b730ad771acf6e2126c3c20d51a6f656e839 -SHA1 (patch-ac) = 41d55b1345e0b87bec206bf5e417d06186d1e8a9 +SHA1 (jed-B0.99-14.tar.gz) = 1b317e6a6044691b61322714f9250f79fc73702b +Size (jed-B0.99-14.tar.gz) = 827970 bytes +SHA1 (patch-aa) = 93df5bb883f9dbcaa758ddd9325fbba082d2cc05 +SHA1 (patch-ab) = 7c976bcecbbedd157adb378d12bd4abbbe915bdf diff --git a/editors/jed/patches/patch-aa b/editors/jed/patches/patch-aa index 102d73bb646..ea448da608b 100644 --- a/editors/jed/patches/patch-aa +++ b/editors/jed/patches/patch-aa @@ -1,28 +1,21 @@ -$NetBSD: patch-aa,v 1.2 1999/06/03 08:47:22 agc Exp $ +$NetBSD: patch-aa,v 1.3 2001/09/14 22:48:27 wiz Exp $ -Make the search path include the correct directories. -On Solaris, find the -lcurses library instead of -ltermcap - ---- configure.orig Wed Feb 11 17:57:02 1998 -+++ configure Sat Oct 31 22:39:03 1998 -@@ -2404,6 +2404,12 @@ - break - fi - done -+opsys=`uname -s` -+if [ $opsys = SunOS ]; then -+ echo "$ac_t""yes" 1>&6 -+ TERMCAP="-lcurses" -+ break -+fi - if test "$TERMCAP"; then - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <<\EOF -@@ -2434,6 +2440,7 @@ - # version. +--- configure.orig Fri Jun 1 04:23:13 2001 ++++ configure +@@ -2525,7 +2525,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:2532: checking for Terminfo" >&5 +@@ -2572,6 +2572,7 @@ + test "x$exec" = "xNONE" && exec="$ac_default_prefix" + test "x$exec_prefix" = "xNONE" && exec_prefix="$prefix" JD_Search_Dirs="$JD_Search_Dirs \ -+ /usr/pkg/include,/usr/pkg/lib \ ++ /usr/pkg/include,/usr/pkg/lib + $includedir,$libdir \ /usr/local/include,/usr/local/lib \ /usr/include,/usr/lib \ - /usr/include/slang,/usr/lib \ diff --git a/editors/jed/patches/patch-ab b/editors/jed/patches/patch-ab index 616f380896b..db4782293e0 100644 --- a/editors/jed/patches/patch-ab +++ b/editors/jed/patches/patch-ab @@ -1,38 +1,32 @@ -$NetBSD: patch-ab,v 1.3 1998/12/30 19:01:10 garbled Exp $ ---- src/Makefile.in.orig Wed Feb 11 09:57:16 1998 -+++ src/Makefile.in Wed Dec 30 11:56:34 1998 +$NetBSD: patch-ab,v 1.4 2001/09/14 22:48:27 wiz Exp $ + +--- src/Makefile.in.orig Fri Jun 1 04:23:13 2001 ++++ src/Makefile.in @@ -13,8 +13,8 @@ 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/jed# <--- make sure # is at end of file!! -+#JED_ROOT = @JED_ROOT@# <--- make sure # is at end of file!! ++JED_ROOT = $(prefix)/share/jed# <-- make sure # is at end of file!! ++#JED_ROOT = @JED_ROOT# <-- make fure # is at end of file!! BIN_DIR = @bindir@ MAN_DIR = @mandir@/man1 INSTALL = @INSTALL@ -@@ -121,7 +121,7 @@ +@@ -151,7 +151,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 -lm -ltermcap +- 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 -lm -ltermcap # getmail: $(OBJDIR)/getmail @echo getmail created in $(OBJDIR) -@@ -136,14 +136,11 @@ - /bin/cp $(OBJDIR)/jed $(BIN_DIR)/ - - /bin/cp $(OBJDIR)/xjed $(BIN_DIR)/ - /bin/cp $(OBJDIR)/rgrep $(BIN_DIR)/ -- - /bin/cp $(OBJDIR)/getmail $(JED_ROOT)/bin/ - - /bin/cp ../doc/rgrep.1 ../doc/jed.1 $(MAN_DIR)/ -- @echo You will have to install the lib files manually. - $(BIN_DIR): - - $(MKINSDIR) $(BIN_DIR) - $(JED_ROOT): - $(MKINSDIR) $(JED_ROOT)/lib -- $(MKINSDIR) $(JED_ROOT)/bin - $(MKINSDIR) $(JED_ROOT)/info - $(MKINSDIR) $(JED_ROOT)/doc - # The symlinks target is for my own private use. It simply creates the object +@@ -183,7 +183,6 @@ + + install: all install_directories + $(INSTALL) $(OBJDIR)/jed $(DEST_BIN_DIR)/ +- -$(INSTALL) $(OBJDIR)/xjed $(DEST_BIN_DIR)/ + -$(INSTALL) $(OBJDIR)/rgrep $(DEST_BIN_DIR)/ + -$(INSTALL) $(OBJDIR)/getmail $(DEST_JED_ROOT)/bin/ + @for i in $(JED_LIB_FILES); \ diff --git a/editors/jed/patches/patch-ac b/editors/jed/patches/patch-ac deleted file mode 100644 index f71a35d6b88..00000000000 --- a/editors/jed/patches/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ac,v 1.1 1999/06/03 08:28:49 agc Exp $ - -Patch to avoid s-lang error with Emacs keybindings - ---- src/keymap.c 1999/06/03 08:21:05 1.1 -+++ src/keymap.c 1999/06/03 08:21:29 -@@ -603,6 +603,7 @@ - { - *buf = 2; - *(buf + 1) = 256 - 1 - i; -+ buf[2] = 0; - SLang_push_string(SLang_make_keystring(buf)); - num++; - } diff --git a/editors/jed/pkg/DESCR b/editors/jed/pkg/DESCR index f9e08b220e9..85912bf363b 100644 --- a/editors/jed/pkg/DESCR +++ b/editors/jed/pkg/DESCR @@ -3,7 +3,7 @@ MS Windows. Features include: * Color syntax highlighting on color terminals. - * Folding support (New for 0.98!) + * Folding support * Extensible in a language resembling C. Completely customizable. * Capable of read GNU info files from within JED's info browser * A variety of programming modes (with syntax highlighting) are diff --git a/editors/jed/pkg/PLIST b/editors/jed/pkg/PLIST index e3dba10e3d3..d2a53f1b4da 100644 --- a/editors/jed/pkg/PLIST +++ b/editors/jed/pkg/PLIST @@ -1,164 +1,249 @@ -@comment $NetBSD: PLIST,v 1.3 1998/11/01 14:55:37 hwr Exp $ +@comment $NetBSD: PLIST,v 1.4 2001/09/14 22:48:28 wiz Exp $ bin/jed bin/rgrep -man/man1/rgrep.1 man/man1/jed.1 -share/jed/lib/tclmode.sl -share/jed/lib/tm2sgml.sl -share/jed/lib/ashell.sl -share/jed/lib/bufed.sl -share/jed/lib/macro.sl -share/jed/lib/perl.sl -share/jed/lib/filter.sl -share/jed/lib/keycode.sl -share/jed/lib/modehook.sl -share/jed/lib/brief.sl -share/jed/lib/lisp.sl -share/jed/lib/javamode.sl -share/jed/lib/html.sl -share/jed/lib/nroff.sl -share/jed/lib/pscript.sl +man/man1/rgrep.1 +share/jed/doc/README +share/jed/doc/manual/jed.1 +share/jed/doc/manual/jed.tex +share/jed/doc/manual/rgrep.1 +share/jed/doc/tm/Makefile +share/jed/doc/tm/README +share/jed/doc/tm/jedfuns.tm +share/jed/doc/tm/quickref.tm +share/jed/doc/tm/rtl/abbrev.tm +share/jed/doc/tm/rtl/blocal.tm +share/jed/doc/tm/rtl/buffer.tm +share/jed/doc/tm/rtl/color.tm +share/jed/doc/tm/rtl/eval.tm +share/jed/doc/tm/rtl/file.tm +share/jed/doc/tm/rtl/hidden.tm +share/jed/doc/tm/rtl/hooks.tm +share/jed/doc/tm/rtl/info.tm +share/jed/doc/tm/rtl/insdel.tm +share/jed/doc/tm/rtl/keys.tm +share/jed/doc/tm/rtl/mark.tm +share/jed/doc/tm/rtl/menu.tm +share/jed/doc/tm/rtl/message.tm +share/jed/doc/tm/rtl/mini.tm +share/jed/doc/tm/rtl/misc.tm +share/jed/doc/tm/rtl/mouse.tm +share/jed/doc/tm/rtl/move.tm +share/jed/doc/tm/rtl/process.tm +share/jed/doc/tm/rtl/rect.tm +share/jed/doc/tm/rtl/region.tm +share/jed/doc/tm/rtl/search.tm +share/jed/doc/tm/rtl/syntax.tm +share/jed/doc/tm/rtl/terminal.tm +share/jed/doc/tm/rtl/tm-sort.sl +share/jed/doc/tm/rtl/userinfo.tm +share/jed/doc/tm/rtl/whatelse.sl +share/jed/doc/tm/rtl/window.tm +share/jed/doc/tm/rtl/xjed.tm +share/jed/doc/txt/abbrev.txt +share/jed/doc/txt/color.txt +share/jed/doc/txt/compile.txt +share/jed/doc/txt/dfa.txt +share/jed/doc/txt/edt.txt +share/jed/doc/txt/emacs.txt +share/jed/doc/txt/filelock.txt +share/jed/doc/txt/fold.txt +share/jed/doc/txt/hooks.txt +share/jed/doc/txt/ide-mode.txt +share/jed/doc/txt/jed_faq.txt +share/jed/doc/txt/jedfuns.txt +share/jed/doc/txt/libfuns.txt +share/jed/doc/txt/linux-keys.txt +share/jed/doc/txt/menus.txt +share/jed/doc/txt/mouse.txt +share/jed/doc/txt/pc-keys.txt +share/jed/doc/txt/program.txt +share/jed/doc/txt/rgrep.txt +share/jed/doc/txt/rmail.txt +share/jed/doc/txt/script.txt +share/jed/doc/txt/syntax.txt +share/jed/doc/txt/undo.txt +share/jed/doc/txt/wjed.txt +share/jed/doc/txt/wordstar.txt +share/jed/doc/txt/xjed.txt +share/jed/doc/txt/yankpop.txt +share/jed/info/dir.info +share/jed/info/info.info +share/jed/info/jed.1in +share/jed/info/jed.2in +share/jed/info/jed.3in +share/jed/info/jed.info +share/jed/lib/README share/jed/lib/abbrev.sl share/jed/lib/abbrmisc.sl +share/jed/lib/aboutjed.hlp +share/jed/lib/acompile.sl +share/jed/lib/aprocess.sl +share/jed/lib/ashell.sl +share/jed/lib/backups.sl +share/jed/lib/bibtex.sl share/jed/lib/binary.sl share/jed/lib/bookmark.sl +share/jed/lib/brief.sl share/jed/lib/buf.sl +share/jed/lib/bufed.sl share/jed/lib/bytecomp.sl share/jed/lib/cal.sl +share/jed/lib/chglog.sl share/jed/lib/cmisc.sl share/jed/lib/cmode.sl +share/jed/lib/colors/README +share/jed/lib/colors/Xjed/elegant.sl +share/jed/lib/colors/Xjed/pastel0.sl +share/jed/lib/colors/black1.sl +share/jed/lib/colors/black2.sl +share/jed/lib/colors/black3.sl +share/jed/lib/colors/blue1.sl +share/jed/lib/colors/blue2.sl +share/jed/lib/colors/blue3.sl +share/jed/lib/colors/default1.sl +share/jed/lib/colors/white1.sl +share/jed/lib/comments.sl +share/jed/lib/compat.sl share/jed/lib/compile.sl -share/jed/lib/acompile.sl +share/jed/lib/compress.sl share/jed/lib/cpright.hlp share/jed/lib/ctags.sl +share/jed/lib/cua.sl share/jed/lib/dabbrev.sl share/jed/lib/dcl.sl share/jed/lib/digraph.sl share/jed/lib/dired.sl -share/jed/lib/dispesc.sl +share/jed/lib/docbook.sl share/jed/lib/dos437.sl share/jed/lib/dos850.sl +share/jed/lib/dos852.sl share/jed/lib/edt.hlp share/jed/lib/edt.sl share/jed/lib/emacs.hlp share/jed/lib/emacs.sl share/jed/lib/emacsmsc.sl -share/jed/lib/fortran.sl +share/jed/lib/emul.sl share/jed/lib/f90.sl share/jed/lib/ff90.sl +share/jed/lib/filter.sl +share/jed/lib/folding.sl +share/jed/lib/fortran.sl share/jed/lib/generic.hlp share/jed/lib/help.sl +share/jed/lib/history.sl +share/jed/lib/hooks.sl +share/jed/lib/html.sl +share/jed/lib/ide.hlp +share/jed/lib/ide.sl share/jed/lib/idl.sl share/jed/lib/info.sl share/jed/lib/isearch.sl -share/jed/lib/iso-latin.sl share/jed/lib/iso-lat2.sl +share/jed/lib/iso-lat3.sl +share/jed/lib/iso-latin.sl share/jed/lib/iso2xxx.sl share/jed/lib/ispell.sl +share/jed/lib/javamode.sl +share/jed/lib/jed.conf share/jed/lib/jed.hlp share/jed/lib/jed.rc +share/jed/lib/jed.sl share/jed/lib/jedhelp.sl +share/jed/lib/jedusage.sl +share/jed/lib/keycode.sl +share/jed/lib/keydefs.sl share/jed/lib/krconv.sl -share/jed/lib/bibtex.sl share/jed/lib/latex.sl share/jed/lib/latex209.sl share/jed/lib/linux.sl +share/jed/lib/lisp.sl share/jed/lib/ltx-comp.dat share/jed/lib/ltx-math.sl +share/jed/lib/macro.sl share/jed/lib/mail.sl +share/jed/lib/mailalias.sl share/jed/lib/man.sl share/jed/lib/maple.sl +share/jed/lib/matlab.sl share/jed/lib/menu.sl +share/jed/lib/menus.sl +share/jed/lib/mime.sl share/jed/lib/mini.sl +share/jed/lib/minued.sl share/jed/lib/misc.sl share/jed/lib/mkdoc.sl share/jed/lib/mktex.sl +share/jed/lib/modehook.sl +share/jed/lib/modeinfo.sl share/jed/lib/most.sl share/jed/lib/mouse.sl -share/jed/lib/mswmouse.sl share/jed/lib/mousex.sl +share/jed/lib/mswmouse.sl share/jed/lib/mutekeys.sl +share/jed/lib/nroff.sl +share/jed/lib/occur.sl share/jed/lib/os.sl +share/jed/lib/perl.sl +share/jed/lib/php.sl share/jed/lib/pipe.sl +share/jed/lib/popups.sl +share/jed/lib/preparse.sl +share/jed/lib/pscript.sl share/jed/lib/pushmode.sl share/jed/lib/pymode.sl -share/jed/lib/preparse.sl +share/jed/lib/rcs.sl +share/jed/lib/recent.sl share/jed/lib/regexp.sl +share/jed/lib/register.sl share/jed/lib/replace.sl share/jed/lib/rmail.sl -share/jed/lib/mime.sl -share/jed/lib/sendmail.sl -share/jed/lib/mailalias.sl -share/jed/lib/register.sl share/jed/lib/rot13.sl share/jed/lib/search.sl +share/jed/lib/seldisp.sl +share/jed/lib/sendmail.sl share/jed/lib/shell.sl share/jed/lib/shmode.sl share/jed/lib/simple.hlp share/jed/lib/site.sl share/jed/lib/slmode.sl share/jed/lib/sort.sl -share/jed/lib/folding.sl share/jed/lib/sortmisc.sl +share/jed/lib/spicemod.sl share/jed/lib/srchmisc.sl share/jed/lib/syntax.sl share/jed/lib/tabs.sl +share/jed/lib/tclmode.sl share/jed/lib/tex.sl share/jed/lib/texcom.sl -share/jed/lib/tmisc.sl share/jed/lib/textmac.sl +share/jed/lib/textmode.sl +share/jed/lib/tiasm.sl +share/jed/lib/tm/linuxdoc.tm +share/jed/lib/tm2sgml.sl +share/jed/lib/tmisc.sl share/jed/lib/tpascal.sl share/jed/lib/untab.sl share/jed/lib/util.sl -share/jed/lib/occur.sl +share/jed/lib/verilog.sl +share/jed/lib/vhdlmode.sl share/jed/lib/vms_shell.com share/jed/lib/vmshelp.sl -share/jed/lib/wmenu.sl +share/jed/lib/win1250.sl share/jed/lib/wmark.sl -share/jed/lib/wordstar.sl +share/jed/lib/wmenu.sl share/jed/lib/wordstar.hlp +share/jed/lib/wordstar.sl share/jed/lib/yankpop.sl -share/jed/lib/verilog.sl -share/jed/lib/spicemod.sl -share/jed/lib/vhdlmode.sl -share/jed/lib/tm/linuxdoc.tm -share/jed/lib/ide.sl -share/jed/lib/compat.sl -share/jed/info/dir.info -share/jed/info/info.info -share/jed/info/jed.1in -share/jed/info/jed.2in -share/jed/info/jed.3in -share/jed/info/jed.info -share/jed/doc/README -share/jed/doc/jed.tex -share/jed/doc/abbrev.txt -share/jed/doc/color.txt -share/jed/doc/edt.txt -share/jed/doc/hooks.txt -share/jed/doc/jed_faq.txt -share/jed/doc/mouse.txt -share/jed/doc/pc-keys.txt -share/jed/doc/program.txt -share/jed/doc/rgrep.txt -share/jed/doc/rmail.txt -share/jed/doc/script.txt -share/jed/doc/syntax.txt -share/jed/doc/fold.txt -share/jed/doc/wjed.txt -share/jed/doc/dfa.txt -share/jed/doc/wordstar.txt -share/jed/doc/xjed.txt -share/jed/doc/undo.txt -share/jed/doc/yankpop.txt -share/jed/doc/emacs.txt -share/jed/doc/tm/Makefile -share/jed/doc/tm/jedfuns.tm -share/jed/doc/jedfuns.txt -share/jed/doc/slangfun.txt @dirrm share/jed/lib/tm +@dirrm share/jed/lib/colors/Xjed +@dirrm share/jed/lib/colors/ @dirrm share/jed/lib +@dirrm share/jed/doc/txt +@dirrm share/jed/doc/tm/rtl @dirrm share/jed/doc/tm +@dirrm share/jed/doc/manual @dirrm share/jed/doc @dirrm share/jed/info +@dirrm share/jed/bin @dirrm share/jed -- cgit v1.2.3