From owner-svn-ports-head@freebsd.org Sat Mar 4 00:03:02 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AFC12CF5373; Sat, 4 Mar 2017 00:03:02 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6CB031D97; Sat, 4 Mar 2017 00:03:02 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v240311G053569; Sat, 4 Mar 2017 00:03:01 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v240316r053566; Sat, 4 Mar 2017 00:03:01 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201703040003.v240316r053566@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 4 Mar 2017 00:03:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435376 - in head/editors/jove: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 00:03:02 -0000 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 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.