From owner-svn-ports-all@FreeBSD.ORG Tue Dec 17 13:20:42 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7389D98A; Tue, 17 Dec 2013 13:20:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5EF1311D6; Tue, 17 Dec 2013 13:20:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHDKgng076181; Tue, 17 Dec 2013 13:20:42 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHDKf9C076176; Tue, 17 Dec 2013 13:20:41 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312171320.rBHDKf9C076176@svn.freebsd.org> From: Dirk Meyer Date: Tue, 17 Dec 2013 13:20:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336722 - in head/net-im: licq licq-icq licq-jabber licq-msn 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.17 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: Tue, 17 Dec 2013 13:20:42 -0000 Author: dinoex Date: Tue Dec 17 13:20:40 2013 New Revision: 336722 URL: http://svnweb.freebsd.org/changeset/ports/336722 Log: - use STAGEDIR - use OPTIONS_DEFINE Modified: head/net-im/licq-icq/Makefile head/net-im/licq-jabber/Makefile head/net-im/licq-msn/Makefile head/net-im/licq-qt-gui/Makefile head/net-im/licq/Makefile Modified: head/net-im/licq-icq/Makefile ============================================================================== --- head/net-im/licq-icq/Makefile Tue Dec 17 13:10:02 2013 (r336721) +++ head/net-im/licq-icq/Makefile Tue Dec 17 13:20:40 2013 (r336722) @@ -21,15 +21,14 @@ PLIST_DIRS= %%PORTDOCS%%%%DOCSDIR%% LICQ_PORT?= net-im/licq -NO_STAGE= yes -.include +.include .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .endif -.include +.include Modified: head/net-im/licq-jabber/Makefile ============================================================================== --- head/net-im/licq-jabber/Makefile Tue Dec 17 13:10:02 2013 (r336721) +++ head/net-im/licq-jabber/Makefile Tue Dec 17 13:20:40 2013 (r336722) @@ -12,8 +12,6 @@ LICENSE= GPLv2 LIB_DEPENDS= libgloox.so:${PORTSDIR}/net-im/gloox \ libboost_regex.so:${PORTSDIR}/devel/boost-libs -NO_STAGE= yes - USES= cmake DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} @@ -24,14 +22,14 @@ PLIST_DIRS= %%PORTDOCS%%%%DOCSDIR%% LICQ_PORT?= net-im/licq -.include +.include .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .endif -.include +.include Modified: head/net-im/licq-msn/Makefile ============================================================================== --- head/net-im/licq-msn/Makefile Tue Dec 17 13:10:02 2013 (r336721) +++ head/net-im/licq-msn/Makefile Tue Dec 17 13:20:40 2013 (r336722) @@ -11,8 +11,6 @@ LICENSE= GPLv2 LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs -NO_STAGE= yes - USES= cmake DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} @@ -23,14 +21,14 @@ PLIST_DIRS= %%PORTDOCS%%%%DOCSDIR%% LICQ_PORT?= net-im/licq -.include +.include .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .endif -.include +.include Modified: head/net-im/licq-qt-gui/Makefile ============================================================================== --- head/net-im/licq-qt-gui/Makefile Tue Dec 17 13:10:02 2013 (r336721) +++ head/net-im/licq-qt-gui/Makefile Tue Dec 17 13:20:40 2013 (r336722) @@ -14,13 +14,20 @@ LICENSE= GPLv2 LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs RUN_DEPENDS= ${LOCALBASE}/lib/licq/protocol_icq.so:${PORTSDIR}/${LICQ_PORT}-icq -NO_STAGE= yes - USE_XORG= x11 xext ice xscrnsaver USES= cmake USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build -.if defined(WITH_KDE) +OPTIONS_DEFINE= KDE4 +OPTIONS_DEFAULT= + +LICQ_PORT?= net-im/licq + +.include + +.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" + +.if ${PORT_OPTIONS:MKDE4} KDE_SUFFIX= -kde USE_KDE4= kdelibs automoc4 CMAKE_ARGS+= -DWITH_KDE:BOOL=ON @@ -34,21 +41,4 @@ PLIST_SUB+= WITH_KDE="@comment " PLIST_SUB+= WITH_QT="" .endif -LICQ_PORT?= net-im/licq - -pre-fetch: -.if defined(WITH_KDE) - @${ECHO_MSG} "" - @${ECHO_MSG} "Build with KDE support" - @${ECHO_MSG} "" -.else - @${ECHO_MSG} "" - @${ECHO_MSG} "You could define WITH_KDE if you want KDE support" - @${ECHO_MSG} "" -.endif - -.include - -.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" - -.include +.include Modified: head/net-im/licq/Makefile ============================================================================== --- head/net-im/licq/Makefile Tue Dec 17 13:10:02 2013 (r336721) +++ head/net-im/licq/Makefile Tue Dec 17 13:20:40 2013 (r336722) @@ -10,12 +10,10 @@ PKGNAMESUFFIX= ${SOCKS_SUFFIX}${PKGNAMES MAINTAINER= dinoex@FreeBSD.org COMMENT= A popular ICQ-compatible plugin-based program -LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs LICENSE= GPLv2 -NO_STAGE= yes - USES= cmake iconv WRKSRC= ${WRKDIR}/${DISTNAME} LICQ_PORT?= net-im/licq @@ -26,20 +24,22 @@ CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -Wl,--export-dynamic -.if !defined(WITHOUT_OPENSSL) -USE_OPENSSL= yes -CONFIGURE_ARGS+=--with-openssl-inc=${OPENSSLINC} -CONFIGURE_ARGS+=--with-openssl-lib=${OPENSSLLIB} -.endif +OPTIONS_DEFINE= OPENSSL +OPTIONS_DEFAULT=OPENSSL + +OPENSSL_USE= OPENSSL=yes +OPENSSL_CONFIGURE_ON= --with-openssl-inc=${OPENSSLINC} --with-openssl-lib=${OPENSSLLIB} .include +.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" + .if ${PORT_OPTIONS:MNLS} -CMAKE_ARGS+= -DENABLE_NLS:BOOL=OFF -PLIST_SUB+= NLS="@comment " -.else USES+= gettext PLIST_SUB+= NLS="" +.else +CMAKE_ARGS+= -DENABLE_NLS:BOOL=OFF +PLIST_SUB+= NLS="@comment " .endif pre-configure: @@ -47,12 +47,7 @@ pre-configure: ${WRKSRC}/bin/sidclean.sh post-install: - @${MKDIR} ${PREFIX}/lib/licq - @${CAT} ${PKGMESSAGE} - ${INSTALL_SCRIPT} ${WRKSRC}/bin/sidclean.sh ${PREFIX}/bin/sidclean.bash - -.include - -.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/licq + ${INSTALL_SCRIPT} ${WRKSRC}/bin/sidclean.sh ${STAGEDIR}${PREFIX}/bin/sidclean.bash -.include +.include