From decc96e9c11fbb94539181f1526aeae51c100a7e Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Tue, 13 Jan 2015 15:35:29 +0000 Subject: [PATCH] - Add LICENSE - Convert to new options helper - Use PORTDOCS and PORTEXAMPLES - Update PORTSCOUT - Cosmetic change - Sort PLIST --- www/p5-Maypole/Makefile | 60 ++++++++++++----------- www/p5-Maypole/pkg-plist | 100 +++++++++++++-------------------------- 2 files changed, 62 insertions(+), 98 deletions(-) diff --git a/www/p5-Maypole/Makefile b/www/p5-Maypole/Makefile index bedf13f76f30..506ce4a0e8cd 100644 --- a/www/p5-Maypole/Makefile +++ b/www/p5-Maypole/Makefile @@ -12,50 +12,45 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= MVC web application framework -BUILD_DEPENDS= p5-CGI-Simple>0:${PORTSDIR}/www/p5-CGI-Simple \ - p5-CGI-Untaint-date>0:${PORTSDIR}/www/p5-CGI-Untaint-date \ - p5-CGI-Untaint-email>0:${PORTSDIR}/www/p5-CGI-Untaint-email \ +LICENSE= ART10 GPLv1 +LICENSE_COMB= dual + +BUILD_DEPENDS= p5-CGI-Simple>=0:${PORTSDIR}/www/p5-CGI-Simple \ p5-CGI-Untaint>=1.26:${PORTSDIR}/www/p5-CGI-Untaint \ - p5-Class-DBI-AbstractSearch>0:${PORTSDIR}/databases/p5-Class-DBI-AbstractSearch \ - p5-Class-DBI-Loader-Relationship>0:${PORTSDIR}/databases/p5-Class-DBI-Loader-Relationship \ - p5-Class-DBI-Loader>=0.02:${PORTSDIR}/databases/p5-Class-DBI-Loader \ - p5-Class-DBI-Pager>0:${PORTSDIR}/databases/p5-Class-DBI-Pager \ - p5-Class-DBI-Plugin-RetrieveAll>0:${PORTSDIR}/databases/p5-Class-DBI-Plugin-RetrieveAll \ - p5-Class-DBI-Plugin-Type>0:${PORTSDIR}/databases/p5-Class-DBI-Plugin-Type \ + p5-CGI-Untaint-date>=0:${PORTSDIR}/www/p5-CGI-Untaint-date \ + p5-CGI-Untaint-email>=0:${PORTSDIR}/www/p5-CGI-Untaint-email \ p5-Class-DBI>=0.96:${PORTSDIR}/databases/p5-Class-DBI \ + p5-Class-DBI-AbstractSearch>=0:${PORTSDIR}/databases/p5-Class-DBI-AbstractSearch \ + p5-Class-DBI-Loader-Relationship>=0:${PORTSDIR}/databases/p5-Class-DBI-Loader-Relationship \ + p5-Class-DBI-Loader>=0.02:${PORTSDIR}/databases/p5-Class-DBI-Loader \ + p5-Class-DBI-Pager>=0:${PORTSDIR}/databases/p5-Class-DBI-Pager \ + p5-Class-DBI-Plugin-RetrieveAll>=0:${PORTSDIR}/databases/p5-Class-DBI-Plugin-RetrieveAll \ + p5-Class-DBI-Plugin-Type>=0:${PORTSDIR}/databases/p5-Class-DBI-Plugin-Type \ p5-File-MMagic-XS>=0.08:${PORTSDIR}/devel/p5-File-MMagic-XS \ - p5-HTML-Tree>0:${PORTSDIR}/www/p5-HTML-Tree \ + p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \ p5-HTTP-Body>=0.5:${PORTSDIR}/www/p5-HTTP-Body \ - p5-Lingua-EN-Inflect-Number>0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number \ - p5-Template-Plugin-Class>0:${PORTSDIR}/www/p5-Template-Plugin-Class \ - p5-Template-Toolkit>0:${PORTSDIR}/www/p5-Template-Toolkit \ - p5-UNIVERSAL-moniker>0:${PORTSDIR}/devel/p5-UNIVERSAL-moniker \ - p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \ - p5-URI>0:${PORTSDIR}/net/p5-URI \ - p5-libwww>0:${PORTSDIR}/www/p5-libwww + p5-Lingua-EN-Inflect-Number>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number \ + p5-Template-Plugin-Class>=0:${PORTSDIR}/www/p5-Template-Plugin-Class \ + p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \ + p5-UNIVERSAL-moniker>=0:${PORTSDIR}/devel/p5-UNIVERSAL-moniker \ + p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \ + p5-URI>=0:${PORTSDIR}/net/p5-URI \ + p5-libwww>=0:${PORTSDIR}/www/p5-libwww RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-Test-MockModule>=0:${PORTSDIR}/devel/p5-Test-MockModule \ p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite -PORTSCOUT= skipv:2.121 +PORTSCOUT= skipv:2.111,2.121 OPTIONS_DEFINE= MODPERL2 DOCS EXAMPLES -OPTIONS_DEFAULT= MODPERL2 +OPTIONS_DEFAULT=MODPERL2 MODPERL2_DESC= mod_perl2 support USES= perl5 USE_PERL5= configure -.include - -.if ${PORT_OPTIONS:MMODPERL2} -USE_APACHE_RUN= 22+ -BUILD_DEPENDS+= p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 -.endif - PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES+= pkg-message - +SUB_FILES= pkg-message DOC_FILES= ../Manual.pod \ About.pod \ Beer.pod \ @@ -65,12 +60,15 @@ DOC_FILES= ../Manual.pod \ StandardTemplates.pod \ View.pod \ Workflow.pod +PORTDOCS= * +PORTEXAMPLES= * + +MODPERL2_USE= APACHE_RUN=22+ +MODPERL2_BUILD_DEPENDS= p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR}/ -.for FILE in ${DOC_FILES} - ${INSTALL_DATA} ${WRKSRC}/lib/Maypole/Manual/${FILE} ${STAGEDIR}${DOCSDIR}/ -.endfor + cd ${WRKSRC}/lib/Maypole/Manual/ && ${INSTALL_DATA} ${DOC_FILES} ${STAGEDIR}${DOCSDIR}/ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ ${CP} -R ${WRKSRC}/examples/ ${STAGEDIR}${EXAMPLESDIR}/ diff --git a/www/p5-Maypole/pkg-plist b/www/p5-Maypole/pkg-plist index 6ad2ae69f3b8..12813fecfaa9 100644 --- a/www/p5-Maypole/pkg-plist +++ b/www/p5-Maypole/pkg-plist @@ -48,71 +48,37 @@ %%SITE_PERL%%/Maypole/templates/factory/search_form %%SITE_PERL%%/Maypole/templates/factory/title %%SITE_PERL%%/Maypole/templates/factory/view +%%PERL5_MAN3%%/Maypole.3.gz +%%PERL5_MAN3%%/Maypole::Application.3.gz +%%PERL5_MAN3%%/Maypole::CLI.3.gz +%%PERL5_MAN3%%/Maypole::Config.3.gz +%%PERL5_MAN3%%/Maypole::Constants.3.gz +%%PERL5_MAN3%%/Maypole::HTTPD.3.gz +%%PERL5_MAN3%%/Maypole::HTTPD::Frontend.3.gz +%%PERL5_MAN3%%/Maypole::Headers.3.gz +%%PERL5_MAN3%%/Maypole::Manual.3.gz +%%PERL5_MAN3%%/Maypole::Manual::About.3.gz +%%PERL5_MAN3%%/Maypole::Manual::Beer.3.gz +%%PERL5_MAN3%%/Maypole::Manual::BuySpy.3.gz +%%PERL5_MAN3%%/Maypole::Manual::Cookbook.3.gz +%%PERL5_MAN3%%/Maypole::Manual::Flox.3.gz +%%PERL5_MAN3%%/Maypole::Manual::Inheritance.3.gz +%%PERL5_MAN3%%/Maypole::Manual::Install.3.gz +%%PERL5_MAN3%%/Maypole::Manual::Model.3.gz +%%PERL5_MAN3%%/Maypole::Manual::Plugins.3.gz +%%PERL5_MAN3%%/Maypole::Manual::StandardTemplates.3.gz +%%PERL5_MAN3%%/Maypole::Manual::View.3.gz +%%PERL5_MAN3%%/Maypole::Manual::Workflow.3.gz +%%PERL5_MAN3%%/Maypole::Model::Base.3.gz +%%PERL5_MAN3%%/Maypole::Model::CDBI.3.gz +%%PERL5_MAN3%%/Maypole::Model::CDBI::AsForm.3.gz +%%PERL5_MAN3%%/Maypole::Model::CDBI::Base.3.gz +%%PERL5_MAN3%%/Maypole::Model::CDBI::DFV.3.gz +%%PERL5_MAN3%%/Maypole::Model::CDBI::FromCGI.3.gz +%%PERL5_MAN3%%/Maypole::Model::CDBI::Plain.3.gz +%%PERL5_MAN3%%/Maypole::Session.3.gz +%%PERL5_MAN3%%/Maypole::View::Base.3.gz +%%PERL5_MAN3%%/Maypole::View::TT.3.gz %%PERL5_MAN3%%/Apache::MVC.3.gz -%%PERL5_MAN3%%/CGI::%%AP_NAME%%.3.gz -%%PERL5_MAN3%%/CGI::Untaint::%%AP_NAME%%.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Application.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::CLI.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Config.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Constants.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::HTTPD.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::HTTPD::Frontend.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Headers.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Manual.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Manual::About.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Manual::Beer.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Manual::BuySpy.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Manual::Cookbook.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Manual::Flox.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Manual::Inheritance.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Manual::Install.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Manual::Model.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Manual::Plugins.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Manual::StandardTemplates.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Manual::View.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Manual::Workflow.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Model::Base.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Model::CDBI.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Model::CDBI::AsForm.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Model::CDBI::Base.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Model::CDBI::DFV.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Model::CDBI::FromCGI.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Model::CDBI::Plain.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::Session.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::View::Base.3.gz -%%PERL5_MAN3%%/%%AP_NAME%%::View::TT.3.gz -%%PORTDOCS%%%%DOCSDIR%%/About.pod -%%PORTDOCS%%%%DOCSDIR%%/Beer.pod -%%PORTDOCS%%%%DOCSDIR%%/BuySpy.pod -%%PORTDOCS%%%%DOCSDIR%%/Flox.pod -%%PORTDOCS%%%%DOCSDIR%%/Manual.pod -%%PORTDOCS%%%%DOCSDIR%%/Model.pod -%%PORTDOCS%%%%DOCSDIR%%/StandardTemplates.pod -%%PORTDOCS%%%%DOCSDIR%%/View.pod -%%PORTDOCS%%%%DOCSDIR%%/Workflow.pod -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BeerDB.pm -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BeerDB/Base.pm -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BeerDB/Beer.pm -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beerdb.sql -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/BeerDB.pm -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Base.pm -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Beer.pm -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Brewery.pm -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Drinker.pm -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/beerdb.sql -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/addnew -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/display_inputs -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/display_search_inputs -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/edit -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/header -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/maypole.css -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/metadata -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/search_form -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fancy_example/templates/custom -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fancy_example/templates -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fancy_example/BeerDB -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fancy_example -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/BeerDB -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +%%PERL5_MAN3%%/CGI::Maypole.3.gz +%%PERL5_MAN3%%/CGI::Untaint::Maypole.3.gz