Remove LINKFLAGSRUNPATH lines that specify -Wl,-rpath,${PREFIX}/lib.

These lines were changed as workaround of libcurl part of PR pkg/46567,
but the actual libcurl problem in curl-config is now fixed and
these unconditional -rpath flags seem to cause non-working binaries
as mentioned in PR pkg/46983.

Bump PKGREVISION.

4 files changed, 9 insertions, 11 deletions

diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile
index 358b7d4b0a8..1681da9ae10 100644
--- a/misc/openoffice3/Makefile
+++ b/misc/openoffice3/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.84 2013/02/16 11:23:25 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2013/03/17 21:37:31 tsutsui Exp $
 
 OO_VER=			3.1.1
 OO_TAG=			OOO310_m19
 DISTNAME=		openoffice-${OO_VER}
 PKGNAME=		openoffice3-${OO_VER}
-PKGREVISION=		40
+PKGREVISION=		41
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
 DIST_SUBDIR=		${DISTNAME}
diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo
index 882f5fa1bd0..7cf6d30ff9c 100644
--- a/misc/openoffice3/distinfo
+++ b/misc/openoffice3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2012/06/29 12:36:39 joerg Exp $
+$NetBSD: distinfo,v 1.34 2013/03/17 21:37:31 tsutsui Exp $
 
 SHA1 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 3b4d0d312a1bed9bdb1bbdfb172fa7361533b498
 RMD160 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 8caa064f836e531035fd551cf2d7288ca5188da0
@@ -56,7 +56,7 @@ SHA1 (patch-bv) = b254cdb889bf5335aafe2b35982fc5cf370207cb
 SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce
 SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
 SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
-SHA1 (patch-ch) = 1e456a34ebcf8639aa1a976e8c5fd05d1ef3ef5c
+SHA1 (patch-ch) = d10b293b5969bc1d050a403e613a2edcebc41e14
 SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
 SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
 SHA1 (patch-ck) = 01925efa75759b3b8efda3ab109b0f6481f45a7f
@@ -64,7 +64,7 @@ SHA1 (patch-cn) = d129e69d8ce9303e46f0b486e495d09c1e446444
 SHA1 (patch-configmgr_source_treemgr_templateimpl.hxx) = d34ed7ddfcd879072993f84e44b32e52c961dffe
 SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
 SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
-SHA1 (patch-cs) = 49b457e23f9edca560abee0acfbbe5ea64b5ea1a
+SHA1 (patch-cs) = 9e9de3db4026c40f2bb20140bef0a23b1396e4bd
 SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
 SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
 SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
diff --git a/misc/openoffice3/patches/patch-ch b/misc/openoffice3/patches/patch-ch
index 471d194fc0a..8201bacdce9 100644
--- a/misc/openoffice3/patches/patch-ch
+++ b/misc/openoffice3/patches/patch-ch
@@ -1,8 +1,8 @@
-$NetBSD: patch-ch,v 1.3 2012/06/29 12:36:39 joerg Exp $
+$NetBSD: patch-ch,v 1.4 2013/03/17 21:37:31 tsutsui Exp $
 
 --- solenv/inc/unxbsdi3.mk.orig	2012-06-22 21:21:26.000000000 +0000
 +++ solenv/inc/unxbsdi3.mk
-@@ -0,0 +1,178 @@
+@@ -0,0 +1,177 @@
 +#
 +# mk file for NetBSD/i386 with gcc 3.4.x and higher.
 +#
@@ -112,7 +112,6 @@ $NetBSD: patch-ch,v 1.3 2012/06/29 12:36:39 joerg Exp $
 +
 +# default linker flags
 +LINKFLAGSDEFS*=-Wl,-z,defs
-+LINKFLAGSRUNPATH*=-Wl,-rpath,${PREFIX}/lib
 +LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
 +
 +# linker flags for linking applications
diff --git a/misc/openoffice3/patches/patch-cs b/misc/openoffice3/patches/patch-cs
index 29e8fc28cfc..b09c5ebc93e 100644
--- a/misc/openoffice3/patches/patch-cs
+++ b/misc/openoffice3/patches/patch-cs
@@ -1,8 +1,8 @@
-$NetBSD: patch-cs,v 1.4 2012/06/29 12:36:39 joerg Exp $
+$NetBSD: patch-cs,v 1.5 2013/03/17 21:37:31 tsutsui Exp $
 
 --- solenv/inc/unxbsdx3.mk.orig	2012-06-22 21:21:26.000000000 +0000
 +++ solenv/inc/unxbsdx3.mk
-@@ -0,0 +1,178 @@
+@@ -0,0 +1,177 @@
 +#
 +# mk file for NetBSD/amd64 with gcc 3.4.x and higher.
 +#
@@ -112,7 +112,6 @@ $NetBSD: patch-cs,v 1.4 2012/06/29 12:36:39 joerg Exp $
 +
 +# default linker flags
 +LINKFLAGSDEFS*=-Wl,-z,defs
-+LINKFLAGSRUNPATH*=-Wl,-rpath,${PREFIX}/lib
 +LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
 +
 +# linker flags for linking applications