svn commit: r306922 - head/editors/openoffice-3-devel
Gerald Pfeifer
gerald at FreeBSD.org
Sat Nov 3 16:17:09 UTC 2012
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
More information about the svn-ports-all
mailing list