Author: bdubbs
Date: Mon Aug  1 20:06:17 2016
New Revision: 17622

Log:
This was a royal PITA due to the upstream formatting of directories 
at sourceforge.

Modified:
   trunk/scripts/blfs-chapter37.php

Modified: trunk/scripts/blfs-chapter37.php
==============================================================================
--- trunk/scripts/blfs-chapter37.php    Mon Aug  1 13:47:09 2016        (r17621)
+++ trunk/scripts/blfs-chapter37.php    Mon Aug  1 20:06:17 2016        (r17622)
@@ -9,21 +9,107 @@
 $STOP_PACKAGE  = 'qupzilla';
 
 $renames = array();
-//$renames[ 'midori_' ] = 'midori_';
+$renames[ 'libfm'  ] = 'libfm-extra';
+$renames[ 'libfm1' ] = 'libfm';
 
 $ignores = array();
 
 $regex = array();
-$regex[ 'midori' ] = "/^.*midori_(\d[\d\.]*\d)_all.*$/";
+$regex[ 'midori'      ] = "/^.*midori_(\d[\d\.]*\d)_all.*$/";
+$regex[ 'libfm'       ] = "/^.* Download libfm-([\d\.]+).tar.*$/";
+$regex[ 'libfm1'      ] = "/^.* Download libfm-([\d\.]+).tar.*$/";
+$regex[ 'lxde-common' ] = "/^.* Download lxde-common-([\d\.]+).tar.*$/";
 
-//$current="midori";
+//$current="QupZilla";
 
 $url_fix = array (
 
+   array( 'pkg'     => 'gpicview',
+          'match'   => '^.*$', 
+          'replace' => 
+             
"https://sourceforge.net/projects/lxde/files/GPicView%20%28image%20Viewer%29";),
+
+   array( 'pkg'     => 'lxappearance',
+          'match'   => '^.*$', 
+          'replace' => 
"https://sourceforge.net/projects/lxde/files/LXAppearance";),
+
+   array( 'pkg'     => 'lxappearance-obconf',
+          'match'   => '^.*$', 
+          'replace' => 
"https://sourceforge.net/projects/lxde/files/LXAppearance%20Obconf/";),
+
+   array( 'pkg'     => 'lxde-common',
+          'match'   => '^.*$', 
+          'replace' => "https://sourceforge.net/projects/lxde/files";),
+
+   array( 'pkg'     => 'lxinput',
+          'match'   => '^.*$', 
+          'replace' => 
"https://sourceforge.net/projects/lxde/files/LXInput%20%28Kbd%20and%20amp_%20mouse%20config%29";),
+
+   array( 'pkg'     => 'lxrandr',
+          'match'   => '^.*$', 
+          'replace' => 
"https://sourceforge.net/projects/lxde/files/LXRandR%20%28monitor%20config%20tool%29";),
+
+   array( 'pkg'     => 'lxtask',
+          'match'   => '^.*$', 
+          'replace' => 
+             
"https://sourceforge.net/projects/lxde/files/LXTask%20%28task%20manager%29";),
+
+   array( 'pkg'     => 'lxterminal',
+          'match'   => '^.*$', 
+          'replace' => 
+             
"https://sourceforge.net/projects/lxde/files/LXTerminal%20%28terminal%20emulator%29";),
+
+   array( 'pkg'     => 'lxsession',
+          'match'   => '^.*$', 
+          'replace' =>
+             
"https://sourceforge.net/projects/lxde/files/LXSession%20%28session%20manager%29";),
+
+   array( 'pkg'     => 'lxmenu-data',
+          'match'   => '^.*$', 
+          'replace' =>
+             
"https://sourceforge.net/projects/lxde/files/lxmenu-data%20%28desktop%20menu%29";),
+
+  array( 'pkg'     => 'libfm',
+          'match'   => '^.*$', 
+          'replace' => "https://sourceforge.net/projects/pcmanfm/files"; ),
+
+   array( 'pkg'     => 'libfm1',
+          'match'   => '^.*$', 
+          'replace' => "https://sourceforge.net/projects/pcmanfm/files"; ),
+
+   array( 'pkg'     => 'menu-cache',
+          'match'   => '^.*$', 
+          'replace' => 
"https://sourceforge.net/projects/lxde/files/menu-cache"; ),
+
+   array( 'pkg'     => 'lxpanel',
+          'match'   => '^.*$', 
+          'replace' => 
+              
"https://sourceforge.net/projects/lxde/files/LXPanel%20%28desktop%20panel%29"; ),
+
    array( 'pkg'     => 'midori',
           'match'   => '^.*$', 
           'replace' => "http://www.midori-browser.org/download/source"; ),
 
+   array( 'pkg'     => 'pcmanfm',
+          'match'   => '^.*$', 
+          'replace' => 
"https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM";
 ),
+
+   array( 'pkg'     => 'qtermwidget',
+          'match'   => '^.*$', 
+          'replace' => "https://github.com/lxde/qtermwidget/releases"; ),
+
+   array( 'pkg'     => 'qterminal',
+          'match'   => '^.*$', 
+          'replace' => "https://github.com/lxde/qterminal/releases"; ),
+
+   array( 'pkg'     => 'QScintilla_gpl',
+          'match'   => '^.*$', 
+          'replace' => 
"https://sourceforge.net/projects/pyqt/files/QScintilla2"; ),
+
+   array( 'pkg'     => 'QupZilla',
+          'match'   => '^.*$', 
+          'replace' => "https://github.com/QupZilla/qupzilla/releases"; ),
+
    array( 'pkg'     => 'xfce4-xkb-plugin',
           'match'   => '^.*$', 
           'replace' => 
"http://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.7"; ),
@@ -90,7 +176,135 @@
     // Get listing
     $lines = http_get_file( "$dirpath/" );
   }
-  else if ( $book_index != "midori"  &&
+  else if ( $book_index == "menu-cache" )
+  {
+    $dirs = http_get_file( "$dirpath/" );    
+    $dir = find_max ( $dirs, "/^\s*\d/", "/^\s*(\d\.[\d\.x]+).*$/" );
+    $dirpath .= "/$dir";
+    $lines    = http_get_file( "$dirpath/" );
+    $ver = find_max( $lines, "/menu-cache/", 
"/^\s+menu-cache-([\d\.]+).tar.*/" );
+    return $ver;
+  }
+  else if ( $book_index == "pcmanfm" )
+  {
+    $lines    = http_get_file( "$dirpath/" );
+    $ver = find_max( $lines, "/pcmanfm/", "/^\s+pcmanfm-([\d\.]+).tar.*/" );
+    return $ver;
+  }
+  else if ( $book_index == "lxappearance" )
+  {
+    $lines    = http_get_file( "$dirpath/" );
+    $ver = find_max( $lines, "/lxappearance/", 
"/^\s+lxappearance-([\d\.]+).tar.*$/" );
+    return $ver;
+  }
+  else if ( $book_index == "lxappearance-obconf" )
+  {
+    $lines    = http_get_file( "$dirpath/" );
+    $ver = find_max( $lines, "/lxappearance/", 
"/^\s+lxappearance-obconf-([\d\.]+).tar.*$/" );
+    return $ver;
+  }
+  else if ( $book_index == "lxpanel" )
+  {
+    $dirs = http_get_file( "$dirpath/" );    
+    $dir = find_max ( $dirs, "/^\s*LXPanel/", "/^\s*(LXPanel 
[0123]\.[\d\.x]+).*$/" );
+    $dir = preg_replace( "/ /", '%20', $dir );
+    $dirpath .= "/$dir";
+    $lines    = http_get_file( "$dirpath/" );
+    $ver = find_max( $lines, "/lxpanel/", "/^\s+lxpanel-([\d\.]+).tar.*$/" );
+    return $ver;
+  }
+  else if ( $book_index == "lxinput" )
+  {
+    $dirs = http_get_file( "$dirpath/" );    
+    $dir = find_max ( $dirs, "/^\s*LXInput/", "/^\s*(LXInput 
[0123]\.[\d\.x]+).*$/" );
+    $dir = preg_replace( "/ /", '%20', $dir );
+    $dirpath .= "/$dir";
+    $lines    = http_get_file( "$dirpath/" );
+    $ver = find_max( $lines, "/lxinput/", "/^\s+lxinput-([\d\.]+).tar.*$/" );
+    return $ver;
+  }
+  else if ( $book_index == "lxrandr" )
+  {
+    $dirs = http_get_file( "$dirpath/" );    
+    $dir = find_max ( $dirs, "/^\s*LXRandR/", "/^\s*(LXRandR 
[0123]\.[\d\.x]+).*$/" );
+    $dir = preg_replace( "/ /", '%20', $dir );
+    $dirpath .= "/$dir";
+    $lines    = http_get_file( "$dirpath/" );
+    $ver = find_max( $lines, "/lxrandr/", "/^\s+lxrandr-([\d\.]+).tar.*$/" );
+    return $ver;
+  }
+  else if ( $book_index == "lxtask" )
+  {
+    $dirs = http_get_file( "$dirpath/" );    
+    $dir = find_max ( $dirs, "/^\s*LXTask/", "/^\s*(LXTask 
[0123]\.[\d\.x]+).*$/" );
+    $dir = preg_replace( "/ /", '%20', $dir );
+    $dirpath .= "/$dir";
+    $lines    = http_get_file( "$dirpath/" );
+    $ver = find_max( $lines, "/lxtask/", "/^\s+lxtask-([\d\.]+).tar.*$/" );
+    return $ver;
+  }
+  else if ( $book_index == "lxterminal" )
+  {
+    $dirs = http_get_file( "$dirpath/" );    
+    $dir = find_max ( $dirs, "/^\s*LXTerminal/", "/^\s*(LXTerminal 
[0123]\.[\d\.x]+).*$/" );
+    $dir = preg_replace( "/ /", '%20', $dir );
+    $dirpath .= "/$dir";
+    $lines    = http_get_file( "$dirpath/" );
+    $ver = find_max( $lines, "/lxterminal/", 
"/^\s+lxterminal-([\d\.]+).tar.*$/" );
+    return $ver;
+  }
+  else if ( $book_index == "lxsession" )
+  {
+    $dirs = http_get_file( "$dirpath/" );    
+    $dir = find_max ( $dirs, "/^\s*LXSession/", "/^\s*(LXSession 
[0123]\.[\d\.x]+).*$/" );
+    $dir = preg_replace( "/ /", '%20', $dir );
+    $dirpath .= "/$dir";
+    $lines    = http_get_file( "$dirpath/" );
+    $ver = find_max( $lines, "/lxsession/", "/^\s+lxsession-([\d\.]+).tar.*$/" 
);
+    return $ver;
+  }
+  else if ( $book_index == "gpicview" )
+  {
+    $dirs = http_get_file( "$dirpath/" );    
+    $dir = find_max ( $dirs, "/^\s*\d/", "/^\s*([0123]\.[\d\.x]+).*$/" );
+    $dir = preg_replace( "/ /", '%20', $dir );
+    $dirpath .= "/$dir";
+    $lines    = http_get_file( "$dirpath/" );
+    $ver = find_max( $lines, "/gpicview/", "/^\s+gpicview-([\d\.]+).tar.*$/" );
+    return $ver;
+  }
+  else if ( $book_index == "qtermwidget" )
+  {
+    $lines    = http_get_file( "$dirpath/" );
+    $ver = find_max( $lines, "/qtermwidget/", 
"/^\s+qtermwidget-([\d\.]+).tar.*$/" );
+    return $ver;
+  }
+  else if ( $book_index == "qterminal" )
+  {
+    $lines    = http_get_file( "$dirpath/" );
+    $ver = find_max( $lines, "/qterminal/", "/^\s+qterminal-([\d\.]+).tar.*$/" 
);
+    return $ver;
+  }
+  else if ( $book_index == "QupZilla" )
+  {
+    $lines    = http_get_file( "$dirpath/" );
+    $ver = find_max( $lines, "/QupZilla/", "/^\s+QupZilla-([\d\.]+).tar.*$/" );
+    return $ver;
+  }
+  else if ( $book_index == "QScintilla_gpl" )
+  {
+    $dirs = http_get_file( "$dirpath/" );    
+    $dir = find_max ( $dirs, "/QScintilla/", "/^\s*(QScintilla-[\d\.]+).*$/" );
+    $dirpath .= "/$dir";
+    $lines    = http_get_file( "$dirpath/" );
+    $ver = find_max( $lines, "/QScintilla_gpl/", 
"/^\s+QScintilla_gpl-([\d\.]+).tar.*$/" );
+    return $ver;
+  }
+  else if ( $book_index != "midori"       &&
+            $book_index != "lxmenu-data"  &&
+            $book_index != "libfm"        &&
+            $book_index != "libfm1"       &&
+            $book_index != "lxde-common"  &&
             $book_index != "xfce4-xkb-plugin" ) // http
   {
      // Most http enties for this chapter
@@ -139,11 +353,11 @@
      return 0;  // This is an error
   }
 
-  if ( $book_index == "lxmenu-data" )
-  {
-    $ver = find_max( $lines, "/$package/", "/^.*$package ([\d\.]*\d).*$/" );
-    return $ver;
-  }
+  //if ( $book_index == "lxmenu-data" )
+  //{
+  //  $ver = find_max( $lines, "/$package/", "/^.*$package-([\d\.]*\d).*$/" );
+  //  return $ver;
+  //}
 
   if ( $book_index == "lxpanel" )
   {
@@ -154,6 +368,9 @@
   if ( $book_index == "lxde-icon-theme" )
     return find_max( $lines, "/$package/", "/^.*$package-([\d\.]*\d).*$/" );
 
+  if ( $book_index == "xfce4-terminal" )
+    return find_max( $lines, "/$package/", "/^.*$package-([\d\.]*\d).*$/", 
TRUE );
+
   // Most packages are in the form $package-n.n.n
   // Occasionally there are dashes (e.g. 201-1)
   return find_max( $lines, "/$package/", "/^.*$package-([\d\.]*\d)\.tar.*$/" );
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to