From owner-svn-ports-all@FreeBSD.ORG Sun Nov 3 16:08:09 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 ESMTP id 4F2EDC4C; Sun, 3 Nov 2013 16:08:09 +0000 (UTC) (envelope-from az@FreeBSD.org) 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 3BEF9253F; Sun, 3 Nov 2013 16:08:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3G89oe036108; Sun, 3 Nov 2013 16:08:09 GMT (envelope-from az@svn.freebsd.org) Received: (from az@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3G889w036098; Sun, 3 Nov 2013 16:08:08 GMT (envelope-from az@svn.freebsd.org) Message-Id: <201311031608.rA3G889w036098@svn.freebsd.org> From: Andrej Zverev Date: Sun, 3 Nov 2013 16:08:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332622 - in head/finance: p5-Business-OnlinePayment-LinkPoint p5-Finance-Currency-Convert-WebserviceX p5-Finance-TW-EmergingQuote 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.14 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: Sun, 03 Nov 2013 16:08:09 -0000 Author: az Date: Sun Nov 3 16:08:07 2013 New Revision: 332622 URL: http://svnweb.freebsd.org/changeset/ports/332622 Log: - resolve conflicts after last two commits Modified: head/finance/p5-Business-OnlinePayment-LinkPoint/Makefile head/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist head/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile head/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist head/finance/p5-Finance-TW-EmergingQuote/Makefile head/finance/p5-Finance-TW-EmergingQuote/pkg-plist Modified: head/finance/p5-Business-OnlinePayment-LinkPoint/Makefile ============================================================================== --- head/finance/p5-Business-OnlinePayment-LinkPoint/Makefile Sun Nov 3 16:02:32 2013 (r332621) +++ head/finance/p5-Business-OnlinePayment-LinkPoint/Makefile Sun Nov 3 16:08:07 2013 (r332622) @@ -17,7 +17,4 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 USE_PERL5= configure -MAN3= Business::OnlinePayment::LinkPoint.3 - -NO_STAGE= yes .include Modified: head/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist ============================================================================== --- head/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist Sun Nov 3 16:02:32 2013 (r332621) +++ head/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist Sun Nov 3 16:08:07 2013 (r332622) @@ -1,5 +1,4 @@ %%SITE_PERL%%/Business/OnlinePayment/LinkPoint.pm -%%PERL5_MAN3%%/Business::OnlinePayment::LinkPoint.3.gz %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint/.packlist %%PERL5_MAN3%%/Business::OnlinePayment::LinkPoint.3.gz @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint Modified: head/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile ============================================================================== --- head/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile Sun Nov 3 16:02:32 2013 (r332621) +++ head/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile Sun Nov 3 16:08:07 2013 (r332622) @@ -10,6 +10,9 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Lightweight currency conversion using WebserviceX.NET +LICENSE= ART10 GPLv1 +LICENSE_COMB= dual + BUILD_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ p5-Module-Install>=0.65:${PORTSDIR}/devel/p5-Module-Install RUN_DEPENDS:= ${BUILD_DEPENDS} @@ -17,7 +20,4 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 USE_PERL5= configure -MAN3= Finance::Currency::Convert::WebserviceX.3 - -NO_STAGE= yes .include Modified: head/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist ============================================================================== --- head/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist Sun Nov 3 16:02:32 2013 (r332621) +++ head/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist Sun Nov 3 16:08:07 2013 (r332622) @@ -1,5 +1,4 @@ %%SITE_PERL%%/Finance/Currency/Convert/WebserviceX.pm -%%PERL5_MAN3%%/Finance::Currency::Convert::WebserviceX.3.gz %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/WebserviceX/.packlist %%PERL5_MAN3%%/Finance::Currency::Convert::WebserviceX.3.gz @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/WebserviceX Modified: head/finance/p5-Finance-TW-EmergingQuote/Makefile ============================================================================== --- head/finance/p5-Finance-TW-EmergingQuote/Makefile Sun Nov 3 16:02:32 2013 (r332621) +++ head/finance/p5-Finance-TW-EmergingQuote/Makefile Sun Nov 3 16:08:07 2013 (r332622) @@ -16,7 +16,4 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 USE_PERL5= configure -MAN3= Finance::TW::EmergingQuote.3 - -NO_STAGE= yes .include Modified: head/finance/p5-Finance-TW-EmergingQuote/pkg-plist ============================================================================== --- head/finance/p5-Finance-TW-EmergingQuote/pkg-plist Sun Nov 3 16:02:32 2013 (r332621) +++ head/finance/p5-Finance-TW-EmergingQuote/pkg-plist Sun Nov 3 16:08:07 2013 (r332622) @@ -1,7 +1,6 @@ %%SITE_PERL%%/Finance/TW/EmergingQuote.pm -%%PERL5_MAN3%%/Finance::TW::EmergingQuote.3.gz -%%PERL5_MAN3%%/Finance::TW::EmergingQuote.3.gz %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/TW/EmergingQuote/.packlist +%%PERL5_MAN3%%/Finance::TW::EmergingQuote.3.gz @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/TW/EmergingQuote @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/TW @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance