diff options
| author | az <az@FreeBSD.org> | 2013-11-03 16:08:07 +0000 |
|---|---|---|
| committer | az <az@FreeBSD.org> | 2013-11-03 16:08:07 +0000 |
| commit | 4cfb0fac1cf388cbc05765b6ad42b9b4d7bc1145 (patch) | |
| tree | 61d2e789378256426c7c900d3968807689947333 | |
| parent | e33abd456018339b50ee24599bdd94c70c6a2feb (diff) | |
| download | FreeBSD-ports-4cfb0fac1cf388cbc05765b6ad42b9b4d7bc1145.zip FreeBSD-ports-4cfb0fac1cf388cbc05765b6ad42b9b4d7bc1145.tar.gz | |
- resolve conflicts after last two commits
6 files changed, 4 insertions, 13 deletions
diff --git a/finance/p5-Business-OnlinePayment-LinkPoint/Makefile b/finance/p5-Business-OnlinePayment-LinkPoint/Makefile index 3d8db6a..9b4f3f2 100644 --- a/finance/p5-Business-OnlinePayment-LinkPoint/Makefile +++ b/finance/p5-Business-OnlinePayment-LinkPoint/Makefile @@ -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> diff --git a/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist b/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist index 2d03974..7140ee6 100644 --- a/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist +++ b/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist @@ -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 diff --git a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile index cb3031c..622b52f 100644 --- a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile +++ b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile @@ -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 <bsd.port.mk> diff --git a/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist b/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist index 1048ed8..81ac312 100644 --- a/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist +++ b/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist @@ -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 diff --git a/finance/p5-Finance-TW-EmergingQuote/Makefile b/finance/p5-Finance-TW-EmergingQuote/Makefile index 3325758..a0aadd2 100644 --- a/finance/p5-Finance-TW-EmergingQuote/Makefile +++ b/finance/p5-Finance-TW-EmergingQuote/Makefile @@ -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> diff --git a/finance/p5-Finance-TW-EmergingQuote/pkg-plist b/finance/p5-Finance-TW-EmergingQuote/pkg-plist index 5c7b955..801c623 100644 --- a/finance/p5-Finance-TW-EmergingQuote/pkg-plist +++ b/finance/p5-Finance-TW-EmergingQuote/pkg-plist @@ -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 |
