Page MenuHomeFreeBSD
Files F144080662

D9881.diff
No OneTemporary
Actions

D9881.diff
View Options

Index: head/editors/jove/Makefile
===================================================================
--- head/editors/jove/Makefile
+++ head/editors/jove/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jove
PORTVERSION= 4.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= ftp://ftp.cs.toronto.edu/pub/moraes/jove/ \
LOCAL/simon
@@ -11,8 +11,17 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Jonathan's Own Version of Emacs
+LICENSE= JOVE
+LICENSE_NAME= JOVE License
+LICENSE_FILE= ${WRKSRC}/README
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
USES= ncurses
MAKE_ARGS= LIBS="${LDFLAGS} -lncurses"
WRKSRC= ${WRKDIR}/${PORTNAME}
+post-patch:
+# Fix collisions with getline(3)
+ @${REINPLACE_CMD} 's|[[:<:]]getline[[:>:]]|get_line|g' ${WRKSRC}/*.c ${WRKSRC}/*.h
+
.include <bsd.port.mk>
Index: head/editors/jove/files/patch-io.h
===================================================================
--- head/editors/jove/files/patch-io.h
+++ head/editors/jove/files/patch-io.h
@@ -1,11 +0,0 @@
---- io.h.orig 1996-03-07 17:34:42 UTC
-+++ io.h
-@@ -37,7 +37,7 @@ extern void
- close_file proto((File *fp)),
- d_cache_init proto((void)),
- file_write proto((char *fname, bool app)),
-- getline proto((daddr addr,char *buf)),
-+ get_line proto((daddr addr,char *buf)),
- lsave proto((void)),
- putreg proto((File *fp,LinePtr line1,int char1,LinePtr line2,int char2,bool makesure)),
- read_file proto((char *file, bool is_insert)),
Index: head/editors/jove/files/patch-io.c
===================================================================
--- head/editors/jove/files/patch-io.c
+++ head/editors/jove/files/patch-io.c
@@ -17,15 +17,3 @@
#else /* MSFILESYSTEM */
tmpfd = open(tfname, O_CREAT|O_EXCL|O_BINARY|O_RDWR, S_IWRITE|S_IREAD);
#endif /* MSFILESYSTEM */
-@@ -1240,9 +1246,9 @@ int Jr_Len; /* length of Just Read Line
-
- void
- #ifdef USE_PROTOTYPES
--getline proto((daddr addr, register char *buf))
-+get_line proto((daddr addr, register char *buf))
- #else
--getline(addr, buf)
-+get_line(addr, buf)
- daddr addr;
- register char *buf;
- #endif
Index: head/editors/jove/files/patch-recover.c
===================================================================
--- head/editors/jove/files/patch-recover.c
+++ head/editors/jove/files/patch-recover.c
@@ -1,20 +0,0 @@
---- recover.c.orig 1996-03-07 17:34:43 UTC
-+++ recover.c
-@@ -160,7 +160,7 @@ size_t n;
- private char *getblock proto((daddr atl));
-
- void
--getline(tl, buf)
-+get_line(tl, buf)
- daddr tl;
- char *buf;
- {
-@@ -561,7 +561,7 @@ FILE *out;
- Nchars = Nlines = 0L;
- while (--nlines >= 0) {
- addr = getaddr(ptrs_fp);
-- getline(addr, buf);
-+ get_line(addr, buf);
- Nlines += 1;
- Nchars += 1 + strlen(buf);
- fputs(buf, out);
Index: head/editors/jove/pkg-descr
===================================================================
--- head/editors/jove/pkg-descr
+++ head/editors/jove/pkg-descr
@@ -1,10 +1,3 @@
-###########################################################################
-# This program is Copyright (C) 1986, 1987, 1988 by Jonathan Payne. JOVE #
-# is provided to you without charge, and with no warranty. You may give #
-# away copies of JOVE, including sources, provided that this notice is #
-# included in all the files. #
-###########################################################################
-
Jove is a simple text editor in the spirit of GNU emacs, but somewhat
smaller and faster to start up.

File Metadata

Mime Type
text/plain
Expires
Thu, Feb 5, 10:44 AM (10 h, 51 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28441773
Default Alt Text
D9881.diff (3 KB)

Event Timeline