CVS commit: pkgsrc/editors/jed

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Dec 19 23:56:00 UTC 2023

Modified Files:
        pkgsrc/editors/jed: Makefile Makefile.common PLIST distinfo
        pkgsrc/editors/jed/patches: patch-src_config.hin
Added Files:
        pkgsrc/editors/jed/patches: patch-autoconf_configure.ac
            patch-src_Makefile.in patch-src_jprocess.c patch-src_pty.c
Removed Files:
        pkgsrc/editors/jed/patches: patch-aa patch-ab patch-ac patch-ad
            patch-autoconf_configure.in patch-configure

Log Message:
editors/jed: Update to 0.99.19

Upstream does not seem to publish any changes, and does not even have tags.

Update prepared in wip by Kevin Bloom.
Committed after two weeks with no response from $MAINTAINER.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/editors/jed/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/editors/jed/Makefile.common \
    pkgsrc/editors/jed/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/jed/PLIST
cvs rdiff -u -r1.7 -r0 pkgsrc/editors/jed/patches/patch-aa \
    pkgsrc/editors/jed/patches/patch-ab
cvs rdiff -u -r1.4 -r0 pkgsrc/editors/jed/patches/patch-ac
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/jed/patches/patch-ad \
    pkgsrc/editors/jed/patches/patch-autoconf_configure.in \
    pkgsrc/editors/jed/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/jed/patches/patch-autoconf_configure.ac \
    pkgsrc/editors/jed/patches/patch-src_Makefile.in \
    pkgsrc/editors/jed/patches/patch-src_jprocess.c \
    pkgsrc/editors/jed/patches/patch-src_pty.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/jed/patches/patch-src_config.hin

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/jed/Makefile
diff -u pkgsrc/editors/jed/Makefile:1.28 pkgsrc/editors/jed/Makefile:1.29
--- pkgsrc/editors/jed/Makefile:1.28    Wed Oct  3 11:43:35 2012
+++ pkgsrc/editors/jed/Makefile Tue Dec 19 23:56:00 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2012/10/03 11:43:35 asau Exp $
+# $NetBSD: Makefile,v 1.29 2023/12/19 23:56:00 gdt Exp $
 #
-PKGNAME=               jed-0.99.16
-PKGREVISION=           2
+PKGNAME=               jed-0.99.19
+LICENSE=               gnu-gpl-v2
 
 .include "../../editors/jed/Makefile.common"
 COMMENT=               Extensible folding editor with Emacs/WordStar/EDT emulations

Index: pkgsrc/editors/jed/Makefile.common
diff -u pkgsrc/editors/jed/Makefile.common:1.15 pkgsrc/editors/jed/Makefile.common:1.16
--- pkgsrc/editors/jed/Makefile.common:1.15     Sun Jan 26 17:31:06 2020
+++ pkgsrc/editors/jed/Makefile.common  Tue Dec 19 23:56:00 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.15 2020/01/26 17:31:06 rillig Exp $
+# $NetBSD: Makefile.common,v 1.16 2023/12/19 23:56:00 gdt Exp $
 #
 # used by editors/jed/Makefile
 # used by editors/xjed/Makefile
 
-DISTNAME=              jed-0.99-16
+DISTNAME=              jed-0.99-19
 CATEGORIES=            editors
 MASTER_SITES=          ftp://space.mit.edu/pub/davis/jed/v0.99/
 MASTER_SITES+=         ftp://ftp.fu-berlin.de/pub/unix/editors/jed/v0.99/
@@ -17,6 +17,7 @@ HOMEPAGE=             https://www.jedsoft.org/jed/
 MAKE_JOBS_SAFE=                no
 
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-slang=${PREFIX}
 
 LIBS.SunOS+=           -lnsl -lresolv
 
@@ -26,9 +27,7 @@ CONF_FILES=           ${EGDIR}/jed.conf ${PREFIX}
 INSTALLATION_DIRS+=    ${EGDIR}
 
 post-install:
-       ${RMDIR} ${DESTDIR}${PREFIX}/share/jed/bin
-       ${RMDIR} ${DESTDIR}${PREFIX}/share/jed/lib/tm
        ${INSTALL_DATA} ${WRKSRC}/lib/jed.conf ${DESTDIR}${EGDIR}
 
-.include "../../devel/libslang/buildlink3.mk"
+.include "../../devel/libslang2/buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
Index: pkgsrc/editors/jed/distinfo
diff -u pkgsrc/editors/jed/distinfo:1.15 pkgsrc/editors/jed/distinfo:1.16
--- pkgsrc/editors/jed/distinfo:1.15    Tue Oct 26 10:21:31 2021
+++ pkgsrc/editors/jed/distinfo Tue Dec 19 23:56:00 2023
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.15 2021/10/26 10:21:31 nia Exp $
+$NetBSD: distinfo,v 1.16 2023/12/19 23:56:00 gdt Exp $
 
-BLAKE2s (jed-0.99-16.tar.bz2) = 7ced6a9587bc45ed053b0b10ffd5a218533a116837dec233cb163aca647f1a0a
-SHA512 (jed-0.99-16.tar.bz2) = 37431d3bb386867a05d90e4597dc5a07efb2d83387434d4318751ab077ca0e646ec5bb61dca46c323aa9f4668c1b6b2a780fe02a6c4c2eb31e28f12a5f4174fc
-Size (jed-0.99-16.tar.bz2) = 667623 bytes
-SHA1 (patch-aa) = da971ebf501a733fece8f968a0168461cbebb4c3
-SHA1 (patch-ab) = 38c8708fbfff84afa67aeb8691bdbd021156ab82
-SHA1 (patch-ac) = 9186b027c04720c45148ec8d2414ec7af7d66dd9
-SHA1 (patch-ad) = 3d1d08c1d70bbfca9608fac5c378fae6928ed4c0
-SHA1 (patch-autoconf_configure.in) = fc6cfdadec3cc876148ede2e993e318b866fa865
-SHA1 (patch-configure) = 9c964872fb5b9ccf0d603525f509bc0d37b1eb16
-SHA1 (patch-src_config.hin) = 3493d4a66ed8ada4d0ebca67ede68ffa1c7f18a6
+BLAKE2s (jed-0.99-19.tar.bz2) = 5d9d89262f4aa31a8a181064d9c0a4c373c3d727ff731feaf7db5fbfb1701bd1
+SHA512 (jed-0.99-19.tar.bz2) = db8a30284f9b8e3e2c5d1a600eeb7af29c9f943a5c23d7c74fce926e0b0252f54805e214670e7c9357ce0e6918ad67cba2769a523979bfbd285328f94fff747c
+Size (jed-0.99-19.tar.bz2) = 884198 bytes
+SHA1 (patch-autoconf_configure.ac) = df7be1bddbd1a4ed1f40e2a4523a7c39a2af3a9d
+SHA1 (patch-src_Makefile.in) = 94379d3acdc5f922485eb2a071dc89ff7a1224cf
+SHA1 (patch-src_config.hin) = c0e5858d9e6539b55c5a3f72342cbde06e3247c5
+SHA1 (patch-src_jprocess.c) = 576950628d199709e77e525295d4cd4542fcdf72
+SHA1 (patch-src_pty.c) = 7333060954757643fe2bc800f9de87e5861c2014

Index: pkgsrc/editors/jed/PLIST
diff -u pkgsrc/editors/jed/PLIST:1.3 pkgsrc/editors/jed/PLIST:1.4
--- pkgsrc/editors/jed/PLIST:1.3        Sun Jun 14 17:50:23 2009
+++ pkgsrc/editors/jed/PLIST    Tue Dec 19 23:56:00 2023
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:50:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/12/19 23:56:00 gdt Exp $
 bin/jed
 bin/jed-script
-bin/rgrep
 man/man1/jed.1
 man/man1/rgrep.1
 share/examples/jed/jed.conf
 share/jed/doc/README
+share/jed/doc/hlp/jedfuns.hlp
+share/jed/doc/hlp/libfuns.hlp
 share/jed/doc/manual/jed.tex
 share/jed/doc/txt/abbrev.txt
 share/jed/doc/txt/color.txt
@@ -18,8 +19,6 @@ 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
@@ -30,17 +29,12 @@ 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/utf8.txt
 share/jed/doc/txt/wjed.txt
 share/jed/doc/txt/wordstar.txt
 share/jed/doc/txt/xjed.txt
 share/jed/doc/txt/xrenderfont.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/abbrev.sl
 share/jed/lib/abbrmisc.sl
 share/jed/lib/aboutjed.hlp
@@ -60,11 +54,15 @@ 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/black4.sl
 share/jed/lib/colors/Xjed/elegant.sl
+share/jed/lib/colors/Xjed/modern.sl
+share/jed/lib/colors/Xjed/night.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/black4.sl
 share/jed/lib/colors/blue1.sl
 share/jed/lib/colors/blue2.sl
 share/jed/lib/colors/blue3.sl
@@ -76,7 +74,9 @@ share/jed/lib/compile.sl
 share/jed/lib/compress.sl
 share/jed/lib/cpright.hlp
 share/jed/lib/ctags.sl
+share/jed/lib/cua.hlp
 share/jed/lib/cua.sl
+share/jed/lib/cuamisc.sl
 share/jed/lib/dabbrev.sl
 share/jed/lib/dcl.sl
 share/jed/lib/digraph.sl
@@ -97,6 +97,7 @@ share/jed/lib/filter.sl
 share/jed/lib/folding.sl
 share/jed/lib/fortran.sl
 share/jed/lib/generic.hlp
+share/jed/lib/gpg.sl
 share/jed/lib/help.sl
 share/jed/lib/history.sl
 share/jed/lib/hooks.sl
@@ -126,9 +127,12 @@ 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/lua.sl
 share/jed/lib/macro.sl
 share/jed/lib/mail.sl
 share/jed/lib/mailalias.sl
+share/jed/lib/mailedit.sl
+share/jed/lib/mailutils.sl
 share/jed/lib/man.sl
 share/jed/lib/maple.sl
 share/jed/lib/matlab.sl
@@ -148,7 +152,9 @@ share/jed/lib/mutekeys.sl
 share/jed/lib/nroff.sl
 share/jed/lib/occur.sl
 share/jed/lib/os.sl
+share/jed/lib/paste.sl
 share/jed/lib/perl.sl
+share/jed/lib/perlxtra.sl
 share/jed/lib/php.sl
 share/jed/lib/pipe.sl
 share/jed/lib/popups.sl
@@ -177,6 +183,7 @@ share/jed/lib/sort.sl
 share/jed/lib/sortmisc.sl
 share/jed/lib/spicemod.sl
 share/jed/lib/srchmisc.sl
+share/jed/lib/syncproc.sl
 share/jed/lib/syntax.sl
 share/jed/lib/tabs.sl
 share/jed/lib/tclmode.sl
@@ -186,6 +193,7 @@ share/jed/lib/textmode.sl
 share/jed/lib/tiasm.sl
 share/jed/lib/tmisc.sl
 share/jed/lib/tmmode.sl
+share/jed/lib/tmpfile.sl
 share/jed/lib/tpascal.sl
 share/jed/lib/untab.sl
 share/jed/lib/util.sl
@@ -197,4 +205,5 @@ share/jed/lib/wmark.sl
 share/jed/lib/wmenu.sl
 share/jed/lib/wordstar.hlp
 share/jed/lib/wordstar.sl
+share/jed/lib/xformreg.sl
 share/jed/lib/yankpop.sl

Index: pkgsrc/editors/jed/patches/patch-src_config.hin
diff -u pkgsrc/editors/jed/patches/patch-src_config.hin:1.1 pkgsrc/editors/jed/patches/patch-src_config.hin:1.2
--- pkgsrc/editors/jed/patches/patch-src_config.hin:1.1 Sun Oct 20 18:15:02 2013
+++ pkgsrc/editors/jed/patches/patch-src_config.hin     Tue Dec 19 23:56:00 2023
@@ -1,8 +1,10 @@
-$NetBSD: patch-src_config.hin,v 1.1 2013/10/20 18:15:02 joerg Exp $
+$NetBSD: patch-src_config.hin,v 1.2 2023/12/19 23:56:00 gdt Exp $
 
---- src/config.hin.orig        2002-10-20 06:55:31.000000000 +0000
+Remove Undefined of HAVE_SYS_STROPTS_H
+
+--- src/config.hin.orig        2023-11-29 01:54:22.766379393 +0000
 +++ src/config.hin
-@@ -29,6 +29,9 @@
+@@ -35,6 +35,9 @@
  /* define if you have sys/fcntl.h */
  #undef HAVE_SYS_FCNTL_H
  
@@ -10,5 +12,5 @@ $NetBSD: patch-src_config.hin,v 1.1 2013
 +#undef HAVE_SYS_STROPTS_H
 +
  #undef HAVE_PTY_H
+ #undef HAVE_SYS_PTY_H
  
- /* define if you have memset */

Added files:

Index: pkgsrc/editors/jed/patches/patch-autoconf_configure.ac
diff -u /dev/null pkgsrc/editors/jed/patches/patch-autoconf_configure.ac:1.1
--- /dev/null   Tue Dec 19 23:56:00 2023
+++ pkgsrc/editors/jed/patches/patch-autoconf_configure.ac      Tue Dec 19 23:56:00 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-autoconf_configure.ac,v 1.1 2023/12/19 23:56:00 gdt Exp $
+
+Add in stropts library
+
+--- autoconf/configure.ac.orig 2023-11-29 01:48:10.235315068 +0000
++++ autoconf/configure.ac
+@@ -33,6 +33,7 @@ termios.h \
+ fcntl.h \
+ sys/fcntl.h \
+ sys/pty.h \
++sys/stropts.h \
+ pty.h \
+ )
+ 
Index: pkgsrc/editors/jed/patches/patch-src_Makefile.in
diff -u /dev/null pkgsrc/editors/jed/patches/patch-src_Makefile.in:1.1
--- /dev/null   Tue Dec 19 23:56:00 2023
+++ pkgsrc/editors/jed/patches/patch-src_Makefile.in    Tue Dec 19 23:56:00 2023
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2023/12/19 23:56:00 gdt Exp $
+
+Change jed's root into the pkg share dir.
+
+--- src/Makefile.in.orig       2009-12-14 02:12:55.000000000 +0000
++++ src/Makefile.in
+@@ -14,8 +14,7 @@ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datarootdir = @datarootdir@
+ #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!!
+ BIN_DIR = @bindir@
+ MAN_DIR = @mandir@/man1
+ INFO_DIR = @infodir@
+@@ -208,7 +207,7 @@ $(OBJDIR)/gtkjed : $(COMMON_OBJS) $(GTKJ
+ 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) $(RPATH) $(SLANG_LIB) -lslang $(TERMCAP_LIB)
++      cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(SLANG_LIB) -lslang -lm -ltermcap
+ #
+ getmail: $(OBJDIR)/getmail
+       @echo getmail created in $(OBJDIR)
Index: pkgsrc/editors/jed/patches/patch-src_jprocess.c
diff -u /dev/null pkgsrc/editors/jed/patches/patch-src_jprocess.c:1.1
--- /dev/null   Tue Dec 19 23:56:00 2023
+++ pkgsrc/editors/jed/patches/patch-src_jprocess.c     Tue Dec 19 23:56:00 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_jprocess.c,v 1.1 2023/12/19 23:56:00 gdt Exp $
+
+If not FreeBSD, don't use PTY
+
+--- src/jprocess.c.orig        2004-03-18 16:39:02.000000000 +0000
++++ src/jprocess.c     2004-03-18 16:39:57.000000000 +0000
+@@ -58,8 +58,10 @@
+ 
+ #ifdef REALLY_HAVE_TERMIOS_H
+ # if !defined(__os2__) && !defined(__APPLE__)
++# ifndef __FreeBSD__
+ #  define USE_PTY
+ # endif
++# endif
+ #endif
+ 
+ #include "buffer.h"
Index: pkgsrc/editors/jed/patches/patch-src_pty.c
diff -u /dev/null pkgsrc/editors/jed/patches/patch-src_pty.c:1.1
--- /dev/null   Tue Dec 19 23:56:00 2023
+++ pkgsrc/editors/jed/patches/patch-src_pty.c  Tue Dec 19 23:56:00 2023
@@ -0,0 +1,39 @@
+$NetBSD: patch-src_pty.c,v 1.1 2023/12/19 23:56:00 gdt Exp $
+
+Only do the I_PUSH stuff if it's defined.
+
+--- src/pty.c.orig     2009-12-14 02:12:55.000000000 +0000
++++ src/pty.c
+@@ -19,10 +19,12 @@
+ #include <errno.h>
+ 
+ #ifdef HAVE_GRANTPT
+-# if !defined (__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(_AIX)
+-#  define USE_SYSV_PTYS
+-#  include <sys/types.h>
+-#  include <stropts.h>
++# ifdef HAVE_SYS_STROPTS_H
++#  if !defined (__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(_AIX)
++#   define USE_SYSV_PTYS
++#   include <sys/types.h>
++#   include <stropts.h>
++#  endif
+ # endif
+ #endif
+ 
+@@ -241,6 +243,7 @@ static int pty_open_slave_pty (char *sla
+    if (-1 == (fd = signal_safe_open (slave_name, O_RDWR)))
+      return -1;
+ 
++#ifdef I_PUSH
+    if ((-1 == ioctl (fd, I_PUSH, "ptem"))
+        || (-1 == ioctl (fd, I_PUSH, "ldterm")))
+      {
+@@ -261,6 +264,7 @@ static int pty_open_slave_pty (char *sla
+         }
+ # endif
+      }
++#endif /* End of I_PUSH */
+    *slave = fd;
+    return 0;
+ }