Add free-standing manifest for msys-flex.

diff --git a/ChangeLog b/ChangeLog
index d7946bf..5552a21 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-01  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Add free-standing manifest for msys-flex.
+
+       * msys/msys-flex.xml (msys-flex-bin): Add missing dependency...
+       (msys-m4-bin): ...on this.
+       Clean up formatting; reduce to deliver only the latest available
+       release; move versioned DLL requirements specs inside the dependent
+       release entity; generate and publish msys-flex.xml.lzma
+
+       * msys/msys-package-list.xml (msys-flex): Make it visible.
+       Regenerate and publish msys-package-list.xml.lzma
+
+       * msys/issue.log: Updated accordingly.
+
 2010-08-31  Charles Wilson  <mingw@cwilson.fastmail.fm>
 
        Add manifests needed for gcc4

diff --git a/msys/issue.log b/msys/issue.log
index 2ac728b..31d96fe 100644 (file)
--- a/msys/issue.log
+++ b/msys/issue.log
@@ -33,6 +33,7 @@
   msys-expat.xml:2010081000
   msys-file.xml:2010080900
   msys-findutils.xml:2010080600
+  msys-flex.xml:2010090100
   msys-gawk.xml:2010072600
   msys-gettext.xml:2010080500
   msys-grep.xml:2010072600
@@ -41,7 +42,7 @@
   msys-libiconv.xml:2010071900
   msys-m4.xml:2010081000
   msys-make.xml:2010080900
-  msys-package-list.xml:2010081000
+  msys-package-list.xml:2010090100
   msys-patch.xml:2010081000
   msys-popt.xml:2010080900
   msys-regex.xml:2010080500

diff --git a/msys/msys-flex.xml b/msys/msys-flex.xml
index fbf390f..c3d8757 100644 (file)
--- a/msys/msys-flex.xml
+++ b/msys/msys-flex.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <software-distribution project="MinGW" home="http://mingw.org" issue="@YYYYMMDDNN@">
+
+  <!-- File: msys-flex.xml -->
+
   <package-collection subsystem="msys">
     <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
+
     <package name="msys-flex">
       <affiliate group="MSYS Developer Toolkit" />
       <description lang="en" title="flex: Fast Lexical Analyzer Generator" >
@@ -10,29 +14,32 @@
           lexical patterns in text.
         </paragraph>
       </description>
+
+      <source tarname="flex-%-msys-%-src.tar" />
+      <licence tarname="flex-%-msys-%-lic.tar" />
+
       <component class="bin">
-        <release tarname="flex-2.5.35-1-msys-1.0.11-bin.tar.lzma" />
         <release tarname="flex-2.5.35-2-msys-1.0.13-bin.tar.lzma" >
           <requires eq="msys-libintl-*-msys-*-dll-8.tar" />
+          <requires eq="msys-libregex-*-msys-*-dll-1.tar" />
         </release>
         <requires eq="msys-core-*-msys-*-bin.tar" />
-        <requires eq="msys-libregex-*-msys-*-dll-1.tar" />
+        <requires eq="msys-m4-*-msys-*-bin.tar" />
       </component>
+
       <component class="lang">
         <release tarname="flex-2.5.35-2-msys-1.0.13-lang.tar.lzma" />
       </component>
+
       <component class="doc">
-        <release tarname="flex-2.5.35-1-msys-1.0.11-doc.tar.lzma" />
         <release tarname="flex-2.5.35-2-msys-1.0.13-doc.tar.lzma" />
       </component>
+
       <component class="lic">
-        <release tarname="flex-2.5.35-1-msys-1.0.11-lic.tar.lzma" />
         <release tarname="flex-2.5.35-2-msys-1.0.13-lic.tar.lzma" />
       </component>
-      <licence tarname="flex-%-msys-%-lic.tar" />
-      <source tarname="flex-%-msys-%-src.tar" />
     </package>
+
   </package-collection>
 </software-distribution>
-<!-- vim: set nocompatible expandtab tw=80 ts=2 sw=2 ff=unix: -->
-
+<!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 shiftwidth=2: -->

diff --git a/msys/msys-package-list.xml b/msys/msys-package-list.xml
index dc8caf2..f9864e9 100644 (file)
--- a/msys/msys-package-list.xml
+++ b/msys/msys-package-list.xml
@@ -38,7 +38,7 @@
   <package-list catalogue="msys-expat" />
   <package-list catalogue="msys-file" />
   <package-list catalogue="msys-findutils" />
-  <!--package-list catalogue="msys-flex" /-->
+  <package-list catalogue="msys-flex" />
   <package-list catalogue="msys-gawk" />
   <!--package-list catalogue="msys-gcc" /-->
   <!--package-list catalogue="msys-gdbm" /-->