[Gsrc-commit] trunk r5924: xorg dir created, good time to bootstrap.configure again

[Carl Hansen]

------------------------------------------------------------
revno: 5924
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Wed 2018-09-12 15:45:42 -0700
message:
  xorg dir created, good time to bootstrap.configure again
renamed:
  pkg/freedesktop/dri3proto/ => pkg/xorg/dri3proto/ 
dri3proto-20180505054919-ypksuypyjfmdmj9n-1
  pkg/freedesktop/libxcb/ => pkg/xorg/libxcb/ 
libxcb-20180416230631-qj4owdepjgc2rx64-1
  pkg/freedesktop/wininfo/ => pkg/xorg/wininfo/ 
wininfo-20180504232932-kgzy5ez0e4pkfsln-1
  pkg/freedesktop/xcb-proto/ => pkg/xorg/xcb-proto/ 
xcbproto-20180416231545-kkzpdjillgbh9418-1
  pkg/freedesktop/xorg-docs/ => pkg/xorg/xorg-docs/ 
xorgdocs-20170802201320-k4duvjm7nswl0kh7-1
  pkg/freedesktop/xorg-server/ => pkg/xorg/xorg-server/ 
xorgserver-20180121025606-g8m46zhl05kebvr6-1
  pkg/freedesktop/xorgproto/ => pkg/xorg/xorgproto/ 
xorgproto-20180218234623-f20xjflm7bf0a3e3-1
  pkg/freedesktop/xtrans/ => pkg/xorg/xtrans/ 
xtrans-20160617013746-7ygosxqw3lxxvo7f-253
modified:
  GNUmakefile.am                 
gnumakefile.am-20101220114433-luja3ml8rpou24n9-2
  gar/gar.lib/mesonninja.mk      mesonninja.mk-20171030065946-2eocvxzl13nbloqy-1
  gar/gar.master.mk              gar.master.mk-20160617013745-b969jpkm3t4wwhf2-1
  gar/gar.mk                     gar.mk-20160617013745-r4h3dj0kiuppihsx-1
  pkg/gnome/gdk-pixbuf/Makefile  makefile-20160617013746-7ygosxqw3lxxvo7f-483
  pkg/gnome/gdk-pixbuf/config.mk config.mk-20160617013919-2ekfl0jm747szv5l-1
  util/templates/package-list.html.m4 
packagelist.html.m4-20130412204301-x472oq5mm1fc6mrc-1

=== modified file 'GNUmakefile.am'
--- a/GNUmakefile.am    2018-05-10 02:43:08 +0000
+++ b/GNUmakefile.am    2018-09-12 22:45:42 +0000
@@ -19,7 +19,7 @@
 
 
 #GROUPS = bio libs tools dev gnu gnustep gnome alpha other local 
-GROUPS = bio gnu gnualpha gnustep gnome gstreamer freedesktop  other local 
external decommissioned
+GROUPS = bio freedesktop gnome gnu gnualpha gnustep  gstreamer   other xorg 
local external decommissioned
 
 SUBDIRS = doc
 EXTRA_DIST = bootstrap gar/gar.mk gar/gar.master.mk gar/gar.conf.mk    \
@@ -46,10 +46,11 @@
 FREEDESKTOP_PACKAGES = $(call find_packages, pkg/freedesktop/*/)
 GSTREAMER_PACKAGES = $(call find_packages, pkg/gstreamer/*/)
 OTHER_PACKAGES = $(call find_packages, pkg/other/*/)
+XORG_PACKAGES = $(call find_packages, pkg/xorg/*/)
 #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)  $(GNU_PACKAGES) $(GNUALPHA_PACKAGES) 
$(GNUSTEP_PACKAGES)   $(GNOME_PACKAGES) $(FREEDESKTOP_PACKAGES) 
$(GSTREAMER_PACKAGES) $(OTHER_PACKAGES)  
+PACKAGES ?= $(BIO_PACKAGES)  $(GNU_PACKAGES) $(GNUALPHA_PACKAGES) 
$(GNUSTEP_PACKAGES)   $(GNOME_PACKAGES) $(FREEDESKTOP_PACKAGES) 
$(GSTREAMER_PACKAGES) $(OTHER_PACKAGES)  $(XORG_PACKAGES)
 PAGER ?= less
 PAGER_OPTS = "-r"
 

=== modified file 'gar/gar.lib/mesonninja.mk'
--- a/gar/gar.lib/mesonninja.mk 2018-08-01 16:17:34 +0000
+++ b/gar/gar.lib/mesonninja.mk 2018-09-12 22:45:42 +0000
@@ -59,7 +59,7 @@
        @echo LC_ALL=C.UTF-8   ninja 
        cd  $(WORKOBJ) && pwd
        pwd
-       LC_ALL=$(LOCALLOCALE)   ninja   -C $(WORKOBJ) 
+       LC_ALL=$(LOCALLOCALE)   ninja -v   -C $(WORKOBJ) 
        @echo ----------------------------------------------
        @echo ----------------------------------------------
        $(MAKECOOKIE)

=== modified file 'gar/gar.master.mk'
--- a/gar/gar.master.mk 2018-09-01 08:39:25 +0000
+++ b/gar/gar.master.mk 2018-09-12 22:45:42 +0000
@@ -26,9 +26,9 @@
        ftp://cam.ctan.org/tex-archive/ \
        ftp://dante.ctan.org/tex-archive/
 MASTER_DEBIAN ?= \
-       ftp://ftp.debian.org/debian/pool/ \
-       http://archive.debian.org/debian/pool/ \
-       ftp://ftp.de.debian.org/debian/pool/
+       ftp://ftp.us.debian.org/debian/pool/ \
+       ftp://ftp.de.debian.org/debian/pool/ \
+       http://archive.debian.org/debian/pool/ 
 MASTER_DISTFILES ?= \
        http://offog.org/files/garstow-distfiles/ \
        ftp://ftp.i-scream.org/pub/offog.org/files/garstow-distfiles/
@@ -96,6 +96,8 @@
        https://savannah.nongnu.org/download/
 MASTER_SAVANNAH_RELEASES ?= \
        https://download.savannah.gnu.org/releases/
+MASTER_SAVANNAH_NONGNU_RELEASES ?= \
+       https://download.savannah.nongnu.org/releases/
 MASTER_SAVANNAH_CVS ?= \
        pserver:address@hidden:/sources
 MASTER_SOURCEFORGE ?= \

=== modified file 'gar/gar.mk'
--- a/gar/gar.mk        2018-03-25 08:09:25 +0000
+++ b/gar/gar.mk        2018-09-12 22:45:42 +0000
@@ -446,7 +446,7 @@
 
 keyring: fetch
        id=`gpg --verify $(DOWNLOADDIR)/$(SIGFILES) 2>&1 | grep -o -E 
"[0-9A-Z]{8}"` \
-               && gpg   --keyserver keys.gnupg.net  --recv-keys $$id && gpg 
--export $$id > gpg-keyring
+               && gpg -v -v   --keyserver keys.gnupg.net  --recv-keys $$id && 
gpg --export $$id > gpg-keyring
 
 
        #c. change

=== modified file 'pkg/gnome/gdk-pixbuf/Makefile'
--- a/pkg/gnome/gdk-pixbuf/Makefile     2018-09-06 22:21:30 +0000
+++ b/pkg/gnome/gdk-pixbuf/Makefile     2018-09-12 22:45:42 +0000
@@ -54,9 +54,19 @@
 # need to mess with GDK_PIXBUF_MODULEDIR because wrong path is built in  
 #  
 # pointless 
-pre-configure:
-       export 
GDK_PIXBUF_MODULEDIR=$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders
-       $(MAKECOOKIE)
+# GDK_PIXBUF_MODULE_FILE
+#   adjust as needed
+#GDK_PIXBUF_MODULEDIR=$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders
+#GDK_PIXBUF_MODULE_FILE=$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
+
+#pre-configure: 
GDK_PIXBUF_MODULEDIR=$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders
 
GDK_PIXBUF_MODULE_FILE=$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
+#      echo  dasdfasdf
+#      echo $(GDK_PIXBUF_MODULEDIR)
+#      echo $(GDK_PIXBUF_MODULE_FILE)
+#      $(MAKECOOKIE)
+
+#snort: pre-configure
+#      env |sort
 
 # missing file, resources.c this is a kludge that lets the rest work:
 pre-build:
@@ -66,9 +76,10 @@
 
#GDK_PIXBUF_MODULEDIR=/opt/gsrc/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders
 #export  GDK_PIXBUF_MODULEDIR
 
-custom-post-install:
-       echo updating  
$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
-       env 
GDK_PIXBUF_MODULEDIR=$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders
 gdk-pixbuf-query-loaders >  
$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
-       $(MAKECOOKIE)
+#custom-post-install:
+#      echo updating  
$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
+#      touch  
$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
+#      env 
GDK_PIXBUF_MODULEDIR=$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders
 gdk-pixbuf-query-loaders >  
$(prefix)/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
+#      $(MAKECOOKIE)
 
 

=== modified file 'pkg/gnome/gdk-pixbuf/config.mk'
--- a/pkg/gnome/gdk-pixbuf/config.mk    2018-08-31 07:50:23 +0000
+++ b/pkg/gnome/gdk-pixbuf/config.mk    2018-09-12 22:45:42 +0000
@@ -1,4 +1,5 @@
 ## Configuration options for gdk-pixbuf ##
+#?
 
 CONFIGURE_OPTS ?= --with-libpng --with-libjpeg -DOS_LINUX
-BUILD_OPTS ?=
+BUILD_OPTS ?= CFLAGS+=--save-temps

=== renamed directory 'pkg/freedesktop/dri3proto' => 'pkg/xorg/dri3proto'
=== renamed directory 'pkg/freedesktop/libxcb' => 'pkg/xorg/libxcb'
=== renamed directory 'pkg/freedesktop/wininfo' => 'pkg/xorg/wininfo'
=== renamed directory 'pkg/freedesktop/xcb-proto' => 'pkg/xorg/xcb-proto'
=== renamed directory 'pkg/freedesktop/xorg-docs' => 'pkg/xorg/xorg-docs'
=== renamed directory 'pkg/freedesktop/xorg-server' => 'pkg/xorg/xorg-server'
=== renamed directory 'pkg/freedesktop/xorgproto' => 'pkg/xorg/xorgproto'
=== renamed directory 'pkg/freedesktop/xtrans' => 'pkg/xorg/xtrans'
=== modified file 'util/templates/package-list.html.m4'
--- a/util/templates/package-list.html.m4       2018-03-22 06:00:59 +0000
+++ b/util/templates/package-list.html.m4       2018-09-12 22:45:42 +0000
@@ -45,7 +45,8 @@
 <h2>GSRC Package List</h2>
 
 <h3>GNU Source Release Collection has now merged with Bioinformatics Source 
Release Collection</h3>
-<h3>Main pkg subdirectories currently are:</h3><h3> bio freedesktop gnome gnu 
gnualpha gnustep gstreamer other </h3>
+<h3>Main pkg subdirectories currently are:</h3>
+<h3> bio freedesktop gnome gnu gnualpha gnustep gstreamer other xorg </h3>
 
 <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