From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Mar 7 12:00:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 1389E157 for ; Fri, 7 Mar 2014 12:00:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 E473367F for ; Fri, 7 Mar 2014 12:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s27C005f047399 for ; Fri, 7 Mar 2014 12:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s27C00ct047396; Fri, 7 Mar 2014 12:00:00 GMT (envelope-from gnats) Resent-Date: Fri, 7 Mar 2014 12:00:00 GMT Resent-Message-Id: <201403071200.s27C00ct047396@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Marakasov 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 7DA1AFF0; Fri, 7 Mar 2014 11:50:46 +0000 (UTC) Received: from smtpout3.timeweb.ru (smtpout3.timeweb.ru [92.53.117.25]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 381DF3E6; Fri, 7 Mar 2014 11:50:45 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1WLtIZ-0008Jo-0j; Fri, 07 Mar 2014 15:50:43 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id 8498E865; Fri, 7 Mar 2014 15:50:42 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 7987A31F44; Fri, 7 Mar 2014 15:50:42 +0400 (MSK) Message-Id: <20140307115042.7987A31F44@hades.panopticon> Date: Fri, 7 Mar 2014 15:50:42 +0400 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/187347: [PATCH] net-im/mcabber: support staging Cc: dhn@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Mar 2014 12:00:01 -0000 >Number: 187347 >Category: ports >Synopsis: [PATCH] net-im/mcabber: support staging >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Mar 07 12:00:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 10.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK >Description: - Support staging - Use new LIB_DEPENDS syntax Port maintainer (dhn@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 1.00.2014.02.18 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- mcabber-0.10.2.patch begins here --- diff -ruN /usr/ports/net-im/mcabber/Makefile ./Makefile --- /usr/ports/net-im/mcabber/Makefile 2013-12-18 01:58:08.000000000 +0400 +++ ./Makefile 2014-03-07 03:15:02.775881302 +0400 @@ -9,7 +9,7 @@ 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 @@ 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 @@ ${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 diff -ruN /usr/ports/net-im/mcabber/pkg-plist ./pkg-plist --- /usr/ports/net-im/mcabber/pkg-plist 2014-01-22 19:16:56.000000000 +0400 +++ ./pkg-plist 2014-03-07 14:26:11.050106953 +0400 @@ -39,6 +39,7 @@ 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 --- mcabber-0.10.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: