[Gsrc-commit] trunk r3995: accomodate freedesktop

[Carl Hansen]

------------------------------------------------------------
revno: 3995
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Thu 2016-10-13 01:24:45 -0700
message:
  accomodate freedesktop
modified:
  GNUmakefile.am                 
gnumakefile.am-20101220114433-luja3ml8rpou24n9-2
  gar/gar.lib.mk                 gar.lib.mk-20160617013741-ul4q527k85thcz4p-1
  gar/gar.master.mk              gar.master.mk-20160617013745-b969jpkm3t4wwhf2-1
  gar/gar.mk                     gar.mk-20160617013745-r4h3dj0kiuppihsx-1

=== modified file 'GNUmakefile.am'
--- a/GNUmakefile.am    2016-06-19 01:53:54 +0000
+++ b/GNUmakefile.am    2016-10-13 08:24:45 +0000
@@ -19,7 +19,7 @@
 
 
 #GROUPS = bio libs tools dev gnu gnustep gnome alpha other local 
-GROUPS = bio  gnu gnustep gnome alpha other external decommissioned
+GROUPS = bio  gnu gnustep gnome freedesktop alpha other external decommissioned
 
 SUBDIRS = doc
 EXTRA_DIST = bootstrap gar/gar.mk gar/gar.master.mk gar/gar.conf.mk    \
@@ -42,12 +42,13 @@
 GNU_PACKAGES = $(call find_packages, pkg/gnu/*/)
 GNOME_PACKAGES = $(call find_packages, pkg/gnome/*/)
 GNUSTEP_PACKAGES = $(call find_packages, pkg/gnustep/*/)
+FREEDESKTOP_PACKAGES = $(call find_packages, pkg/freedesktop/*/)
 ALPHA_PACKAGES = $(call find_packages, pkg/alpha/*/)
 OTHER_PACKAGES = $(call find_packages, pkg/other/*/)
 #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) $(GNOME_PACKAGES) 
$(GNUSTEP_PACKAGES) $(OTHER_PACKAGES)  
+PACKAGES ?= $(BIO_PACKAGES)  $(GNU_PACKAGES) $(GNOME_PACKAGES) 
$(FREEDESKTOP_PACKAGES) $(GNUSTEP_PACKAGES) $(OTHER_PACKAGES)  
 PAGER ?= less
 PAGER_OPTS = "-r"
 

=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk    2016-06-18 00:37:20 +0000
+++ b/gar/gar.lib.mk    2016-10-13 08:24:45 +0000
@@ -271,6 +271,13 @@
        cd $(DOWNLOADDIR) && sha256sum -c $*.sha256
        $(MAKECOOKIE)
 
+#carl for gnome, all wrong
+#checksig-%.sha256sum:
+##     @printf "[$(OK)checksig$(OFF)] $(MSG)Checking SHA256 checksums 
$(OFF)$*\n"
+#      #cd $(DOWNLOADDIR) && sha256sum -c $*
+#      cd $(DOWNLOADDIR) && sha256sum -c $*.sha256sum
+#      $(MAKECOOKIE)
+
 #################### GARCHIVE RULES ####################
 
 # while we're here, let's just handle how to back up our

=== modified file 'gar/gar.master.mk'
--- a/gar/gar.master.mk 2016-09-22 06:35:10 +0000
+++ b/gar/gar.master.mk 2016-10-13 08:24:45 +0000
@@ -111,5 +111,7 @@
        ftp://ftp.opengroup.org/pub/x.org/pub/ \
        http://www2.x.org/pub/ \
        ftp://ftp.x.org/pub/
+MASTER_FREEDESKTOP ?= \
+       http://freedesktop.org/
 MASTER_XORG_INDIVIDUAL ?= \
        http://xorg.freedesktop.org/releases/individual/

=== modified file 'gar/gar.mk'
--- a/gar/gar.mk        2016-06-18 00:37:20 +0000
+++ b/gar/gar.mk        2016-10-13 08:24:45 +0000
@@ -30,7 +30,7 @@
 
 GARDIR ?= ../../../gar
 GARPKGDIR ?= ../..
-PKGGROUPS ?= gnu gnome gnustep gnome bio other libs tools dev external
+PKGGROUPS ?= gnu gnustep gnome bio freedesktop other libs tools dev external
 PKGGROUPDIRS ?= $(foreach GROUP,$(PKGGROUPS),$(GARPKGDIR)/$(GROUP))
 GARDIR_ABSOLUTE := $(shell cd $(GARDIR) && pwd)
 SCRIPTSDIR = $(GARDIR_ABSOLUTE)/gar.scripts
@@ -417,3 +417,50 @@
 .NOTPARALLEL:
 
 endif
+
+
+
+# added
+
+# -*- coding: utf-8 -*-
+#
+#       gsrc-maint.mk
+#
+#       Copyright © 2013, 2014 Brandon Invergo <address@hidden>
+#
+#       This file is part of GSRC.
+#
+#       GSRC is free software: you can redistribute it and/or modify
+#       it under the terms of the GNU General Public License as published by
+#       the Free Software Foundation, either version 3 of the License, or
+#       (at your option) any later version.
+#
+#       GSRC is distributed in the hope that it will be useful,
+#       but WITHOUT ANY WARRANTY; without even the implied warranty of
+#       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#       GNU General Public License for more details.
+#
+#       You should have received a copy of the GNU General Public License
+#       along with GSRC.  If not, see <http://www.gnu.org/licenses/>.
+
+keyring: fetch
+       id=`gpg2 --verify $(DOWNLOADDIR)/$(SIGFILES) 2>&1 | grep -o -E 
"[0-9A-Z]{8}"` \
+               && gpg2   --keyserver keys.gnupg.net  --recv-keys $$id && gpg2 
--export $$id > gpg-keyring
+       #c. change
+               #&& gpg2 --recv-keys $$id && gpg2 --export $$id > gpg-keyring
+
+test-build: clean install uninstall uninstall-pkg
+
+test-url:
+       @curl -L -s --head $(HOME_URL) | grep "HTTP/1.[01]"
+
+find-updates:
+       @for v in `python ../../util/gen-version-nums.py $(GARVERSION)`; do \
+               printf "%s\r\t\t%s" $(GARNAME) $$v; \
+               make test-download GARVERSION="$$v" 1>/dev/null 2>&1 && printf 
"\n" && exit 0; \
+               printf "\r                                               \r"; \
+       done
+       @printf "\r                                               \r"
+
+test-download:
+       WGET_OPTS="-c --spider --no-check-certificate --passive-ftp -U 
\"GSRC/1.0\"" make fetch