Index: head/editors/jove/Makefile
===================================================================
--- head/editors/jove/Makefile	(revision 435375)
+++ head/editors/jove/Makefile	(revision 435376)
@@ -1,18 +1,27 @@
 # Created by: jkh
 # $FreeBSD$
 
 PORTNAME=	jove
 PORTVERSION=	4.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/moraes/jove/ \
 		LOCAL/simon
 
 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	(revision 435375)
+++ head/editors/jove/files/patch-io.h	(nonexistent)
@@ -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)),

Property changes on: head/editors/jove/files/patch-io.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/editors/jove/files/patch-recover.c
===================================================================
--- head/editors/jove/files/patch-recover.c	(revision 435375)
+++ head/editors/jove/files/patch-recover.c	(nonexistent)
@@ -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);

Property changes on: head/editors/jove/files/patch-recover.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/editors/jove/files/patch-io.c
===================================================================
--- head/editors/jove/files/patch-io.c	(revision 435375)
+++ head/editors/jove/files/patch-io.c	(revision 435376)
@@ -1,31 +1,19 @@
 --- io.c.orig	1996-03-07 17:34:42 UTC
 +++ io.c
 @@ -1193,10 +1193,16 @@ tmpinit()
  #endif
  		);
  	tfname = copystr(buf);
 +#ifdef NO_MKSTEMP
  	tfname = mktemp(tfname);
 +#endif
  #ifndef MSFILESYSTEM
 +#ifndef NO_MKSTEMP
 +	tmpfd = mkstemp(tfname);
 +#else
  	(void) close(creat(tfname, 0600));
  	tmpfd = open(tfname, 2);
 +#endif
  #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/pkg-descr
===================================================================
--- head/editors/jove/pkg-descr	(revision 435375)
+++ head/editors/jove/pkg-descr	(revision 435376)
@@ -1,15 +1,8 @@
-###########################################################################
-# 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.
 
 There are man pages for jove and teachjove.  Teachjove is for people who
 have never used EMACS style editors.  It is an interactive tutorial, THE
 tutorial written by Stallman for the original EMACS, only slightly
 modified for JOVE in the appropriate places.  The man pages are
 completely up to date, thanks to me.