From owner-svn-ports-head@FreeBSD.ORG Sun Nov 3 16:02:33 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id A267D89A; Sun, 3 Nov 2013 16:02:33 +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 761BD250C; Sun, 3 Nov 2013 16:02:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3G2XTR035057; Sun, 3 Nov 2013 16:02:33 GMT (envelope-from az@svn.freebsd.org) Received: (from az@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3G2XUk035055; Sun, 3 Nov 2013 16:02:33 GMT (envelope-from az@svn.freebsd.org) Message-Id: <201311031602.rA3G2XUk035055@svn.freebsd.org> From: Andrej Zverev Date: Sun, 3 Nov 2013 16:02:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332621 - head/finance/p5-Business-OnlinePayment X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 16:02:33 -0000 Author: az Date: Sun Nov 3 16:02:32 2013 New Revision: 332621 URL: http://svnweb.freebsd.org/changeset/ports/332621 Log: - resolve conflicts after last two commits Modified: head/finance/p5-Business-OnlinePayment/Makefile head/finance/p5-Business-OnlinePayment/pkg-plist Modified: head/finance/p5-Business-OnlinePayment/Makefile ============================================================================== --- head/finance/p5-Business-OnlinePayment/Makefile Sun Nov 3 15:45:45 2013 (r332620) +++ head/finance/p5-Business-OnlinePayment/Makefile Sun Nov 3 16:02:32 2013 (r332621) @@ -21,10 +21,4 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 USE_PERL5= configure -MAN3= Business::OnlinePayment.3 \ - Business::FraudDetect.3 \ - Business::FraudDetect::preCharge.3 \ - Business::OnlinePayment::HTTPS.3 - -NO_STAGE= yes .include Modified: head/finance/p5-Business-OnlinePayment/pkg-plist ============================================================================== --- head/finance/p5-Business-OnlinePayment/pkg-plist Sun Nov 3 15:45:45 2013 (r332620) +++ head/finance/p5-Business-OnlinePayment/pkg-plist Sun Nov 3 16:02:32 2013 (r332621) @@ -1,16 +1,13 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/.packlist -%%PERL5_MAN3%%/Business::OnlinePayment.3.gz -%%PERL5_MAN3%%/Business::FraudDetect.3.gz -%%PERL5_MAN3%%/Business::FraudDetect::preCharge.3.gz -%%PERL5_MAN3%%/Business::FraudDetect.3.gz -%%PERL5_MAN3%%/Business::FraudDetect::preCharge.3.gz -%%PERL5_MAN3%%/Business::OnlinePayment.3.gz -%%PERL5_MAN3%%/Business::OnlinePayment::HTTPS.3.gz %%SITE_PERL%%/Business/FraudDetect.pm %%SITE_PERL%%/Business/FraudDetect/preCharge.pm %%SITE_PERL%%/Business/OnlinePayment.pm %%SITE_PERL%%/Business/OnlinePayment/HTTPS.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/.packlist +%%PERL5_MAN3%%/Business::OnlinePayment.3.gz +%%PERL5_MAN3%%/Business::FraudDetect.3.gz +%%PERL5_MAN3%%/Business::FraudDetect::preCharge.3.gz +%%PERL5_MAN3%%/Business::OnlinePayment::HTTPS.3.gz @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business @dirrmtry %%SITE_PERL%%/Business/OnlinePayment