From owner-svn-ports-head@FreeBSD.ORG Sun Dec 30 17:41:44 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 59F21D5E; Sun, 30 Dec 2012 17:41:44 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3CBF08FC0C; Sun, 30 Dec 2012 17:41:44 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBUHfifF048773; Sun, 30 Dec 2012 17:41:44 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBUHfiXL048772; Sun, 30 Dec 2012 17:41:44 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201212301741.qBUHfiXL048772@svn.freebsd.org> From: Chris Rees Date: Sun, 30 Dec 2012 17:41:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309682 - head/x11-toolkits/qt33 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Dec 2012 17:41:44 -0000 Author: crees Date: Sun Dec 30 17:41:43 2012 New Revision: 309682 URL: http://svnweb.freebsd.org/changeset/ports/309682 Log: Check realpath of PREFIX only when required Modified: head/x11-toolkits/qt33/Makefile Modified: head/x11-toolkits/qt33/Makefile ============================================================================== --- head/x11-toolkits/qt33/Makefile Sun Dec 30 16:50:29 2012 (r309681) +++ head/x11-toolkits/qt33/Makefile Sun Dec 30 17:41:43 2012 (r309682) @@ -77,10 +77,6 @@ PACKAGE_COOKIE= ${WRKDIR}/.package_done. .include -.if exists(${PREFIX}) -PREFIX_REAL!= /bin/realpath ${PREFIX} -.endif - # The previous Qt port versions installed qmake and qmake's specs under LOCALBASE # The new devel/qmake port installs them under LOCALBASE. We can use # either one here, but we prefer the newer: @@ -197,8 +193,10 @@ post-build: @cd ${WRKSRC}/tools/${tool}; ${SETENV} ${MAKE_ENV} ${MAKE} .endfor @${RM} -f ${WRKSRC}/doc/html/qmake* - ${REINPLACE_CMD} -e 's|${PREFIX_REAL}/include/q.*h||g' \ - -e 's|${PREFIX_REAL}/include/private/q.*h||g' \ + + PREFIX_REAL=$$(/bin/realpath ${PREFIX}); \ + ${REINPLACE_CMD} -e "s|$${PREFIX_REAL}/include/q.*h||g" \ + -e "s|$${PREFIX_REAL}/include/private/q.*h||g" \ ${WRKSRC}/src/Makefile # Work around qmake generated dependencies