From owner-svn-ports-all@FreeBSD.ORG Wed Feb 26 14:52:04 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EE6CBF60; Wed, 26 Feb 2014 14:52:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BF93311D0; Wed, 26 Feb 2014 14:52:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1QEq4el054801; Wed, 26 Feb 2014 14:52:04 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1QEq4Dp054799; Wed, 26 Feb 2014 14:52:04 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201402261452.s1QEq4Dp054799@svn.freebsd.org> From: John Marino Date: Wed, 26 Feb 2014 14:52:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346208 - in head/editors/joe: . 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2014 14:52:05 -0000 Author: marino Date: Wed Feb 26 14:52:04 2014 New Revision: 346208 URL: http://svnweb.freebsd.org/changeset/ports/346208 QAT: https://qat.redports.org/buildarchive/r346208/ Log: editors/joe: Fix jmacs mode segfault (fix from pkgsrc) Fix segfault per PR (pkgsrc fix verified). Relocate license to please portlint, reset maintainer. PR: ports/182373 Submitted by: Sergey Kandaurov Approved by: maintainer timeout (5 months) Added: head/editors/joe/files/patch-main.c (contents, props changed) Modified: head/editors/joe/Makefile Modified: head/editors/joe/Makefile ============================================================================== --- head/editors/joe/Makefile Wed Feb 26 14:20:05 2014 (r346207) +++ head/editors/joe/Makefile Wed Feb 26 14:52:04 2014 (r346208) @@ -3,14 +3,16 @@ PORTNAME= joe PORTVERSION= 3.7 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES?= editors MASTER_SITES= SF/joe-editor/JOE%20sources/joe-${PORTVERSION} -MAINTAINER= sylvio@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Joe's Own Editor +LICENSE= GPLv1 + BUILD_DEPENDS= aspell:${PORTSDIR}/textproc/aspell RUN_DEPENDS= aspell:${PORTSDIR}/textproc/aspell @@ -18,7 +20,6 @@ OPTIONS_DEFINE= DOCS CONFLICTS= joe-2.* -LICENSE= GPLv1 USES= gmake iconv ncurses GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" Added: head/editors/joe/files/patch-main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/joe/files/patch-main.c Wed Feb 26 14:52:04 2014 (r346208) @@ -0,0 +1,18 @@ +$NetBSD: patch-main.c,v 1.1 2011/04/01 13:12:24 wiz Exp $ + +Fix for crash with a segv if called as jmacs with more then +one file as an argument on the command line from upstream. + +http://joe-editor.cvs.sourceforge.net/viewvc/joe-editor/joe-current/main/main.c?r1=1.5&r2=1.6 + +--- main.c.orig 2008-10-27 03:01:11.000000000 +0000 ++++ main.c +@@ -431,7 +431,7 @@ int main(int argc, char **real_argv, cha + b->orphan = 1; + b->oldcur = pdup(b->bof, USTR "main"); + pline(b->oldcur, get_file_pos(b->name)); +- p_goto_bol(bw->cursor); ++ p_goto_bol(b->oldcur); + line = b->oldcur->line - (maint->h - 1) / 2; + if (line < 0) + line = 0;