From owner-svn-ports-head@FreeBSD.ORG Wed Oct 9 10:08:20 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id 04E26C8A; Wed, 9 Oct 2013 10:08:20 +0000 (UTC) (envelope-from makc@FreeBSD.org) 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 D7DAB2A4D; Wed, 9 Oct 2013 10:08:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99A8JLn079784; Wed, 9 Oct 2013 10:08:19 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99A8JaA079781; Wed, 9 Oct 2013 10:08:19 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201310091008.r99A8JaA079781@svn.freebsd.org> From: Max Brazhnikov Date: Wed, 9 Oct 2013 10:08:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329881 - in head: graphics/fraqtive net-im/psi 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: Wed, 09 Oct 2013 10:08:20 -0000 Author: makc Date: Wed Oct 9 10:08:19 2013 New Revision: 329881 URL: http://svnweb.freebsd.org/changeset/ports/329881 Log: - Set DESTDIRNAME, allow staging - Use options helpers - Use new LIB_DEPENDS syntax - Remove post-configure patching: CC, etc are now respected via QMAKESPEC Modified: head/graphics/fraqtive/Makefile head/net-im/psi/Makefile Modified: head/graphics/fraqtive/Makefile ============================================================================== --- head/graphics/fraqtive/Makefile Wed Oct 9 10:08:04 2013 (r329880) +++ head/graphics/fraqtive/Makefile Wed Oct 9 10:08:19 2013 (r329881) @@ -17,27 +17,15 @@ HAS_CONFIGURE= yes CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" \ QMAKE_CFLAGS="${CFLAGS}" CONFIGURE_ARGS= -prefix ${PREFIX} -qmake ${QMAKE} +DESTDIRNAME= INSTALL_ROOT OPTIONS_DEFINE= SSE2 SSE2_DESC= Enable SSE2 optimization +SSE2_CONFIGURE_OFF= -no-sse2 STRIP_FILES= bin/fraqtive -NO_STAGE= yes -.include - -.if !${PORT_OPTIONS:MSSE2} -CONFIGURE_ARGS+=-no-sse2 -.endif - -post-configure: - @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \ - -e 's|^CC .*|CC=${CC}|; s|^CXX .*|CXX=${CXX}|' \ - -e 's|^LINK .*|LINK=${CXX}|' \ - -e 's|^CFLAGS .*|CFLAGS=${CFLAGS} -Wall -W $$\(DEFINES\)|' \ - -e 's|^CXXFLAGS .*|CXXFLAGS=${CXXFLAGS} -Wall -W $$\(DEFINES\)|' - post-install: - ${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,} + ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} .include Modified: head/net-im/psi/Makefile ============================================================================== --- head/net-im/psi/Makefile Wed Oct 9 10:08:04 2013 (r329880) +++ head/net-im/psi/Makefile Wed Oct 9 10:08:19 2013 (r329881) @@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/Psi/${PORTV MAINTAINER= makc@FreeBSD.org COMMENT= Qt 4 based Jabber client -LIB_DEPENDS= qca.2:${PORTSDIR}/devel/qca +LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \ qca-gnupg>=2.0.0.b3:${PORTSDIR}/security/qca-gnupg @@ -24,6 +24,7 @@ USE_XORG= xscrnsaver CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${LOCALBASE} \ --disable-growl --verbose CONFIGURE_ENV= QMAKEFLAGS='${QMAKEFLAGS}' +DESTDIRNAME= INSTALL_ROOT OPTIONS_DEFINE= ASPELL ENCHANT DBUS DEBUG OPTIONS_DEFAULT= ASPELL DBUS @@ -31,7 +32,6 @@ OPTIONS_DEFAULT= ASPELL DBUS ASPELL_DESC= Use aspell for spell checking ENCHANT_DESC= Use Enchant for spell checking -NO_STAGE= yes .include .if ${PORT_OPTIONS:MDEBUG} @@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --disable-qdbus .endif .if ${PORT_OPTIONS:MASPELL} -LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell +LIB_DEPENDS+= libaspell.so:${PORTSDIR}/textproc/aspell CONFIGURE_ARGS+= --with-aspell-inc=${LOCALBASE}/include \ --with-aspell-lib=${LOCALBASE}/lib .else @@ -57,12 +57,12 @@ CONFIGURE_ARGS+= --disable-aspell .endif .if ${PORT_OPTIONS:MENCHANT} -LIB_DEPENDS+= enchant.1:${PORTSDIR}/textproc/enchant +LIB_DEPENDS+= libenchant.so:${PORTSDIR}/textproc/enchant .else CONFIGURE_ARGS+= --disable-enchant .endif post-install: - ${STRIP_CMD} ${PREFIX}/bin/psi + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/psi .include