From owner-svn-ports-all@FreeBSD.ORG Sat Mar 29 14:08:25 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3F828DEB; Sat, 29 Mar 2014 14:08:25 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2CB445ED; Sat, 29 Mar 2014 14:08:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2TE8Put005409; Sat, 29 Mar 2014 14:08:25 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2TE8OlD005407; Sat, 29 Mar 2014 14:08:24 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201403291408.s2TE8OlD005407@svn.freebsd.org> From: Dmitry Marakasov Date: Sat, 29 Mar 2014 14:08:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349516 - head/net-im/mcabber 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: Sat, 29 Mar 2014 14:08:25 -0000 Author: amdmi3 Date: Sat Mar 29 14:08:24 2014 New Revision: 349516 URL: http://svnweb.freebsd.org/changeset/ports/349516 QAT: https://qat.redports.org/buildarchive/r349516/ Log: - Support staging - Use new LIB_DEPENDS syntax PR: 187347 Submitted by: amdmi3 Approved by: maintainer timeout, portmgr (blanket) Modified: head/net-im/mcabber/Makefile head/net-im/mcabber/pkg-plist Modified: head/net-im/mcabber/Makefile ============================================================================== --- head/net-im/mcabber/Makefile Sat Mar 29 14:07:59 2014 (r349515) +++ head/net-im/mcabber/Makefile Sat Mar 29 14:08:24 2014 (r349516) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.lilotux.net/~mi MAINTAINER= dhn@FreeBSD.org COMMENT= Small Jabber console client -LIB_DEPENDS= loudmouth:${PORTSDIR}/net-im/loudmouth +LIB_DEPENDS= libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth LICENSE= GPLv2 @@ -22,48 +22,24 @@ USES= pkgconfig gettext iconv ncurses USE_LDCONFIG= yes USE_GNOME= glib20 -MAN1= mcabber.1 - OPTIONS_DEFINE= GPGME OTR OPTIONS_RADIO= SPELL OPTIONS_RADIO_SPELL= ASPELL ENCHANT +OPTIONS_SUB= yes + GPGME_DESC= Use security/gpgme for PGP support OTR_DESC= Off-the-record messaging support ENCHANT_DESC= Spell checking via enchant -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MGPGME} -LIB_DEPENDS+= libgpgme.so:${PORTSDIR}/security/gpgme -CONFIGURE_ARGS+=--enable-gpgme -.else -CONFIGURE_ARGS+=--disable-gpgme -.endif - -.if ${PORT_OPTIONS:MASPELL} -LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell -CONFIGURE_ARGS+=--enable-aspell -.else -CONFIGURE_ARGS+=--disable-aspell -.endif - -.if ${PORT_OPTIONS:MENCHANT} -LIB_DEPENDS+= enchant.1:${PORTSDIR}/textproc/enchant -CONFIGURE_ARGS+=--enable-enchant -.else -CONFIGURE_ARGS+=--disable-enchant -.endif - -.if ${PORT_OPTIONS:MOTR} -LIB_DEPENDS+= otr.4:${PORTSDIR}/security/libotr3 \ - gcrypt:${PORTSDIR}/security/libgcrypt -CONFIGURE_ARGS+=--enable-otr -PLIST_SUB+= OTR="" -.else -CONFIGURE_ARGS+=--disable-otr -PLIST_SUB+= OTR="@comment " -.endif +GPGME_LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme +GPGME_CONFIGURE_ENABLE= gpgme +ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell +ASPELL_CONFIGURE_ENABLE=aspell +ENCHANT_LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant +ENCHANT_CONFIGURE_ENABLE=enchant +OTR_LIB_DEPENDS= libotr.so.4:${PORTSDIR}/security/libotr3 \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt +OTR_CONFIGURE_ENABLE= otr post-patch: @${REINPLACE_CMD} -e 's|$$"$${datadir}"|"$${datadir}"|;s|-O2||'\ @@ -72,9 +48,9 @@ post-patch: ${WRKSRC}/Makefile.* post-install: - @${INSTALL} -d ${PREFIX}/share/applications/ ${EXAMPLESDIR}/ - @${INSTALL} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/applications/ - @${CP} -R ${WRKSRC}/contrib ${DATADIR}/ - ${INSTALL_DATA} ${WRKSRC}/mcabberrc.example ${EXAMPLESDIR}/mcabberrc + @${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}/ + @${INSTALL} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/ + @${CP} -R ${WRKSRC}/contrib ${STAGEDIR}${DATADIR}/ + ${INSTALL_DATA} ${WRKSRC}/mcabberrc.example ${STAGEDIR}${EXAMPLESDIR}/mcabberrc .include Modified: head/net-im/mcabber/pkg-plist ============================================================================== --- head/net-im/mcabber/pkg-plist Sat Mar 29 14:07:59 2014 (r349515) +++ head/net-im/mcabber/pkg-plist Sat Mar 29 14:08:24 2014 (r349516) @@ -39,6 +39,7 @@ lib/mcabber/libfifo.la lib/mcabber/liburlregex.so lib/mcabber/libfifo.so libdata/pkgconfig/mcabber.pc +man/man1/mcabber.1.gz share/applications/mcabber.desktop %%EXAMPLESDIR%%/mcabberrc %%DATADIR%%/help/en/hlp.txt