Thu Mar 8 06:42:11 2012 UTC ()
Pullup ticket #3699 - requested by he
misc/openoffice3: build fix

Revisions pulled up:
- misc/openoffice3/Makefile                                     1.65 via patch
- misc/openoffice3/patches/patch-bo                             deleted

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Wed Mar  7 15:07:23 UTC 2012

   Modified Files:
   	pkgsrc/misc/openoffice3: Makefile
   Removed Files:
   	pkgsrc/misc/openoffice3/patches: patch-bo

   Log Message:
   Remove patch-bo, which is indirectly responsible for placing
   -R/usr/X11R7/lib early into the link line in extensions/source/plugin/unx/,
   creating another instance of "the pixman problem" when trying to build
   this package on NetBSD 5.1.  It appears that some other part of the
   makefile setup for OpenOffice3 is now responsible for inserting the
   appropriate -Wl,-R/usr/X11R7/lib into the linker line.
   The resulting package has been verify to build and start up, and
   fixes PR#46131.  Bump pkgrevision.


(tron)
diff -r1.57 -r1.57.2.1 pkgsrc/misc/openoffice3/Makefile
diff -r1.1.1.1 -r0 pkgsrc/misc/openoffice3/patches/patch-bo
cvs diff -r1.57 -r1.57.2.1 pkgsrc/misc/openoffice3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/Makefile 2011/12/30 12:20:43 1.57
+++ pkgsrc/misc/openoffice3/Attic/Makefile 2012/03/08 06:42:11 1.57.2.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.57 2011/12/30 12:20:43 he Exp $ 1# $NetBSD: Makefile,v 1.57.2.1 2012/03/08 06:42:11 tron Exp $
2 2
3OO_VER= 3.1.1 3OO_VER= 3.1.1
4OO_TAG= OOO310_m19 4OO_TAG= OOO310_m19
5DISTNAME= openoffice-${OO_VER} 5DISTNAME= openoffice-${OO_VER}
6PKGNAME= openoffice3-${OO_VER} 6PKGNAME= openoffice3-${OO_VER}
7PKGREVISION= 15 7PKGREVISION= 22
8CATEGORIES= misc 8CATEGORIES= misc
9MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/} 9MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
10DIST_SUBDIR= ${DISTNAME} 10DIST_SUBDIR= ${DISTNAME}
11 11
12DISTFILES= OOo_${OO_VER}_src_core.tar.bz2 12DISTFILES= OOo_${OO_VER}_src_core.tar.bz2
13DISTFILES+= OOo_${OO_VER}_src_binfilter.tar.bz2 13DISTFILES+= OOo_${OO_VER}_src_binfilter.tar.bz2
14DISTFILES+= OOo_${OO_VER}_src_l10n.tar.bz2 14DISTFILES+= OOo_${OO_VER}_src_l10n.tar.bz2
15DISTFILES+= OOo_${OO_VER}_src_system.tar.bz2 15DISTFILES+= OOo_${OO_VER}_src_system.tar.bz2
16DISTFILES+= OOo_${OO_VER}_src_extensions.tar.bz2 16DISTFILES+= OOo_${OO_VER}_src_extensions.tar.bz2
17 17
18MAINTAINER= pkgsrc-users@NetBSD.org 18MAINTAINER= pkgsrc-users@NetBSD.org
19HOMEPAGE= http://www.openoffice.org/ 19HOMEPAGE= http://www.openoffice.org/
20COMMENT= Integrated office productivity suite (version 3) 20COMMENT= Integrated office productivity suite (version 3)
File Deleted: pkgsrc/misc/openoffice3/patches/Attic/patch-bo