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

- add some more keywords for C

Browse Source 
- remove djm@ as maintainer (per his request)
- regen patches while here

ok ajacoutot@ djm@
This commit is contained in:
jasper 2007-06-26 19:54:53 +00:00
parent 3c6793efd6
commit bbc653e7bb
6 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editors/nedit/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.34 2007/02/19 14:42:15 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.35 2007/06/26 19:54:53 jasper Exp $
# $FreeBSD: Makefile,v 1.10 1998/03/28 14:36:34 steve Exp $
COMMENT= "X11/Motif GUI text editor"
DISTNAME= nedit-5.5
PKGNAME= ${DISTNAME}p0
DISTFILES= ${DISTNAME}-src.tar.gz wrapmark.diff:0
CATEGORIES= editors x11
@ -16,8 +17,6 @@ MASTER_SITES0= http://www.obsd.fr/OpenBSD/distfiles/
HOMEPAGE= http://www.nedit.org/
MAINTAINER= Damien Miller <djm@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes

10
editors/nedit/patches/patch-doc_nc_man
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_nc_man,v 1.5 2004/11/04 08:07:11 djm Exp $
--- doc/nc.man.orig Fri Oct 1 07:03:59 2004
+++ doc/nc.man Sat Oct 16 17:45:26 2004
$OpenBSD: patch-doc_nc_man,v 1.6 2007/06/26 19:54:53 jasper Exp $
--- doc/nc.man.orig Thu Sep 30 23:03:59 2004
+++ doc/nc.man Fri Jun 22 17:30:03 2007
@@ -128,13 +128,13 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
@ -19,7 +19,7 @@ $OpenBSD: patch-doc_nc_man,v 1.5 2004/11/04 08:07:11 djm Exp $
[\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]
@@ -144,14 +144,14 @@ nc [\fB\-read\fR] [\fB\-create\fR] [\fB\
@@ -144,14 +144,14 @@ nc [\fB\-read\fR] [\fB\-create\fR] [\fB\-line\fR \fIn\
[\fB\-V\fR | \fB\-version\fR] [\fB\-\-\fR] [file...]
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
@ -62,7 +62,7 @@ $OpenBSD: patch-doc_nc_man,v 1.5 2004/11/04 08:07:11 djm Exp $
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 co
@@ -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"

10
editors/nedit/patches/patch-doc_nedit_man
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_nedit_man,v 1.4 2004/11/04 08:07:11 djm Exp $
--- doc/nedit.man.orig Fri Oct 1 07:03:59 2004
+++ doc/nedit.man Sat Oct 16 17:44:11 2004
$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"
@ -19,7 +19,7 @@ $OpenBSD: patch-doc_nedit_man,v 1.4 2004/11/04 08:07:11 djm Exp $
.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 overri
@@ -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
@ -28,7 +28,7 @@ $OpenBSD: patch-doc_nedit_man,v 1.4 2004/11/04 08:07:11 djm Exp $
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 d
@@ -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"

6
editors/nedit/patches/patch-makefiles_Makefile_openbsd
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-makefiles_Makefile_openbsd,v 1.5 2007/02/19 14:42:15 ajacoutot Exp $
$OpenBSD: patch-makefiles_Makefile_openbsd,v 1.6 2007/06/26 19:54:53 jasper Exp $
--- makefiles/Makefile.openbsd.orig Sat Nov 22 14:03:39 2003
+++ makefiles/Makefile.openbsd Mon Feb 19 12:21:13 2007
+++ makefiles/Makefile.openbsd Fri Jun 22 17:30:03 2007
@@ -1,6 +1,6 @@
# $Id: patch-makefiles_Makefile_openbsd,v 1.5 2007/02/19 14:42:15 ajacoutot Exp $
# $Id: patch-makefiles_Makefile_openbsd,v 1.6 2007/06/26 19:54:53 jasper Exp $
-CC=cc
-AR=ar
+CC?=cc

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

@ -1,7 +1,7 @@
$OpenBSD: patch-source_file_c,v 1.5 2004/10/17 21:23:50 djm Exp $
--- source/file.c.orig Tue Aug 24 19:37:24 2004
+++ source/file.c Sat Oct 16 17:42:51 2004
@@ -1314,7 +1314,12 @@ void PrintWindow(WindowInfo *window, int
$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)
*/
void PrintString(const char *string, int length, Widget parent, const char *jobName)
{
@ -14,7 +14,7 @@ $OpenBSD: patch-source_file_c,v 1.5 2004/10/17 21:23:50 djm Exp $
FILE *fp;
int fd;
@@ -1325,6 +1330,10 @@ void PrintString(const char *string, int
@@ -1325,6 +1330,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 +25,7 @@ $OpenBSD: patch-source_file_c,v 1.5 2004/10/17 21:23:50 djm Exp $
tmpnam(tmpFileName);
/* open the temporary file */
@@ -1333,6 +1342,7 @@ void PrintString(const char *string, int
@@ -1333,6 +1342,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 */

12
editors/nedit/patches/patch-source_highlightData_c Normal file
View File

@ -0,0 +1,12 @@
$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\
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\
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\