update to nedit-5.7, from Alessandro De Laurenzis (taking MAINTAINER).
many bugs fixed, including crashers. the external wrapmark.diff patch is dropped; it originally came from http://ajbj.free.fr/nedit/nedit-scripts/INTERESTING/utilsrc/nedit/myNEditPatches/HairlineMargin.diff and seems unmaintained (and doesn't apply to the newer version).
This commit is contained in:
sthen
parent
6654eefafd
commit
bc410fb783
|
|
@ -1,15 +1,16 @@
|
|||
# $OpenBSD: Makefile,v 1.78 2018/09/04 12:46:11 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.79 2019/02/28 23:00:47 sthen Exp $
|
||||
|
||||
COMMENT= X11/Motif GUI text editor
|
||||
COMMENT= a fast, compact Motif/X11 plain text editor
|
||||
|
||||
DISTNAME= nedit-5.5
|
||||
DISTNAME= nedit-5.7
|
||||
P_V= 0.5
|
||||
REVISION= 23
|
||||
EPOCH= 0
|
||||
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} \
|
||||
nedit_patterns-${P_V}.tgz:0
|
||||
PATCHFILES= wrapmark.diff:0
|
||||
|
||||
CATEGORIES= editors x11
|
||||
HOMEPAGE = https://sourceforge.net/projects/nedit/
|
||||
MAINTAINER = Alessandro De Laurenzis <just22@atlantide.t28.net>
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nedit/}
|
||||
MASTER_SITES0= http://distfiles.nl/
|
||||
|
|
@ -25,14 +26,14 @@ WANTLIB += c expat fontconfig freetype iconv m z Xm
|
|||
LIB_DEPENDS+= converters/libiconv \
|
||||
x11/motif
|
||||
|
||||
ALL_TARGET= openbsd
|
||||
ALL_TARGET= openbsd docs
|
||||
|
||||
NO_TEST= Yes
|
||||
|
||||
CFLAGS+= -DBUILD_UNTESTED_NEDIT
|
||||
MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -lXm'
|
||||
MAKE_ENV+= MOTIFLIB='-L${LOCALBASE}/lib -lXm'
|
||||
|
||||
do-install:
|
||||
sed -i "s/^\.TH NC/&L/" ${WRKSRC}/doc/nc.man
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/source/nedit ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/source/nc ${PREFIX}/bin/ncl
|
||||
${INSTALL_MAN} ${WRKSRC}/doc/nedit.man ${PREFIX}/man/man1/nedit.1
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
SHA256 (nedit/nedit-5.5-src.tar.gz) = fNa7yd8VQhzM6Zj0xqzZZuCmRTxV6JegMN4TLggkP1I=
|
||||
SHA256 (nedit/nedit-5.7-src.tar.gz) = rdmsef+XNSitNshoWCOLrE9ZiWwn2/KFy+ak1CX8oXo=
|
||||
SHA256 (nedit/nedit_patterns-0.5.tgz) = 7qnt2CG5d9xtvfYGk7nAOlSeuNrba+d++GO5y58bpdA=
|
||||
SHA256 (nedit/wrapmark.diff) = zVi6lmNskZwQ4zfIedeKFD//kbECfO/Hq8uocohGqO0=
|
||||
SIZE (nedit/nedit-5.5-src.tar.gz) = 1503942
|
||||
SIZE (nedit/nedit-5.7-src.tar.gz) = 1344754
|
||||
SIZE (nedit/nedit_patterns-0.5.tgz) = 9245
|
||||
SIZE (nedit/wrapmark.diff) = 50327
|
||||
|
|
|
|||
13
editors/nedit/patches/patch-Makefile
Normal file
13
editors/nedit/patches/patch-Makefile
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$OpenBSD: patch-Makefile,v 1.1 2019/02/28 23:00:47 sthen Exp $
|
||||
|
||||
Index: Makefile
|
||||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
@@ -32,7 +32,6 @@ all:
|
||||
(cd Xlt; $(MAKE) -f Makefile.$@ libXlt.a)
|
||||
(cd Microline/XmL; $(MAKE) -f Makefile.$@ libXmL.a)
|
||||
(cd source; $(MAKE) -f Makefile.$@ nedit nc)
|
||||
- @source/nedit -V
|
||||
|
||||
# This should not be in the default build, as users may not have Perl
|
||||
# installed. This is only interesting to developers.
|
||||
|
|
@ -1,119 +0,0 @@
|
|||
$OpenBSD: patch-doc_nc_man,v 1.7 2007/08/29 10:06:52 mbalmer Exp $
|
||||
--- doc/nc.man.orig Thu Sep 30 23:03:59 2004
|
||||
+++ doc/nc.man Mon Aug 27 12:03:21 2007
|
||||
@@ -128,30 +128,30 @@
|
||||
.rm #[ #] #H #V #F C
|
||||
.\" ========================================================================
|
||||
.\"
|
||||
-.IX Title "NC 1"
|
||||
-.TH NC 1 "2004-07-21" "NEdit 5.5" "NEdit documentation"
|
||||
+.IX Title "NCL 1"
|
||||
+.TH NCL 1 "2004-07-21" "NEdit 5.5" "NEdit documentation"
|
||||
.SH "NAME"
|
||||
-nc \- Client program for NEdit text editor
|
||||
+ncl \- Client program for NEdit text editor
|
||||
.SH "SYNOPSYS"
|
||||
.IX Header "SYNOPSYS"
|
||||
-nc [\fB\-read\fR] [\fB\-create\fR] [\fB\-line\fR \fIn\fR | \fB+\fR\fIn\fR] [\fB\-do\fR \fIcommand\fR]
|
||||
- [\fB\-ask\fR] [\fB\-noask\fR] [\fB\-svrname\fR \fIname\fR] [\fB\-svrcmd\fR \fIcommand\fR]
|
||||
- [\fB\-lm\fR \fIlanguagemode\fR]
|
||||
- [\fB\-geometry\fR \fIgeometry\fR | \fB\-g\fR \fIgeometry\fR] [\fB\-icon\fR | \fB\-iconic\fR]
|
||||
- [\fB\-display\fR \fI[host]:server[.screen]\fR]
|
||||
- [\fB\-timeout\fR \fIseconds\fR] [\fB\-wait\fR] [\fB\-xrm\fR \fIresourcestring\fR]
|
||||
- [\fB\-tabbed\fR] [\fB\-untabbed\fR] [\fB\-group\fR]
|
||||
- [\fB\-V\fR | \fB\-version\fR] [\fB\-\-\fR] [file...]
|
||||
+ncl [\fB\-read\fR] [\fB\-create\fR] [\fB\-line\fR \fIn\fR | \fB+\fR\fIn\fR] [\fB\-do\fR \fIcommand\fR]
|
||||
+ [\fB\-ask\fR] [\fB\-noask\fR] [\fB\-svrname\fR \fIname\fR] [\fB\-svrcmd\fR \fIcommand\fR]
|
||||
+ [\fB\-lm\fR \fIlanguagemode\fR]
|
||||
+ [\fB\-geometry\fR \fIgeometry\fR | \fB\-g\fR \fIgeometry\fR] [\fB\-icon\fR | \fB\-iconic\fR]
|
||||
+ [\fB\-display\fR \fI[host]:server[.screen]\fR]
|
||||
+ [\fB\-timeout\fR \fIseconds\fR] [\fB\-wait\fR] [\fB\-xrm\fR \fIresourcestring\fR]
|
||||
+ [\fB\-tabbed\fR] [\fB\-untabbed\fR] [\fB\-group\fR]
|
||||
+ [\fB\-V\fR | \fB\-version\fR] [\fB\-\-\fR] [file...]
|
||||
.SH "DESCRIPTION"
|
||||
.IX Header "DESCRIPTION"
|
||||
-\&\fBnc\fR is the client interface to the NEdit text editor. A server can be started
|
||||
+\&\fBncl\fR is the client interface to the NEdit text editor. A server can be started
|
||||
explicitly by running NEdit in server mode:
|
||||
.PP
|
||||
.Vb 1
|
||||
\& nedit -server
|
||||
.Ve
|
||||
.PP
|
||||
-If no server is running, \fBnc\fR will start one unless configured otherwise.
|
||||
+If no server is running, \fBncl\fR will start one unless configured otherwise.
|
||||
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.
|
||||
@@ -171,21 +171,21 @@ Go to line number \fIn\fR.
|
||||
Execute an NEdit macro or action on the file following the \-do argument on the
|
||||
command line.
|
||||
.Sp
|
||||
-If you use this command without a filename, \fBnc\fR would randomly choose one
|
||||
+If you use this command without a filename, \fBncl\fR would randomly choose one
|
||||
window to focus and execute the macro in.
|
||||
.IP "\fB\-ask\fR, \fB\-noask\fR" 4
|
||||
.IX Item "-ask, -noask"
|
||||
-Instructs \fBnc\fR whether to automatically start a server if one is not
|
||||
+Instructs \fBncl\fR whether to automatically start a server if one is not
|
||||
available. This overrides the X resource `nc.autoStart'.
|
||||
.IP "\fB\-svrname\fR \fIname\fR" 4
|
||||
.IX Item "-svrname name"
|
||||
-Explicitly instructs \fBnc\fR which server to connect to, an instance of
|
||||
+Explicitly instructs \fBncl\fR which server to connect to, an instance of
|
||||
\&\fInedit\fR\|(1) with a corresponding \fB\-svrname\fR argument. By naming servers, you
|
||||
can run several simultaneously, and direct files and commands specifically to
|
||||
any one.
|
||||
.IP "\fB\-svrcmd\fR \fIcommand\fR" 4
|
||||
.IX Item "-svrcmd command"
|
||||
-The command which \fBnc\fR uses to start an NEdit server. It is also settable via
|
||||
+The command which \fBncl\fR uses to start an NEdit server. It is also settable via
|
||||
the X resource `nc.serverCommand', by default, \fI\*(L"nedit \-server\*(R"\fR.
|
||||
.IP "\fB\-lm\fR \fIlanguagemode\fR" 4
|
||||
.IX Item "-lm languagemode"
|
||||
@@ -221,11 +221,11 @@ Under rare conditions (such as a slow connection), it
|
||||
increase the time-out period. In most cases, the default is fine.
|
||||
.IP "\fB\-wait\fR" 4
|
||||
.IX Item "-wait"
|
||||
-Instructs \fBnc\fR not to return to the shell until all files given
|
||||
+Instructs \fBncl\fR not to return to the shell until all files given
|
||||
are closed.
|
||||
.Sp
|
||||
-Normally, \fBnc\fR returns once the files given in its command line
|
||||
-are opened by the server. When this option is given, nc returns
|
||||
+Normally, \fBncl\fR 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.
|
||||
@@ -262,11 +262,11 @@ for your display:
|
||||
.Ve
|
||||
.SH "NOTES"
|
||||
.IX Header "NOTES"
|
||||
-Communication between \fInc\fR\|(1) and \fInedit\fR\|(1) is through the X display. So as
|
||||
-long as X windows is set up and working properly, \fBnc\fR will work properly
|
||||
-as well. \fBnc\fR uses the `\s-1DISPLAY\s0' environment variable, the machine name and
|
||||
+Communication between \fIncl\fR\|(1) and \fInedit\fR\|(1) is through the X display. So as
|
||||
+long as X windows is set up and working properly, \fBncl\fR will work properly
|
||||
+as well. \fBncl\fR uses the `\s-1DISPLAY\s0' environment variable, the machine name and
|
||||
your user name to find the appropriate server, meaning, if you have several
|
||||
-machines sharing a common file system, \fBnc\fR will not be able to find a server
|
||||
+machines sharing a common file system, \fBncl\fR will not be able to find a server
|
||||
that is running on a machine with a different host name, even though it may be
|
||||
perfectly appropriate for editing a given file.
|
||||
.PP
|
||||
@@ -275,12 +275,12 @@ command line, for example:
|
||||
.IP "incorrect:" 4
|
||||
.IX Item "incorrect:"
|
||||
.Vb 1
|
||||
-\& nc file.c -line 25
|
||||
+\& ncl file.c -line 25
|
||||
.Ve
|
||||
.IP "correct:" 4
|
||||
.IX Item "correct:"
|
||||
.Vb 1
|
||||
-\& nc -line 25 file.c
|
||||
+\& ncl -line 25 file.c
|
||||
.Ve
|
||||
.PP
|
||||
For more information see NEdit's online help, or \fInedit.doc\fR in the NEdit
|
||||
119
editors/nedit/patches/patch-doc_nc_pod
Normal file
119
editors/nedit/patches/patch-doc_nc_pod
Normal file
|
|
@ -0,0 +1,119 @@
|
|||
$OpenBSD: patch-doc_nc_pod,v 1.1 2019/02/28 23:00:47 sthen Exp $
|
||||
|
||||
Index: doc/nc.pod
|
||||
--- doc/nc.pod.orig
|
||||
+++ doc/nc.pod
|
||||
@@ -3,27 +3,27 @@
|
||||
|
||||
=head1 NAME
|
||||
|
||||
-nc - Client program for NEdit text editor
|
||||
+ncl - Client program for NEdit text editor
|
||||
|
||||
=head1 SYNOPSYS
|
||||
|
||||
-nc [B<-read>] [B<-create>] [B<-line> I<n> | B<+>I<n>] [B<-do> I<command>]
|
||||
- [B<-ask>] [B<-noask>] [B<-svrname> I<name>] [B<-svrcmd> I<command>]
|
||||
- [B<-lm> I<languagemode>]
|
||||
- [B<-geometry> I<geometry> | B<-g> I<geometry>] [B<-icon> | B<-iconic>]
|
||||
- [B<-display> I<[host]:server[.screen]>]
|
||||
- [B<-timeout> I<seconds>] [B<-wait>] [B<-xrm> I<resourcestring>]
|
||||
- [B<-tabbed>] [B<-untabbed>] [B<-group>]
|
||||
- [B<-V> | B<-version>] [B<-h> | B<-help>] [B<-->] [file...]
|
||||
+ncl [B<-read>] [B<-create>] [B<-line> I<n> | B<+>I<n>] [B<-do> I<command>]
|
||||
+ [B<-ask>] [B<-noask>] [B<-svrname> I<name>] [B<-svrcmd> I<command>]
|
||||
+ [B<-lm> I<languagemode>]
|
||||
+ [B<-geometry> I<geometry> | B<-g> I<geometry>] [B<-icon> | B<-iconic>]
|
||||
+ [B<-display> I<[host]:server[.screen]>]
|
||||
+ [B<-timeout> I<seconds>] [B<-wait>] [B<-xrm> I<resourcestring>]
|
||||
+ [B<-tabbed>] [B<-untabbed>] [B<-group>]
|
||||
+ [B<-V> | B<-version>] [B<-h> | B<-help>] [B<-->] [file...]
|
||||
|
||||
=head1 DESCRIPTION
|
||||
|
||||
-B<nc> is the client interface to the NEdit text editor. A server can be started
|
||||
+B<ncl> is the client interface to the NEdit text editor. A server can be started
|
||||
explicitly by running NEdit in server mode:
|
||||
|
||||
nedit -server
|
||||
|
||||
-If no server is running, B<nc> will start one unless configured otherwise.
|
||||
+If no server is running, B<ncl> will start one unless configured otherwise.
|
||||
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<n>.
|
||||
Execute an NEdit macro or action on the file following the -do argument on the
|
||||
command line.
|
||||
|
||||
-If you use this command without a filename, B<nc> would randomly choose one
|
||||
+If you use this command without a filename, B<ncl> would randomly choose one
|
||||
window to focus and execute the macro in.
|
||||
|
||||
=item B<-ask>, B<-noask>
|
||||
|
||||
-Instructs B<nc> whether to automatically start a server if one is not
|
||||
+Instructs B<ncl> whether to automatically start a server if one is not
|
||||
available. This overrides the X resource `nc.autoStart'.
|
||||
|
||||
|
||||
=item B<-svrname> I<name>
|
||||
|
||||
-Explicitly instructs B<nc> which server to connect to, an instance of
|
||||
+Explicitly instructs B<ncl> which server to connect to, an instance of
|
||||
L<nedit(1)> with a corresponding B<-svrname> argument. By naming servers, you
|
||||
can run several simultaneously, and direct files and commands specifically to
|
||||
any one.
|
||||
|
||||
=item B<-svrcmd> I<command>
|
||||
|
||||
-The command which B<nc> uses to start an NEdit server. It is also settable via
|
||||
+The command which B<ncl> uses to start an NEdit server. It is also settable via
|
||||
the X resource `nc.serverCommand', by default, I<"nedit -server">.
|
||||
|
||||
=item B<-lm> I<languagemode>
|
||||
@@ -107,11 +107,11 @@ increase the time-out period. In most cases, the defau
|
||||
|
||||
=item B<-wait>
|
||||
|
||||
-Instructs B<nc> not to return to the shell until all files given
|
||||
+Instructs B<ncl> not to return to the shell until all files given
|
||||
are closed.
|
||||
|
||||
-Normally, B<nc> returns once the files given in its command line
|
||||
-are opened by the server. When this option is given, nc returns
|
||||
+Normally, B<ncl> 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:
|
||||
|
||||
=head1 NOTES
|
||||
|
||||
-Communication between L<nc(1)> and L<nedit(1)> is through the X display. So as
|
||||
-long as X windows is set up and working properly, B<nc> will work properly
|
||||
-as well. B<nc> uses the `DISPLAY' environment variable, the machine name and
|
||||
+Communication between L<ncl(1)> and L<nedit(1)> is through the X display. So as
|
||||
+long as X windows is set up and working properly, B<ncl> will work properly
|
||||
+as well. B<ncl> uses the `DISPLAY' environment variable, the machine name and
|
||||
your user name to find the appropriate server, meaning, if you have several
|
||||
-machines sharing a common file system, B<nc> will not be able to find a server
|
||||
+machines sharing a common file system, B<ncl> will not be able to find a server
|
||||
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:
|
||||
|
||||
=item incorrect:
|
||||
|
||||
- nc file.c -line 25
|
||||
+ ncl file.c -line 25
|
||||
|
||||
=item correct:
|
||||
|
||||
- nc -line 25 file.c
|
||||
+ ncl -line 25 file.c
|
||||
|
||||
=back
|
||||
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
$OpenBSD: patch-doc_nedit_doc,v 1.4 2004/10/17 21:23:50 djm Exp $
|
||||
--- doc/nedit.doc.orig Fri Oct 1 07:03:56 2004
|
||||
+++ doc/nedit.doc Sat Oct 16 17:42:51 2004
|
||||
@@ -4,6 +4,10 @@
|
||||
|
||||
NEdit 5.5 September 30, 2004
|
||||
|
||||
+ NOTE: Due to conflict with the program nc - Arbitrary tcp and udp
|
||||
+ connections and listens - the NEdit Client program, called nc in this
|
||||
+ document, has been installed as ncl.
|
||||
+
|
||||
NEdit is a standard GUI (Graphical User Interface) style text editor for
|
||||
programs and plain-text files. Users of Macintosh and MS Windows based text
|
||||
editors should find NEdit a familiar and comfortable environment. NEdit
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
$OpenBSD: patch-doc_nedit_man,v 1.5 2007/06/26 19:54:53 jasper Exp $
|
||||
--- doc/nedit.man.orig Thu Sep 30 23:03:59 2004
|
||||
+++ doc/nedit.man Fri Jun 22 17:30:03 2007
|
||||
@@ -168,14 +168,14 @@ Go to line number \fIn\fR.
|
||||
.IP "\fB\-server\fR" 4
|
||||
.IX Item "-server"
|
||||
Designate this session as an NEdit server, for processing commands from the
|
||||
-\&\fInc\fR\|(1) program. \fInc\fR\|(1) can be used to interface NEdit to code development
|
||||
+\&\fIncl\fR\|(1) program. \fIncl\fR\|(1) can be used to interface NEdit to code development
|
||||
environments, mailers, etc., or just as a quick way to open files from the
|
||||
shell command line without starting a new NEdit session.
|
||||
.IP "\fB\-do\fR \fIcommand\fR" 4
|
||||
.IX Item "-do command"
|
||||
Execute an NEdit macro or action on the file following the \-do argument on the
|
||||
-command line. \fB\-do\fR is particularly useful from the \fInc\fR\|(1) program, where
|
||||
-`nc \-do' can remotely execute commands in an nedit \fB\-server\fR session.
|
||||
+command line. \fB\-do\fR is particularly useful from the \fIncl\fR\|(1) program, where
|
||||
+`ncl \-do' can remotely execute commands in an nedit \fB\-server\fR session.
|
||||
.IP "\fB\-tags\fR \fIfile\fR" 4
|
||||
.IX Item "-tags file"
|
||||
Load a file of directions for finding definitions of program subroutines and
|
||||
@@ -249,7 +249,7 @@ Set the value of an X resource to override a default v
|
||||
.IP "\fB\-svrname\fR \fIname\fR" 4
|
||||
.IX Item "-svrname name"
|
||||
When starting nedit in server mode, name the server, such that it responds to
|
||||
-requests only when \fInc\fR\|(1) is given a corresponding \fB\-svrname\fR argument. By
|
||||
+requests only when \fIncl\fR\|(1) is given a corresponding \fB\-svrname\fR argument. By
|
||||
naming servers, you can run several simultaneously, and direct files and
|
||||
commands specifically to any one. Specifying a non-empty name automatically
|
||||
designates this session as an NEdit server, as though \fB\-server\fR were specified.
|
||||
@@ -344,7 +344,7 @@ NEdit sources, executables, additional documentation,
|
||||
are available from the NEdit web site at http://nedit.org.
|
||||
.SH "SEE ALSO"
|
||||
.IX Header "SEE ALSO"
|
||||
-\&\fInc\fR\|(1), X(1), \fImwm\fR\|(1), \fIctags\fR\|(1), \fIetags\fR\|(1)
|
||||
+\&\fIncl\fR\|(1), X(1), \fImwm\fR\|(1), \fIctags\fR\|(1), \fIetags\fR\|(1)
|
||||
.SH "AUTHORS"
|
||||
.IX Header "AUTHORS"
|
||||
NEdit was written by Mark Edel, Joy Kyriakopulos, Christopher Conrad, Jim
|
||||
44
editors/nedit/patches/patch-doc_nedit_pod
Normal file
44
editors/nedit/patches/patch-doc_nedit_pod
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
$OpenBSD: patch-doc_nedit_pod,v 1.1 2019/02/28 23:00:47 sthen Exp $
|
||||
|
||||
Index: doc/nedit.pod
|
||||
--- doc/nedit.pod.orig
|
||||
+++ doc/nedit.pod
|
||||
@@ -48,15 +48,15 @@ Go to line number I<n>.
|
||||
=item B<-server>
|
||||
|
||||
Designate this session as an NEdit server, for processing commands from the
|
||||
-L<nc(1)> program. L<nc(1)> can be used to interface NEdit to code development
|
||||
+L<ncl(1)> program. L<ncl(1)> can be used to interface NEdit to code development
|
||||
environments, mailers, etc., or just as a quick way to open files from the
|
||||
shell command line without starting a new NEdit session.
|
||||
|
||||
=item B<-do> I<command>
|
||||
|
||||
Execute an NEdit macro or action on the file following the -do argument on the
|
||||
-command line. B<-do> is particularly useful from the L<nc(1)> program, where
|
||||
-`nc -do' can remotely execute commands in an nedit B<-server> session.
|
||||
+command line. B<-do> is particularly useful from the L<ncl(1)> program, where
|
||||
+`ncl -do' can remotely execute commands in an nedit B<-server> session.
|
||||
|
||||
=item B<-tags> I<file>
|
||||
|
||||
@@ -145,7 +145,7 @@ Set the value of an X resource to override a default v
|
||||
=item B<-svrname> I<name>
|
||||
|
||||
When starting nedit in server mode, name the server, such that it responds to
|
||||
-requests only when L<nc(1)> is given a corresponding B<-svrname> argument. By
|
||||
+requests only when L<ncl(1)> is given a corresponding B<-svrname> argument. By
|
||||
naming servers, you can run several simultaneously, and direct files and
|
||||
commands specifically to any one. Specifying a non-empty name automatically
|
||||
designates this session as an NEdit server, as though B<-server> were specified.
|
||||
@@ -263,6 +263,10 @@ distribution kit.
|
||||
|
||||
NEdit sources, executables, additional documentation, and contributed software
|
||||
are available from the NEdit web site at http://nedit.org.
|
||||
+
|
||||
+In the original distribution, the client program is named "nc".
|
||||
+It has been renamed in this package to avoid a conflict with nc(1).
|
||||
+
|
||||
|
||||
=head1 SEE ALSO
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
$OpenBSD: patch-makefiles_Makefile_openbsd,v 1.9 2010/04/24 20:18:39 naddy Exp $
|
||||
--- makefiles/Makefile.openbsd.orig Sat Nov 22 06:03:39 2003
|
||||
+++ makefiles/Makefile.openbsd Sat Oct 27 07:31:57 2007
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: patch-makefiles_Makefile_openbsd,v 1.9 2010/04/24 20:18:39 naddy Exp $
|
||||
$OpenBSD: patch-makefiles_Makefile_openbsd,v 1.10 2019/02/28 23:00:47 sthen Exp $
|
||||
Index: makefiles/Makefile.openbsd
|
||||
--- makefiles/Makefile.openbsd.orig
|
||||
+++ makefiles/Makefile.openbsd
|
||||
@@ -2,5 +2,5 @@
|
||||
-CC=cc
|
||||
-AR=ar
|
||||
+CC?=cc
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
$OpenBSD: patch-source_file_c,v 1.6 2007/06/26 19:54:53 jasper Exp $
|
||||
--- source/file.c.orig Tue Aug 24 11:37:24 2004
|
||||
+++ source/file.c Fri Jun 22 17:30:03 2007
|
||||
@@ -1314,7 +1314,12 @@ void PrintWindow(WindowInfo *window, int selectedOnly)
|
||||
$OpenBSD: patch-source_file_c,v 1.7 2019/02/28 23:00:47 sthen Exp $
|
||||
Index: source/file.c
|
||||
--- source/file.c.orig
|
||||
+++ source/file.c
|
||||
@@ -1376,7 +1376,12 @@ void PrintWindow(WindowInfo *window, int selectedOnly)
|
||||
*/
|
||||
void PrintString(const char *string, int length, Widget parent, const char *jobName)
|
||||
{
|
||||
|
|
@ -14,7 +15,7 @@ $OpenBSD: patch-source_file_c,v 1.6 2007/06/26 19:54:53 jasper Exp $
|
|||
FILE *fp;
|
||||
int fd;
|
||||
|
||||
@@ -1325,6 +1330,10 @@ void PrintString(const char *string, int length, Widge
|
||||
@@ -1387,6 +1392,10 @@ void PrintString(const char *string, int length, Widge
|
||||
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 +26,7 @@ $OpenBSD: patch-source_file_c,v 1.6 2007/06/26 19:54:53 jasper Exp $
|
|||
tmpnam(tmpFileName);
|
||||
|
||||
/* open the temporary file */
|
||||
@@ -1333,6 +1342,7 @@ void PrintString(const char *string, int length, Widge
|
||||
@@ -1395,6 +1404,7 @@ void PrintString(const char *string, int length, Widge
|
||||
#else
|
||||
if ((fd = open(tmpFileName, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR | S_IWUSR)) < 0 || (fp = fdopen(fd, "w")) == NULL)
|
||||
#endif /* VMS */
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
$OpenBSD: patch-source_highlightData_c,v 1.1 2007/06/26 19:54:53 jasper Exp $
|
||||
--- source/highlightData.c.orig Sun Aug 1 12:06:10 2004
|
||||
+++ source/highlightData.c Fri Jun 22 17:37:08 2007
|
||||
@@ -265,7 +265,7 @@ static char *DefaultPatternSets[] = {
|
||||
preprocessor keywords:\"<__(?:LINE|FILE|DATE|TIME|STDC)__>\":::Preprocessor::\n\
|
||||
$OpenBSD: patch-source_highlightData_c,v 1.2 2019/02/28 23:00:47 sthen Exp $
|
||||
Index: source/highlightData.c
|
||||
--- source/highlightData.c.orig
|
||||
+++ source/highlightData.c
|
||||
@@ -266,7 +266,7 @@ static char *DefaultPatternSets[] = {
|
||||
preprocessor keywords c++11:\"<__func__|__STDC_HOSTED__|_Pragma>\":::Preprocessor::\n\
|
||||
character constant:\"L?'\":\"'\":\"[^\\\\][^']\":Character Const::\n\
|
||||
numeric constant:\"(?<!\\Y)(?:(?:0(?:x|X)[0-9a-fA-F]*)|(?:(?:[0-9]+\\.?[0-9]*)|(?:\\.[0-9]+))(?:(?:e|E)(?:\\+|-)?[0-9]+)?)(?:L|l|UL|ul|u|U|F|f)?(?!\\Y)\":::Numeric Const::D\n\
|
||||
- storage keyword:\"<(?:class|typename|typeid|template|friend|virtual|inline|explicit|operator|public|private|protected|const|extern|auto|register|static|mutable|unsigned|signed|volatile|char|double|float|int|long|short|bool|wchar_t|void|typedef|struct|union|enum|asm|export)>\":::Storage Type::D\n\
|
||||
+ storage keyword:\"<(?:class|typename|typeid|template|friend|virtual|inline|explicit|operator|public|private|protected|const|extern|auto|register|static|mutable|unsigned|signed|volatile|char|double|float|int|long|short|bool|wchar_t|void|u_char|u_short|u_int|u_long|u_int8_t|u_int16_t|u_int32_t|u_int64_t|int8_t|int16_t|int32_t|int64_t|typedef|struct|union|enum|asm|export)>\":::Storage Type::D\n\
|
||||
storage keyword c++11:\"<(?:override|final|decltype|constexpr|noexcept)>\":::Storage Type::D\n\
|
||||
keyword:\"<(?:new|delete|this|return|goto|if|else|case|default|switch|break|continue|while|do|for|try|catch|throw|sizeof|true|false|namespace|using|dynamic_cast|static_cast|reinterpret_cast|const_cast)>\":::Keyword::D\n\
|
||||
braces:\"[{}]\":::Keyword::D}",
|
||||
"C:1:0 {\n\
|
||||
keyword c++11:\"<(?:nullptr|static_assert|alignof)>\":::Keyword::D\n\
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
$OpenBSD: patch-source_nc_c,v 1.1 2007/08/29 10:06:52 mbalmer Exp $
|
||||
--- source/nc.c.orig Mon Aug 27 12:02:09 2007
|
||||
+++ source/nc.c Mon Aug 27 12:02:31 2007
|
||||
@@ -113,15 +113,15 @@ static const char cmdLineHelp[] =
|
||||
$OpenBSD: patch-source_nc_c,v 1.2 2019/02/28 23:00:47 sthen Exp $
|
||||
Index: source/nc.c
|
||||
--- source/nc.c.orig
|
||||
+++ source/nc.c
|
||||
@@ -112,15 +112,15 @@ static const char cmdLineHelp[] =
|
||||
#ifdef VMS
|
||||
"";
|
||||
"[Sorry, no on-line help available.]\n"; /* Why is that ? */
|
||||
#else
|
||||
-"Usage: nc [-read] [-create]\n"
|
||||
-" [-line n | +n] [-do command] [-lm languagemode]\n"
|
||||
|
|
@ -11,7 +12,7 @@ $OpenBSD: patch-source_nc_c,v 1.1 2007/08/29 10:06:52 mbalmer Exp $
|
|||
-" [-ask] [-noask] [-timeout seconds]\n"
|
||||
-" [-geometry geometry | -g geometry] [-icon | -iconic]\n"
|
||||
-" [-tabbed] [-untabbed] [-group] [-wait]\n"
|
||||
-" [-V | -version]\n"
|
||||
-" [-V | -version] [-h|-help]\n"
|
||||
-" [-xrm resourcestring] [-display [host]:server[.screen]]\n"
|
||||
-" [--] [file...]\n";
|
||||
+"Usage: ncl [-read] [-create]\n"
|
||||
|
|
@ -20,7 +21,7 @@ $OpenBSD: patch-source_nc_c,v 1.1 2007/08/29 10:06:52 mbalmer Exp $
|
|||
+" [-ask] [-noask] [-timeout seconds]\n"
|
||||
+" [-geometry geometry | -g geometry] [-icon | -iconic]\n"
|
||||
+" [-tabbed] [-untabbed] [-group] [-wait]\n"
|
||||
+" [-V | -version]\n"
|
||||
+" [-V | -version] [-h|-help]\n"
|
||||
+" [-xrm resourcestring] [-display [host]:server[.screen]]\n"
|
||||
+" [--] [file...]\n";
|
||||
#endif /*VMS*/
|
||||
|
|
|
|||
|
|
@ -1,15 +1,25 @@
|
|||
$OpenBSD: patch-source_preferences_c,v 1.3 2010/12/20 12:02:12 jasper Exp $
|
||||
$OpenBSD: patch-source_preferences_c,v 1.4 2019/02/28 23:00:47 sthen Exp $
|
||||
|
||||
Add .pp to the list of extensions for Pascal source files.
|
||||
|
||||
--- source/preferences.c.orig Mon Dec 20 01:41:55 2010
|
||||
+++ source/preferences.c Mon Dec 20 01:42:05 2010
|
||||
@@ -695,7 +695,7 @@ static PrefDescripRec PrefDescrip[] = {
|
||||
Index: source/preferences.c
|
||||
--- source/preferences.c.orig
|
||||
+++ source/preferences.c
|
||||
@@ -759,7 +759,7 @@ static PrefDescripRec PrefDescrip[] = {
|
||||
Makefile:MAKEFILE:::None:8:8::\n\
|
||||
Matlab:.M .OCT .SCI:::::::\n\
|
||||
NEdit Macro:.NM .NEDITMACRO:::::::\n\
|
||||
- Pascal:.PAS .P .INT:::::::\n\
|
||||
+ Pascal:.PAS .P .PP .INT:::::::\n\
|
||||
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[] = {
|
||||
Makefile:Makefile makefile .gmk:::None:8:8::\n\
|
||||
Matlab:.m .oct .sci:::::::\n\
|
||||
NEdit Macro:.nm .neditmacro:::::::\n\
|
||||
- Pascal:.pas .p .int:::::::\n\
|
||||
+ Pascal:.pas .p pp .int:::::::\n\
|
||||
+ Pascal:.pas .p .pp .int:::::::\n\
|
||||
Perl:.pl .pm .p5 .PL:\"^[ \\t]*#[ \\t]*!.*perl\":Auto:None:::\".,/\\\\`'!$@#%^&*()-=+{}[]\"\":;<>?~|\":\n\
|
||||
PostScript:.ps .eps .epsf .epsi:\"^%!\":::::\"/%(){}[]<>\":\n\
|
||||
Python:.py:\"^#!.*python\":Auto:None:::\"!\"\"#$%&'()*+,-./:;<=>?@[\\\\]^`{|}~\":\n\
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
$OpenBSD: patch-source_regularExp_c,v 1.1 2011/04/08 06:21:46 jasper Exp $
|
||||
|
||||
Fix an off-by-one error, which could lead to a crash.
|
||||
From upstream CVS: https://sourceforge.net/tracker/index.php?func=detail&aid=2858723&group_id=11005&atid=111005
|
||||
|
||||
--- source/regularExp.c.orig Thu Apr 7 22:28:54 2011
|
||||
+++ source/regularExp.c Thu Apr 7 22:29:14 2011
|
||||
@@ -2645,7 +2645,7 @@ static struct brace_counts *Brace;
|
||||
|
||||
/* Default table for determining whether a character is a word delimiter. */
|
||||
|
||||
-static unsigned char Default_Delimiters [UCHAR_MAX] = {0};
|
||||
+static unsigned char Default_Delimiters [UCHAR_MAX+1] = {0};
|
||||
|
||||
static unsigned char *Current_Delimiters; /* Current delimiter table */
|
||||
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
$OpenBSD: patch-util_check_lin_tif_c,v 1.1 2007/02/19 14:42:15 ajacoutot Exp $
|
||||
--- util/check_lin_tif.c.orig Mon Feb 19 12:20:03 2007
|
||||
+++ util/check_lin_tif.c Mon Feb 19 12:20:44 2007
|
||||
@@ -158,7 +158,6 @@ void finish(int exitcode, char *tif) {
|
||||
good_versions();
|
||||
if (exitcode == 1) {
|
||||
#ifdef BUILD_BROKEN_NEDIT
|
||||
- char buf[2];
|
||||
fprintf(stderr,
|
||||
"\n========================== WARNING ===========================\n"
|
||||
"You have chosen to build NEdit with a known-bad version of %s,\n"
|
||||
@@ -167,7 +166,6 @@ void finish(int exitcode, char *tif) {
|
||||
"reproduce them with a known-good NEdit binary downloaded from:\n"
|
||||
"\thttp://www.nedit.org\n"
|
||||
"\nHIT ENTER TO CONTINUE\n", tif);
|
||||
- fgets(buf, 2, stdin);
|
||||
exit(0);
|
||||
#else
|
||||
fprintf(stderr,
|
||||
@@ -179,14 +177,12 @@ void finish(int exitcode, char *tif) {
|
||||
#endif
|
||||
} else if (exitcode == 2) {
|
||||
#ifdef BUILD_UNTESTED_NEDIT
|
||||
- char buf[2];
|
||||
fprintf(stderr,
|
||||
"\n========================== WARNING ===========================\n"
|
||||
"You have chosen to build NEdit with an untested version of %s.\n"
|
||||
"Please report your success or failure with this version to:\n"
|
||||
"\tdevelop@nedit.org\n"
|
||||
"\nHIT ENTER TO CONTINUE\n", tif);
|
||||
- fgets(buf, 2, stdin);
|
||||
exit(0);
|
||||
#else
|
||||
fprintf(stderr,
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
$OpenBSD: patch-util_misc_c,v 1.1 2008/01/02 17:39:13 jasper Exp $
|
||||
--- util/misc.c.orig Mon Aug 9 23:19:38 2004
|
||||
+++ util/misc.c Sat Dec 29 14:39:46 2007
|
||||
@@ -475,6 +475,15 @@ Boolean FindBestVisual(Display *display, const char *a
|
||||
bestClass = 0;
|
||||
bestVisual = 0;
|
||||
for (i=0; i < nVis; i++) {
|
||||
+ if (visList[i].depth >= 32 &&
|
||||
+ strstr(ServerVendor(display), "X.Org") != 0) {
|
||||
+ /* Xorg 6.8.* 32-bit visuals (with alpha-channel) cause a lot
|
||||
+ of problems, so we have to skip them.
|
||||
+ Users can achieve the same effect with older versions of
|
||||
+ NEdit by setting the environment variable
|
||||
+ XLIB_SKIP_ARGB_VISUALS. */
|
||||
+ continue;
|
||||
+ }
|
||||
if (visList[i].depth > maxDepth) {
|
||||
maxDepth = visList[i].depth;
|
||||
bestClass = 0;
|
||||
|
|
@ -1,8 +1,4 @@
|
|||
NEdit is a GUI (Graphical User Interface) style text editor for
|
||||
programs and plain-text files. Users of Macintosh and MS Windows
|
||||
based text editors will find NEdit a familiar and comfortable
|
||||
environment. NEdit provides all of the standard menu, dialog,
|
||||
editing, and mouse support, as well as all of the standard shortcuts
|
||||
to which the users of modern GUI based environments are accustomed.
|
||||
For users of older style Unix editors, welcome to the world of
|
||||
mouse-based editing!
|
||||
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.
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
$OpenBSD: README,v 1.2 2018/09/04 12:46:11 espie Exp $
|
||||
$OpenBSD: README,v 1.3 2019/02/28 23:00:47 sthen Exp $
|
||||
|
||||
+-----------------------------------------------------------------------
|
||||
| Running ${PKGSTEM} on OpenBSD
|
||||
+-----------------------------------------------------------------------
|
||||
|
||||
Due to a conflict with nc(1), the NEdit Client program, originally
|
||||
called nc, has been installed as ncl.
|
||||
|
||||
Additional patterns for NEdit have been installed under:
|
||||
${TRUEPREFIX}/share/nedit/patterns/
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user