jed/xjed: got both compiling & install

[Kevin Bloom <kevin.bloom%posteo.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Thu Nov 23 21:49:55 2023 -0500
Changeset:	1c0f61a8675713703438cbbdff8313a1e7488122

Modified Files:
	jed/Makefile.common
	jed/PLIST
	jed/distinfo
	xjed/Makefile
	xjed/PLIST.xjed
	xjed/distinfo
Added Files:
	jed/patches/patch-src_Makefile.in
	jed/patches/patch-src_pty.c
	xjed/patches/patch-src_Makefile.in
Removed Files:
	xjed/patches/patch-ab

Log Message:
jed/xjed: got both compiling & install

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1c0f61a8675713703438cbbdff8313a1e7488122

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

diffstat:
 jed/Makefile.common                |  3 +--
 jed/PLIST                          | 29 +++++++++++++++++++----------
 jed/distinfo                       |  2 ++
 jed/patches/patch-src_Makefile.in  | 23 +++++++++++++++++++++++
 jed/patches/patch-src_pty.c        | 37 +++++++++++++++++++++++++++++++++++++
 xjed/Makefile                      |  6 ++++--
 xjed/PLIST.xjed                    |  2 +-
 xjed/distinfo                      |  8 ++++----
 xjed/patches/patch-ab              | 23 -----------------------
 xjed/patches/patch-src_Makefile.in | 23 +++++++++++++++++++++++
 10 files changed, 114 insertions(+), 42 deletions(-)

diffs:
diff --git a/jed/Makefile.common b/jed/Makefile.common
index 137e755b33..87107e12f9 100644
--- a/jed/Makefile.common
+++ b/jed/Makefile.common
@@ -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,8 +27,6 @@ CONF_FILES=		${EGDIR}/jed.conf ${PREFIX}/etc/jed.conf
 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/libslang2/buildlink3.mk"
diff --git a/jed/PLIST b/jed/PLIST
index b86c8fea5c..7522aa57ce 100644
--- a/jed/PLIST
+++ b/jed/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:50:23 joerg Exp $
+@comment $NetBSD$
 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
diff --git a/jed/distinfo b/jed/distinfo
index e91680d483..5a8f7cc600 100644
--- a/jed/distinfo
+++ b/jed/distinfo
@@ -3,3 +3,5 @@ $NetBSD: distinfo,v 1.15 2021/10/26 10:21:31 nia Exp $
 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-src_Makefile.in) = 301002f36dadea78a59b8edec9391bedf58bb3cb
+SHA1 (patch-src_pty.c) = fc954f310187482ddf8ce65c601448d33926958f
diff --git a/jed/patches/patch-src_Makefile.in b/jed/patches/patch-src_Makefile.in
new file mode 100644
index 0000000000..fbbe95d6d2
--- /dev/null
+++ b/jed/patches/patch-src_Makefile.in
@@ -0,0 +1,23 @@
+$NetBSD$
+
+--- 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)
diff --git a/jed/patches/patch-src_pty.c b/jed/patches/patch-src_pty.c
new file mode 100644
index 0000000000..08ecbfbc07
--- /dev/null
+++ b/jed/patches/patch-src_pty.c
@@ -0,0 +1,37 @@
+$NetBSD$
+
+--- 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;
+ }
diff --git a/xjed/Makefile b/xjed/Makefile
index 02711e5904..6b0f416365 100644
--- a/xjed/Makefile
+++ b/xjed/Makefile
@@ -1,9 +1,10 @@
 # $NetBSD: Makefile,v 1.17 2013/04/06 03:45:12 rodent Exp $
 #
-PKGNAME=		xjed-0.99.16
+PKGNAME=		xjed-0.99.19
 PKGREVISION=		1
 
-.include "../../editors/jed/Makefile.common"
+#.include "../../editors/jed/Makefile.common"
+.include "../jed/Makefile.common"
 COMMENT=		Extensible folding editor + Emacs/WordStar/EDT emulations, X11 version
 
 CONFLICTS=		jed-[0-9]*
@@ -28,4 +29,5 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xjed/PLIST.xjed b/xjed/PLIST.xjed
index 6aedb169d5..14ac564738 100644
--- a/xjed/PLIST.xjed
+++ b/xjed/PLIST.xjed
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.xjed,v 1.1 2003/04/05 21:39:41 wiz Exp $
+@comment $NetBSD$
 bin/xjed
diff --git a/xjed/distinfo b/xjed/distinfo
index 83b5d95407..d1eb872b27 100644
--- a/xjed/distinfo
+++ b/xjed/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.7 2021/10/26 10:21:44 nia 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-ab) = d7c8edfb2f45f9aa73082d04c91fa4f33e3f9b26
+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-src_Makefile.in) = 301002f36dadea78a59b8edec9391bedf58bb3cb
diff --git a/xjed/patches/patch-ab b/xjed/patches/patch-ab
deleted file mode 100644
index 6d290c408b..0000000000
--- a/xjed/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/04/05 21:39:43 wiz Exp $
-
---- 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/jed# <--- make sure # is at end of file!!
- BIN_DIR = @bindir@
- MAN_DIR = @mandir@/man1
- INSTALL		= @INSTALL@
-@@ -158,7 +157,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) $(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)
diff --git a/xjed/patches/patch-src_Makefile.in b/xjed/patches/patch-src_Makefile.in
new file mode 100644
index 0000000000..fbbe95d6d2
--- /dev/null
+++ b/xjed/patches/patch-src_Makefile.in
@@ -0,0 +1,23 @@
+$NetBSD$
+
+--- 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)