Date: Sat, 4 Mar 2017 00:03:01 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435376 - in head/editors/jove: . files Message-ID: <201703040003.v240316r053566@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Sat Mar 4 00:03:01 2017 New Revision: 435376 URL: https://svnweb.freebsd.org/changeset/ports/435376 Log: JOVE defines a getline function that collides with getline(3). r419275 tried to fix it by renaming it to get_line, but a few renames were missed leading to crashes when trying to run JOVE. Finish the previous work and also add LICENSE while here. PR: 217516 Submitted by: crahman@gmail.com (based on) Reviewed by: crahman@gmail.com Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D9881 Deleted: head/editors/jove/files/patch-io.h head/editors/jove/files/patch-recover.c Modified: head/editors/jove/Makefile head/editors/jove/files/patch-io.c head/editors/jove/pkg-descr Modified: head/editors/jove/Makefile ============================================================================== --- head/editors/jove/Makefile Fri Mar 3 23:58:02 2017 (r435375) +++ head/editors/jove/Makefile Sat Mar 4 00:03:01 2017 (r435376) @@ -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 @@ MASTER_SITES= ftp://ftp.cs.toronto.edu/p 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> Modified: head/editors/jove/files/patch-io.c ============================================================================== --- head/editors/jove/files/patch-io.c Fri Mar 3 23:58:02 2017 (r435375) +++ head/editors/jove/files/patch-io.c Sat Mar 4 00:03:01 2017 (r435376) @@ -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 Modified: head/editors/jove/pkg-descr ============================================================================== --- head/editors/jove/pkg-descr Fri Mar 3 23:58:02 2017 (r435375) +++ head/editors/jove/pkg-descr Sat Mar 4 00:03:01 2017 (r435376) @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703040003.v240316r053566>