From owner-svn-ports-all@freebsd.org Sat Sep 5 15:15:44 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13E019CAFA1; Sat, 5 Sep 2015 15:15:44 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DA5E7D14; Sat, 5 Sep 2015 15:15:43 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t85FFhDq010440; Sat, 5 Sep 2015 15:15:43 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t85FFhf2010439; Sat, 5 Sep 2015 15:15:43 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201509051515.t85FFhf2010439@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Sat, 5 Sep 2015 15:15:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396181 - head/net-im/licq-qt-gui X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2015 15:15:44 -0000 Author: dinoex Date: Sat Sep 5 15:15:43 2015 New Revision: 396181 URL: https://svnweb.freebsd.org/changeset/ports/396181 Log: - Add HUNSPELL option (enabled by default) - Use qt4-linguisttools instead of qt4-linguist for *.ts files. - Depend on qt4-xml and qt4-gui even when KDE is selected (they are used anyway). - Use OPTIONS helpers where possible. PR: 202547 Submitted by: Andriy Voskoboinyk Modified: head/net-im/licq-qt-gui/Makefile Modified: head/net-im/licq-qt-gui/Makefile ============================================================================== --- head/net-im/licq-qt-gui/Makefile Sat Sep 5 14:56:01 2015 (r396180) +++ head/net-im/licq-qt-gui/Makefile Sat Sep 5 15:15:43 2015 (r396181) @@ -3,6 +3,7 @@ PORTNAME= qt4-gui PORTVERSION= 1.8.2 +PORTREVISION= 1 CATEGORIES= net-im PKGNAMESUFFIX?= ${KDE_SUFFIX}${PKGNAMESUFFIX2} @@ -16,29 +17,39 @@ RUN_DEPENDS= ${LOCALBASE}/lib/licq/proto USE_XORG= x11 xext ice xscrnsaver USES= cmake -USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build +USE_QT4= qmake_build moc_build rcc_build uic_build linguisttools_build \ + corelib xml gui -OPTIONS_DEFINE= KDE4 -OPTIONS_DEFAULT= +OPTIONS_DEFINE= HUNSPELL KDE4 +OPTIONS_DEFAULT=HUNSPELL LICQ_PORT?= net-im/licq +HUNSPELL_LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell +HUNSPELL_CMAKE_ON= -DHUNSPELL_INCLUDE_DIRS=${LOCALBASE}/include/hunspell \ + -DHUNSPELL_LIBRARIES=${LOCALBASE}/lib/libhunspell-1.3.so \ + -DHUNSPELL_FOUND:BOOL=ON +HUNSPELL_CMAKE_OFF= -DHUNSPELL_FOUND:BOOL=OFF + +KDE4_USE= KDE4=kdelibs,automoc4 +KDE4_PREVENTS= HUNSPELL +KDE4_CMAKE_ON= -DWITH_KDE:BOOL=ON +KDE4_CMAKE_OFF= -DWITH_KDE:BOOL=OFF +KDE4_PLIST_SUB= GUI_NAME=kde4 WITH_KDE="" WITH_QT="@comment " +KDE4_PLIST_SUB_OFF= GUI_NAME=qt4 WITH_KDE="@comment " WITH_QT="" + .include .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" .if ${PORT_OPTIONS:MKDE4} KDE_SUFFIX= -kde -USE_KDE4= kdelibs automoc4 -CMAKE_ARGS+= -DWITH_KDE:BOOL=ON -PLIST_SUB+= GUI_NAME=kde4 -PLIST_SUB+= WITH_KDE="" -PLIST_SUB+= WITH_QT="@comment " -.else -USE_QT4+= xml gui -PLIST_SUB+= GUI_NAME=qt4 -PLIST_SUB+= WITH_KDE="@comment " -PLIST_SUB+= WITH_QT="" +.endif + +.if ${PORT_OPTIONS:MHUNSPELL} +.if ${PORT_OPTIONS:MKDE4} +IGNORE= option HUNSPELL can not be used with KDE4 +.endif .endif .include