From 4763a75e8d6d1994557cbb7b117a81e85e1fe60f Mon Sep 17 00:00:00 2001
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Fri, 15 Aug 2014 07:31:47 +0000
Subject: 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
---
net-im/psi/Makefile | 55 +++++++++++++++++++++--------------------------------
1 file changed, 22 insertions(+), 33 deletions(-)
(limited to 'net-im/psi')
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index ab8348efcd8e..03053682b158 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -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
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+= --debug
-PLIST_SUB+= DEBUG=""
-.else
-CONFIGURE_ARGS+= --release --no-separate-debug-info
-PLIST_SUB+= DEBUG="@comment "
-.endif
+DEBUG_CONFIGURE_ON= --debug
+DEBUG_CONFIGURE_OFF= --release --no-separate-debug-info
-.if ${PORT_OPTIONS:MDBUS}
-USE_QT4+= dbus
-.else
-CONFIGURE_ARGS+= --disable-qdbus
-.endif
+DBUS_USE= QT4=dbus
+DBUS_CONFIGURE_OFF= --disable-qdbus
-.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
-post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/psi
+ENCHANT_DESC= Use Enchant for spell checking
+ENCHANT_LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant
+ENCHANT_CONFIGURE_OFF= --disable-enchant
+
+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>
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0