[Gsrc-commit] trunk r3749: fix GNUmakefile package list problem, I hope

[Carl Hansen]

------------------------------------------------------------
revno: 3749
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Sat 2016-06-18 16:42:38 -0700
message:
  fix GNUmakefile package list problem, I hope
removed:
  pkg/gnome/NGclutter            ngclutter-20160617013746-7ygosxqw3lxxvo7f-3
  pkg/gnome/clutter.ng           clutter.ng-20160617013746-7ygosxqw3lxxvo7f-29
  pkg/gnu/gnucobol/sha256sums.oct 
sha256sums.oct-20160617014725-uokjfnggs70iry9h-795
  pkg/gnu/gnucobol/sha256sums.octnew 
sha256sums.octnew-20160617014725-uokjfnggs70iry9h-796
  pkg/gnu/gnucobol/sha256sums.orgi.ng 
sha256sums.orgi.ng-20160617014725-uokjfnggs70iry9h-797
modified:
  GNUmakefile.am                 
gnumakefile.am-20101220114433-luja3ml8rpou24n9-2
  IMPORTANT.MESSAGE.17.June.2016 
important.message.17-20160617190616-90drcsc69q1lb34a-1
  util/templates/package-list.html.m4 
packagelist.html.m4-20130412204301-x472oq5mm1fc6mrc-1
  util/templates/package.html.templ 
package.html.templ-20130412204301-x472oq5mm1fc6mrc-2

=== modified file 'GNUmakefile.am'
--- a/GNUmakefile.am    2016-06-17 20:53:46 +0000
+++ b/GNUmakefile.am    2016-06-18 23:42:38 +0000
@@ -18,29 +18,36 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
-GROUPS = bio libs tools dev gnu gnustep gnome alpha other local 
+#GROUPS = bio libs tools dev gnu gnustep gnome alpha other local 
+GROUPS = bio  gnu gnustep gnome alpha other external decommissioned
 
 SUBDIRS = doc
 EXTRA_DIST = bootstrap gar/gar.mk gar/gar.master.mk gar/gar.conf.mk    \
-gar/gar.env.mk gar/gar.lib.mk gar/gar.lib/auto.mk                              
        \
-gar/gar.lib/external.mk gar/gar.lib/gnustep.mk $(foreach                       
\
-GROUP,$(GROUPS),pkg/$(GROUP)/*) gsrc.in MANIFEST.rec
+gar/gar.env.mk gar/gar.lib.mk  \
+gar/gar.lib/auto.mk                                    \
+gar/gar.lib/broken.mk gar/gar.lib/cmake.mk \
+gar/gar.lib/external.mk gar/gar.lib/gnustep.mk \
+gar/gar.lib/info.mk gar/gar.lib/python.mk \
+gar/gar.lib/wrong_arch.mk \
+$(foreach   GROUP,$(GROUPS),pkg/$(GROUP)/*) gsrc.in MANIFEST.rec
 bin_SCRIPTS = gsrc
 CLEANFILES = $(bin_SCRIPTS)
 
 find_packages = $(sort $(filter-out $(IGNORE),$(patsubst %/,%,$(filter 
%/,$(wildcard $(1))))))
+# better coding is possible
 BIO_PACKAGES = $(call find_packages, pkg/bio/*/)
-LIBS_PACKAGES = $(call find_packages, pkg/libs/*/)
-TOOLS_PACKAGES = $(call find_packages, pkg/tools/*/)
-DEV_PACKAGES = $(call find_packages, pkg/dev/*/)
+#LIBS_PACKAGES = $(call find_packages, pkg/libs/*/)
+#TOOLS_PACKAGES = $(call find_packages, pkg/tools/*/)
+#DEV_PACKAGES = $(call find_packages, pkg/dev/*/)
 GNU_PACKAGES = $(call find_packages, pkg/gnu/*/)
 GNOME_PACKAGES = $(call find_packages, pkg/gnome/*/)
 GNUSTEP_PACKAGES = $(call find_packages, pkg/gnustep/*/)
 ALPHA_PACKAGES = $(call find_packages, pkg/alpha/*/)
 OTHER_PACKAGES = $(call find_packages, pkg/other/*/)
-LOCAL_PACKAGES = $(call find_packages, pkg/local/*/)
+#LOCAL_PACKAGES = $(call find_packages, pkg/local/*/)
 
-PACKAGES ?= $(BIO_PACKAGES) $(LIBS_PACKAGES) $(TOOLS_PACKAGES) $(DEV_PACKAGES) 
$(GNU_PACKAGES) $(GNOME_PACKAGES) $(GNUSTEP_PACKAGES) $(OTHER_PACKAGES)  
+#PACKAGES ?= $(BIO_PACKAGES) $(LIBS_PACKAGES) $(TOOLS_PACKAGES) 
$(DEV_PACKAGES) $(GNU_PACKAGES) $(GNOME_PACKAGES) $(GNUSTEP_PACKAGES) 
$(OTHER_PACKAGES)  
+PACKAGES ?= $(BIO_PACKAGES)  $(GNU_PACKAGES) $(GNOME_PACKAGES) 
$(GNUSTEP_PACKAGES) $(OTHER_PACKAGES)  
 PAGER ?= less
 PAGER_OPTS = "-r"
 
@@ -102,13 +109,13 @@
        nbfixes=`printf "$$bfixes\n" | wc -l`; \
        echo "Fixed builds: $$nnew"; printf "$$bfixes\n" | sort | sed -r -e 
's/fix (.+) build/\1/g'
 
-manifest-html:  MANIFEST.rec  package-list.md.m4  package-list.html
-       echo making MANIFEST.rc package-list.md.m4 package-list.html
-
-manifest: MANIFEST.rec
-       echo making  MANIFEST.rec
-
-MANIFEST.rec:
+manifest-html:  manifest  package-list.md.m4  package-list.html
+
+
+MANIFEST.rec: manifest
+
+manifest: 
+       @echo making  MANIFEST.rec
        echo "# -*- mode: rec -*-" > MANIFEST.rec
        echo "# Note: this file is a Recutils database (recfile)." >> 
MANIFEST.rec
        echo "# See the GNU Recutils package for more information. " >> 
MANIFEST.rec
@@ -125,15 +132,16 @@
                fi \
        done
 
-package-list.md.m4: MANIFEST.rec
+package-list.md.m4: manifest
        printf "define(\`PACKAGE_LIST\', \`" > package-list.tmp
        echo "`$(RECSEL) MANIFEST.rec | $(RECFMT) -f $(HTML_PKG_TEMPLATE)`" >> 
package-list.tmp
        echo "')" >> package-list.tmp
        m4 -D UPDATE_DATE="$(DATE)" package-list.tmp \
                $(HTML_LIST_TEMPLATE) > $@
        rm package-list.tmp
+       cp package-list.md.m4 package-list.html
 
-package-list.html: package-list.md.m4
+package-list.html: manifest package-list.md.m4
        cp package-list.md.m4 package-list.html
 
 

=== modified file 'IMPORTANT.MESSAGE.17.June.2016'
--- a/IMPORTANT.MESSAGE.17.June.2016    2016-06-17 19:08:15 +0000
+++ b/IMPORTANT.MESSAGE.17.June.2016    2016-06-18 23:42:38 +0000
@@ -12,9 +12,9 @@
 cd to gsrc directory
 
 mkdir pkg
-mv gnu gnustep gnome external alpha    decommissioned  pkg
-mkdir pkg/other pkg/local
+mv gnu gnustep gnome external alpha    decommissioned  pkg/
 # Notice we are moveing the package directories to "pkg/"
+mv cache gar/
 
 now do your normal
 bzr update

=== removed file 'pkg/gnome/NGclutter'
=== removed file 'pkg/gnome/clutter.ng'
=== removed file 'pkg/gnu/gnucobol/sha256sums.oct'
--- a/pkg/gnu/gnucobol/sha256sums.oct   2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/gnucobol/sha256sums.oct   1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-bd319c0d001e85835c8501ad74c9de0052fe82b8a38b4530f41b49b2af028b9d  
download/gnu-cobol-1.1.tar.gz
-9294728eddb185ef9cad1f2cffe6da975515a8e19847d14725826cffcfd56206  
download/gnu-cobol-1.1.tar.gz.sig

=== removed file 'pkg/gnu/gnucobol/sha256sums.octnew'
--- a/pkg/gnu/gnucobol/sha256sums.octnew        2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/gnucobol/sha256sums.octnew        1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-bd319c0d001e85835c8501ad74c9de0052fe82b8a38b4530f41b49b2af028b9d  
download/gnu-cobol-1.1.tar.gz
-9294728eddb185ef9cad1f2cffe6da975515a8e19847d14725826cffcfd56206  
download/gnu-cobol-1.1.tar.gz.sig

=== removed file 'pkg/gnu/gnucobol/sha256sums.orgi.ng'
--- a/pkg/gnu/gnucobol/sha256sums.orgi.ng       2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/gnucobol/sha256sums.orgi.ng       1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-bd319c0d001e85835c8501ad74c9de0052fe82b8a38b4530f41b49b2af028b9d  
download/gnu-cobol-1.1.tar.gz
-204195d31af9e233450085cd957743d552928c3bb14193aac7b43cd0dca6dc02  
download/gnu-cobol-1.1.tar.gz.sig

=== modified file 'util/templates/package-list.html.m4'
--- a/util/templates/package-list.html.m4       2016-06-17 21:55:14 +0000
+++ b/util/templates/package-list.html.m4       2016-06-18 23:42:38 +0000
@@ -47,18 +47,18 @@
 <p>This is a list of all the packages that are currently present in
   GSRC. This list is automatically updated daily to reflect the
   latest software versions or package additions. The "GSRC Name" of a
-  package is the one that you would use to install the package via
-  GSRC, a filesystem name, i.e. <pre>make -C pkg/gnu/hello</pre>  The "Name" 
of the package
+  package is a filesystem name,  one that you would use to install the package 
via
+  GSRC,  i.e. <pre>make -C pkg/gnu/hello</pre>  The "Name" of the package
   is its canonical name as might be used in text to communicate among 
humans.</p>
 
 <p><b>Last update:</b> UPDATE_DATE</p>
 
 <table style="table-layout: fixed; width: 100%">
   <tr>
-    <th width="15%">GSRC Name</th>
-    <th width="15%">Name</th>
-    <th width="60%">Description</th>
-    <th width="10%">Version</th>
+    <th width="10%">GSRC Name</th>
+    <th width="10%">Name</th>
+    <th width="75%">Description</th>
+    <th width="5%">Version</th>
   </tr>
 PACKAGE_LIST
 </table>

=== modified file 'util/templates/package.html.templ'
--- a/util/templates/package.html.templ 2013-04-15 20:33:59 +0000
+++ b/util/templates/package.html.templ 2016-06-18 23:42:38 +0000
@@ -1,6 +1,6 @@
   <tr>
-    <td width="15%" style="word-wrap: break-word" 
id="{{Garname}}">{{Directory}}/{{Garname}}</td>
-    <td width="15%" style="word-wrap: break-word"><a 
href="{{Home_URL}}">{{Name}}</a></td>
-    <td width="60%">{{Blurb = "" ? Description : Blurb}}</td>
-    <td width="10%">{{Version}}</td>
+    <td width="10%" style="word-wrap: break-word" 
id="{{Garname}}">{{Directory}}/{{Garname}}</td>
+    <td width="10%" style="word-wrap: break-word"><a 
href="{{Home_URL}}">{{Name}}</a></td>
+    <td width="75%">{{Blurb = "" ? Description : Blurb}}</td>
+    <td width="5%">{{Version}}</td>
   </tr>