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

upgrade to 5.1.1

Browse Source
This commit is contained in:
form 2000-06-09 20:10:30 +00:00
parent d1c70f6fd1
commit dfe9e1c79d
18 changed files with 121 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
editors/nedit/Makefile
View File

@ -1,45 +1,44 @@
# $OpenBSD: Makefile,v 1.12 2000/03/24 23:28:07 espie Exp $
# $OpenBSD: Makefile,v 1.13 2000/06/09 20:10:30 form Exp $
# $FreeBSD: Makefile,v 1.10 1998/03/28 14:36:34 steve Exp $
DISTNAME= nedit-5.0.2
DISTNAME= nedit-5.1.1
CATEGORIES= editors x11
NEED_VERSION= 1.230
NEED_VERSION= 1.230
MAINTAINER= ports@openbsd.org
MAINTAINER= form@openbsd.org
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
HOMEPAGE= http://www.nedit.org/
MASTER_SITES= ftp://ftp.nedit.org/pub/v5_0_2/
MASTER_SITES0= ftp://ftp.nedit.org/pub/contrib/
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} nedit-5.1.app-defaults:0
EXTRACT_ONLY= ${DISTNAME}-src${EXTRACT_SUFX}
DIST_SUBDIR= nedit
DISTFILES= nedit_source.tar.gz nedit.app-defaults
EXTRACT_ONLY= nedit_source.tar.gz
WRKDIST= ${WRKDIR}
MASTER_SITES= ftp://ftp.nedit.org/pub/v5_1_1/
MASTER_SITES0= ftp://ftp.nedit.org/pub/contrib/misc/
LIB_DEPENDS= Xm.1.::x11/lesstif
USE_X11= Yes
ALL_TARGET= openbsd_nedit
FAKE= Yes
ALL_TARGET= openbsd
post-extract:
@cp ${DISTDIR}/nedit.app-defaults ${WRKSRC}/NEdit.ad
@cp ${DISTDIR}/${DIST_SUBDIR}/nedit-5.1.app-defaults ${WRKSRC}/NEdit.ad
@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_DATA_DIR} ${PREFIX}/lib/X11/app-defaults
@${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_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_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
.include <bsd.port.mk>

17
editors/nedit/files/Makefile.openbsd Normal file
View File

@ -0,0 +1,17 @@
# $OpenBSD: Makefile.openbsd,v 1.1 2000/06/09 20:10:31 form Exp $
CC?= cc
AR?= ar
LOCALBASE?=/usr/local
X11BASE?=/usr/X11R6
CFLAGS+=-I${LOCALBASE}/include -I${X11BASE}/include
CFLAGS+=-DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DHAVE_MKSTEMP
ARFLAGS=-ur
LIBS= -L${LOCALBASE}/lib -L${X11BASE}/lib
LIBS+= -lm -lXm -lXpm -lXext -lXt -lSM -lICE -lX11
include Makefile.common

12
editors/nedit/files/md5
View File

@ -1,6 +1,6 @@
MD5 (nedit.app-defaults) = 498caafc2c001e9bfed42b0b1811862c
MD5 (nedit_source.tar.gz) = f4eb558c83ecb542e07766e2775c1874
RMD160 (nedit.app-defaults) = 753bf2da307ed4f457dad59d3bb580ba343c540b
RMD160 (nedit_source.tar.gz) = f2d90916b788e1b75dfd30d2929845f8ba206d7c
SHA1 (nedit.app-defaults) = f64959c8987a00c4c178e9a904a6acd54fe46774
SHA1 (nedit_source.tar.gz) = 0d072ab6cd5da87b605a8b54bc58efbc4478301f
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

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

@ -1,20 +0,0 @@
--- Makefile.~1~ Thu Mar 19 13:20:29 1998
+++ Makefile Wed Jul 15 17:19:37 1998
@@ -2,7 +2,7 @@
# Makefile for NEdit text editor
#
# targets: sgi_nedit, hp_nedit, ultrix_nedit, ibm_nedit, sunos_nedit,
-# solaris_nedit, dec_nedit, linux_nedit
+# solaris_nedit, dec_nedit, linux_nedit, openbsd_nedit
#
# Builds an intermediate library in util directory, then builds
# the nedit executable in the source directory
@@ -42,3 +42,8 @@
linux_nedit:
(cd util; $(MAKE) -f Makefile.linux libNUtil.a)
(cd source; $(MAKE) -f Makefile.linux nedit nc)
+
+openbsd_nedit:
+ (cd util; $(MAKE) -f Makefile.openbsd libNUtil.a)
+ (cd source; $(MAKE) -f Makefile.openbsd nedit nc)
+

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

@ -1,11 +0,0 @@
--- /dev/null Wed Jul 15 17:17:57 1998
+++ util/Makefile.openbsd Wed Jul 15 17:25:39 1998
@@ -0,0 +1,8 @@
+CC=cc
+AR=ar
+
+CFLAGS= -O2 -I${PREFIX}/include -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD \
+ -DUSE_XMIM -DEDITRES
+LIBS= -L${PREFIX}/lib -L/usr/X11R6/lib -lXm -lm -lXpm -lXext -lXmu -lXt -lSM -lICE -lX11
+
+include Makefile.common

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

@ -1,11 +0,0 @@
--- /dev/null Wed Jul 15 17:17:57 1998
+++ source/Makefile.openbsd Wed Jul 15 17:25:39 1998
@@ -0,0 +1,8 @@
+CC=cc
+AR=ar
+
+CFLAGS= -O2 -I${PREFIX}/include -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD \
+ -DUSE_XMIM -DEDITRES
+LIBS= -L${PREFIX}/lib -L/usr/X11R6/lib -lXm -lm -lXpm -lXext -lXmu -lXt -lSM -lICE -lX11
+
+include Makefile.common

15
editors/nedit/patches/patch-ad
View File

@ -1,15 +0,0 @@
--- util/printUtils.c.~1~ Thu Mar 19 13:20:28 1998
+++ util/printUtils.c Wed Jul 15 17:35:49 1998
@@ -254,9 +254,9 @@
#ifdef USE_LPR_PRINT_CMD
getLprQueueDefault(defaultQueue);
PrintPrefDescrip.printCommand.defaultString = "lpr";
- PrintPrefDescrip.copiesOption.defaultString = "-# ";
- PrintPrefDescrip.queueOption.defaultString = "-P ";
- PrintPrefDescrip.nameOption.defaultString = "-J ";
+ PrintPrefDescrip.copiesOption.defaultString = " -#";
+ PrintPrefDescrip.queueOption.defaultString = " -P ";
+ PrintPrefDescrip.nameOption.defaultString = " -J ";
PrintPrefDescrip.hostOption.defaultString = "";
PrintPrefDescrip.defaultQueue.defaultString = defaultQueue;
PrintPrefDescrip.defaultHost.defaultString = "";

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

@ -1,11 +0,0 @@
--- source/server.c.~1~ Thu Mar 19 13:20:24 1998
+++ source/server.c Wed Jul 15 17:39:56 1998
@@ -54,7 +54,7 @@
independent way), please change this (L_cuserid is apparently not ANSI) */
#define MAXUSERNAMELEN 32
-#if defined(VMS) || defined(linux)
+#if defined(VMS) || defined(linux) || defined( __OpenBSD__ )
#define MAXNODENAMELEN (MAXPATHLEN+2)
#elif defined(SUNOS)
#define MAXNODENAMELEN 9

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

@ -1,11 +0,0 @@
--- source/nc.c.~1~ Thu Mar 19 13:20:23 1998
+++ source/nc.c Wed Jul 15 17:46:58 1998
@@ -51,7 +51,7 @@
#define APP_NAME "nc"
#define APP_CLASS "NEditClient"
-#if defined(VMS) || defined(linux)
+#if defined(VMS) || defined(linux) || defined( __OpenBSD__ )
#define MAXNODENAMELEN (MAXPATHLEN+2)
#elif defined(SUNOS)
#define MAXNODENAMELEN 9

25
editors/nedit/patches/patch-ag
View File

@ -1,25 +0,0 @@
--- source/file.c.~1~ Thu Mar 19 13:20:22 1998
+++ source/file.c Wed Jul 15 18:01:16 1998
@@ -875,16 +875,18 @@
void PrintString(char *string, int length, Widget parent, char *jobName)
{
char tmpFileName[L_tmpnam]; /* L_tmpnam defined in stdio.h */
+ int fd;
FILE *fp;
- /* Generate a temporary file name */
- tmpnam(tmpFileName);
-
/* open the temporary file */
#ifdef VMS
+ tmpnam(tmpFileName);
if ((fp = fopen(tmpFileName, "w", "rfm = stmlf")) == NULL) {
#else
- if ((fp = fopen(tmpFileName, "w")) == NULL) {
+ strcpy( tmpFileName, "/var/tmp/nedit-XXXXXXXXXX" );
+ fd = mkstemp( tmpFileName );
+ if (( fd == -1 ) ||
+ ((fp = fdopen(fd, "w")) == NULL)) {
#endif /* VMS */
DialogF(DF_WARN, parent, 1, "Unable to write file for printing:\n%s",
"Dismiss", errorString());

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

@ -1,20 +0,0 @@
--- nc.man.~1~ Thu Mar 19 13:20:23 1998
+++ nc.man Wed Jul 15 20:22:52 1998
@@ -1,13 +1,13 @@
.\" SCCS ID: nedit.man 1.2 9/27/94
-.TH NC 1F "PU0135" FERMILAB
+.TH NCL 1F "PU0135" FERMILAB
.SH NAME
-NC \- Client program for NEdit text editor
+NCL \- Client program for NEdit text editor
.SH SYNOPSYS
-.B nc
+.B ncl
[\-read] [\-create] [\-line n\ |\ +n] [\-do\ command] [\-[no]ask]
[\-svrname\ name] [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

8
editors/nedit/patches/patch-ai
View File

@ -1,8 +0,0 @@
--- nedit.man.~1~ Thu Mar 19 13:20:23 1998
+++ nedit.man Wed Jul 15 20:24:09 1998
@@ -29,4 +29,4 @@
NEdit distribution kit. Fermilab users can obtain NEdit
documentation (PU0135) from the Computing Division Library.
.SH SEE ALSO
-nc, X, mwm, vi, emacs
+ncl, X, mwm, vi, emacs

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

@ -1,12 +0,0 @@
--- nedit.doc.~1~ Wed Jul 15 20:05:45 1998
+++ nedit.doc Wed Jul 15 20:26:01 1998
@@ -1,5 +1,9 @@
NEDIT 5.0 March 11, 1998
+ 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 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

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

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

13
editors/nedit/patches/patch-nedit_doc Normal file
View File

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

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

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

32
editors/nedit/patches/patch-source_file_c Normal file
View File

@ -0,0 +1,32 @@
$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
*/
void PrintString(char *string, int length, Widget parent, 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;
+#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
#else
if ((fp = fopen(tmpFileName, "w")) == NULL) {
#endif /* VMS */
+#endif /* HAVE_MKSTEMP */
DialogF(DF_WARN, parent, 1, "Unable to write file for printing:\n%s",
"Dismiss", errorString());
return;

7
editors/nedit/pkg/PLIST
View File

@ -1,7 +1,8 @@
lib/X11/app-defaults/NEdit
bin/nedit
@comment $OpenBSD: PLIST,v 1.4 2000/06/09 20:10:32 form Exp $
bin/ncl
man/man1/nedit.1
bin/nedit
lib/X11/app-defaults/NEdit
man/man1/ncl.1
man/man1/nedit.1
share/doc/nedit/nedit.doc
@dirrm share/doc/nedit