? editors/nedit/Applying ? editors/nedit/Extracting ? editors/nedit/Patching Index: editors/nedit/Makefile =================================================================== RCS file: /cvs/ports/editors/nedit/Makefile,v diff -u -p -u -p -r1.85 Makefile --- editors/nedit/Makefile 21 Sep 2023 12:22:33 -0000 1.85 +++ editors/nedit/Makefile 18 Sep 2026 22:58:07 -0000 @@ -1,20 +1,17 @@ -COMMENT= a fast, compact Motif/X11 plain text editor +COMMENT= fast, compact Motif/X11 plain text editor (classic fork) -DISTNAME= nedit-5.7 -P_V= 0.5 -EPOCH= 0 -REVISION = 1 -DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} -DISTFILES.trap = nedit_patterns-${P_V}.tgz - -CATEGORIES= editors x11 -HOMEPAGE = https://sourceforge.net/projects/nedit/ -MAINTAINER = Alessandro De Laurenzis +COMMIT_ID= dd408440cb392db2258edfef753c57e134cfbbd8 +DISTNAME= nedit-classic-5.7.20260411 +PKGNAME= nedit-5.7.20260411 -SITES= ${SITE_SOURCEFORGE:=nedit/} -SITES.trap= http://distfiles.sigtrap.nl/ +CATEGORIES= editors x11 +HOMEPAGE= https://github.com/alx210/nedit-classic +MAINTAINER= Alessandro De Laurenzis -DIST_SUBDIR= nedit +SITES= https://github.com/alx210/nedit-classic/archive/ +DISTFILES= ${COMMIT_ID}.tar.gz + +WRKDIST= ${WRKDIR}/nedit-classic-${COMMIT_ID} # GPLv2 PERMIT_PACKAGE= Yes @@ -22,27 +19,28 @@ PERMIT_PACKAGE= Yes WANTLIB += ICE SM X11 Xau Xdmcp Xext Xft Xmu Xpm Xrender Xt WANTLIB += c expat fontconfig freetype iconv m z Xm -LIB_DEPENDS+= converters/libiconv \ - x11/motif +LIB_DEPENDS+= converters/libiconv \ + x11/motif + +ALL_TARGET= openbsd -ALL_TARGET= openbsd docs +post-build: + /usr/bin/pod2man --section=1 ${WRKSRC}/doc/nedit.pod ${WRKSRC}/doc/nedit.man + /usr/bin/pod2man --section=1 ${WRKSRC}/doc/nc.pod ${WRKSRC}/doc/nc.man -NO_TEST= Yes +NO_TEST= Yes -MAKE_ENV+= MOTIFLIB='-L${LOCALBASE}/lib -lXm' +MAKE_ENV+= MOTIFLIB='-L${LOCALBASE}/lib -lXm' \ + LOCALBASE='${LOCALBASE}' \ + X11BASE='${X11BASE}' do-install: sed -i "s/^\.TH NC/&L/" ${WRKSRC}/doc/nc.man - ${INSTALL_PROGRAM} ${WRKBUILD}/source/nedit ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKBUILD}/source/nedit ${PREFIX}/bin/nedit ${INSTALL_PROGRAM} ${WRKBUILD}/source/nc ${PREFIX}/bin/ncl ${INSTALL_MAN} ${WRKSRC}/doc/nedit.man ${PREFIX}/man/man1/nedit.1 ${INSTALL_MAN} ${WRKSRC}/doc/nc.man ${PREFIX}/man/man1/ncl.1 ${INSTALL_DATA} ${WRKSRC}/doc/NEdit.ad \ ${PREFIX}/lib/X11/app-defaults/NEdit - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nedit - ${INSTALL_DATA} ${WRKSRC}/doc/nedit.doc ${PREFIX}/share/doc/nedit - ${INSTALL_DATA_DIR} ${PREFIX}/share/nedit/patterns - ${INSTALL_DATA} ${WRKDIR}/nedit_patterns-${P_V}/*.pats \ - ${PREFIX}/share/nedit/patterns/ .include Index: editors/nedit/distinfo =================================================================== RCS file: /cvs/ports/editors/nedit/distinfo,v diff -u -p -u -p -r1.19 distinfo --- editors/nedit/distinfo 28 Feb 2019 23:00:47 -0000 1.19 +++ editors/nedit/distinfo 18 Sep 2026 22:58:07 -0000 @@ -1,4 +1,2 @@ -SHA256 (nedit/nedit-5.7-src.tar.gz) = rdmsef+XNSitNshoWCOLrE9ZiWwn2/KFy+ak1CX8oXo= -SHA256 (nedit/nedit_patterns-0.5.tgz) = 7qnt2CG5d9xtvfYGk7nAOlSeuNrba+d++GO5y58bpdA= -SIZE (nedit/nedit-5.7-src.tar.gz) = 1344754 -SIZE (nedit/nedit_patterns-0.5.tgz) = 9245 +SHA256 (dd408440cb392db2258edfef753c57e134cfbbd8.tar.gz) = VgrTf5ZbH3CjFy5V8fzJOXp5Oz98LQ6Siw4gMU12vTc= +SIZE (dd408440cb392db2258edfef753c57e134cfbbd8.tar.gz) = 1329024 Index: editors/nedit/patches/patch-doc_nc_pod =================================================================== RCS file: /cvs/ports/editors/nedit/patches/patch-doc_nc_pod,v diff -u -p -u -p -r1.2 patch-doc_nc_pod --- editors/nedit/patches/patch-doc_nc_pod 11 Mar 2022 18:58:33 -0000 1.2 +++ editors/nedit/patches/patch-doc_nc_pod 18 Sep 2026 22:58:07 -0000 @@ -1,7 +1,12 @@ +SPDX-License-Identifier: GPL-2.0-or-later + +Rename the client program to ncl in its manual page, matching the name +installed by this package. + Index: doc/nc.pod --- doc/nc.pod.orig +++ doc/nc.pod -@@ -3,27 +3,27 @@ +@@ -3,11 +3,11 @@ =head1 NAME @@ -11,21 +16,11 @@ Index: doc/nc.pod =head1 SYNOPSYS -nc [B<-read>] [B<-create>] [B<-line> I | B<+>I] [B<-do> I] -- [B<-ask>] [B<-noask>] [B<-svrname> I] [B<-svrcmd> I] -- [B<-lm> I] -- [B<-geometry> I | B<-g> I] [B<-icon> | B<-iconic>] -- [B<-display> I<[host]:server[.screen]>] -- [B<-timeout> I] [B<-wait>] [B<-xrm> I] -- [B<-tabbed>] [B<-untabbed>] [B<-group>] -- [B<-V> | B<-version>] [B<-h> | B<-help>] [B<-->] [file...] +ncl [B<-read>] [B<-create>] [B<-line> I | B<+>I] [B<-do> I] -+ [B<-ask>] [B<-noask>] [B<-svrname> I] [B<-svrcmd> I] -+ [B<-lm> I] -+ [B<-geometry> I | B<-g> I] [B<-icon> | B<-iconic>] -+ [B<-display> I<[host]:server[.screen]>] -+ [B<-timeout> I] [B<-wait>] [B<-xrm> I] -+ [B<-tabbed>] [B<-untabbed>] [B<-group>] -+ [B<-V> | B<-version>] [B<-h> | B<-help>] [B<-->] [file...] + [B<-ask>] [B<-noask>] [B<-svrname> I] [B<-svrcmd> I] + [B<-lm> I] + [B<-geometry> I | B<-g> I] [B<-icon> | B<-iconic>] +@@ -18,12 +18,12 @@ =head1 DESCRIPTION @@ -40,7 +35,7 @@ Index: doc/nc.pod Client/server mode is useful for integrating NEdit with software development environments, mailers, and other programs; or just as a quick way to open files from the shell command line without starting a new NEdit session. -@@ -49,25 +49,25 @@ Go to line number I. +@@ -49,25 +49,25 @@ Execute an NEdit macro or action on the file following the -do argument on the command line. @@ -70,22 +65,7 @@ Index: doc/nc.pod the X resource `nc.serverCommand', by default, I<"nedit -server">. =item B<-lm> I -@@ -107,11 +107,11 @@ increase the time-out period. In most cases, the defau - - =item B<-wait> - --Instructs B not to return to the shell until all files given -+Instructs B not to return to the shell until all files given - are closed. - --Normally, B returns once the files given in its command line --are opened by the server. When this option is given, nc returns -+Normally, B returns once the files given in its command line -+are opened by the server. When this option is given, ncl returns - only after the last file given in this call is closed. - Note that this option affects all files, not only the ones - following this option in the command line. -@@ -167,11 +167,11 @@ for your display: +@@ -155,11 +155,11 @@ =head1 NOTES @@ -101,7 +81,7 @@ Index: doc/nc.pod that is running on a machine with a different host name, even though it may be perfectly appropriate for editing a given file. -@@ -182,11 +182,11 @@ command line, for example: +@@ -170,11 +170,11 @@ =item incorrect: Index: editors/nedit/patches/patch-makefiles_Makefile_openbsd =================================================================== RCS file: /cvs/ports/editors/nedit/patches/patch-makefiles_Makefile_openbsd,v diff -u -p -u -p -r1.11 patch-makefiles_Makefile_openbsd --- editors/nedit/patches/patch-makefiles_Makefile_openbsd 11 Mar 2022 18:58:33 -0000 1.11 +++ editors/nedit/patches/patch-makefiles_Makefile_openbsd 18 Sep 2026 22:58:07 -0000 @@ -20,7 +20,7 @@ Index: makefiles/Makefile.openbsd +CFLAGS+=-DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DHAVE_MKSTEMP ARFLAGS=-ur -LIBS= -L/usr/X11R6/lib -lXm -lXpm -lXp -lXext -lXt -lSM -lICE -lX11 -lm -+MOTIFLIB?=-L${LOCALBASE} -lXm ++MOTIFLIB?=-L${LOCALBASE}/lib -lXm +LIBS=-L${X11BASE}/lib ${MOTIFLIB} -lXft -lXpm -lXext -lXt -lSM -lICE -lX11 -lfontconfig -lfreetype -lexpat -lm -lXau -lXdmcp -lXrender -lXmu -lz -liconv include Makefile.common Index: editors/nedit/patches/patch-source_file_c =================================================================== RCS file: /cvs/ports/editors/nedit/patches/patch-source_file_c,v diff -u -p -u -p -r1.8 patch-source_file_c --- editors/nedit/patches/patch-source_file_c 11 Mar 2022 18:58:33 -0000 1.8 +++ editors/nedit/patches/patch-source_file_c 18 Sep 2026 22:58:07 -0000 @@ -1,7 +1,11 @@ +SPDX-License-Identifier: GPL-2.0-or-later + +Use mkstemp(3) for the print temporary file instead of tmpnam(3). + Index: source/file.c --- source/file.c.orig +++ source/file.c -@@ -1376,7 +1376,12 @@ void PrintWindow(WindowInfo *window, int selectedOnly) +@@ -1373,7 +1373,12 @@ */ void PrintString(const char *string, int length, Widget parent, const char *jobName) { @@ -14,7 +18,7 @@ Index: source/file.c FILE *fp; int fd; -@@ -1387,6 +1392,10 @@ void PrintString(const char *string, int length, Widge +@@ -1384,6 +1389,10 @@ 1. Create a filename 2. Open the file with the O_CREAT|O_EXCL flags So all an attacker can do is a DoS on the print function. */ @@ -25,7 +29,7 @@ Index: source/file.c tmpnam(tmpFileName); /* open the temporary file */ -@@ -1395,6 +1404,7 @@ void PrintString(const char *string, int length, Widge +@@ -1392,6 +1401,7 @@ #else if ((fd = open(tmpFileName, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR | S_IWUSR)) < 0 || (fp = fdopen(fd, "w")) == NULL) #endif /* VMS */ Index: editors/nedit/patches/patch-source_nc_c =================================================================== RCS file: /cvs/ports/editors/nedit/patches/patch-source_nc_c,v diff -u -p -u -p -r1.4 patch-source_nc_c --- editors/nedit/patches/patch-source_nc_c 11 Mar 2022 18:58:33 -0000 1.4 +++ editors/nedit/patches/patch-source_nc_c 18 Sep 2026 22:58:07 -0000 @@ -1,7 +1,12 @@ +SPDX-License-Identifier: GPL-2.0-or-later + +Rename the client program in the usage help and avoid the %n printf +conversion. + Index: source/nc.c --- source/nc.c.orig +++ source/nc.c -@@ -112,15 +112,15 @@ static const char cmdLineHelp[] = +@@ -110,15 +110,15 @@ #ifdef VMS "[Sorry, no on-line help available.]\n"; /* Why is that ? */ #else @@ -26,7 +31,7 @@ Index: source/nc.c #endif /*VMS*/ /* Structure to hold X Resource values */ -@@ -778,10 +778,10 @@ static void parseCommandLine(int argc, char **argv, Co +@@ -740,10 +740,10 @@ The "long" cast on strlen() is necessary because size_t is 64 bit on Alphas, and 32-bit on most others. There is no printf format specifier for "size_t", thanx, ANSI. */ @@ -39,7 +44,7 @@ Index: source/nc.c outPtr += charsWritten; strcpy(outPtr, path); outPtr += strlen(path); -@@ -816,9 +816,9 @@ static void parseCommandLine(int argc, char **argv, Co +@@ -778,9 +778,9 @@ * iconic state (and optional language mode and geometry). */ if (toDoCommand[0] != '\0' || fileCount == 0) { Index: editors/nedit/patches/patch-source_preferences_c =================================================================== RCS file: /cvs/ports/editors/nedit/patches/patch-source_preferences_c,v diff -u -p -u -p -r1.5 patch-source_preferences_c --- editors/nedit/patches/patch-source_preferences_c 11 Mar 2022 18:58:33 -0000 1.5 +++ editors/nedit/patches/patch-source_preferences_c 18 Sep 2026 22:58:07 -0000 @@ -1,9 +1,11 @@ +SPDX-License-Identifier: GPL-2.0-or-later + Add .pp to the list of extensions for Pascal source files. Index: source/preferences.c --- source/preferences.c.orig +++ source/preferences.c -@@ -759,7 +759,7 @@ static PrefDescripRec PrefDescrip[] = { +@@ -761,7 +761,7 @@ Makefile:MAKEFILE:::None:8:8::\n\ Matlab:.M .OCT .SCI:::::::\n\ NEdit Macro:.NM .NEDITMACRO:::::::\n\ @@ -12,7 +14,7 @@ Index: source/preferences.c Perl:.PL .PM .P5:\"^[ \\t]*#[ \\t]*!.*perl\":Auto:None:::\".,/\\\\`'!$@#%^&*()-=+{}[]\"\":;<>?~|\":\n\ PostScript:.ps .PS .eps .EPS .epsf .epsi:\"^%!\":::::\"/%(){}[]<>\":\n\ Python:.PY:\"^#!.*python\":Auto:None:::\"!\"\"#$%&'()*+,-./:;<=>?@[\\\\]^`{|}~\":\n\ -@@ -788,7 +788,7 @@ static PrefDescripRec PrefDescrip[] = { +@@ -790,7 +790,7 @@ Makefile:Makefile makefile .gmk:::None:8:8::\n\ Matlab:.m .oct .sci:::::::\n\ NEdit Macro:.nm .neditmacro:::::::\n\ Index: editors/nedit/pkg/DESCR =================================================================== RCS file: /cvs/ports/editors/nedit/pkg/DESCR,v diff -u -p -u -p -r1.5 DESCR --- editors/nedit/pkg/DESCR 28 Feb 2019 23:00:47 -0000 1.5 +++ editors/nedit/pkg/DESCR 18 Sep 2026 22:58:07 -0000 @@ -1,4 +1,8 @@ -NEdit is a standard GUI (Graphical User Interface) style text editor -for programs and plain-text files. It provides mouse based editing and -a streamlined editing style, based on popular Macintosh and MS Windows -editors, for users of X workstations and X terminals. +NEdit is a multi-purpose text editor for the X Window System, which +combines a standard, easy to use, graphical user interface with the +thorough functionality and stability required by users who edit text +eight hours a day. + +This is the "classic" fork with experimental patches adding MWM +workspace manager compatibility and optional support for Xft fonts. +Compatible with the updated Motif 2.3.9 library. Index: editors/nedit/pkg/PLIST =================================================================== RCS file: /cvs/ports/editors/nedit/pkg/PLIST,v diff -u -p -u -p -r1.17 PLIST --- editors/nedit/pkg/PLIST 11 Mar 2022 18:58:33 -0000 1.17 +++ editors/nedit/pkg/PLIST 18 Sep 2026 22:58:07 -0000 @@ -1,25 +1,6 @@ -@pkgpath ${BASE_PKGPATH} -@pkgpath ${BASE_PKGPATH},wrapmark -@pkgpath ${BASE_PKGPATH},lesstif,wrapmark -@pkgpath ${BASE_PKGPATH},lesstif @bin bin/ncl @bin bin/nedit lib/X11/app-defaults/NEdit @man man/man1/ncl.1 @man man/man1/nedit.1 -share/doc/nedit/ -share/doc/nedit/nedit.doc share/doc/pkg-readmes/${PKGSTEM} -share/nedit/ -share/nedit/patterns/ -share/nedit/patterns/arm.pats -share/nedit/patterns/diff.pats -share/nedit/patterns/erlang.pats -share/nedit/patterns/forth.pats -share/nedit/patterns/haskell.pats -share/nedit/patterns/lua.pats -share/nedit/patterns/mipsasm.pats -share/nedit/patterns/postgresql.pats -share/nedit/patterns/prolog.pats -share/nedit/patterns/ruby.pats -share/nedit/patterns/scheme.pats