From owner-svn-ports-all@FreeBSD.ORG  Wed Aug 29 22:20:19 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC0F4106564A;
	Wed, 29 Aug 2012 22:20:19 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A66AA8FC16;
	Wed, 29 Aug 2012 22:20:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7TMKJoe024669;
	Wed, 29 Aug 2012 22:20:19 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7TMKJnJ024667;
	Wed, 29 Aug 2012 22:20:19 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201208292220.q7TMKJnJ024667@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 29 Aug 2012 22:20:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303352 - head/editors/libreoffice
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2012 22:20:19 -0000

Author: jkim
Date: Wed Aug 29 22:20:19 2012
New Revision: 303352
URL: http://svn.freebsd.org/changeset/ports/303352

Log:
  Fix the previous commit to make it really work.  See the following upstream
  PR for more information about this issue:
  
  https://bugs.freedesktop.org/show_bug.cgi?id=54015

Modified:
  head/editors/libreoffice/Makefile

Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile	Wed Aug 29 22:14:13 2012	(r303351)
+++ head/editors/libreoffice/Makefile	Wed Aug 29 22:20:19 2012	(r303352)
@@ -377,7 +377,7 @@ post-extract:
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f -print0 | \
-	    ${XARGS} -0 ${REINPLACE_CMD} -i '' -e 's#-Wl,-rpath,#-Wl,-z,origin -Wl,-rpath,#g'
+	    ${XARGS} -0 ${REINPLACE_CMD} -i '' -e 's#-Wl,-rpath,#-Wl,-z,origin,-rpath,#g'
 	@${REINPLACE_CMD} -e 's#5.1 5.0#${BDB_VER}#g' \
 		 -e 's,-ldb$$dash$$dbver,-l${BDB_LIB_NAME},g' \
 		 -e 's,"Linux" \&\& test "z$$enable_graphite","FreeBSD" \&\& test "z$$enable_graphite",g' \