From: Karen Etheridge Date: Fri, 22 Mar 2024 21:00:39 +0000 (-0700) Subject: Release commit for 5.9013 X-Git-Tag: v5.9013^0 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Manual.git;a=commitdiff_plain;h=HEAD;hp=ff760c54d335471ab212390b1a3012357d32ea0f Release commit for 5.9013 - fix mojibake in metadata --- diff --git a/.gitignore b/.gitignore index a188f4d..ce4b333 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /blib/ /cover_db/ /pm_to_blib +/.ackrc diff --git a/.mailmap b/.mailmap index deaf37f..b52aab0 100644 --- a/.mailmap +++ b/.mailmap @@ -1,8 +1,39 @@ -# https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html#_mapping_authors -Gerda Shank -Jesse Sheidlower Jesse +Alex Sparkman +Andreas Marienborg +Andrew Rodland +Aristotle Pagaltzis +Artem Konev <41629299+artemkonev@users.noreply.github.com> +Brian Phillips +Christopher Masto +Colin Newell +Dagfinn Ilmari Mannsåker +Dagfinn Ilmari Mannsåker +David Schmidt +Eden Cardim +Gareth Kirwan +Gerda Shank +Jay Hannah +Jesse Sheidlower +John Napiorkowski Jonathan Yu -Kennedy Clark hkclark +Julien Fiegehenn +Kartik Thakore +Kennedy Clark Kennedy Clark -Mateu X. Hunter Mateu X Hunter +Kostya Ten +Mark Ellis +Mateu X. Hunter +Matthias Dietrich Rafael Kitover +Ricardo Signes +Samuel Kaufman +Tomas Doran +Tomas Doran +Tomas Doran +Tomáš Valoušek +Wallace Reis +Wallace Reis +Wes Sheldahl +antgel +kmx +kmx diff --git a/Changes b/Changes index 6bbad33..62c6e4a 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,12 @@ Revision history for Catalyst-Manual +5.9013 - 2024-03-22 + - fix mojibake in metadata + +5.9012 - 2024-02-03 + - fixed some broken links (Graham Knop, Daniel Böhmer) + +5.9011 - 2020-07-22 - added NGINX Unit deployment documentation 5.9010 - 2019-04-25 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..887a689 --- /dev/null +++ b/LICENSE @@ -0,0 +1,374 @@ +Terms of the Perl programming language system itself + +a) the GNU General Public License as published by the Free + Software Foundation; either version 1, or (at your option) any + later version, or +b) the "Artistic License" + +--- The GNU General Public License, Version 1, February 1989 --- + +This software is Copyright (c) 2020 by Catalyst Contributors, see Catalyst.pm, Kieren Diment . + +This is free software, licensed under: + + The GNU General Public License, Version 1, February 1989 + + GNU GENERAL PUBLIC LICENSE + Version 1, February 1989 + + Copyright (C) 1989 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The license agreements of most software companies try to keep users +at the mercy of those companies. By contrast, our General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. The +General Public License applies to the Free Software Foundation's +software and to any other program whose authors commit to using it. +You can use it for your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Specifically, the General Public License is designed to make +sure that you have the freedom to give away or sell copies of free +software, that you receive source code or can get it if you want it, +that you can change the software or use pieces of it in new free +programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of a such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must tell them their rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any program or other work which +contains a notice placed by the copyright holder saying it may be +distributed under the terms of this General Public License. The +"Program", below, refers to any such program or work, and a "work based +on the Program" means either the Program or any work containing the +Program or a portion of it, either verbatim or with modifications. Each +licensee is addressed as "you". + + 1. You may copy and distribute verbatim copies of the Program's source +code as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this +General Public License and to the absence of any warranty; and give any +other recipients of the Program a copy of this General Public License +along with the Program. You may charge a fee for the physical act of +transferring a copy. + + 2. You may modify your copy or copies of the Program or any portion of +it, and copy and distribute such modifications under the terms of Paragraph +1 above, provided that you also do the following: + + a) cause the modified files to carry prominent notices stating that + you changed the files and the date of any change; and + + b) cause the whole of any work that you distribute or publish, that + in whole or in part contains the Program or any part thereof, either + with or without modifications, to be licensed at no charge to all + third parties under the terms of this General Public License (except + that you may choose to grant warranty protection to some or all + third parties, at your option). + + c) If the modified program normally reads commands interactively when + run, you must cause it, when started running for such interactive use + in the simplest and most usual way, to print or display an + announcement including an appropriate copyright notice and a notice + that there is no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program under these + conditions, and telling the user how to view a copy of this General + Public License. + + d) You may charge a fee for the physical act of transferring a + copy, and you may at your option offer warranty protection in + exchange for a fee. + +Mere aggregation of another independent work with the Program (or its +derivative) on a volume of a storage or distribution medium does not bring +the other work under the scope of these terms. + + 3. You may copy and distribute the Program (or a portion or derivative of +it, under Paragraph 2) in object code or executable form under the terms of +Paragraphs 1 and 2 above provided that you also do one of the following: + + a) accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of + Paragraphs 1 and 2 above; or, + + b) accompany it with a written offer, valid for at least three + years, to give any third party free (except for a nominal charge + for the cost of distribution) a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of + Paragraphs 1 and 2 above; or, + + c) accompany it with the information you received as to where the + corresponding source code may be obtained. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form alone.) + +Source code for a work means the preferred form of the work for making +modifications to it. For an executable file, complete source code means +all the source code for all modules it contains; but, as a special +exception, it need not include source code for modules which are standard +libraries that accompany the operating system on which the executable +file runs, or for standard header files or definitions files that +accompany that operating system. + + 4. You may not copy, modify, sublicense, distribute or transfer the +Program except as expressly provided under this General Public License. +Any attempt otherwise to copy, modify, sublicense, distribute or transfer +the Program is void, and will automatically terminate your rights to use +the Program under this License. However, parties who have received +copies, or rights to use copies, from you under this General Public +License will not have their licenses terminated so long as such parties +remain in full compliance. + + 5. By copying, distributing or modifying the Program (or any work based +on the Program) you indicate your acceptance of this license to do so, +and all its terms and conditions. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these +terms and conditions. You may not impose any further restrictions on the +recipients' exercise of the rights granted herein. + + 7. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of the license which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +the license, you may choose any version ever published by the Free Software +Foundation. + + 8. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to humanity, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + + To do so, attach the following notices to the program. It is safest to +attach them to the start of each source file to most effectively convey +the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19xx name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the +appropriate parts of the General Public License. Of course, the +commands you use may be called something other than `show w' and `show +c'; they could even be mouse-clicks or menu items--whatever suits your +program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + program `Gnomovision' (a program to direct compilers to make passes + at assemblers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +That's all there is to it! + + +--- The Artistic License 1.0 --- + +This software is Copyright (c) 2020 by Catalyst Contributors, see Catalyst.pm, Kieren Diment . + +This is free software, licensed under: + + The Artistic License 1.0 + +The Artistic License + +Preamble + +The intent of this document is to state the conditions under which a Package +may be copied, such that the Copyright Holder maintains some semblance of +artistic control over the development of the package, while giving the users of +the package the right to use and distribute the Package in a more-or-less +customary fashion, plus the right to make reasonable modifications. + +Definitions: + + - "Package" refers to the collection of files distributed by the Copyright + Holder, and derivatives of that collection of files created through + textual modification. + - "Standard Version" refers to such a Package if it has not been modified, + or has been modified in accordance with the wishes of the Copyright + Holder. + - "Copyright Holder" is whoever is named in the copyright or copyrights for + the package. + - "You" is you, if you're thinking about copying or distributing this Package. + - "Reasonable copying fee" is whatever you can justify on the basis of media + cost, duplication charges, time of people involved, and so on. (You will + not be required to justify it to the Copyright Holder, but only to the + computing community at large as a market that must bear the fee.) + - "Freely Available" means that no fee is charged for the item itself, though + there may be fees involved in handling the item. It also means that + recipients of the item may redistribute it under the same conditions they + received it. + +1. You may make and give away verbatim copies of the source form of the +Standard Version of this Package without restriction, provided that you +duplicate all of the original copyright notices and associated disclaimers. + +2. You may apply bug fixes, portability fixes and other modifications derived +from the Public Domain or from the Copyright Holder. A Package modified in such +a way shall still be considered the Standard Version. + +3. You may otherwise modify your copy of this Package in any way, provided that +you insert a prominent notice in each changed file stating how and when you +changed that file, and provided that you do at least ONE of the following: + + a) place your modifications in the Public Domain or otherwise make them + Freely Available, such as by posting said modifications to Usenet or an + equivalent medium, or placing the modifications on a major archive site + such as ftp.uu.net, or by allowing the Copyright Holder to include your + modifications in the Standard Version of the Package. + + b) use the modified Package only within your corporation or organization. + + c) rename any non-standard executables so the names do not conflict with + standard executables, which must also be provided, and provide a separate + manual page for each non-standard executable that clearly documents how it + differs from the Standard Version. + + d) make other distribution arrangements with the Copyright Holder. + +4. You may distribute the programs of this Package in object code or executable +form, provided that you do at least ONE of the following: + + a) distribute a Standard Version of the executables and library files, + together with instructions (in the manual page or equivalent) on where to + get the Standard Version. + + b) accompany the distribution with the machine-readable source of the Package + with your modifications. + + c) accompany any non-standard executables with their corresponding Standard + Version executables, giving the non-standard executables non-standard + names, and clearly documenting the differences in manual pages (or + equivalent), together with instructions on where to get the Standard + Version. + + d) make other distribution arrangements with the Copyright Holder. + +5. You may charge a reasonable copying fee for any distribution of this +Package. You may charge any fee you choose for support of this Package. You +may not charge a fee for this Package itself. However, you may distribute this +Package in aggregate with other (possibly commercial) programs as part of a +larger (possibly commercial) software distribution provided that you do not +advertise this Package as a product of your own. + +6. The scripts and library files supplied as input to or produced as output +from the programs of this Package do not automatically fall under the copyright +of this Package, but belong to whomever generated them, and may be sold +commercially, and may be aggregated with this Package. + +7. C or perl subroutines supplied by you and linked into this Package shall not +be considered part of this Package. + +8. The name of the Copyright Holder may not be used to endorse or promote +products derived from this software without specific prior written permission. + +9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +The End + diff --git a/Makefile.PL b/Makefile.PL index 29de74f..83f096e 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,165 +1,165 @@ use strict; -use warnings FATAL => 'all'; -use ExtUtils::MakeMaker; -(do './maint/Makefile.PL.include' or die $@) unless -f 'META.yml'; - -my %WriteMakefileArgs = ( - NAME => 'Catalyst::Manual', - VERSION_FROM => 'lib/Catalyst/Manual.pm', - AUTHOR => [ 'Catalyst Contributors, see Catalyst.pm', 'Kieren Diment ' ], - - META_MERGE => { - 'meta-spec' => { version => 2 }, - dynamic_config => 0, - resources => { - repository => { - url => 'https://github.com/perl-catalyst/Catalyst-Manual.git', - web => 'https://github.com/perl-catalyst/Catalyst-Manual', - type => 'git', - }, - bugtracker => { - mailto => 'bug-Catalyst-Manual@rt.cpan.org', - web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Catalyst-Manual', - }, - x_IRC => 'irc://irc.perl.org/#catalyst', - x_MailingList => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst', +use warnings; +use 5.006; +use utf8; + +my %META = ( + name => 'Catalyst-Manual', + license => 'perl_5', + author => [ + 'Catalyst Contributors, see Catalyst.pm', + 'Kieren Diment ', + ], + dynamic_config => 0, + resources => { + repository => { + url => 'https://github.com/perl-catalyst/Catalyst-Manual.git', + web => 'https://github.com/perl-catalyst/Catalyst-Manual', + type => 'git', + }, + bugtracker => { + mailto => 'bug-Catalyst-Manual@rt.cpan.org', + web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Catalyst-Manual', }, - x_contributors => [ # manually added, from git shortlog -e -s -n - 'Kennedy Clark ', - 'Tomas Doran ', - 'Kieren Diment ', - 'Karen Etheridge ', - 'Graham Knop ', - 'Jonathan Rockway ', - 'Jesse Sheidlower ', - 'Brian Cassidy ', - 'Caleb Cushing ', - 'Rafael Kitover ', - 'Dan Dascalescu ', - 'Jason Felds ', - 'Frederik Schwarzer ', - 'Jonathan Yu ', - 'Matt S Trout ', - 'Breno G. de Oliveira ', - 'Lars Dɪᴇᴄᴋᴏᴡ 迪拉斯 ', - 'Matthew Horsfall ', - 'Florian Ragwitz ', - 'Jess Robinson ', - 'Eden Cardim ', - 'Ricardo SIGNES ', - 'Shlomi Fish ', - 'Andrew Rodland ', - 'Robert \'phaylon\' Sedlacek ', - 'Justin Hunter ', - 'Nick Tonkin <1nickt@users.noreply.github.com>', - 'Alexander Hartmaier ', - 'Andreas Marienborg ', - 'Dagfinn Ilmari Mannsåker ', - 'Gerda Shank ', - 'Ian Wells ', - 'Jay Kuri ', - 'Mark A. Stratman ', - 'Mateu X. Hunter ', - 'Peter Karman ', - 'sockmonk ', - 'u-foka ', - 'Jay Hannah ', - 'Eric A. Zarko ', - 'Lilly An ', - 'Marcus Ramberg ', - 'antgel ', - 'kostya ', - 'Eisenberger Tamás ', - 'Edwin de Graaf ', - 'Matthias Dietrich ', - 'Alastair McGowan-Douglas ', - 'Paul Waring ', - 'kthakore ', - 'Dominic Humphries ', - 'David Steinbrunner ', - 'David Schmidt ', - 'Ronald J Kimball ', - 'Ash Berlin ', - 'Tom Feist ', - 'Andy Grundman ', - 'Ton Voon ', - 'Zsolt Zemancsik ', - 'Jonathan Otsuka ', - 'Jonathan "Duke" Leto ', - 'KMX ', - 'Jay Hannah ', - 'Iñigo Tejedor Arrondo ', - ], + x_IRC => 'irc://irc.perl.org/#catalyst', + x_MailingList => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst', }, - - META_ADD => { - prereqs => { - configure => { - requires => { - 'ExtUtils::MakeMaker' => '0', - }, + # perl -MData::Dumper -e'$Data::Dumper::Indent = $Data::Dumper::Terse = $Data::Dumper::Trailingcomma = 1; print Dumper([map /^\s*\d+\s+(.*)/, `git shortlog -e -s -n`]);' + x_contributors => [ + 'Kennedy Clark ', + 'Tomas Doran ', + 'Kieren Diment ', + 'Karen Etheridge ', + 'Graham Knop ', + 'Jonathan Rockway ', + 'Jesse Sheidlower ', + 'Brian Cassidy ', + 'Caleb Cushing ', + 'Dan Dascalescu ', + 'Rafael Kitover ', + 'Jason Felds ', + 'Frederik Schwarzer ', + 'Jonathan Yu ', + 'Breno G. de Oliveira ', + 'Lars Dɪᴇᴄᴋᴏᴡ 迪拉斯 ', + 'Matt S Trout ', + 'Florian Ragwitz ', + 'Jess Robinson ', + 'Matthew Horsfall ', + 'Andrew Rodland ', + 'Artem Konev ', + 'Eden Cardim ', + 'Justin Hunter ', + 'Ricardo Signes ', + 'Robert \'phaylon\' Sedlacek ', + 'Shlomi Fish ', + 'antgel ', + 'Alexander Hartmaier ', + 'Andreas Marienborg ', + 'Dagfinn Ilmari Mannsåker ', + 'Gerda Shank ', + 'Ian Wells ', + 'Jay Hannah ', + 'Jay Kuri ', + 'Mark A. Stratman ', + 'Mateu X. Hunter ', + 'Nick Tonkin <1nickt@users.noreply.github.com>', + 'Peter Karman ', + 'Wes Sheldahl ', + 'Alastair McGowan-Douglas ', + 'Andy Grundman ', + 'Ash Berlin ', + 'David Schmidt ', + 'David Steinbrunner ', + 'Dominic Humphries ', + 'Edwin de Graaf ', + 'Eisenberger Tamás ', + 'Eric A. Zarko ', + 'Iñigo Tejedor Arrondo ', + 'Jonathan "Duke" Leto ', + 'Jonathan Otsuka ', + 'Kartik Thakore ', + 'Kostya Ten ', + 'Lilly An ', + 'Marcus Ramberg ', + 'Matthias Dietrich ', + 'Paul Waring ', + 'Ronald J Kimball ', + 'Tom Feist ', + 'Ton Voon ', + 'Zsolt Zemancsik ', + 'kmx ', + ], + prereqs => { + configure => { + requires => { + 'ExtUtils::MakeMaker' => '0', }, - runtime => { - requires => { - perl => '5.006', - }, + }, + runtime => { + requires => { + perl => '5.006', }, - test => { - requires => { - 'Test::More' => '0.88', - }, + }, + test => { + requires => { + 'Test::More' => '0.88', }, - develop => { - requires => { - 'Pod::Simple' => '3.11', # L support - 'Test::Pod' => '1.14', - 'Test::Pod::Coverage' => '1.04', - }, + }, + develop => { + requires => { + 'Pod::Simple' => '3.11', # L support + 'Test::Pod' => '1.14', + 'Test::Pod::Coverage' => '1.04', }, }, }, - - realclean => { FILES => [ 'Distar/', 'MANIFEST*' ] }, ); +my %MM_ARGS = (); + +## BOILERPLATE ############################################################### +require ExtUtils::MakeMaker; +(do './maint/Makefile.PL.include' or die $@) unless -f 'META.yml'; + +# have to do this since old EUMM dev releases miss the eval $VERSION line my $eumm_version = eval $ExtUtils::MakeMaker::VERSION; +my $mymeta = $eumm_version >= 6.57_02; +my $mymeta_broken = $mymeta && $eumm_version < 6.57_07; + +($MM_ARGS{NAME} = $META{name}) =~ s/-/::/g; +($MM_ARGS{VERSION_FROM} = "lib/$MM_ARGS{NAME}.pm") =~ s{::}{/}g; +$META{license} = [ $META{license} ] + if $META{license} && !ref $META{license}; +$MM_ARGS{LICENSE} = $META{license}[0] + if $META{license} && $eumm_version >= 6.30; +$MM_ARGS{NO_MYMETA} = 1 + if $mymeta_broken; +$MM_ARGS{META_ADD} = { 'meta-spec' => { version => 2 }, %META } + unless -f 'META.yml'; +$MM_ARGS{PL_FILES} ||= {}; +$MM_ARGS{NORECURS} = 1 + if not exists $MM_ARGS{NORECURS}; for (qw(configure build test runtime)) { my $key = $_ eq 'runtime' ? 'PREREQ_PM' : uc $_.'_REQUIRES'; - next unless exists $WriteMakefileArgs{META_ADD}{prereqs}{$_} - or exists $WriteMakefileArgs{$key}; - my $r = $WriteMakefileArgs{$key} = { - %{$WriteMakefileArgs{META_ADD}{prereqs}{$_}{requires} || {}}, - %{delete $WriteMakefileArgs{$key} || {}}, + my $r = $MM_ARGS{$key} = { + %{$META{prereqs}{$_}{requires} || {}}, + %{delete $MM_ARGS{$key} || {}}, }; defined $r->{$_} or delete $r->{$_} for keys %$r; } -# dynamic prereqs get added here. - -$WriteMakefileArgs{MIN_PERL_VERSION} = delete $WriteMakefileArgs{PREREQ_PM}{perl} || 0; - -$WriteMakefileArgs{BUILD_REQUIRES} = { - %{$WriteMakefileArgs{BUILD_REQUIRES} || {}}, - %{delete $WriteMakefileArgs{TEST_REQUIRES}} -} if $eumm_version < 6.63_03; +$MM_ARGS{MIN_PERL_VERSION} = delete $MM_ARGS{PREREQ_PM}{perl} || 0; -$WriteMakefileArgs{PREREQ_PM} = { - %{$WriteMakefileArgs{PREREQ_PM}}, - %{delete $WriteMakefileArgs{BUILD_REQUIRES}} -} if $eumm_version < 6.55_01; - -delete $WriteMakefileArgs{CONFIGURE_REQUIRES} +delete $MM_ARGS{MIN_PERL_VERSION} + if $eumm_version < 6.47_01; +$MM_ARGS{BUILD_REQUIRES} = {%{$MM_ARGS{BUILD_REQUIRES}}, %{delete $MM_ARGS{TEST_REQUIRES}}} + if $eumm_version < 6.63_03; +$MM_ARGS{PREREQ_PM} = {%{$MM_ARGS{PREREQ_PM}}, %{delete $MM_ARGS{BUILD_REQUIRES}}} + if $eumm_version < 6.55_01; +delete $MM_ARGS{CONFIGURE_REQUIRES} if $eumm_version < 6.51_03; -delete $WriteMakefileArgs{MIN_PERL_VERSION} - if $eumm_version < 6.48; - -delete @WriteMakefileArgs{qw(META_ADD META_MERGE)} - if $eumm_version < 6.46; - -delete $WriteMakefileArgs{LICENSE} - if $eumm_version < 6.31; - -WriteMakefile(%WriteMakefileArgs); - +ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS); +## END BOILERPLATE ########################################################### diff --git a/lib/Catalyst/Manual.pm b/lib/Catalyst/Manual.pm index d73d94c..2713ea9 100644 --- a/lib/Catalyst/Manual.pm +++ b/lib/Catalyst/Manual.pm @@ -6,7 +6,7 @@ package Catalyst::Manual; use strict; use warnings; -our $VERSION = '5.9011'; +our $VERSION = '5.9013'; 1; __END__ @@ -82,7 +82,7 @@ By: Kieren Diment, Matt Trout Available July 12, 2009 ISBN 10: 1-4302-2365-0 ISBN 13: 978-1-4302-2365-8 -http://www.apress.com/book/view/9781430223658 +https://link.springer.com/book/10.1007/978-1-4302-2366-5 =item * @@ -92,7 +92,6 @@ By: Jonathan Rockway Published December, 2007 ISBN 10: 1847190952 ISBN 13: 978-1-847190-95-6 -http://www.packtpub.com/catalyst-perl-web-application/book =back diff --git a/lib/Catalyst/Manual/Cookbook.pod b/lib/Catalyst/Manual/Cookbook.pod index 40fc646..da71df4 100644 --- a/lib/Catalyst/Manual/Cookbook.pod +++ b/lib/Catalyst/Manual/Cookbook.pod @@ -1295,7 +1295,7 @@ please put your actions into your Root controller. =head3 Flowchart A graphical flowchart of how the dispatcher works can be found on the wiki at -L. +L. =head2 DRY Controllers with Chained actions diff --git a/lib/Catalyst/Manual/Deployment/IIS/FastCGI.pod b/lib/Catalyst/Manual/Deployment/IIS/FastCGI.pod index 41f84f6..761379a 100644 --- a/lib/Catalyst/Manual/Deployment/IIS/FastCGI.pod +++ b/lib/Catalyst/Manual/Deployment/IIS/FastCGI.pod @@ -30,7 +30,7 @@ Let us assume that our server has the following layout: FastCGI is not a standard part of IIS 6 - you have to install it separately. For more info and the download, go to -Lhttps://www.iis.net/downloads/microsoft/fastcgi-for-iis>. Choose the appropriate version +L. Choose the appropriate version (32-bit/64-bit); installation is quite simple (in fact no questions, no options). diff --git a/lib/Catalyst/Manual/Deployment/nginx/FastCGI.pod b/lib/Catalyst/Manual/Deployment/nginx/FastCGI.pod index a04c2ee..53cd42c 100644 --- a/lib/Catalyst/Manual/Deployment/nginx/FastCGI.pod +++ b/lib/Catalyst/Manual/Deployment/nginx/FastCGI.pod @@ -96,7 +96,7 @@ the following in your nginx config for the SSL vhost: =head1 MORE INFO For more information on nginx, visit: -L +L =head1 AUTHORS diff --git a/maint/Makefile.PL.include b/maint/Makefile.PL.include index 13ad7a2..6c4f999 100644 --- a/maint/Makefile.PL.include +++ b/maint/Makefile.PL.include @@ -1,4 +1,4 @@ -BEGIN { -e 'Distar' or system("git clone git://git.shadowcat.co.uk/p5sagit/Distar.git") } +BEGIN { -e 'Distar' or system qw(git clone https://github.com/p5sagit/Distar.git) } use lib 'Distar/lib'; use Distar 0.002000;