Date: Wed, 9 Oct 2013 10:08:19 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> 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 Message-ID: <201310091008.r99A8JaA079781@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> - -.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 <bsd.port.mk> 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 <bsd.port.options.mk> .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 <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310091008.r99A8JaA079781>