diff options
| author | tron <tron@pkgsrc.org> | 2012-03-08 06:42:11 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2012-03-08 06:42:11 +0000 |
| commit | 36e669d834438e679b9f2d6f811380e74c19fe0e (patch) | |
| tree | 97cf76bbb4b53a33462375563a7b566e51255f8f | |
| parent | a43ccd0dc7a57917c7b272b273e883d88dd887d0 (diff) | |
| download | pkgsrc-36e669d834438e679b9f2d6f811380e74c19fe0e.tar.gz | |
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.
| -rw-r--r-- | misc/openoffice3/Makefile | 4 | ||||
| -rw-r--r-- | misc/openoffice3/patches/patch-bo | 13 |
2 files changed, 2 insertions, 15 deletions
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile index a105743df9d..6fbdea1dc0e 100644 --- a/misc/openoffice3/Makefile +++ b/misc/openoffice3/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.57 2011/12/30 12:20:43 he Exp $ +# $NetBSD: Makefile,v 1.57.2.1 2012/03/08 06:42:11 tron Exp $ OO_VER= 3.1.1 OO_TAG= OOO310_m19 DISTNAME= openoffice-${OO_VER} PKGNAME= openoffice3-${OO_VER} -PKGREVISION= 15 +PKGREVISION= 22 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/} DIST_SUBDIR= ${DISTNAME} diff --git a/misc/openoffice3/patches/patch-bo b/misc/openoffice3/patches/patch-bo deleted file mode 100644 index 48f30eb2653..00000000000 --- a/misc/openoffice3/patches/patch-bo +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bo,v 1.1.1.1 2008/10/14 11:02:24 hira Exp $ - ---- extensions/source/plugin/unx/makefile.mk.orig 2006-12-01 23:19:00.000000000 +0900 -+++ extensions/source/plugin/unx/makefile.mk 2007-04-01 22:05:33.000000000 +0900 -@@ -81,7 +81,7 @@ - APP1STDLIBS+=-lXaw - .ENDIF - .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" --APP1STDLIBS+= -lXt -lXext -lX11 -+APP1STDLIBS+=$(X11_LDFLAGS) -lXt -lXext -lX11 - .ELSE - APP1STDLIBS+= -lXt -lXext -lX11 -ldl - .ENDIF |