From owner-svn-ports-all@FreeBSD.ORG Mon Jun 9 15:17:04 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 74F57404; Mon, 9 Jun 2014 15:17:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 562262037; Mon, 9 Jun 2014 15:17:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s59FH4r2064883; Mon, 9 Jun 2014 15:17:04 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s59FH3kT064881; Mon, 9 Jun 2014 15:17:03 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201406091517.s59FH3kT064881@svn.freebsd.org> From: Antoine Brodin Date: Mon, 9 Jun 2014 15:17:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357168 - head/devel/qmake 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.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jun 2014 15:17:04 -0000 Author: antoine Date: Mon Jun 9 15:17:03 2014 New Revision: 357168 URL: http://svnweb.freebsd.org/changeset/ports/357168 QAT: https://qat.redports.org/buildarchive/r357168/ Log: Unbreak a bit Modified: head/devel/qmake/Makefile head/devel/qmake/pkg-plist Modified: head/devel/qmake/Makefile ============================================================================== --- head/devel/qmake/Makefile Mon Jun 9 14:57:33 2014 (r357167) +++ head/devel/qmake/Makefile Mon Jun 9 15:17:03 2014 (r357168) @@ -19,21 +19,24 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd PLIST_SUB+= _PREFIX="${PREFIX}" MAKE_ENV+= FILESDIR="${FILESDIR}" STAGEDIR="${STAGEDIR}" -USE_BZIP2= yes -USES= uidfix +USES= tar:bzip2 uidfix EXTRACT_AFTER_ARGS= \ '${DISTNAME}/mkspecs' \ '${DISTNAME}/src/*/*.h' '${DISTNAME}/qmake' \ '${DISTNAME}/src/tools' -.if !defined(NOPORTDOCS) +OPTIONS_DEFINE= DOCS + +.include + +.if ${PORT_OPTIONS:MDOCS} EXTRACT_AFTER_ARGS+='${DISTNAME}/doc/html/qmake*' -DOCSDIR=${PREFIX}/share/doc/qt -PLIST_SUB+= DOCSDIR='${DOCSDIR}' +DOCSDIR= ${PREFIX}/share/doc/qt +PLIST_SUB+= DOCSDIR="${DOCSDIR}" post-install: - ${MKDIR} '${DOCSDIR}' - ${CP} -Rp '${WRKSRC:H}/doc/html' '${DOCSDIR}' + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${CP} -Rp ${WRKSRC:H}/doc/html ${STAGEDIR}${DOCSDIR} .endif post-patch: @@ -55,10 +58,4 @@ do-configure: ${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/qmodules.h ${LN} -s . ${WRKDIR}/${DISTNAME}/src/tools/private -.include - -.if ${ARCH} == "alpha" -CXXFLAGS+= -mieee -.endif - -.include +.include Modified: head/devel/qmake/pkg-plist ============================================================================== --- head/devel/qmake/pkg-plist Mon Jun 9 14:57:33 2014 (r357167) +++ head/devel/qmake/pkg-plist Mon Jun 9 15:17:03 2014 (r357168) @@ -193,15 +193,15 @@ win32-watcom/qmake.conf @dirrm win32-watcom @unexec rmdir %%_PREFIX%%/share/qt/mkspecs @unexec rmdir %%_PREFIX%%/share/qt || echo %%_PREFIX%%/share/qt is still in use -- probably by the rest of Qt -%%PORTDOCS%%@cwd %%DOCSDIR%% -%%PORTDOCS%%html/qmake.dcf -%%PORTDOCS%%html/qmake-manual.html -%%PORTDOCS%%html/qmake-manual-1.html -%%PORTDOCS%%html/qmake-manual-2.html -%%PORTDOCS%%html/qmake-manual-3.html -%%PORTDOCS%%html/qmake-manual-4.html -%%PORTDOCS%%html/qmake-manual-5.html -%%PORTDOCS%%html/qmake-manual-6.html -%%PORTDOCS%%html/qmake-manual-7.html -%%PORTDOCS%%html/qmake-manual-8.html -%%PORTDOCS%%@unexec (rmdir %%DOCSDIR%%/html && rmdir %%DOCSDIR%%) || echo %%DOCSDIR%% is still in use -- by other Qt docs? +%%PORTDOCS%%%%DOCSDIR%%/html/qmake.dcf +%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual.html +%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-1.html +%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-2.html +%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-3.html +%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-4.html +%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-5.html +%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-6.html +%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-7.html +%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-8.html +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/html +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%