[blfs-book] r20798 - trunk/scripts

[bdubbs--- via blfs-book]

Author: bdubbs
Date: Tue Dec 11 09:58:32 2018
New Revision: 20798

Log:
Script updates

Modified:
   trunk/scripts/blfs-chapter13.php
   trunk/scripts/blfs-chapter17.php
   trunk/scripts/blfs-chapter25.php

Modified: trunk/scripts/blfs-chapter13.php
==============================================================================
--- trunk/scripts/blfs-chapter13.php    Tue Dec 11 09:30:30 2018        (r20797)
+++ trunk/scripts/blfs-chapter13.php    Tue Dec 11 09:58:32 2018        (r20798)
@@ -109,7 +109,7 @@
 
    array( 'pkg'     => 'doxygen',
           'match'   => '^.*$',
-          'replace' => "ftp://ftp.stack.nl/pub/doxygen"; ),
+          'replace' => "http://www.doxygen.nl/download.html"; ),
 
    array( 'pkg'     => 'expect',
           'match'   => '^.*$',

Modified: trunk/scripts/blfs-chapter17.php
==============================================================================
--- trunk/scripts/blfs-chapter17.php    Tue Dec 11 09:30:30 2018        (r20797)
+++ trunk/scripts/blfs-chapter17.php    Tue Dec 11 09:58:32 2018        (r20798)
@@ -20,7 +20,6 @@
 $regex[ 'neon'          ] = "/^.*neon-(\d[\d\.]*).tar.*$/";
 $regex[ 'libevent'      ] = "/^.*release-(\d[\d\.]*)-stable.*$/";
 $regex[ 'libnsl'        ] = "/^.*libnsl ([\d\.]+\d)*$/";
-$regex[ 'procmail'      ] = "/^.*version ([\d\.]+\d) released.*$/";
 $regex[ 'rpcsvc-proto'  ] = "/^.*Version ([\d\.]+\d)*$/";
 
 $url_fix = array (
@@ -225,6 +224,9 @@
   if ( $book_index == "geoclue1" )
     return find_max( $lines, '/geoclue/', '/^.*geoclue-([\d\.]+).tar.*$/' );
 
+  if ( $book_index == "procmail" )
+    return find_max( $lines, '/procmail/', '/^.*procmail-([\d\.]+)\.tar.*$/' );
+
   // libtirpc  (sourceforge is inconsistent here)
   if ( $book_index == "libtirpc" )
     return find_max( $lines, '/^\s*\d/', '/^\s*(\d\.[\d\.]+) .*$/' );

Modified: trunk/scripts/blfs-chapter25.php
==============================================================================
--- trunk/scripts/blfs-chapter25.php    Tue Dec 11 09:30:30 2018        (r20797)
+++ trunk/scripts/blfs-chapter25.php    Tue Dec 11 09:58:32 2018        (r20798)
@@ -25,6 +25,10 @@
 $regex = array();
 
 $url_fix = array (
+   array( 'pkg'     => 'fltk',
+          'match'   => '^.*$', 
+          'replace' => "https://www.fltk.org/software.php"; ),
+
    array( 'pkg'     => 'freeglut',
           'match'   => '^.*$', 
           'replace' => "http://sourceforge.net/projects/freeglut/files"; ),
@@ -181,12 +185,6 @@
       $ver = find_max( $lines, "/QScintilla_gpl/", 
"/^.*QScintilla_gpl-([\d\.]+).tar.*$/" );
       return $ver;
     }
-    if ( $book_index == "fltk" )
-    {
-      $dirpath  = rtrim  ( $dirpath, "/" );    // Trim any trailing slash
-      $position = strrpos( $dirpath, "/" );
-      $dirpath  = substr ( $dirpath, 0, $position ); // Up 1
-    }
 
     $lines = http_get_file( $dirpath );
 
@@ -238,7 +236,7 @@
     return find_max( $lines, "/src.*tar.xz/", "/^.*src-([\d\.]+).tar.*$/" );
 
   if ( $book_index == "fltk" )
-    return find_max( $lines, "/1\./", "/^\s+(1\.[\d\.]+).*$/" );
+    return find_max( $lines, "/fltk-/", "/.*fltk-(\d[\d\.-]+)-source.*$/" );
 
   // Most packages are in the form $package-n.n.n
   // Occasionally there are dashes (e.g. 201-1)
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page