CVS commit: pkgsrc/editors/edt-o3one

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Feb 15 23:06:05 UTC 2025

Modified Files:
        pkgsrc/editors/edt-o3one: Makefile distinfo
        pkgsrc/editors/edt-o3one/patches: patch-os.c
Added Files:
        pkgsrc/editors/edt-o3one/patches: patch-makefile

Log Message:
edt-o3one: fix help file handling

>From RVP in PR 59051.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/edt-o3one/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/edt-o3one/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/edt-o3one/patches/patch-makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/edt-o3one/patches/patch-os.c

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

Modified files:

Index: pkgsrc/editors/edt-o3one/Makefile
diff -u pkgsrc/editors/edt-o3one/Makefile:1.2 pkgsrc/editors/edt-o3one/Makefile:1.3
--- pkgsrc/editors/edt-o3one/Makefile:1.2       Sat Feb 15 15:32:45 2025
+++ pkgsrc/editors/edt-o3one/Makefile   Sat Feb 15 23:06:05 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2025/02/15 15:32:45 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2025/02/15 23:06:05 wiz Exp $
 
 DISTNAME=      edtdist_20161222
 PKGNAME=       ${DISTNAME:S/dist_/-o3one-/}
+PKGREVISION=   1
 CATEGORIES=    editors
 MASTER_SITES=  http://www.o3one.org/downloads/
 EXTRACT_SUFX=  .tbz
@@ -13,6 +14,7 @@ LICENSE=      gnu-gpl-v2
 
 MAKE_FILE=     makefile
 BUILD_TARGET=  edt
+MAKE_FLAGS+=   EDT_HELPFILE=${PREFIX}/share/doc/edt-o3one/edt.hlp
 
 INSTALLATION_DIRS=     bin share/doc/edt-o3one
 

Index: pkgsrc/editors/edt-o3one/distinfo
diff -u pkgsrc/editors/edt-o3one/distinfo:1.1 pkgsrc/editors/edt-o3one/distinfo:1.2
--- pkgsrc/editors/edt-o3one/distinfo:1.1       Tue Feb 11 08:01:29 2025
+++ pkgsrc/editors/edt-o3one/distinfo   Sat Feb 15 23:06:05 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2025/02/11 08:01:29 wiz Exp $
+$NetBSD: distinfo,v 1.2 2025/02/15 23:06:05 wiz Exp $
 
 BLAKE2s (edtdist_20161222.tbz) = 3412abf8a779c64bb60bb011ee94055ae020e66d878eb023bd07bd590fed5710
 SHA512 (edtdist_20161222.tbz) = 62ec59969f5d56704fa40e0d85ad26b22c396e43cb9785a5b3df373101d4386fbf2eb249f15dae6478d0e6c8585f436b462da8c4da7040c2eb67f74ee947b6d3
 Size (edtdist_20161222.tbz) = 72236 bytes
-SHA1 (patch-os.c) = 8971f3792d8590ff35509ef373629af6246bf5dd
+SHA1 (patch-makefile) = e83680b31f1d0d438bcc4febbed8530d40b21db2
+SHA1 (patch-os.c) = 135ae8b0efb4c6bdef10f40a976bfb82f75717ac

Index: pkgsrc/editors/edt-o3one/patches/patch-os.c
diff -u pkgsrc/editors/edt-o3one/patches/patch-os.c:1.1 pkgsrc/editors/edt-o3one/patches/patch-os.c:1.2
--- pkgsrc/editors/edt-o3one/patches/patch-os.c:1.1     Tue Feb 11 08:01:29 2025
+++ pkgsrc/editors/edt-o3one/patches/patch-os.c Sat Feb 15 23:06:05 2025
@@ -1,8 +1,9 @@
-$NetBSD: patch-os.c,v 1.1 2025/02/11 08:01:29 wiz Exp $
+$NetBSD: patch-os.c,v 1.2 2025/02/15 23:06:05 wiz Exp $
 
 Add missing header for ioctl().
+Use path to help file.
 
---- os.c.orig  2016-12-23 00:35:48.000000000 +0000
+--- os.c.orig  2025-02-15 23:03:15.290131323 +0000
 +++ os.c
 @@ -25,6 +25,8 @@
  
@@ -13,3 +14,26 @@ Add missing header for ioctl().
  #define JOURNAL_FLUSH_INTERVAL (15)
  
  static int screenmode = 0;
+@@ -265,6 +267,14 @@ void os_initialization (void)
+     abort ();
+   }
+ 
++#ifdef EDT_HELPFILE
++  help_name = malloc(strlen(EDT_HELPFILE) + 1);
++  if (help_name == NULL) {
++    fprintf (stderr, "out of memory\n");
++    exit (1); 
++  }
++  strcpy(help_name, EDT_HELPFILE);
++#else
+   /* Try to find help file - same directory as executable */
+ 
+   pathstring = NULL;                                          /* haven't allocated a string yet */
+@@ -303,6 +313,7 @@ void os_initialization (void)
+   strcat (help_name, ".hlp");                                 /* append .hlp for the help file name */
+ 
+   if (pathstring != NULL) string_delete (pathstring);         /* free off string if we allocated one */
++#endif
+ 
+ #endif
+ 

Added files:

Index: pkgsrc/editors/edt-o3one/patches/patch-makefile
diff -u /dev/null pkgsrc/editors/edt-o3one/patches/patch-makefile:1.1
--- /dev/null   Sat Feb 15 23:06:05 2025
+++ pkgsrc/editors/edt-o3one/patches/patch-makefile     Sat Feb 15 23:06:05 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-makefile,v 1.1 2025/02/15 23:06:05 wiz Exp $
+
+Pass path to help file to build.
+
+--- makefile.orig      2016-12-23 00:28:13.000000000 +0000
++++ makefile
+@@ -119,7 +119,7 @@ md5.o:     md5.c md5.h
+       $(CC) md5.c
+ 
+ os.linux.o: os.c
+-      $(CC) -DUSE_LIBREADLINE -o os.linux.o os.c
++      $(CC) -DUSE_LIBREADLINE -DEDT_HELPFILE=\"${EDT_HELPFILE}\" -o os.linux.o os.c
+ 
+ output.o: output.c
+       $(CC) output.c