possible PR?

[Don Lewis]

On 18 Oct, Scott Robbins wrote:
> I have run into the following issue--I'm not sure how unique my
> situation may or may not be, which is why I'm not sure if it merits a PR
> or not.
> FreeBSD 5.3-BETA7.  This is an upgrade from 5.2.1 and I have the
> compat4x libraries.
> 
> 
> I had openoffice-1.1.3 installed.
> 
> I attempted to do a portupgrade of openoffice as follows
> portupgrade -Rr -m WITHOUT_JAVA=yes -m WITHOUT_MOZILLA=yes.
> 
> It failed (I'll give more specifics in a moment.)
> I then tried uninstalling OO completely and removed all distfiles
> in the /usr/ports/distfiles/openoffice-1.1/ directory.
> 
> I tried doing it WITHOUT_JAVA=yes and WITHOUT_MOZILLA=yes and then tried
> doing it while leaving those two out.  
> 
> This is the output--this is from an example where I didn't do
> WITHOUT_JAVA and WITHOUT_MOZILLA
> 
> 
> ==>  Extracting for openoffice-1.1.4.20041012
>>> Checksum OK for openoffice1.1/OOo_1.1.4.20041012_source.tar.bz2.
>>> Checksum OK for openoffice1.1/gpc231.tar.Z.
>>> Checksum OK for openoffice1.1/patch-openoffice-mozilla101-2002-10-14.
>>> Checksum OK for openoffice1.1/mozilla-vendor-1.0.2a.tgz.
> ===>   openoffice-1.1.4.20041012 depends on file:
> /usr/local/bin/perl5.8.5 - found
> ===>  Patching for openoffice-1.1.4.20041012
> ===>   openoffice-1.1.4.20041012 depends on file:
> /usr/local/bin/perl5.8.5 - found
> ===>  Applying FreeBSD patches for openoffice-1.1.4.20041012
> Ignoring previously applied (or reversed) patch.
> 1 out of 1 hunks ignored--saving rejects to
> instsetoo/util/openoffice.lst.rej
>>> Patch patch-1.1.3-1.1.4 failed to apply cleanly.
> *** Error code 1
> 
> Stop in /usr/ports/editors/openoffice-1.1-devel.
> ** Command failed [exit code 1]: /usr/bin/script -qa
> /tmp/portupgrade78762.1 make
> ** Fix the problem and try again.

Same here.  It looks like the first chunk of files/patch-1.1.3-1.1.4 is
reversed.   Applying the following patch (to the patch) allows "make
patch" succeed.  I don't yet know if the build will succeed.

Index: editors/openoffice-1.1-devel/files/patch-1.1.3-1.1.4
===================================================================
RCS file: /home/ncvs/ports/editors/openoffice-1.1-devel/files/patch-1.1.3-1.1.4,v
retrieving revision 1.1
diff -u -r1.1 patch-1.1.3-1.1.4
--- editors/openoffice-1.1-devel/files/patch-1.1.3-1.1.4	15 Oct 2004 06:02:39 -0000	1.1
+++ editors/openoffice-1.1-devel/files/patch-1.1.3-1.1.4	19 Oct 2004 03:46:26 -0000
@@ -7,8 +7,8 @@
  		variables
  		{
  			PRODUCTNAME OpenOffice.org
--			PRODUCTVERSION 1.1.4
-+			PRODUCTVERSION 1.1.3
+-			PRODUCTVERSION 1.1.3
++			PRODUCTVERSION 1.1.4
  			PRODUCTEXTENSION
  			LONG_PRODUCTEXTENSION
  			EVAL