Re: cvs commit: ports/editors/textroom Makefile

From: MJBrune <admin_at_mjbrune.org>
Date: Fri, 07 May 2010 18:31:08 -0700
On 05/07/10 06:42, Emanuel Haupt wrote:
> Max Brazhnikov<makc_at_issp.ac.ru>  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<admin_at_mjbrune.org>
>>> (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_at_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_at_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
Received on Sat May 08 2010 - 02:03:00 UTC