CVS commit: pkgsrc/editors/nedit

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Nov 22 17:07:10 UTC 2024

Modified Files:
        pkgsrc/editors/nedit: Makefile distinfo
        pkgsrc/editors/nedit/patches: patch-aa
Removed Files:
        pkgsrc/editors/nedit/patches: patch-Xlt_SlideC.c
            patch-source_highlight.c patch-source_interpret.c
            patch-source_macro.c patch-source_menu.c patch-source_parse.y
            patch-source_preferences.c patch-source_regularExp.c
            patch-source_search.c patch-source_selection.c patch-source_shell.c
            patch-source_tags.c patch-source_text.c patch-source_textBuf.c
            patch-source_textDisp.c patch-source_textDrag.c
            patch-source_userCmds.c patch-source_window.c patch-util_misc.c
            patch-util_prefFile.c

Log Message:
nedit: update to 5.7

(The upstream change log is incomplete, not going to list here.)

Informed by changes made in pkgsrc-wip by Andrew Randrianasulu and
Benny Siegert. Further/different changes by me.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/editors/nedit/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/editors/nedit/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/nedit/patches/patch-Xlt_SlideC.c \
    pkgsrc/editors/nedit/patches/patch-source_menu.c \
    pkgsrc/editors/nedit/patches/patch-source_regularExp.c \
    pkgsrc/editors/nedit/patches/patch-source_search.c \
    pkgsrc/editors/nedit/patches/patch-source_selection.c \
    pkgsrc/editors/nedit/patches/patch-source_shell.c \
    pkgsrc/editors/nedit/patches/patch-source_tags.c \
    pkgsrc/editors/nedit/patches/patch-source_text.c \
    pkgsrc/editors/nedit/patches/patch-source_textBuf.c \
    pkgsrc/editors/nedit/patches/patch-source_textDisp.c \
    pkgsrc/editors/nedit/patches/patch-source_textDrag.c \
    pkgsrc/editors/nedit/patches/patch-source_window.c
cvs rdiff -u -r1.14 -r1.15 pkgsrc/editors/nedit/patches/patch-aa
cvs rdiff -u -r1.2 -r0 pkgsrc/editors/nedit/patches/patch-source_highlight.c \
    pkgsrc/editors/nedit/patches/patch-source_interpret.c \
    pkgsrc/editors/nedit/patches/patch-source_macro.c \
    pkgsrc/editors/nedit/patches/patch-source_parse.y \
    pkgsrc/editors/nedit/patches/patch-source_preferences.c \
    pkgsrc/editors/nedit/patches/patch-source_userCmds.c \
    pkgsrc/editors/nedit/patches/patch-util_misc.c \
    pkgsrc/editors/nedit/patches/patch-util_prefFile.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/nedit/Makefile
diff -u pkgsrc/editors/nedit/Makefile:1.60 pkgsrc/editors/nedit/Makefile:1.61
--- pkgsrc/editors/nedit/Makefile:1.60  Sat Jun  8 10:40:56 2019
+++ pkgsrc/editors/nedit/Makefile       Fri Nov 22 17:07:09 2024
@@ -1,31 +1,21 @@
-# $NetBSD: Makefile,v 1.60 2019/06/08 10:40:56 rillig Exp $
+# $NetBSD: Makefile,v 1.61 2024/11/22 17:07:09 gutteridge Exp $
 
-DISTNAME=      nedit-${VERS}-src
-PKGNAME=       nedit-${VERS}
-PKGREVISION=   9
+DISTNAME=      nedit-5.7-src
+PKGNAME=       ${DISTNAME:S/-src//}
 CATEGORIES=    editors
-MASTER_SITES=  ${MASTER_SITE_NEDIT:=v${VERS:S/./_/g}/}
 MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=nedit/}
-EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.nedit.org/
-# Upstream "info%nedit.org@localhost" did not reply to a message send on 22 March 2014
-# asking about patches for modern compilers.
-COMMENT=       Motif based standard GUI style text editor
+COMMENT=       Motif-based standard GUI style text editor
 LICENSE=       gnu-gpl-v2
 
-VERS=          5.5
-MASTER_SITE_NEDIT= \
-               http://www.nedit.org/ftp/                       \
-               http://nl.nedit.org/ftp/                        \
-               ftp://nl.nedit.org/pub/NEdit/                   \
-               ftp://ftp.fu-berlin.de/unix/editors/nedit/      \
-               ftp://cri.univ-tlse1.fr/pub/unix/nedit/NEdit/   \
-               ftp://ftp.chg.ru/pub/unix/editors/nedit/
+USE_TOOLS+=    perl
+
+MAKE_JOBS_SAFE=        no
 
 WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
-BUILD_TARGET=          netbsd
+BUILD_TARGET=          netbsd docs
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PREFIX}/share/doc/nedit
 
 do-install:

Index: pkgsrc/editors/nedit/distinfo
diff -u pkgsrc/editors/nedit/distinfo:1.21 pkgsrc/editors/nedit/distinfo:1.22
--- pkgsrc/editors/nedit/distinfo:1.21  Tue Oct 26 10:21:34 2021
+++ pkgsrc/editors/nedit/distinfo       Fri Nov 22 17:07:09 2024
@@ -1,26 +1,6 @@
-$NetBSD: distinfo,v 1.21 2021/10/26 10:21:34 nia Exp $
+$NetBSD: distinfo,v 1.22 2024/11/22 17:07:09 gutteridge Exp $
 
-BLAKE2s (nedit-5.5-src.tar.bz2) = c58343161f94ae00877b9531f628e27979cc1509c85b9a6a8bad0569913b2766
-SHA512 (nedit-5.5-src.tar.bz2) = a1b409024851c2332c0992b5bfb8606c875795f1907a977b245cb2b081a45b53e606f615e413cfa8c34af2df782504e55351ce1a7545b7265958db06038d0858
-Size (nedit-5.5-src.tar.bz2) = 1124825 bytes
-SHA1 (patch-Xlt_SlideC.c) = aafca789053536a0d3ca0bc98ae301c60697e4c2
-SHA1 (patch-aa) = 29cf7e55b23e437b0203e0dde09cc053d65f245c
-SHA1 (patch-source_highlight.c) = cfb36657e654747a16f7cf9ed6394e047493e1f5
-SHA1 (patch-source_interpret.c) = c2fc78178c814fff1b572f8674f0fec3803926e5
-SHA1 (patch-source_macro.c) = e0a1562687c3f989d96eb2fc62a93452273d1ea7
-SHA1 (patch-source_menu.c) = 529be222b97904b82721dc79ae8fa587378ccd48
-SHA1 (patch-source_parse.y) = 089eb827eaa9d5d1b23237bf67df883d7d416a33
-SHA1 (patch-source_preferences.c) = 12c27f32cd7e9e2e6f48ac2f8fd53b2b42cba2e3
-SHA1 (patch-source_regularExp.c) = d607b663a3853a6963d3dea7a32ba6c42af681eb
-SHA1 (patch-source_search.c) = b60f984d803d58618813f39a4b93e27f2b9325c8
-SHA1 (patch-source_selection.c) = 28d0fd4eaddbd1e36ef2eef12ad28fa5adc406ca
-SHA1 (patch-source_shell.c) = 8d8b0820d509553140f2e1d173287122ed6d7a96
-SHA1 (patch-source_tags.c) = ae8ebe7ab48a154d7538e417540eeac223cae624
-SHA1 (patch-source_text.c) = e88669188ed3512ee3945ab68bb392d0f3aa7708
-SHA1 (patch-source_textBuf.c) = 06fadd285929922fe42904d3d49e7eacf4e61e90
-SHA1 (patch-source_textDisp.c) = 84e3631eb7076c77704390ac6aee66b27d0422f3
-SHA1 (patch-source_textDrag.c) = 8b66f1bb80bbc2b3cf3751ff7c601ded34b54646
-SHA1 (patch-source_userCmds.c) = 7bf5de6ec24f5c5867a95bd75b6c038c92975a79
-SHA1 (patch-source_window.c) = 72fda2bf7cc178ec57f38d25915dab8a8765874d
-SHA1 (patch-util_misc.c) = d3445336389fc26b69b2e0205930f8843f224784
-SHA1 (patch-util_prefFile.c) = 2fb587dd1a4b27a16469b31f4355b9d7e62b37da
+BLAKE2s (nedit-5.7-src.tar.gz) = 39c70225a47446ecd8d655d830f1175af624a65e9a471b44d64cd0589751e244
+SHA512 (nedit-5.7-src.tar.gz) = cf242d2f8eea4c78649dbeb741f545a3dc8ffaf5bb36239794a4b2635420e5445fa1c77472add79c05ec081d71a0b9df4431f48db365a71692e43869fd4e7932
+Size (nedit-5.7-src.tar.gz) = 1344754 bytes
+SHA1 (patch-aa) = 01e0ea7c72ade2067b72576e06cb57fdeeb6deb4

Index: pkgsrc/editors/nedit/patches/patch-aa
diff -u pkgsrc/editors/nedit/patches/patch-aa:1.14 pkgsrc/editors/nedit/patches/patch-aa:1.15
--- pkgsrc/editors/nedit/patches/patch-aa:1.14  Fri May 21 12:13:05 2004
+++ pkgsrc/editors/nedit/patches/patch-aa       Fri Nov 22 17:07:09 2024
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.14 2004/05/21 12:13:05 adam Exp $
+$NetBSD: patch-aa,v 1.15 2024/11/22 17:07:09 gutteridge Exp $
 
---- makefiles/Makefile.netbsd.orig     2003-09-28 15:03:10.000000000 +0000
+Provide correct arguments.
+
+--- makefiles/Makefile.netbsd.orig     2017-02-04 17:46:06.000000000 +0000
 +++ makefiles/Makefile.netbsd
-@@ -10,10 +10,10 @@ AR=ar
+@@ -10,9 +10,9 @@ AR=ar
  # To test if the Motif library exports the runtime version
  # add -DHAVE__XMVERSIONSTRING to CFLAGS
  #
@@ -14,5 +16,3 @@ $NetBSD: patch-aa,v 1.14 2004/05/21 12:1
  
  include Makefile.common
  
--verify_config: check_tif_rule
-+verify_config: