From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 2 15:52:56 2014 Return-Path: Delivered-To: freebsd-ports-bugs@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 8A25B434 for ; Mon, 2 Jun 2014 15:52:56 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 71B9A2562 for ; Mon, 2 Jun 2014 15:52:56 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.8/8.14.8) with ESMTP id s52FquTg037143 for ; Mon, 2 Jun 2014 16:52:56 +0100 (BST) (envelope-from no-reply-bugzilla-daemon@freebsd.org) From: no-reply-bugzilla-daemon@freebsd.org To: freebsd-ports-bugs@FreeBSD.org Subject: [Bug 190514] New: [maintainer] unbreak, update and stagify editors/wordgrinder Date: Mon, 02 Jun 2014 15:52:56 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: new X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports Tree X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: vmagerya@gmail.com X-Bugzilla-Status: Needs Triage X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: freebsd-ports-bugs@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform op_sys bug_status bug_severity priority component assigned_to reporter Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Bugzilla-URL: http://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2014 15:52:56 -0000 http://bugs.freebsd.org/bugzilla/show_bug.cgi?id=190514 Bug ID: 190514 Summary: [maintainer] unbreak, update and stagify editors/wordgrinder Product: Ports Tree Version: Latest Hardware: Any OS: Any Status: Needs Triage Severity: Affects Only Me Priority: --- Component: Individual Port(s) Assignee: freebsd-ports-bugs@FreeBSD.org Reporter: vmagerya@gmail.com - Update editors/wordgrinder from 0.3.3 to 0.5.1 - Switch from lua 5.1 to lua 5.2 - Stagify Note that this update depends on devel/luafilesystem being updated to 1.6.2 or higher, so that it would support lang/lua52. I've submitted this update a bit earlier (bug tracker is currently offline, so I can't tell you the PR number); please commit that update before this is committed. Redports logs are at [1]. [1] https://redports.org/buildarchive/20140602154600-25924/ Fix: Patch attached with submission follows: Files wordgrinder.orig/..asd and wordgrinder/..asd differ diff -ruN wordgrinder.orig/Makefile wordgrinder/Makefile --- wordgrinder.orig/Makefile 2014-06-02 15:54:00.000000000 +0300 +++ wordgrinder/Makefile 2014-06-02 17:16:46.000000000 +0300 @@ -2,9 +2,10 @@ # $FreeBSD: head/editors/wordgrinder/Makefile 355360 2014-05-26 15:28:28Z bapt $ PORTNAME= wordgrinder -PORTVERSION= 0.3.3 +PORTVERSION= 0.5.1 CATEGORIES= editors MASTER_SITES= SF +MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME} MAINTAINER= vmagerya@gmail.com COMMENT= A simple Unicode-aware console-based word processor @@ -13,35 +14,31 @@ RUN_DEPENDS= ${LUA_MODLIBDIR}/lfs.so:${PORTSDIR}/devel/luafilesystem -USES= lua:51 tar:bzip2 - -MAN1= wordgrinder.1 +USES= lua:52 tar:bzip2 gmake PLIST_DIRS= share/doc/wordgrinder -PLIST_FILES= bin/wordgrinder share/doc/wordgrinder/README.wg +PLIST_FILES= bin/wordgrinder \ + share/doc/wordgrinder/README.wg \ + man/man1/wordgrinder.1.gz -NO_STAGE= yes post-patch: - ${REINPLACE_CMD} -e 's,^PREFIX =.*$$,PREFIX = "${PREFIX}",' \ - -e 's,/usr/include/lua5.1,${LUA_INCDIR},' \ - -e 's,command = "lua ,command = "${LUA_CMD} ,' \ - -e '/curses_exe =/s,$$,\ - CLINKFLAGS = {PARENT\, "-L${LUA_LIBDIR}"}\,,' \ - -e 's,lua5.1,lua,' \ - -e 's,install -D,install,' \ - ${WRKSRC}/pmfile - ${REINPLACE_CMD} 's,^LUACOMPILER =.*$$,LUACOMPILER = "${LUAC_CMD}",' \ - ${WRKSRC}/tools/lua.pm - ${REINPLACE_CMD} "/CCOMPILER = /s,gcc,cc ," ${WRKSRC}/tools/c.pm - ${REINPLACE_CMD} "/CC=/s,gcc,cc ," ${WRKSRC}/pm - -do-build: - (cd ${WRKSRC}; ./pm) - -do-install: - ${MKDIR} ${PREFIX}/bin ${PREFIX}/man/man1 - ${MKDIR} ${PREFIX}/share/doc/wordgrinder - (cd ${WRKSRC}; ./pm install) - ${STRIP_CMD} ${PREFIX}/bin/wordgrinder + ${REINPLACE_CMD} \ + -e '/hide = /s/@//' \ + -e '/cc := gcc/s|gcc|${CC}|' \ + -e '/INCLUDES := /s|= .*|= -I${LOCALBASE}/include/lua52|' \ + -e '/ldflags := /s|=|= -L${LOCALBASE}/lib|' \ + -e 's|-llua5.2|-llua-5.2|' \ + -e 's|@lua|${LUA_CMD}|' \ + -e '/PREFIX = /d' \ + -e '/install /s|$$(PRE|${STAGEDIR}$$(PRE|' \ + -e '/install /s|-D||' \ + -e '/install /s|share/man/man1|man/man1|' \ + ${WRKSRC}/Makefile + +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/wordgrinder + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/wordgrinder .include diff -ruN wordgrinder.orig/distinfo wordgrinder/distinfo --- wordgrinder.orig/distinfo 2014-06-02 15:54:00.000000000 +0300 +++ wordgrinder/distinfo 2014-06-02 15:59:12.000000000 +0300 @@ -1,2 +1,2 @@ -SHA256 (wordgrinder-0.3.3.tar.bz2) = 999781e169eda05d64b5df6034e0ab1d98f768a936218979754f754ca6eeb339 -SIZE (wordgrinder-0.3.3.tar.bz2) = 680918 +SHA256 (wordgrinder-0.5.1.tar.bz2) = 387cf4e8fc5f188c821cd77c782e1256ddb7c27987a682e1526143dc582d3677 +SIZE (wordgrinder-0.5.1.tar.bz2) = 652378 -- You are receiving this mail because: You are the assignee for the bug.