svn commit: r365369 - branches/2014Q3/net-im/psi

[Max Brazhnikov]

Author: makc
Date: Tue Aug 19 09:40:43 2014
New Revision: 365369
URL: http://svnweb.freebsd.org/changeset/ports/365369
QAT: https://qat.redports.org/buildarchive/r365369/

Log:
  MFH: r364945
  
  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
  Approved by:	portmgr (erwin)

Modified:
  branches/2014Q3/net-im/psi/Makefile
Directory Properties:
  branches/2014Q3/   (props changed)

Modified: branches/2014Q3/net-im/psi/Makefile
==============================================================================
--- branches/2014Q3/net-im/psi/Makefile	Tue Aug 19 09:33:04 2014	(r365368)
+++ branches/2014Q3/net-im/psi/Makefile	Tue Aug 19 09:40:43 2014	(r365369)
@@ -3,13 +3,15 @@
 
 PORTNAME=	psi
 PORTVERSION=	0.15
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	SF/${PORTNAME}/Psi/${PORTVERSION}
 
 MAINTAINER=	makc at 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
 
@@ -27,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>