[44037] trunk/dports/perl

[Ryan Schmidt]

On Dec 25, 2008, at 11:15, Matthew Ross wrote:

> On Dec 24, 2008, at 8:48 PM, Ryan Schmidt wrote:
>
>> On Dec 19, 2008, at 13:26, narf_tm at macports.org wrote:
>>
>>> Revision: 44037
>>>          http://trac.macports.org/changeset/44037
>>> Author:   narf_tm at macports.org
>>> Date:     2008-12-19 11:26:18 -0800 (Fri, 19 Dec 2008)
>>> Log Message:
>>> -----------
>>> New port p5-text-spellchecker 0.05.
>>
>> You also updated p5-xml-sax-expat to 0.40... intentional?
>
> No, that was a mistake :-(
> Wasn't sure how/if I should correct it.

If you meant to update the version of p5-xml-sax-expat anyway (but  
had meant to do so in a separate commit), no problem; just add a note  
to the commit message to say that you did also update that port:

cd /path/to/workingcopy
svn propedit --revprop -r44037 svn:log

I see it's not your port... Is that why you didn't mean to commit it?  
You could email the maintainer and ask if it's ok that you updated  
it; if so, you can just do as above.


Otherwise if you need to undo the change, here's how:

cd /path/to/workingcopy
svn merge -c-44037 \
http://svn.macosforge.org/repository/macports/trunk/dports/perl/p5- 
xml-sax-expat

Unfortunately the diff does not apply cleanly because other changes  
have been made to the port since then and r44037 not only updated the  
port version but also included lots of whitespace changes. This is  
another reason it's preferable to commit whitespace changes and  
functional changes separately from one another.

You would also add "epoch 1" to the Portfile to ensure that anyone  
who had already updated to 0.40 will downgrade back to 0.39.

Then commit all the changes:

svn commit -m "p5-xml-sax-expat: undo inadvertent update from r44037"

Then add a note to the log message for r44037 to indicate that the  
changes to p5-xml-sax-expat were inadvertent and undone in whatever  
revision it is:

cd /path/to/workingcopy
svn propedit --revprop -r44037 svn:log

This is clearly a lot more work than the first option, so hopefully  
it will be ok to keep the updated version of p5-xml-sax-expat.


>>> Modified Paths:
>>> --------------
>>>    trunk/dports/perl/p5-xml-sax-expat/Portfile
>>>
>>> Added Paths:
>>> -----------
>>>    trunk/dports/perl/p5-text-spellchecker/
>>>    trunk/dports/perl/p5-text-spellchecker/Portfile
>>>
>>> Added: trunk/dports/perl/p5-text-spellchecker/Portfile
>>> ===================================================================
>>> --- trunk/dports/perl/p5-text-spellchecker/ 
>>> Portfile	                        (rev 0)
>>> +++ trunk/dports/perl/p5-text-spellchecker/Portfile	2008-12-19  
>>> 19:26:18 UTC (rev 44037)
>>> @@ -0,0 +1,17 @@
>>> +# $Id$
>>> +
>>> +PortSystem            1.0
>>> +PortGroup             perl5 1.0
>>> +
>>> +perl5.setup           Text-SpellChecker 0.05
>>> +maintainers           narf_tm openmaintainer
>>> +description           OO interface for spell-checking a block of  
>>> text
>>> +long_description      ${description}
>>> +
>>> +platforms             darwin
>>> +
>>> +checksums             md5 3a6be263bb08e82cb7a975ca799063a7 \
>>> +                      sha1  
>>> 0ac032a447bca6a703cd60dec19c15f8b786241b \
>>> +                      rmd160  
>>> 4153eb7567829f96ec67e6d91dae9ea2e82d6dae
>>> +
>>> +depends_lib-append    port:p5-text-aspell
>>>
>>>
>>> Property changes on: trunk/dports/perl/p5-text-spellchecker/Portfile
>>> ___________________________________________________________________
>>> Added: svn:keywords
>>>   + Id
>>> Added: svn:eol-style
>>>   + native
>>>
>>> Modified: trunk/dports/perl/p5-xml-sax-expat/Portfile
>>> ===================================================================
>>> --- trunk/dports/perl/p5-xml-sax-expat/Portfile	2008-12-19  
>>> 19:23:42 UTC (rev 44036)
>>> +++ trunk/dports/perl/p5-xml-sax-expat/Portfile	2008-12-19  
>>> 19:26:18 UTC (rev 44037)
>>> @@ -1,21 +1,25 @@
>>> # $Id$
>>>
>>> -PortSystem          1.0
>>> -PortGroup           perl5 1.0
>>> -perl5.setup         XML-SAX-Expat 0.39
>>> -maintainers         sal at email.arc.nasa.gov
>>> -description         SAX2 Driver for Expat (XML::Parser)
>>> -long_description    This is an implementation of a SAX2 driver \
>>> -    sitting on top of Expat (XML::Parser)
>>> +PortSystem            1.0
>>> +PortGroup             perl5 1.0
>>>
>>> -platforms           darwin
>>> +perl5.setup           XML-SAX-Expat 0.40
>>> +maintainers           sal at email.arc.nasa.gov
>>> +description           SAX2 Driver for Expat (XML::Parser)
>>> +long_description      This is an implementation of a SAX2 driver \
>>> +                      sitting on top of Expat (XML::Parser)
>>>
>>> -checksums           md5 a31400a29eae0eec74650bd06dbc823f \
>>> -                    sha1 0f440b662a137705ee0e358fd1fc92e510500806 \
>>> -                    rmd160 da36f9b2a1c9a53729f4b0e1e35a15349c8f0101
>>> +platforms             darwin
>>>
>>> -depends_lib-append  port:p5-xml-parser port:p5-xml-sax port:p5- 
>>> xml-namespacesupport
>>> +checksums             md5 ca58d1e26c437b31c52456b4b4ae5c4a \
>>> +                      sha1  
>>> 3fdbd7b5e83216bb24d1e83ff3a6c17fcde9ba3f \
>>> +                      rmd160  
>>> fd0452bc817b55607ebbb4e8de017c6fd99ecaea
>>>
>>> -post-activate {
>>> -    system "cd ${worksrcpath} && ${build.cmd} install_sax_expat"
>>> -}
>>> +depends_lib-append    port:p5-xml-parser \
>>> +                      port:p5-xml-sax \
>>> +                      port:p5-xml-namespacesupport \
>>> +                      port:p5-xml-sax-base
>>> +
>>> +post-activate {
>>> +    system "cd ${worksrcpath} && ${build.cmd} install_sax_expat"
>>> +}