From owner-svn-ports-all@FreeBSD.ORG Fri Nov 22 12:55:23 2013 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 4E5135F4; Fri, 22 Nov 2013 12:55:23 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 24F8122E9; Fri, 22 Nov 2013 12:55:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAMCtNjC085100; Fri, 22 Nov 2013 12:55:23 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAMCtMFq085099; Fri, 22 Nov 2013 12:55:23 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201311221255.rAMCtMFq085099@svn.freebsd.org> From: Max Brazhnikov Date: Fri, 22 Nov 2013 12:55:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334589 - head/editors/texworks 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.16 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: Fri, 22 Nov 2013 12:55:23 -0000 Author: makc Date: Fri Nov 22 12:55:22 2013 New Revision: 334589 URL: http://svnweb.freebsd.org/changeset/ports/334589 Log: - Convert to USES=qmake - Support staging properly Approved by: portmgr (blanket approval) Modified: head/editors/texworks/Makefile Modified: head/editors/texworks/Makefile ============================================================================== --- head/editors/texworks/Makefile Fri Nov 22 12:55:18 2013 (r334588) +++ head/editors/texworks/Makefile Fri Nov 22 12:55:22 2013 (r334589) @@ -17,19 +17,19 @@ OPTIONS_DEFINE= DOCS LUA PYTHON BUILD_DEPENDS= hunspell:${PORTSDIR}/textproc/hunspell LIB_DEPENDS= libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 -USES= pkgconfig -USE_QT4= qmake_build gui corelib rcc_build moc_build uic_build \ +USES= pkgconfig qmake +USE_QT4= gui corelib rcc_build moc_build uic_build \ dbus xml scripttools designer_build -QMAKEFLAGS= QMAKE_LFLAGS="-lz" -QMAKE_ARGS= INSTALL_PREFIX=${STAGEDIR}${PREFIX} \ - DATA_DIR=${STAGEDIR}${DATADIR} \ - DOCS_DIR=${STAGEDIR}${DOCSDIR} \ - ICON_DIR=${STAGEDIR}${PREFIX}/share/pixmaps \ - DESKTOP_DIR=${STAGEDIR}${PREFIX}/share/applications \ - MAN_DIR=${STAGEDIR}${PREFIX}/man/man1 \ +QMAKE_ARGS= INSTALL_PREFIX=${PREFIX} \ + DATA_DIR=${DATADIR} \ + DOCS_DIR=${DOCSDIR} \ + ICON_DIR=${PREFIX}/share/pixmaps \ + DESKTOP_DIR=${PREFIX}/share/applications \ + MAN_DIR=${PREFIX}/man/man1 \ TW_DICPATH=${LOCALBASE}/share/hunspell \ TW_HELPPATH=${DOCSDIR} \ TW_PLUGINPATH=${PREFIX}/lib/texworks +LDFLAGS+= -lz VCS_REVISION= 1281 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -73,16 +73,14 @@ post-patch: ${WRKSRC}/TeXworks.pro .endif -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} TeXworks.pro +post-configure: .if ${PORT_OPTIONS:MLUA} cd ${WRKSRC}/plugins-src/TWLuaPlugin && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}/TWLuaPlugin.pro + ${QMAKE} ${QMAKE_ARGS} .endif .if ${PORT_OPTIONS:MPYTHON} cd ${WRKSRC}/plugins-src/TWPythonPlugin && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}/TWPythonPlugin.pro + ${QMAKE} ${QMAKE_ARGS} .endif post-build: