expat portupgrade dies

[Michael C. Shultz]

On Friday 04 March 2005 07:44 am, Randy Schultz wrote:
> On Thu, 3 Mar 2005, Michael C. Shultz wrote:
>
> -}On Thursday 03 March 2005 01:59 pm, Randy Schultz wrote:
> -}> On a 5.3 system when I try to portupgrade some ports the
> portupgrade -}> dies on expat:
> -}>       --->  Upgrading 'expat-1.95.6_1' to 'expat-1.95.8'
> -}> (textproc/expat2) --->  Building '/usr/ports/textproc/expat2'
> -}>       ===>  Cleaning for libtool-1.3.5_2
> -}>       ===>  Cleaning for expat-1.95.8
> -}>       ===>  Vulnerability check disabled, database not found
> -}>       ===>  Extracting for expat-1.95.8
> -}>
> -}>       >> Checksum OK for expat-1.95.8.tar.gz.
> -}>
> -}>       ===>  Patching for expat-1.95.8
> -}>       ===>  Applying FreeBSD patches for expat-1.95.8
> -}>       1 out of 2 hunks failed--saving rejects to lib/expat.h.rej
> -}>
> -}>       >> Patch patch-expat.h failed to apply cleanly.
> -}>       >> Patch(es) patch-configure applied cleanly.
> -}>
> -}>       *** Error code 1
> -}>
> -}>       Stop in /usr/ports/textproc/expat2.
> -}>
> -}>
> -}> I've tried doing a pkg_delete on the old expat, same effect.  Is
> -}> there a standard way to continue from this fail other than
> patching -}> by hand?
> -}
> -}Make sure you first run "make clean" to get rid of old patched
> files, -}then run "make patch". If the patches still fail to apply
> then notify -}the portmaintainer, if the patches apply then just
> continue with a -}normal "make install clean".
>
> Hmm.  I did try to run the patch command by hand.  Hadn't tried the
> make patch. (stepping into a nearby phone booth...)
>
> Ok.  Same issues.  I'll contact the port maintainer.
>
> Tnx all for the pointers.
>
I just tried the patch target on my machine and it works so maybe
there is sum cruft still needs cleaning on yours.  One more suggestion:

rm -r /usr/ports/textproc/expat2
cd /usr/ports
make update (assuming you have this setup in make.conf otherwise run 
cvsup -g -L2 path-to-ports-supfile/ports-supfile)
cd /usr/ports/textproc/expat2
make clean; make patch

( sample output from my system)

root at ringworm:~>cd /usr/ports/textproc/expat2
root at ringworm:/usr/ports/textproc/expat2>make patch
===>  Vulnerability check disabled
===>  Extracting for expat-1.95.8
=> Checksum OK for expat-1.95.8.tar.gz.
===>  Patching for expat-1.95.8
===>  Applying FreeBSD patches for expat-1.95.8
root at ringworm:/usr/ports/textproc/expat2>make clean
===>  Cleaning for libtool-1.3.5_2
===>  Cleaning for expat-1.95.8

-Mike