svn commit: r332622 - in head/finance: p5-Business-OnlinePayment-LinkPoint p5-Finance-Currency-Convert-WebserviceX p5-Finance-TW-EmergingQuote

[Andrej Zverev]

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 <bsd.port.mk>

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 at 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 <bsd.port.mk>

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 <bsd.port.mk>

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