Date: Fri, 15 Aug 2014 07:31:47 +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: r364945 - head/net-im/psi Message-ID: <201408150731.s7F7Vl7D098863@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Fri Aug 15 07:31:47 2014 New Revision: 364945 URL: http://svnweb.freebsd.org/changeset/ports/364945 QAT: https://qat.redports.org/buildarchive/r364945/ Log: net-im/psi: - Add dependence on archivers/minizip - Convert to options helpers - Reorder paths to always include internal socks.h [1] PR: 192270 [1] Reported by: Jordan Irwin MFH: 2014Q3 Modified: head/net-im/psi/Makefile Modified: head/net-im/psi/Makefile ============================================================================== --- head/net-im/psi/Makefile Fri Aug 15 07:17:05 2014 (r364944) +++ head/net-im/psi/Makefile Fri Aug 15 07:31:47 2014 (r364945) @@ -3,14 +3,15 @@ PORTNAME= psi PORTVERSION= 0.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= SF/${PORTNAME}/Psi/${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= Qt 4 based Jabber client -LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca +LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca \ + libminizip.so:${PORTSDIR}/archivers/minizip RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \ qca-gnupg>=2.0.0.b3:${PORTSDIR}/security/qca-gnupg @@ -28,41 +29,29 @@ DESTDIRNAME= INSTALL_ROOT OPTIONS_DEFINE= ASPELL ENCHANT DBUS DEBUG OPTIONS_DEFAULT= ASPELL DBUS +OPTIONS_SUB= yes # DEBUG -ASPELL_DESC= Use aspell for spell checking -ENCHANT_DESC= Use Enchant for spell checking +DEBUG_CONFIGURE_ON= --debug +DEBUG_CONFIGURE_OFF= --release --no-separate-debug-info -.include <bsd.port.options.mk> +DBUS_USE= QT4=dbus +DBUS_CONFIGURE_OFF= --disable-qdbus -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --debug -PLIST_SUB+= DEBUG="" -.else -CONFIGURE_ARGS+= --release --no-separate-debug-info -PLIST_SUB+= DEBUG="@comment " -.endif - -.if ${PORT_OPTIONS:MDBUS} -USE_QT4+= dbus -.else -CONFIGURE_ARGS+= --disable-qdbus -.endif - -.if ${PORT_OPTIONS:MASPELL} -LIB_DEPENDS+= libaspell.so:${PORTSDIR}/textproc/aspell -CONFIGURE_ARGS+= --with-aspell-inc=${LOCALBASE}/include \ +ASPELL_DESC= Use aspell for spell checking +ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell +ASPELL_CONFIGURE_ON= --with-aspell-inc=${LOCALBASE}/include \ --with-aspell-lib=${LOCALBASE}/lib -.else -CONFIGURE_ARGS+= --disable-aspell -.endif - -.if ${PORT_OPTIONS:MENCHANT} -LIB_DEPENDS+= libenchant.so:${PORTSDIR}/textproc/enchant -.else -CONFIGURE_ARGS+= --disable-enchant -.endif +ASPELL_CONFIGURE_OFF= --disable-aspell + +ENCHANT_DESC= Use Enchant for spell checking +ENCHANT_LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant +ENCHANT_CONFIGURE_OFF= --disable-enchant -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/psi +post-configure: +# Reorder paths to always include internal socks.h (PR: 192270) + ${REINPLACE_CMD} -e '/^INCPATH/s,-I\.,-I\. -Icutestuff,' \ + ${WRKSRC}/iris/src/irisnet/noncore/Makefile + ${REINPLACE_CMD} -e '/^INCPATH/s,-I\.,-I\. -I../irisnet/noncore/cutestuff,' \ + ${WRKSRC}/iris/src/xmpp/Makefile .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408150731.s7F7Vl7D098863>