From owner-cvs-ports@FreeBSD.ORG Sat May 8 02:03:00 2010 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 70623106566C; Sat, 8 May 2010 02:03:00 +0000 (UTC) (envelope-from admin@mjbrune.org) Received: from emailserver1.namecheaphosting.com (emailserver1.namecheaphosting.com [65.98.58.42]) by mx1.freebsd.org (Postfix) with ESMTP id 410318FC18; Sat, 8 May 2010 02:02:56 +0000 (UTC) Received: from c-67-170-46-147.hsd1.wa.comcast.net ([67.170.46.147] helo=mjbrune.org) by emailserver1.namecheaphosting.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1OAYrg-0005e8-UM; Fri, 07 May 2010 21:30:01 -0400 Message-ID: <4BE4BEDC.7030908@mjbrune.org> Date: Fri, 07 May 2010 18:31:08 -0700 From: MJBrune User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100409 Thunderbird/3.0.4 MIME-Version: 1.0 To: Emanuel Haupt References: <201005071234.o47CYhTg095245@repoman.freebsd.org> <201005071652.08857.makc@issp.ac.ru> <20100507154249.503defbf.ehaupt@FreeBSD.org> In-Reply-To: <20100507154249.503defbf.ehaupt@FreeBSD.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - emailserver1.namecheaphosting.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - mjbrune.org X-Source: X-Source-Args: X-Source-Dir: Cc: cvs-ports@FreeBSD.org, Max Brazhnikov , cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/editors/textroom Makefile X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 May 2010 02:03:00 -0000 On 05/07/10 06:42, Emanuel Haupt wrote: > Max Brazhnikov wrote: > >> On Fri, 7 May 2010 12:34:43 +0000 (UTC), Emanuel Haupt wrote: >> >>> ehaupt 2010-05-07 12:34:43 UTC >>> >>> FreeBSD ports repository >>> >>> Modified files: >>> editors/textroom Makefile >>> Log: >>> Fix hardcoded references to /usr/share >>> >>> PR: 146368 >>> Submitted by: Michael James Brune >>> (maintainer) >>> >>> Revision Changes Path >>> 1.2 +5 -1 ports/editors/textroom/Makefile >>> >> Needless changes. files/patch* already make the port to respect both >> LOCALBASE and PREFIX. I've sent a mail to maintainer about my >> correction to the port, but my mailserver failed to deliver it: >> > Then your patch was incomplete: > > root@portjail:/usr/ports/editors/textroom # make patch > ===> Vulnerability check disabled, database not found > ===> Extracting for textroom-0.6.3.2_1 > => MD5 Checksum OK for textroom-0.6.3.2.tar.gz. > => SHA256 Checksum OK for textroom-0.6.3.2.tar.gz. > ===> Patching for textroom-0.6.3.2_1 > ===> Applying FreeBSD patches for textroom-0.6.3.2_1 > root@portjail:/usr/ports/editors/textroom # grep -r '/usr/share' work/textroom | grep -v bak | grep -v orig > work/textroom/src/textroom.cpp: soundenter = Mix_LoadWAV("/usr/share/sounds/keyenter.wav"); > work/textroom/src/textroom.cpp: soundany = Mix_LoadWAV("/usr/share/sounds/keyany.wav"); > work/textroom/src/textroom.cpp: affFile = (char *) "/usr/share/myspell/dicts/en_US.aff"; > work/textroom/src/textroom.cpp: dicFile = (char *) "/usr/share/myspell/dicts/en_US.dic"; > work/textroom/src/textroom.cpp: affFile = (char *) "/usr/share/myspell/dicts/tr.aff"; > work/textroom/src/textroom.cpp: dicFile = (char *) "/usr/share/myspell/dicts/tr.dic"; > work/textroom/resource/desktop/textroom-uninstall:xdg-mime uninstall /usr/share/textroom/textroom-txr-mime.xml > work/textroom/resource/desktop/textroom-uninstall:sudo rm -f /usr/share/textroom/keyenter.wav > work/textroom/resource/desktop/textroom-uninstall:sudo rm -f /usr/share/textroom/keyany.wav > work/textroom/resource/desktop/textroom-uninstall:sudo rm -f /usr/share/applications/textroom.desktop > work/textroom/resource/desktop/textroom-uninstall:sudo rm -f /usr/share/textroom/textroom-txr-mime.xml > work/textroom/resource/desktop/textroom-uninstall:sudo rm -r -f /usr/share/textroom > > I see the problem here, it wasn't a needless change because the patch-textroom.cp doesn't cover the rest of the program which has hardcoded links in it but it wasn't a complete patch because there are still hardcoded paths which should be corrected. I will submit a new patch correcting all of the above in a day or two as i am out of time right now. I am sorry I missed this and thank you for bringing it to my attention. -- Michael James Brune 206-552-8572