cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to 5.2

Browse Source
This commit is contained in:
form 2001-10-31 08:03:18 +00:00
parent c3789f934a
commit fcfd2a2abe
10 changed files with 194 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
editors/nedit/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.18 2001/04/18 15:01:09 espie Exp $
# $OpenBSD: Makefile,v 1.19 2001/10/31 08:03:18 form Exp $
# $FreeBSD: Makefile,v 1.10 1998/03/28 14:36:34 steve Exp $
COMMENT= "X11/Motif GUI text editor"
DISTNAME= nedit-5.1.1
DISTNAME= nedit-5.2
CATEGORIES= editors x11
NEED_VERSION= 1.400
MAINTAINER= Oleg Safiullin <form@openbsd.org>
@ -16,12 +15,10 @@ PERMIT_DISTFILES_FTP= Yes
HOMEPAGE= http://www.nedit.org/
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} nedit-5.1.app-defaults:0
EXTRACT_ONLY= ${DISTNAME}-src${EXTRACT_SUFX}
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX}
DIST_SUBDIR= nedit
MASTER_SITES= ftp://ftp.nedit.org/pub/v5_1_1/
MASTER_SITES0= ftp://ftp.nedit.org/pub/contrib/misc/
MASTER_SITES= http://nedit.org/ftp/v5_2/
USE_MOTIF= any
@ -32,12 +29,12 @@ post-extract:
@cp ${FILESDIR}/Makefile.openbsd ${WRKSRC}/makefiles
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/source/nedit ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/source/nc ${PREFIX}/bin/ncl
${INSTALL_MAN} ${WRKSRC}/nedit.man ${PREFIX}/man/man1/nedit.1
${INSTALL_MAN} ${WRKSRC}/nc.man ${PREFIX}/man/man1/ncl.1
${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
${INSTALL_MAN} ${WRKSRC}/doc/nc.man ${PREFIX}/man/man1/ncl.1
${INSTALL_DATA} ${WRKSRC}/NEdit.ad ${PREFIX}/lib/X11/app-defaults/NEdit
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nedit
${INSTALL_DATA} ${WRKSRC}/nedit.doc ${PREFIX}/share/doc/nedit
${INSTALL_DATA} ${WRKSRC}/doc/nedit.doc ${PREFIX}/share/doc/nedit
.include <bsd.port.mk>

9
editors/nedit/files/md5
View File

@ -1,6 +1,3 @@
MD5 (nedit/nedit-5.1.1-src.tar.gz) = dba0970c60debada237ca852b5f57ec8
MD5 (nedit/nedit-5.1.app-defaults) = 36c5e660039e0bd4b4d05df609b505bb
RMD160 (nedit/nedit-5.1.1-src.tar.gz) = 1cf7ca8ee506ce85ea32f63bf7419e8de683cabc
RMD160 (nedit/nedit-5.1.app-defaults) = 1e0a258aae4e1147ab700851830915076623a833
SHA1 (nedit/nedit-5.1.1-src.tar.gz) = 29332e39f0d5b3beb62323ea54218571c3b75960
SHA1 (nedit/nedit-5.1.app-defaults) = 3c96ef6d7eed60f6823f4ea6ebc48dfc380a892f
MD5 (nedit/nedit-5.2-src.tar.gz) = c5aa936eccfc1d1c0f39d339f0d88d76
RMD160 (nedit/nedit-5.2-src.tar.gz) = 7dd6376a01fdd2f606a17c825e4094fb99594175
SHA1 (nedit/nedit-5.2-src.tar.gz) = 00327cb34f02318eb786d44051478dc367f65563

35
editors/nedit/patches/patch-NEdit_ad Normal file
View File

@ -0,0 +1,35 @@
$OpenBSD: patch-NEdit_ad,v 1.1 2001/10/31 08:03:19 form Exp $
--- NEdit.ad.orig Wed Oct 31 13:49:05 2001
+++ NEdit.ad Wed Oct 31 13:49:12 2001
@@ -11,16 +11,16 @@
*pane.sashHeight: 11
*pane.sashWidth: 11
*text.selectionArrayCount: 3
-*fontList:-adobe-helvetica-medium-r-normal-*-12-*-*-*-*-*-*
-*XmList.fontList:-adobe-courier-medium-r-normal-*-12-*-*-*-*-*-*
-*XmText.fontList:-adobe-courier-medium-r-normal-*-12-*-*-*-*-*-*
+*fontList:-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*
+*XmList.fontList:-*-courier-medium-r-normal-*-12-*-*-*-*-*-*
+*XmText.fontList:-*-courier-medium-r-normal-*-12-*-*-*-*-*-*
/* This should not be necessary, but some default in lesstif is
overriding the resource above, and specifying the app-name fixes it */
-nedit*XmText.fontList:-adobe-courier-medium-r-normal-*-12-*-*-*-*-*-*
+nedit*XmText.fontList:-*-courier-medium-r-normal-*-12-*-*-*-*-*-*
/* Same with this, both Solaris Motif and Lesstif seem to have some
very specific defaults for file selection box fonts */
-nedit*FileSelect*XmList.fontList:-adobe-courier-medium-r-normal-*-12-*-*-*-*-*-*
-*XmTextField.fontList:-adobe-courier-medium-r-normal-*-12-*-*-*-*-*-*
+nedit*FileSelect*XmList.fontList:-*-courier-medium-r-normal-*-12-*-*-*-*-*-*
+*XmTextField.fontList:-*-courier-medium-r-normal-*-12-*-*-*-*-*-*
*background: #b3b3b3
*foreground: black
*text.lineNumForeground: #777777
@@ -33,7 +33,7 @@ nedit*FileSelect*XmList.fontList:-adobe-
*helpText.background: #cccccc
*helpText.foreground: black
*helpText.selectBackground: #b3b3b3
-*helpText.font: -adobe-courier-medium-r-normal-*-12-*-*-*-*-*-*
+*helpText.font: -*-courier-medium-r-normal-*-12-*-*-*-*-*-*
*XmText.translations: #override \
Ctrl~Alt~Meta<KeyPress>v: paste-clipboard()\n\
Ctrl~Alt~Meta<KeyPress>c: copy-clipboard()\n\

88
editors/nedit/patches/patch-doc_nc_man Normal file
View File

@ -0,0 +1,88 @@
$OpenBSD: patch-doc_nc_man,v 1.1 2001/10/31 08:03:19 form Exp $
--- doc/nc.man.orig Wed Oct 31 13:27:55 2001
+++ doc/nc.man Wed Oct 31 13:29:09 2001
@@ -137,26 +137,26 @@
.rm #[ #] #H #V #F C
.\" ======================================================================
.\"
-.IX Title "NC 1"
-.TH NC 1 " " "2001-08-12" " "
+.IX Title "NCL 1"
+.TH NCL 1 " " "2001-08-12" " "
.UC
.SH "NAME"
-nc \- Client program for NEdit text editor
+ncl \- Client program for NEdit text editor
.SH "SYNOPSYS"
.IX Header "SYNOPSYS"
-\&\fBnc\fR [\fB\-read\fR] [\fB\-create\fR] [\fB\-line\fR \fIn\fR | \fB+\fR\fIn\fR] [\fB\-do\fR \fIcommand\fR]
+\&\fBncl\fR [\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\-iconic\fR] [\fB\-display\fR
\&\fI[host]:server[.screen]\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
-If no server is running, \fBnc\fR will start one unless configured otherwize.
+If no server is running, \fBncl\fR will start one unless configured otherwize.
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.
@@ -177,17 +177,17 @@ Execute an NEdit macro or action. On eac
the command line.
.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 is also settable via the X resource, \f(CW\*(C`nc.autoStart\*(C'\fR.
.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
\&\fBnedit\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 \f(CW\*(C`nc.serverCommand\*(C'\fR, by default, \fI\*(L"nedit \-server\*(R"\fR.
.Ip "\fB\-lm\fR \fIlanguagemode\fR" 4
.IX Item "-lm languagemode"
@@ -226,11 +226,11 @@ for your display:
.Ve
.SH "NOTES"
.IX Header "NOTES"
-Communication between \fBnc\fR and \fBnedit\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 \f(CW\*(C`DISPLAY\*(C'\fR environment variable, the machine name and
+Communication between \fBncl\fR and \fBnedit\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 \f(CW\*(C`DISPLAY\*(C'\fR 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
@@ -239,12 +239,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

11
editors/nedit/patches/patch-nedit_doc → editors/nedit/patches/patch-doc_nedit_doc
View File

@ -1,8 +1,9 @@
$OpenBSD: patch-nedit_doc,v 1.1 2000/06/09 20:10:32 form Exp $
--- nedit.doc.orig Sat Jun 10 02:13:41 2000
+++ nedit.doc Sat Jun 10 02:13:51 2000
@@ -1,5 +1,9 @@
NEdit Version 5.1.1, March 17, 2000
$OpenBSD: patch-doc_nedit_doc,v 1.1 2001/10/31 08:03:19 form Exp $
--- doc/nedit.doc.orig Wed Oct 31 13:30:28 2001
+++ doc/nedit.doc Wed Oct 31 13:30:43 2001
@@ -2,6 +2,10 @@
$Id: patch-doc_nedit_doc,v 1.1 2001/10/31 08:03:19 form Exp $
+ NOTE: Due to conflict with the program nc - Arbitrary tcp and udp
+ connections and listens - the NEdit Client program, called nc in this

39
editors/nedit/patches/patch-doc_nedit_man Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-doc_nedit_man,v 1.1 2001/10/31 08:03:19 form Exp $
--- doc/nedit.man.orig Wed Oct 31 13:31:16 2001
+++ doc/nedit.man Wed Oct 31 13:32:03 2001
@@ -172,14 +172,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 each file following the \fB\-do\fR argument on
-the command line. \fB\-do\fR is particularly useful from the \fInc\fR\|(1) program, where
-\&\f(CW\*(C`nc \-do\*(C'\fR can remotely execute commands in an nedit \fB\-server\fR session.
+the command line. \fB\-do\fR is particularly useful from the \fIncl\fR\|(1) program, where
+\&\f(CW\*(C`ncl \-do\*(C'\fR 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
@@ -252,7 +252,7 @@ Set the value of an X resource to overri
.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.
.Ip "\fB\-import\fR \fIfile\fR" 4
@@ -300,7 +300,7 @@ NEdit sources, executables, additional d
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), \fIvi\fR\|(1), \fIemacs\fR\|(1), \fIctags\fR\|(1)
+\&\fIncl\fR\|(1), X(1), \fImwm\fR\|(1), \fIvi\fR\|(1), \fIemacs\fR\|(1), \fIctags\fR\|(1)
.SH "AUTHORS"
.IX Header "AUTHORS"
NEdit was written by Mark Edel, Joy Kyriakopulos, Christopher Conrad, Jim

20
editors/nedit/patches/patch-nc_man
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-nc_man,v 1.1 2000/06/09 20:10:32 form Exp $
--- nc.man.orig Sat Jun 10 02:19:09 2000
+++ nc.man Sat Jun 10 02:19:53 2000
@@ -1,12 +1,12 @@
-.TH NC 1
+.TH NCL 1
.SH NAME
-NC \- Client program for NEdit text editor
+NCL \- Client program for NEdit text editor
.SH SYNOPSYS
-.B nc [\-read] [\-create] [\-line n\ |\ +n] [\-do\ command]
+.B ncl [\-read] [\-create] [\-line n\ |\ +n] [\-do\ command]
[\-ask] [\-noask] [\-svrname\ name] [-svrcmd\ command]
[\-lm languagemode] [\-geometry\ geometry] [\-iconic] [file...]
.SH DESCRIPTION
-nc is the client interface to the NEdit text editor. To use nc,
+ncl is the client interface to the NEdit text editor. To use ncl,
first run NEdit in server mode:
.PP
.EX

9
editors/nedit/patches/patch-nedit_man
View File

@ -1,9 +0,0 @@
$OpenBSD: patch-nedit_man,v 1.1 2000/06/09 20:10:32 form Exp $
--- nedit.man.orig Sat Jun 10 02:20:09 2000
+++ nedit.man Sat Jun 10 02:20:39 2000
@@ -24,4 +24,4 @@ the Unix environment variable for your d
For more information see NEdit's on-line help, or nedit.doc in the
NEdit distribution kit.
.SH SEE ALSO
-nc, X, mwm, vi, emacs
+ncl, X, mwm, vi, emacs

24
editors/nedit/patches/patch-source_file_c
View File

@ -1,32 +1,36 @@
$OpenBSD: patch-source_file_c,v 1.1 2000/06/09 20:10:32 form Exp $
--- source/file.c.orig Sat Mar 18 03:13:47 2000
+++ source/file.c Sat Jun 10 02:55:25 2000
@@ -1006,9 +1006,20 @@ void PrintWindow(WindowInfo *window, int
$OpenBSD: patch-source_file_c,v 1.2 2001/10/31 08:03:19 form Exp $
--- source/file.c.orig Thu Sep 27 19:41:01 2001
+++ source/file.c Wed Oct 31 13:37:26 2001
@@ -1042,7 +1042,12 @@ void PrintWindow(WindowInfo *window, int
*/
void PrintString(char *string, int length, Widget parent, char *jobName)
void PrintString(const char *string, int length, Widget parent, const char *jobName)
{
+#ifdef HAVE_MKSTEMP
+ int fd;
+ static char template[] = "/var/tmp/nedit-XXXXXXXXXX";
+ char tmpFileName[sizeof(template)];
+#else
char tmpFileName[L_tmpnam]; /* L_tmpnam defined in stdio.h */
+#endif
FILE *fp;
int fd;
@@ -1053,6 +1058,10 @@ void PrintString(const char *string, int
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. */
+#ifdef HAVE_MKSTEMP
+ /* Generate a temporary file name */
+ strcpy(tmpFileName, template);
+ if ((fd = mkstemp(tmpFileName)) < 0 || (fp = fdopen(fd, "w")) == NULL) {
+#else
/* Generate a temporary file name */
tmpnam(tmpFileName);
@@ -1018,6 +1029,7 @@ void PrintString(char *string, int lengt
/* open the temporary file */
@@ -1061,6 +1070,8 @@ void PrintString(const char *string, int
#else
if ((fp = fopen(tmpFileName, "w")) == NULL) {
if ((fd = open(tmpFileName, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR | S_IWUSR)) < 0 || (fp = fdopen(fd, "w")) == NULL) {
#endif /* VMS */
+#endif /* HAVE_MKSTEMP */
+
DialogF(DF_WARN, parent, 1, "Unable to write file for printing:\n%s",
"Dismiss", errorString());
return;

11
editors/nedit/patches/patch-source_preferences_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-source_preferences_c,v 1.1 2001/02/12 10:47:23 espie Exp $
--- source/preferences.c.orig Mon Feb 12 11:26:38 2001
+++ source/preferences.c Mon Feb 12 11:26:46 2001
@@ -25,6 +25,7 @@
* *
*******************************************************************************/
#include <stdlib.h>
+#include <stdio.h>
#include <ctype.h>
#ifdef VMS
#include "../util/VMSparam.h"