From owner-svn-ports-all@FreeBSD.ORG  Sat Nov  3 16:17:09 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8B995344;
 Sat,  3 Nov 2012 16:17:09 +0000 (UTC)
 (envelope-from gerald@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 728648FC0A;
 Sat,  3 Nov 2012 16:17:09 +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 qA3GH9Jk098446;
 Sat, 3 Nov 2012 16:17:09 GMT (envelope-from gerald@svn.freebsd.org)
Received: (from gerald@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA3GH9p1098444;
 Sat, 3 Nov 2012 16:17:09 GMT (envelope-from gerald@svn.freebsd.org)
Message-Id: <201211031617.qA3GH9p1098444@svn.freebsd.org>
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Sat, 3 Nov 2012 16:17:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306922 - head/editors/openoffice-3-devel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Sat, 03 Nov 2012 16:17:09 -0000

Author: gerald
Date: Sat Nov  3 16:17:08 2012
New Revision: 306922
URL: http://svn.freebsd.org/changeset/ports/306922

Log:
  Remove the use of _GCC_BUILD_DEPENDS, which was never meant to be used
  outside of Mk/bsd.gcc.mk and is going to go away there, and replace it
  by the new _GCC_RUNTIME.  That one is a stop gap measure as well, but
  at least documented as such and easier to use.
  
  Really, using CFLAGS, LDFLAGS and the like should be sufficient and a
  hack like this never necessary.
  
  Simplify Makefile headers according to new guidance.
  
  Approved by:	maintainer timeout (3 weeks)
  Feature safe:	yes

Modified:
  head/editors/openoffice-3-devel/Makefile

Modified: head/editors/openoffice-3-devel/Makefile
==============================================================================
--- head/editors/openoffice-3-devel/Makefile	Sat Nov  3 14:36:21 2012	(r306921)
+++ head/editors/openoffice-3-devel/Makefile	Sat Nov  3 16:17:08 2012	(r306922)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: Apache OpenOffice
-# Date created:		28 February 2002
-# Whom:                 Martin Blapp
-#
+# Created by: Martin Blapp
 # $FreeBSD$
-#
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	3.4.${SVNREVISION}
@@ -252,8 +248,8 @@ post-extract:
 
 post-patch:
 .if defined (USE_GCC)
-	@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
-	@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
+	@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
+	@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
 .else
 	@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
 	@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk