<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[129562] contrib/cpan2port/cpan2port</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/129562">129562</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-12-15 08:33:44 -0800 (Mon, 15 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>cpan2port: remove 5.8, write out sorted list of dependencies using p${perl5.major}-*, put deps inside a block (#44654)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#contribcpan2portcpan2port">contrib/cpan2port/cpan2port</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribcpan2portcpan2port"></a>
<div class="modfile"><h4>Modified: contrib/cpan2port/cpan2port (129561 => 129562)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/cpan2port/cpan2port 2014-12-15 16:28:13 UTC (rev 129561)
+++ contrib/cpan2port/cpan2port 2014-12-15 16:33:44 UTC (rev 129562)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> use CPAN;
</span><span class="cx"> use Module::Depends;
</span><span class="cx"> use Module::Depends::Intrusive;
</span><del>-use List::MoreUtils qw(any);
</del><ins>+use List::MoreUtils qw(any uniq);
</ins><span class="cx"> use Module::CoreList;
</span><span class="cx">
</span><span class="cx"> sub is_corelist {
</span><span class="lines">@@ -95,6 +95,13 @@
</span><span class="cx"> return $name;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub dependency_name {
+ my ( $name ) = shift;
+ $name = lc "p\${perl5.major}-$name";
+ $name =~ y/+/x/;
+ return $name;
+}
+
</ins><span class="cx"> sub debian {
</span><span class="cx"> my ( $name ) = shift;
</span><span class="cx"> $name = lc "lib$name-perl";
</span><span class="lines">@@ -132,7 +139,7 @@
</span><span class="cx"> $info;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub from_port { (about(shift) or return () )->{port} }
</del><ins>+sub from_port { (about(shift) or return () )->{dependency} }
</ins><span class="cx">
</span><span class="cx"> sub about {
</span><span class="cx"> my ( $module_name, $config ) = @_;
</span><span class="lines">@@ -170,8 +177,9 @@
</span><span class="cx"> $info{description} = $desc;
</span><span class="cx"> MSG::warn $desc;
</span><span class="cx"> }
</span><del>- $info{port} = package_name($info{prefix});
- $info{debian} = package_name($info{prefix});
</del><ins>+ $info{port} = package_name($info{prefix});
+ $info{dependency} = dependency_name($info{prefix});
+ $info{debian} = package_name($info{prefix});
</ins><span class="cx"> $info{dist_dir} = "$$CPAN::Config{build_dir}/$info{prefix}-$info{version}";
</span><span class="cx"> $info{module} = $module;
</span><span class="cx"> \%info;
</span><span class="lines">@@ -219,7 +227,8 @@
</span><span class="cx"> $$info{maintainers} ||= 'nomaintainer';
</span><span class="cx"> my $checksums = '';
</span><span class="cx"> my $depends = '';
</span><del>- my $build_depends = '';
</del><ins>+ my $depends_build = '';
+ my $depends_lib = '';
</ins><span class="cx"> my $use_module_build = '';
</span><span class="cx">
</span><span class="cx"> if ( exists $$info{depends} ) {
</span><span class="lines">@@ -229,25 +238,29 @@
</span><span class="cx"> $checksums = 'checksums '.join(" \\\n".(' 'x20),@hashes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( my $dep_ref = Huggy::depends_on($info) ) {
- my @depends = map {
- MSG::warn "$$info{name} requires $_";
</del><ins>+ if ( my $dep_ref = Huggy::depends_on($info, during=>"build_requires") ) {
+ my @depends_build = Huggy::uniq map {
+ MSG::warn "$$info{name} build_requires $_";
</ins><span class="cx"> 'port:'.Huggy::from_port $_
</span><del>- } keys %{ $dep_ref };
- if (@depends) {
- $depends = 'depends_lib-append '.join(" \\\n".(' 'x20),@depends);
</del><ins>+ } sort(keys %{ $dep_ref });
+ if (@depends_build) {
+ unshift(@depends_build, ' depends_build-append');
+ $depends_build = join(" \\\n".(' 'x20), sort(@depends_build))."\n";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- if ( my $dep_ref = Huggy::depends_on($info, during=>"build_requires") ) {
- my @depends = map {
- MSG::warn "$$info{name} build_requires $_";
</del><ins>+ if ( my $dep_ref = Huggy::depends_on($info) ) {
+ my @depends_lib = Huggy::uniq map {
+ MSG::warn "$$info{name} requires $_";
</ins><span class="cx"> 'port:'.Huggy::from_port $_
</span><del>- } keys %{ $dep_ref };
- if (@depends) {
- $build_depends = 'depends_build-append '.join(" \\\n".(' 'x21),@depends);
</del><ins>+ } sort(keys %{ $dep_ref });
+ if (@depends_lib) {
+ unshift(@depends_lib, ' depends_lib-append');
+ $depends_lib = join(" \\\n".(' 'x20), sort(@depends_lib))."\n";
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><ins>+ if ($depends_build.$depends_lib ne '') {
+ $depends = "\nif {\${perl5.major} != \"\"} {\n" . $depends_build . $depends_lib . "}\n";
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # If no Makefile.PL is present, maybe we need use_module_build?
</span><span class="lines">@@ -297,9 +310,6 @@
</span><span class="cx">
</span><span class="cx"> $portfile .= <<STOP;
</span><span class="cx"> $checksums
</span><del>-
-$build_depends
-
</del><span class="cx"> $depends
</span><span class="cx"> $use_module_build
</span><span class="cx"> STOP
</span></span></pre>
</div>
</div>
</body>
</html>