Changeset 82617

Timestamp:

08/16/11 13:58:26 (4 years ago)

Author:

jmr@…

Message:

perl5 portgroup: allow calling perl5-setup while having a name that is not of the form p5-*

File:

• trunk/dports/_resources/port1.0/group/perl5-1.0.tcl (modified) (1 diff)

trunk/dports/_resources/port1.0/group/perl5-1.0.tcl

@@ -113 +113 @@
     dist_subdir         perl5
 
-    set rootname        [string range $name 3 end]
-
-    foreach v ${perl5.branches} {
-        subport p${v}-${rootname} { depends_lib port:perl${v} }
-    }
-
-    if {$subport == $name} {
-        perl5.major
-        distfiles
-        supported_archs noarch
-        replaced_by p[option perl5.default_branch]-${rootname}
-        depends_lib port:p[option perl5.default_branch]-${rootname}
-        use_configure no
-        build {}
-        destroot {
-            xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
-            system "echo $name is a stub port > ${destroot}${prefix}/share/doc/${name}/README"
+    if {[string match p5-* $name]} {
+        set rootname        [string range $name 3 end]
+
+        foreach v ${perl5.branches} {
+            subport p${v}-${rootname} {
+                depends_lib port:perl${v}
+                perl5.major ${v}
+            }
+        }
+
+        if {$subport == $name} {
+            perl5.major
+            distfiles
+            supported_archs noarch
+            replaced_by p[option perl5.default_branch]-${rootname}
+            depends_lib port:p[option perl5.default_branch]-${rootname}
+            use_configure no
+            build {}
+            destroot {
+                xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
+                system "echo $name is a stub port > ${destroot}${prefix}/share/doc/${name}/README"
+            }
         }
     } else {
-        perl5.major [string range $subport 1 [expr [string first - $subport]-1]]
+        perl5.major ${perl5.default_branch}
+        depends_lib port:perl${perl5.default_branch}
+    }
+    if {![string match p5-* $name] || $subport != $name} {
         configure.cmd       ${perl5.bin}
         configure.env       PERL_AUTOINSTALL=--skipdeps
         configure.pre_args  Makefile.PL
         configure.args      INSTALLDIRS=vendor
-    
+
         test.run            yes
-    
+
         destroot.target     pure_install
-    
+
         post-destroot {
             fs-traverse file ${destroot}${perl5.lib} {