gsrc-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gsrc-commit] trunk r8600: gar changes, basic operations


From: Carl Hansen
Subject: [Gsrc-commit] trunk r8600: gar changes, basic operations
Date: Tue, 27 Sep 2022 01:35:48 -0400 (EDT)
User-agent: Bazaar (2.7.0dev1)

------------------------------------------------------------
revno: 8600
revision-id: carlhansen@gnu.org-20220927053542-7i8bs6nqrdjrt1ga
parent: carlhansen@gnu.org-20220927052158-qj2tdx1vyg4ev5wm
committer: Carl Hansen <carlhansen@gnu.org>
branch nick: trunk
timestamp: Mon 2022-09-26 22:35:42 -0700
message:
  gar changes, basic operations
added:
  gar/gsrc-maint.mk              gsrcmaint.mk-20220927041122-92dxd0tly081nk61-1
modified:
  gar/gar.conf.mk                gar.conf.mk-20160617013739-fyi5aiwubjgbbvfn-2
  gar/gar.env.mk                 gar.env.mk-20160617013739-wvc0o4a3snqz0iin-1
  gar/gar.lib.mk                 gar.lib.mk-20160617013741-ul4q527k85thcz4p-1
  gar/gar.lib/auto.mk            auto.mk-20160617013740-b2gc1gamt0k7pzjx-2
  gar/gar.lib/external.mk        external.mk-20160617013740-b2gc1gamt0k7pzjx-5
  gar/gar.lib/info.mk            info.mk-20160617013740-b2gc1gamt0k7pzjx-7
  gar/gar.lib/mesonninja.mk      mesonninja.mk-20171030065946-2eocvxzl13nbloqy-1
  gar/gar.lib/wrong_arch.mk      
wrong_arch.mk-20160617013740-b2gc1gamt0k7pzjx-10
  gar/gar.master.mk              gar.master.mk-20160617013745-b969jpkm3t4wwhf2-1
  gar/gar.mk                     gar.mk-20160617013745-r4h3dj0kiuppihsx-1
=== modified file 'gar/gar.conf.mk'
--- a/gar/gar.conf.mk   2022-09-07 17:25:24 +0000
+++ b/gar/gar.conf.mk   2022-09-27 05:35:42 +0000
@@ -12,7 +12,6 @@
 MAKE_ARGS += V=1
 
 
-
 # List of packages that should not be installed automatically as
 # dependencies by GARStow -- for example, if they're provided by an
 # underlying operating system.
@@ -25,17 +24,18 @@
 # can insert symbols to designate GSRC output.
 USE_COLOR ?= n
 ifeq ($(USE_COLOR),y)
-       OFF  =  "\\033[00m"
-       MSG  =  "\\033[01\;37m"
-       MSG2 =  "\\033[01\;37m"
-       ERR  =  "\\033[01\;31m"
-       OK   =  "\\033[00\;32m"
+    # good for dark background
+    OFF  =  "\\033[00m"
+    MSG  =  "\\033[01\;44m"
+    MSG2 =  "\\033[01\;43m"
+    ERR  =  "\\033[01\;31m"
+    OK   =  "\\033[00\;32m"
 else
-       OFF  =
-       MSG  = ==>
-       MSG2 =
-       ERR  = ***
-       OK   =
+    OFF  =
+    MSG  = ==>
+    MSG2 =
+    ERR  = ***
+    OK   =
 endif
 
 # If you want to redirect the output of most of the build process
@@ -46,11 +46,12 @@
 # redirect or pipe > |
 REDIRECT_OUTPUT ?= n
 ifeq ($(REDIRECT_OUTPUT),n)
-       OUTPUT = 
+    OUTPUT = 
 
 else
-       OUTPUT = 1>/dev/null 2>&1
+    OUTPUT = 1>/dev/null 2>&1
 endif
 
 # If you want rules to apply to all packages ("custom-pre-stow" etc.),
 # then define them here.
+#

=== modified file 'gar/gar.env.mk'
--- a/gar/gar.env.mk    2019-12-19 00:23:00 +0000
+++ b/gar/gar.env.mk    2022-09-27 05:35:42 +0000
@@ -44,7 +44,7 @@
 # Choose your Python binary
 PYTHON ?= python
 PYTHON2_VER := 2.7
-PYTHON3_VER := 3.7
+PYTHON3_VER := 3.10
 PYTHON_PATH := 
$(prefix)/lib/python${PYTHON2_VER}/site-packages/:$(prefix)/lib/python${PYTHON3_VER}:$(PYTHON_PATH)
 
 # Export variables to the build environment.
@@ -74,3 +74,4 @@
 unexport SESSION_MANAGER
 unexport SSL_AUTH_SOCK
 unexport XAUTHORITY
+

=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk    2022-09-22 21:19:25 +0000
+++ b/gar/gar.lib.mk    2022-09-27 05:35:42 +0000
@@ -22,8 +22,8 @@
 # a port maintainer, since they'e pattern-based.  Thus:
 #
 # extract-foo.tar.gz:
-#      (special stuff to unpack non-standard tarball, such as one
-#      accidentally named .gz when it's really bzip2 or something)
+#  (special stuff to unpack non-standard tarball, such as one
+#  accidentally named .gz when it's really bzip2 or something)
 #
 # and this will override the extract-%.tar.gz rule.
 
@@ -64,17 +64,17 @@
 # get one that doesn't return an error code.
 $(DOWNLOADDIR)/%:
        @if test -f $(COOKIEDIR)/checksum-$*; then : ; else \
-               printf "[$(OK)fetch$(OFF)] $(MSG)Grabbing $(OFF)$@\n"; \
-               for i in $(filter %/$*,$(URLS)); do  \
-                       printf "[$(OK)fetch$(OFF)] $(MSG)Trying .... 
$(OFF)$$i\n"; \
-                       $(MAKE) $$i $(OUTPUT) || continue; \
-                       break; \
-               done; \
-               if test -r $@ ; then : ; else \
-                       printf "[$(ERR)fetch$(OFF)] $(MSG)Failed to download 
$(OFF)$@$(MSG)!$(OFF)\n" 1>&2; \
-                       false; \
-               fi; \
-       fi
+        printf "[$(OK)fetch$(OFF)] $(MSG)Grabbing $(OFF)$@\n"; \
+        for i in $(filter %/$*,$(URLS)); do  \
+            printf "[$(OK)fetch$(OFF)] $(MSG)Trying .... $(OFF)$$i\n"; \
+            $(MAKE) $$i $(OUTPUT) || continue; \
+            break; \
+        done; \
+        if test -r $@ ; then : ; else \
+            printf "[$(ERR)fetch$(OFF)] $(MSG)Failed to download 
$(OFF)$@$(MSG)!$(OFF)\n" 1>&2; \
+            false; \
+        fi; \
+    fi
 
 # We specify --passive-ftp for all protocols because it's possible for
 # an HTTP URL to redirect to an FTP one -- download.kde.org works like
@@ -102,19 +102,19 @@
 # link to a local copy of the file
 # (absolute path)
 file///%:
-       if test -f /$*; then \
-               ln -sf "/$*" $(DOWNLOADDIR)/$(notdir $*); \
-       else \
-               false; \
-       fi $(OUTPUT)
+       @if test -f /$*; then \
+        ln -sf "/$*" $(DOWNLOADDIR)/$(notdir $*); \
+    else \
+        false; \
+    fi $(OUTPUT)
 
 # (relative path)
 file//%:
-       if test -f $*; then \
-               ln -sf $(CURDIR)/$* $(DOWNLOADDIR)/$(notdir $*); \
-       else \
-               false; \
-       fi $(OUTPUT)
+       @if test -f $*; then \
+         ln -sf $(CURDIR)/$* $(DOWNLOADDIR)/$(notdir $*); \
+     else \
+         false; \
+     fi $(OUTPUT)
 
 # Using Jeff Waugh's rsync rule.
 # DOES NOT PRESERVE SYMLINKS!
@@ -140,8 +140,8 @@
 cvs//%:
        mkdir -p $(DOWNLOADDIR)/cvs
        cd $(DOWNLOADDIR)/cvs && \
-               cvs -z3 -d:$(CVS_ROOT) co -d $(DISTNAME) $(CVS_CO_OPTS) 
$(CVS_MODULE) && \
-               tar czvf ../$(notdir $*) $(DISTNAME)
+        cvs -z3 -d:$(CVS_ROOT) co -d $(DISTNAME) $(CVS_CO_OPTS) $(CVS_MODULE) 
&& \
+        tar czvf ../$(notdir $*) $(DISTNAME)
 
 # Check out source from Subversion.
 SVN_REVISION ?= "{$(strip $(GARVERSION))}"
@@ -149,30 +149,30 @@
 svnco//%:
        mkdir -p $(DOWNLOADDIR)/svn
        cd $(DOWNLOADDIR)/svn && \
-               svn co $(SVN_CO_OPTS) $(SVN_PATH) $(DISTNAME) && \
-               tar czvf ../$(notdir $*) $(DISTNAME)
+        svn co $(SVN_CO_OPTS) $(SVN_PATH) $(DISTNAME) && \
+        tar czvf ../$(notdir $*) $(DISTNAME)
 
 # Check out source from Darcs.
 DARCS_GET_OPTS ?= --partial --to-match "date $(GARVERSION)"
 darcs//%:
        mkdir -p $(DOWNLOADDIR)/darcs
        cd $(DOWNLOADDIR)/darcs && \
-               darcs get $(DARCS_GET_OPTS) $(DARCS_PATH) $(DISTNAME) && \
-               tar -czvf ../$(notdir $*) $(DISTNAME)
+        darcs get $(DARCS_GET_OPTS) $(DARCS_PATH) $(DISTNAME) && \
+        tar -czvf ../$(notdir $*) $(DISTNAME)
 
 # Check out source from Git.
 #GIT_REVISION ?= v$(strip $(GARVERSION))
 #git//%:
-#      mkdir -p $(DOWNLOADDIRGIT)
-#      cd $(DOWNLOADDIRGIT) && \
-#              git clone $(GIT_PATH) $(DISTNAME) && \
-#              (cd $(DISTNAME) && git checkout $(GIT_REVISION)) && \
-#              tar czvf ../$(notdir $*) $(DISTNAME)
+#    mkdir -p $(DOWNLOADDIRGIT)
+#    cd $(DOWNLOADDIRGIT) && \
+#        git clone $(GIT_PATH) $(DISTNAME) && \
+#        (cd $(DISTNAME) && git checkout $(GIT_REVISION)) && \
+#        tar czvf ../$(notdir $*) $(DISTNAME)
 #new
 
 .PHONY: gitpull fetch-git
 #WORKSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
-GIT_REVISION ?= master 
+GIT_REVISION ?= master    
 
 gitpull:
        @printf "git pulling..\n"; 
@@ -182,7 +182,7 @@
 
 fetch-git:  
        @if [ -d $(DOWNLOADDIRGIT)/$(GARNAME)/.git ]; then    $(MAKE) gitpull ; 
 else  \
-               printf "git cloning and checking out..\n"; \
+        printf "git cloning and checking out..\n"; \
                 mkdir -p $(DOWNLOADDIRGIT)/$(GARNAME);   \
               cd $(DOWNLOADDIRGIT) &&  git clone $(GIT_PATH) $(GARNAME)  ; \
              ( cd $(GARNAME) &&  git checkout $(GIT_REVISION) ) ;  fi 
@@ -195,41 +195,41 @@
 # a rather annoying kludge
 
 #githttps//%:
-#      @echo gitting it
-#      mkdir -p $(DOWNLOADDIRGIT)`
-#      cd $(DOWNLOADDIR)-git && \
-#              git clone $(GIT_PATH) $(DISTNAME) && \
-#              (cd $(DISTNAME) && git checkout $(GIT_REVISION)) 
-
-
-
-#      @echo githttp $*
-#      wget $(WGET_OPTS) -O $(DOWNLOADDIR)/$(notdir $*).partial https://$*
-#      mv $(DOWNLOADDIR)/$(notdir $*).partial  $(DOWNLOADDIR)/$(notdir $*) 
-#      cp $(DOWNLOADDIR)/$(notdir $*)          
$(DOWNLOADDIR)/$(DISTNAME).tar.gz
-#      @echo before ----------------ALLFILES      $(ALLFILES)
-#      echo ALLFILES = $(subst    $(notdir $*) , $(DISTNAME).tar.gz, 
$(ALLFILES) )
-#      @echo after ----------------ALLFILES      $(ALLFILES)
-#      #$(MAKE) garchve-$(DOWNLOADDIR)/$(DISTNAME).tar.gz
+#    @echo gitting it
+#    mkdir -p $(DOWNLOADDIRGIT)`
+#    cd $(DOWNLOADDIR)-git && \
+#        git clone $(GIT_PATH) $(DISTNAME) && \
+#        (cd $(DISTNAME) && git checkout $(GIT_REVISION)) 
+
+
+
+#    @echo githttp $*
+#    wget $(WGET_OPTS) -O $(DOWNLOADDIR)/$(notdir $*).partial https://$*
+#    mv $(DOWNLOADDIR)/$(notdir $*).partial  $(DOWNLOADDIR)/$(notdir $*) 
+#    cp $(DOWNLOADDIR)/$(notdir $*)          $(DOWNLOADDIR)/$(DISTNAME).tar.gz
+#    @echo before ----------------ALLFILES      $(ALLFILES)
+#    echo ALLFILES = $(subst    $(notdir $*) , $(DISTNAME).tar.gz, $(ALLFILES) 
)
+#    @echo after ----------------ALLFILES      $(ALLFILES)
+#    #$(MAKE) garchve-$(DOWNLOADDIR)/$(DISTNAME).tar.gz
 
 
 ## working notes 
 ## # download an http URL (colons omitted)
 ## http//%:
-##     wget $(WGET_OPTS) -O $(DOWNLOADDIR)/$(notdir $*).partial http://$*
-##     mv $(DOWNLOADDIR)/$(notdir $*).partial $(DOWNLOADDIR)/$(notdir $*)
+##     wget $(WGET_OPTS) -O $(DOWNLOADDIR)/$(notdir $*).partial http://$*
+##     mv $(DOWNLOADDIR)/$(notdir $*).partial $(DOWNLOADDIR)/$(notdir $*)
 ## 
 ## # download an https URL (colons omitted)
 ## https//%:
-##     wget $(WGET_OPTS) -O $(DOWNLOADDIR)/$(notdir $*).partial https://$*
-##     mv $(DOWNLOADDIR)/$(notdir $*).partial $(DOWNLOADDIR)/$(notdir $*)
+##     wget $(WGET_OPTS) -O $(DOWNLOADDIR)/$(notdir $*).partial https://$*
+##     mv $(DOWNLOADDIR)/$(notdir $*).partial $(DOWNLOADDIR)/$(notdir $*)
 ## 
 ## ---
-##     mkdir -p $(DOWNLOADDIR)/git
-##     cd $(DOWNLOADDIR)/git && \
-##             git clone $(GIT_PATH) $(DISTNAME) && \
-##             (cd $(DISTNAME) && git checkout $(GIT_REVISION)) && \
-##             tar czvf ../$(notdir $*) $(DISTNAME)
+##     mkdir -p $(DOWNLOADDIR)/git
+##     cd $(DOWNLOADDIR)/git && \
+##         git clone $(GIT_PATH) $(DISTNAME) && \
+##         (cd $(DISTNAME) && git checkout $(GIT_REVISION)) && \
+##         tar czvf ../$(notdir $*) $(DISTNAME)
 ## ---
 
 # Check out source from Mercurial.
@@ -238,8 +238,8 @@
 hg//%:
        mkdir -p $(DOWNLOADDIR)/hg
        cd $(DOWNLOADDIR)/hg && \
-               hg clone $(HG_CLONE_OPTS) $(HG_PATH) $(DISTNAME) && \
-               tar czvf ../$(notdir $*) $(DISTNAME)
+        hg clone $(HG_CLONE_OPTS) $(HG_PATH) $(DISTNAME) && \
+        tar czvf ../$(notdir $*) $(DISTNAME)
 
 # Check out source from Bazaar.
 BZR_REVISION ?= before:date:$(strip $(GARVERSION))
@@ -247,8 +247,8 @@
 bzr//%:
        mkdir -p $(DOWNLOADDIR)/bzr
        cd $(DOWNLOADDIR)/bzr && \
-               bzr checkout $(BZR_CHECKOUT_OPTS) $(BZR_PATH) $(DISTNAME) && \
-               tar czvf ../$(notdir $*) $(DISTNAME)
+        bzr checkout $(BZR_CHECKOUT_OPTS) $(BZR_PATH) $(DISTNAME) && \
+        tar czvf ../$(notdir $*) $(DISTNAME)
 
 #################### CHECKSUM RULES ####################
 
@@ -264,17 +264,17 @@
 checksum-%: $(CHECKSUM_FILE)
        @printf "[$(OK)checksum$(OFF)] $(MSG)Running $(CHECKSUM_CMD) on 
$(OFF)$*\n"
        @if grep -- '  $(DOWNLOADDIR)/$*$$' $(CHECKSUM_FILE); then \
-               if LC_ALL="C" LANG="C"  grep -- '  $(DOWNLOADDIR)/$*$$' 
$(CHECKSUM_FILE) | $(CHECKSUM_CMD) -c | grep ':[ ]\+OK'; then \
-                       printf "[$(OK)checksum$(OFF)] $(MSG)$(CHECKSUM_FILE) is 
OK$(OFF)\n"; \
-                       $(DOMAKECOOKIE); \
-               else \
-                       printf "[$(ERR)checksum$(OFF)] $(MSG)$* failed checksum 
test!$(OFF)\n" 1>&2; \
-                       false; \
-               fi \
-       else \
-               printf "[$(ERR)checksum$(OFF)] $(MSG)$* not in $(CHECKSUM_FILE) 
file!$(OFF)\n" 1>&2; \
-               false; \
-       fi $(OUTPUT)
+        if LC_ALL="C" LANG="C"  grep -- '  $(DOWNLOADDIR)/$*$$' 
$(CHECKSUM_FILE) | $(CHECKSUM_CMD) -c | grep ':[ ]\+OK'; then \
+            printf "[$(OK)checksum$(OFF)] $(MSG)$(CHECKSUM_FILE) is 
OK$(OFF)\n"; \
+            $(DOMAKECOOKIE); \
+        else \
+            printf "[$(ERR)checksum$(OFF)] $(MSG)$* failed checksum 
test!$(OFF)\n" 1>&2; \
+            false; \
+        fi \
+    else \
+        printf "[$(ERR)checksum$(OFF)] $(MSG)$* not in $(CHECKSUM_FILE) 
file!$(OFF)\n" 1>&2; \
+        false; \
+    fi $(OUTPUT)
 
 # use a signature file to check the file it refers to
 GPGV ?= gpg --verify --keyring $(GPG_KEYRING)
@@ -334,10 +334,10 @@
 
 #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)
+##    @printf "[$(OK)checksig$(OFF)] $(MSG)Checking SHA256 checksums 
$(OFF)$*\n"
+#    #cd $(DOWNLOADDIR) && sha256sum -c $*
+#    cd $(DOWNLOADDIR) && sha256sum -c $*.sha256sum
+# $(MAKECOOKIE)
 
 #################### GARCHIVE RULES ####################
 
@@ -356,8 +356,8 @@
 # Enable the "regular user" behaviour for tar, so that we don't extract
 # archives with random users or world-writable permissions.
 TAR_OPTS = \
-       --no-same-owner \
-       --no-same-permissions
+    --no-same-owner \
+    --no-same-permissions
 
 # rule to extract files with tar xzf
 extract-%.tar.Z extract-%.tgz extract-%.tar.gz extract-%.taz:
@@ -445,8 +445,8 @@
        @printf "[$(OK)makepatch$(OFF)] $(MSG)Creating patch $(OFF)$@\n"
        EXTRACTDIR=$(SCRATCHDIR) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) 
extract
        if diff -x 'config.log' -x 'config.status' -ru $(SCRATCHDIR) $(WORKDIR) 
| grep -v '^Only in' > $@; then :; else \
-               rm $@; \
-       fi $(OUTPUT)
+        rm $@; \
+    fi $(OUTPUT)
 
 
 ####################### HELP RULES ######################
@@ -462,16 +462,16 @@
 #################### CONFIGURE RULES ####################
 
 ifneq ($(prefix),/usr/local/bin)
-       DIRPATHS = --prefix=$(prefix)
+    DIRPATHS = --prefix=$(prefix)
 endif
 
 ifneq ($(sysconfdir),$(prefix)/etc)
-       DIRPATHS += --sysconfdir=$(sysconfdir)
+    DIRPATHS += --sysconfdir=$(sysconfdir)
 endif
 
 ifneq ($(vardir),$(prefix)/var)
-       DIRPATHS += --localstatedir=$(vardir)
-       DIRPATHS += --sharedstatedir=$(vardir)/com
+    DIRPATHS += --localstatedir=$(vardir)
+    DIRPATHS += --sharedstatedir=$(vardir)/com
 endif
 
 CONFIGURE_ARGS ?= $(DIRPATHS)
@@ -516,11 +516,11 @@
 # CMake doesn't respect many of the standard environment variables, so we have
 # to tell it explicitly where to look for some things.
 CMAKE_CONFIGURE_ARGS ?= \
-       -DCMAKE_INSTALL_PREFIX=$(prefix) \
-       -DSYSCONFDIR=$(sysconfdir) \
-       -DPKG_CONFIG_EXECUTABLE=$(PKG_CONFIG) \
-       -DPKGCONFIG_EXECUTABLE=$(PKG_CONFIG) \
-       -DSDL_INCLUDE_DIR=$(prefix)/include/SDL
+    -DCMAKE_INSTALL_PREFIX=$(prefix) \
+    -DSYSCONFDIR=$(sysconfdir) \
+    -DPKG_CONFIG_EXECUTABLE=$(PKG_CONFIG) \
+    -DPKGCONFIG_EXECUTABLE=$(PKG_CONFIG) \
+    -DSDL_INCLUDE_DIR=$(prefix)/include/SDL
 
 # configure a package that uses CMake
 configure-%/CMakeLists.txt:
@@ -559,8 +559,8 @@
 # There is no standardisation for SCons arguments; we have to try several
 # possibilities.
 SCONS_ARGS ?= \
-       prefix=$(prefix) \
-       PREFIX=$(prefix)
+    prefix=$(prefix) \
+    PREFIX=$(prefix)
 
 # configure using SCons (which is only needed by some packages...)
 configure-%/SConstruct:
@@ -616,21 +616,21 @@
 build-%/setup.py:
        @printf "[$(OK)build$(OFF)] $(MSG)Running setup.py build in $(OFF)$*\n"
        cd $* && $(BUILD_ENV) $(PYTHON) setup.py build $(PY_BUILD_ARGS) 
$(OUTPUT) \
-               || $(BUILD_FAIL)
+        || $(BUILD_FAIL)
        $(MAKECOOKIE)
 
 # build using Ruby setup.rb
 build-%/setup.rb:
        @printf "[$(OK)build$(OFF)] $(MSG)Running setup.rb setup in $(OFF)$*\n"
        cd $* && $(BUILD_ENV) ruby setup.rb setup $(RUBY_BUILD_ARGS) $(OUTPUT) \
-               || $(BUILD_FAIL)
+        || $(BUILD_FAIL)
        $(MAKECOOKIE)
 
 # build using Ruby install.rb
 build-%/install.rb:
        @printf "[$(OK)build$(OFF)] $(MSG)Running install.rb setup in 
$(OFF)$*\n"
        cd $* && $(BUILD_ENV) ruby install.rb setup $(RUBY_BUILD_ARGS) 
$(OUTPUT) \
-               || $(BUILD_FAIL)
+        || $(BUILD_FAIL)
        $(MAKECOOKIE)
 
 # build using SCons (which pretends not to have a seperate configure step,
@@ -638,14 +638,14 @@
 build-%/SConstruct:
        @printf "[$(OK)build$(OFF)] $(MSG)Running scons in $(OFF)$*\n"
        cd $* && $(BUILD_ENV) scons $(SCONS_DEBUG) $(SCONS_ARGS) $(OUTPUT) \
-               || $(BUILD_FAIL)
+        || $(BUILD_FAIL)
        $(MAKECOOKIE)
 
 # build using Cabal
 build-%/Setup.hs:
        @printf "[$(OK)build$(OFF)] $(MSG)Running Setup build in $(OFF)$*\n"
        cd $* && $(BUILD_ENV) ./Setup build $(CABAL_BUILD_ARGS) $(OUTPUT) \
-               || $(BUILD_FAIL)
+        || $(BUILD_FAIL)
        $(MAKECOOKIE)
 
 # build using waf
@@ -674,12 +674,12 @@
 # Not all setup.py instances have a test command...
 test-%/setup.py:
        set -e; cd $* && \
-               if $(PYTHON) setup.py --help test >/dev/null 2>&1; then \
-                       printf "[$(OK)test$(OFF)] $(MSG)Running setup.py test 
in $(OFF)$*\n"; \
-                       $(TEST_ENV) $(PYTHON) setup.py test $(PY_TEST_ARGS) 
$(OUTPUT); \
-               else \
-                       printf "[$(ERR)test$(OFF)] $(MSG)No test support in 
$(OFF)$*\n"; \
-               fi
+        if $(PYTHON) setup.py --help test >/dev/null 2>&1; then \
+            printf "[$(OK)test$(OFF)] $(MSG)Running setup.py test in 
$(OFF)$*\n"; \
+            $(TEST_ENV) $(PYTHON) setup.py test $(PY_TEST_ARGS) $(OUTPUT); \
+        else \
+            printf "[$(ERR)test$(OFF)] $(MSG)No test support in $(OFF)$*\n"; \
+        fi
        $(MAKECOOKIE)
 
 # Test a program using Cabal.
@@ -716,57 +716,57 @@
 
 # Directories that should have pristine versions stored to be merged upon
 # installation.
-#      Removed: sysconf $(sysconfdir) (etc/)
-#      var $(vardir)
-#      boot $(bootdir)
-#      rootlib /lib
+#    Removed: sysconf $(sysconfdir) (etc/)
+#    var $(vardir)
+#    boot $(bootdir)
+#    rootlib /lib
 CREATED_MERGE_DIRS =
 
 # Directories that will be merged if created by a package, but won't be
 # created automatically.
 MERGE_DIRS = \
-       $(CREATED_MERGE_DIRS) \
-       root /
+    $(CREATED_MERGE_DIRS) \
+    root /
 
 prepare-install:
        @printf "[$(OK)prepare-install$(OFF)] $(MSG)Preparing staging 
area$(OFF)\n"
        rm -fr $(packageDESTDIR)
        mkdir -p $(packageDESTDIR)$(prefix)
        set -e; \
-               set -- $(CREATED_MERGE_DIRS); \
-               while [ "$$1" != "" ]; do \
-                   echo echoing 1  $$1 und 2 $$2; \
-                       src=$(packagedotgardir)/$$1; \
-                       dest=$(packageDESTDIR)$$2; \
-                       echo  echoing mkdir -p $$src `dirname $$dest`; \
-                       mkdir -p $$src `dirname $$dest`; \
-                       rm -f $$dest; \
-                       ln -sf $$src $$dest; \
-                       shift; shift; \
-               done $(OUTPUT)
+        set -- $(CREATED_MERGE_DIRS); \
+        while [ "$$1" != "" ]; do \
+            echo echoing 1  $$1 und 2 $$2; \
+            src=$(packagedotgardir)/$$1; \
+            dest=$(packageDESTDIR)$$2; \
+            echo  echoing mkdir -p $$src `dirname $$dest`; \
+            mkdir -p $$src `dirname $$dest`; \
+            rm -f $$dest; \
+            ln -sf $$src $$dest; \
+            shift; shift; \
+        done $(OUTPUT)
        $(MAKECOOKIE)
 
 finish-install:
        @printf "[$(OK)finish-install$(OFF)] $(MSG)Moving files from staging 
area$(OFF)\n"
        set -e; \
-               set -- $(CREATED_MERGE_DIRS); \
-               while [ "$$1" != "" ]; do \
-                   echo echoing fininst 1  $$1 and 2 $$2; \
-                       rmdir -v $(packagedotgardir)/$$1 $(OUTPUT) || true; \
-                       rm -v $(packageDESTDIR)$$2 $(OUTPUT); \
-                       shift; shift; \
-               done $(OUTPUT)
+        set -- $(CREATED_MERGE_DIRS); \
+        while [ "$$1" != "" ]; do \
+            echo echoing fininst 1  $$1 and 2 $$2; \
+            rmdir -v $(packagedotgardir)/$$1 $(OUTPUT) || true; \
+            rm -v $(packageDESTDIR)$$2 $(OUTPUT); \
+            shift; shift; \
+        done $(OUTPUT)
        rm -rvf $(packagedir) $(OUTPUT)
        mv $(packageDESTDIR)$(prefix) $(packagedir)
        rm -rv $(packageDESTDIR) $(OUTPUT)
        $(MAKECOOKIE)
 
 GNU_INSTALL_ARGS = \
-       prefix=$(packageprefix) \
-       exec_prefix=$(packageprefix) \
-       sysconfdir=$(packagesysconfdir) \
-       localstatedir=$(packagevardir) \
-       sharedstatedir=$(packagevardir)/com
+    prefix=$(packageprefix) \
+    exec_prefix=$(packageprefix) \
+    sysconfdir=$(packagesysconfdir) \
+    localstatedir=$(packagevardir) \
+    sharedstatedir=$(packagevardir)/com
 INSTALL_TARGET ?= install
 INSTALL_ARGS ?= $(GNU_INSTALL_ARGS)
 
@@ -814,8 +814,8 @@
        $(MAKECOOKIE)
 
 SCONS_INSTALL_ARGS = \
-       destdir=$(packageDESTDIR) \
-       DESTDIR=$(packageDESTDIR)
+    destdir=$(packageDESTDIR) \
+    DESTDIR=$(packageDESTDIR)
 
 # install using SCons
 install-%/SConstruct:
@@ -832,9 +832,9 @@
        @printf " $(MSG)Generating Haskell package config in $(OFF)$*\n"
        cd $* && $(INSTALL_ENV) ./Setup register --gen-pkg-config=package.conf 
$(OUTPUT)
        if [ -e $*/package.conf ]; then \
-               mkdir -p $(packagedotgardir)/haskell; \
-               install -m644 $*/package.conf $(packagedotgardir)/haskell; \
-       fi $(OUTPUT)
+        mkdir -p $(packagedotgardir)/haskell; \
+        install -m644 $*/package.conf $(packagedotgardir)/haskell; \
+    fi $(OUTPUT)
        $(MAKECOOKIE)
 
 # install using CMake
@@ -913,13 +913,13 @@
 # [What?]
 dep-$(GARDIR)/%:
        @if [ "$(filter $*,$(IGNORE_DEPS))" != "" ] ; then \
-               printf "[$(OK)install-deps$(OFF)] $(MSG)Ignoring dependency 
$*$(OFF)\n" ; \
-       else \
-               printf "[$(OK)install-deps$(OFF)] $(MSG)Building $* as a 
dependency$(OFF)\n" ; \
-               $(if $(FORCE_REBUILD),,$(MAKE) -C $(DEP) install-p $(OUTPUT) || 
\
-                 ($(MAKE) -C $(DEP) reinstall-p && $(MAKE) -C $(DEP) reinstall 
$(OUTPUT)) ) || \
-                  $(MAKE) -C $(DEP) install $(OUTPUT); \
-       fi
+        printf "[$(OK)install-deps$(OFF)] $(MSG)Ignoring dependency 
$*$(OFF)\n" ; \
+    else \
+        printf "[$(OK)install-deps$(OFF)] $(MSG)Building $* as a 
dependency$(OFF)\n" ; \
+        $(if $(FORCE_REBUILD),,$(MAKE) -C $(DEP) install-p $(OUTPUT) || \
+              ($(MAKE) -C $(DEP) reinstall-p && $(MAKE) -C $(DEP) reinstall 
$(OUTPUT)) ) || \
+           $(MAKE) -C $(DEP) install $(OUTPUT); \
+    fi
 
 ######################################
 # Commands for installing different types of files
@@ -938,50 +938,50 @@
 INSTALL_LADSPA = install_ladspa () { mkdir -p $(packageprefix)/lib/ladspa && 
install -m755 $$* $(packageprefix)/lib/ladspa; } && install_ladspa
 INSTALL_THEMES = install_themes () { mkdir -p $(packageprefix)/share/themes && 
cp -R "$$@" $(packageprefix)/share/themes; } && install_themes
 INSTALL_HOOKS = install_hooks () { \
-       for x in $$*; do \
-               n=`basename $$x`; \
-               case $$n in \
-                       *.*) \
-                               d=$(packageDESTDIR)$(prefix)/.gar/gar.`echo $$n 
| sed 's,^.*\.,,'`; \
-                               f=`echo $$n | sed 's,\..*$$,,'`; \
-                               ;; \
-                       *) \
-                               d=$(packagedotgardir); \
-                               f=$$n; \
-                               ;; \
-               esac; \
-               mkdir -p $$d; \
-               install -m755 $$x $$d/$$f; \
-       done \
-       } && install_hooks
+    for x in $$*; do \
+        n=`basename $$x`; \
+        case $$n in \
+            *.*) \
+                d=$(packageDESTDIR)$(prefix)/.gar/gar.`echo $$n | sed 
's,^.*\.,,'`; \
+                f=`echo $$n | sed 's,\..*$$,,'`; \
+                ;; \
+            *) \
+                d=$(packagedotgardir); \
+                f=$$n; \
+                ;; \
+        esac; \
+        mkdir -p $$d; \
+        install -m755 $$x $$d/$$f; \
+    done \
+    } && install_hooks
 
 SYMLINK_BIN = symlink_bin () { from=$$1; shift; mkdir -p $(packageprefix)/bin 
&& for x in $$* ; do ln -sf $$from $(packageprefix)/bin/$$x ; done } && 
symlink_bin
 SYMLINK_SBIN = symlink_sbin () { from=$$1; shift; mkdir -p 
$(packageprefix)/sbin && for x in $$* ; do ln -sf $$from 
$(packageprefix)/sbin/$$x ; done } && symlink_sbin
 SYMLINK_LIB = symlink_lib () { from=$$1; shift; mkdir -p $(packageprefix)/lib 
&& for x in $$* ; do ln -sf $$from $(packageprefix)/lib/$$x ; done } && 
symlink_lib
 
 SUFFIX_PROG = suffix_prog () { \
-       suffix=$$1; shift; \
-       for x in $$*; do \
-               case "$$x" in $$suffix*) continue ;; esac; \
-               n=`basename $$x`; \
-               maybe_mv () { \
-                       if [ -f $$1 ] ; then \
-                               echo "Renaming $$1 to $$2"; \
-                               mv $$1 $$2; \
-                       fi \
-               }; \
-               maybe_mv $$x $$x-$$suffix; \
-               for s in 1 2 3 4 5 8; do \
-                       maybe_mv $(packageprefix)/man/man$$s/$$n.$$s 
$(packageprefix)/man/man$$s/$$n-$$suffix.$$s; \
-                       maybe_mv $(packageprefix)/share/man/man$$s/$$n.$$s 
$(packageprefix)/share/man/man$$s/$$n-$$suffix.$$s; \
-               done; \
-               if [ -d $(packageprefix)/info ]; then \
-                       (cd $(packageprefix)/info && for x in $$n $$n-*; do \
-                               maybe_mv $$x `echo $$x | sed 
"s,^$$n,$$n-$$suffix,"`; \
-                       done); \
-               fi; \
-       done \
-       } && suffix_prog
+    suffix=$$1; shift; \
+    for x in $$*; do \
+        case "$$x" in $$suffix*) continue ;; esac; \
+        n=`basename $$x`; \
+        maybe_mv () { \
+            if [ -f $$1 ] ; then \
+                echo "Renaming $$1 to $$2"; \
+                mv $$1 $$2; \
+            fi \
+        }; \
+        maybe_mv $$x $$x-$$suffix; \
+        for s in 1 2 3 4 5 8; do \
+            maybe_mv $(packageprefix)/man/man$$s/$$n.$$s 
$(packageprefix)/man/man$$s/$$n-$$suffix.$$s; \
+            maybe_mv $(packageprefix)/share/man/man$$s/$$n.$$s 
$(packageprefix)/share/man/man$$s/$$n-$$suffix.$$s; \
+        done; \
+        if [ -d $(packageprefix)/info ]; then \
+            (cd $(packageprefix)/info && for x in $$n $$n-*; do \
+                maybe_mv $$x `echo $$x | sed "s,^$$n,$$n-$$suffix,"`; \
+            done); \
+        fi; \
+    done \
+    } && suffix_prog
 
 #################### CHECK-DEP RULES ####################
 
@@ -992,24 +992,24 @@
 
 checkdep-users:
        @set -e; for user in $(NEED_USERS) -; do \
-               [ "$$user" = "-" ] && continue; \
-               printf "[$(OK)checkdep-users$(OFF)] $(MSG)Checking if user %s 
exists$(OFF)\n" $$user; \
-               $(PYTHON) -c "import pwd; pwd.getpwnam('$$user')" 2>/dev/null 
|| \
-                       (printf "[$(ERR)checkdep-users$(OFF)] $(MSG)User %s is 
required \
+        [ "$$user" = "-" ] && continue; \
+        printf "[$(OK)checkdep-users$(OFF)] $(MSG)Checking if user %s 
exists$(OFF)\n" $$user; \
+        $(PYTHON) -c "import pwd; pwd.getpwnam('$$user')" 2>/dev/null || \
+            (printf "[$(ERR)checkdep-users$(OFF)] $(MSG)User %s is required \
 to run this program.\nPlease create the the user or check if the program \
 supports changing the \nrequired user.$(OFF)\n" $$user && exit 1); \
-       done $(OUTPUT)
+    done $(OUTPUT)
        $(MAKECOOKIE)
 
 checkdep-groups:
        @set -e; for group in $(NEED_GROUPS) -; do \
-               [ "$$group" = "-" ] && continue; \
-               printf "[$(OK)checkdep-groups$(OFF)] $(MSG)Checking if group %s 
exists$(OFF)\n" $$group; \
-               $(PYTHON) -c "import grp; grp.getgrnam('$$group')" 2>/dev/null  
|| \
-                       (printf "[$(ERR)checkdep-groups(OFF)] $(MSG)Group 
$$group is required to \
+        [ "$$group" = "-" ] && continue; \
+        printf "[$(OK)checkdep-groups$(OFF)] $(MSG)Checking if group %s 
exists$(OFF)\n" $$group; \
+        $(PYTHON) -c "import grp; grp.getgrnam('$$group')" 2>/dev/null  || \
+            (printf "[$(ERR)checkdep-groups(OFF)] $(MSG)Group $$group is 
required to \
 run this program.\nPlease create the the group or check if the program 
supports \
 changing the \nrequired group.$(OFF)\n" && exit 1); \
-       done $(OUTPUT)
+    done $(OUTPUT)
        $(MAKECOOKIE)
 
 #################### SYS-INSTALL RULES ####################
@@ -1020,34 +1020,34 @@
 # Some files which multiple packages seem to contain. These get
 # removed before stowing.
 COLLISIONS ?= \
-       share/info/configure.info* \
-       share/info/standards.info* \
-       share/info/dir \
-       share/info/dir.old \
-       lib/libiberty.* \
-       lib/perl5/*/*/perllocal.pod \
-       lib/perl5/site_perl/*/*/perllocal.pod \
-       share/applications/mimeinfo.cache \
-       share/fonts/X11/*/fonts.cache* \
-       share/fonts/X11/*/fonts.dir \
-       share/fonts/X11/*/fonts.scale \
-       share/mime/XMLnamespaces \
-       share/mime/aliases \
-       share/mime/generic-icons \
-       share/mime/globs \
-       share/mime/globs2 \
-       share/mime/icons \
-       share/mime/magic \
-       share/mime/mime.cache \
-       share/mime/subclasses \
-       share/mime/treemagic \
-       share/mime/types
+    share/info/configure.info* \
+    share/info/standards.info* \
+    share/info/dir \
+    share/info/dir.old \
+    lib/libiberty.* \
+    lib/perl5/*/*/perllocal.pod \
+    lib/perl5/site_perl/*/*/perllocal.pod \
+    share/applications/mimeinfo.cache \
+    share/fonts/X11/*/fonts.cache* \
+    share/fonts/X11/*/fonts.dir \
+    share/fonts/X11/*/fonts.scale \
+    share/mime/XMLnamespaces \
+    share/mime/aliases \
+    share/mime/generic-icons \
+    share/mime/globs \
+    share/mime/globs2 \
+    share/mime/icons \
+    share/mime/magic \
+    share/mime/mime.cache \
+    share/mime/subclasses \
+    share/mime/treemagic \
+    share/mime/types
 
 # When a package is removed (or replaced with a newer version), files matching
 # any of these regexps in $(prefix)/lib that aren't present in the new version
 # are copied into compatlibs.
 COMPATLIBS = \
-       ^lib.*\.so\.[0-9]+$$
+    ^lib.*\.so\.[0-9]+$$
 
 # Packages that may contain files that this package is allowed to replace.
 DECONFLICT = compatlibs
@@ -1059,47 +1059,47 @@
 # Variables that will be stored in $(dotgardir)/package_vars for use during
 # package installation, and used as part of the package hash.
 PACKAGE_VARS = \
-       GARNAME \
-       GARVERSION \
-       GARPROFILE \
-       prefix \
-       sysconfdir \
-       vardir \
-       bootdir \
-       packagesdir \
-       packagedir \
-       dotgardir
+    GARNAME \
+    GARVERSION \
+    GARPROFILE \
+    prefix \
+    sysconfdir \
+    vardir \
+    bootdir \
+    packagesdir \
+    packagedir \
+    dotgardir
 
 # Variables that will be included in PACKAGE_VARS only if the package has
 # changed them from the default value.
 OPTIONAL_PACKAGE_VARS = \
-       GARREVISION \
-       DECONFLICT \
-       COMPATLIBS
+    GARREVISION \
+    DECONFLICT \
+    COMPATLIBS
 
 # Additional variables to include in the package hash.
 PACKAGE_IDENT_VARS = \
-       GARARCH \
-       CFLAGS_OPTIMIZE \
-       LDFLAGS_OPTIMIZE \
-       IGNORE_DEPS
+    GARARCH \
+    CFLAGS_OPTIMIZE \
+    LDFLAGS_OPTIMIZE \
+    IGNORE_DEPS
 
 # Files to include in the package hash, relative to the package source
 # directory. (We may include more files in the future.)
 PACKAGE_IDENT_FILES = \
-       Makefile
+    Makefile
 
 # carl ls ? backtick or $sheel
 #
 sysinstall-check:
        @printf "[$(OK)sysinstall-check$(OFF)] $(MSG)Checking status of DESTDIR 
install$(OFF)\n"
        @if [ "`ls $(packagedir)`" ]; then \
-               printf "[$(OK)sysinstall$(OFF)] $(MSG)Successful DESTDIR 
$(packagedir)  install$(OFF)\n"; \
-       else \
-               printf "[$(ERR)sysinstall$(OFF)] $(MSG)DESTDIR $(packagedir) 
install failed, uninstalling$(OFF)\n"; \
-               $(MAKE) -C $(WORKOBJ) uninstall $(OUTPUT); \
-               exit 1; \
-       fi
+        printf "[$(OK)sysinstall$(OFF)] $(MSG)Successful DESTDIR $(packagedir) 
 install$(OFF)\n"; \
+    else \
+        printf "[$(ERR)sysinstall$(OFF)] $(MSG)DESTDIR $(packagedir) install 
failed, uninstalling$(OFF)\n"; \
+        $(MAKE) -C $(WORKOBJ) uninstall $(OUTPUT); \
+        exit 1; \
+    fi
        $(MAKECOOKIE)
 
 
@@ -1111,28 +1111,28 @@
 sysinstall-normalise:
        @printf "[$(OK)sysinstall-normalise$(OFF)] $(MSG)Normalising directory 
layout$(OFF)\n"
        @set -e; \
-       normalise () { \
-               rmdir $$1 2>/dev/null || true; \
-               if [ -d $$1 ]; then \
-                       printf "[$(OK)sysinstall normalise $(OFF)] $(MSG)Moving 
contents of $$1 to $$2$(OFF)\n"; \
-                       mkdir -p $$2; \
-                       cp -a $$1/* $$2; \
-                       rm -fr $$1; \
-               fi; \
-       }; \
-       normalise $(packagedir)/man $(packagedir)/share/man; \
-       normalise $(packagedir)/info $(packagedir)/share/info; \
-       normalise $(packagedir)/doc $(packagedir)/share/doc; \
-       normalise $(packagedir)/games $(packagedir)/bin  $(OUTPUT)
+    normalise () { \
+        rmdir $$1 2>/dev/null || true; \
+        if [ -d $$1 ]; then \
+            printf "[$(OK)sysinstall normalise $(OFF)] $(MSG)Moving contents 
of $$1 to $$2$(OFF)\n"; \
+            mkdir -p $$2; \
+            cp -a $$1/* $$2; \
+            rm -fr $$1; \
+        fi; \
+    }; \
+    normalise $(packagedir)/man $(packagedir)/share/man; \
+    normalise $(packagedir)/info $(packagedir)/share/info; \
+    normalise $(packagedir)/doc $(packagedir)/share/doc; \
+    normalise $(packagedir)/games $(packagedir)/bin  $(OUTPUT)
        $(MAKECOOKIE)
 
 sysinstall-packagevars:
        @printf "[$(OK)sysinstall-packagevars$(OFF)] $(MSG)Writing package 
metadata$(OFF)\n"
        @test -d $(dotgardir) || mkdir -p $(dotgardir);
        @(cd $(packagedir) \
-       && find . -not -type d -print > $(dotgardir)/FILES \
-       && find . -mindepth 2 -depth -type d -print > $(dotgardir)/DIRS ) \
-       || $(SYSINSTALL_FAIL)
+       && find . -not -type d -print > $(dotgardir)/FILES \
+       && find . -mindepth 2 -depth -type d -print > $(dotgardir)/DIRS ) \
+        || $(SYSINSTALL_FAIL)
        cat Makefile $(CHECKSUM_FILE) | sha256sum > $(dotgardir)/BUILD $(OUTPUT)
 
 SYSINSTALL_FAIL = (rm -f $(packagesdir)/$(strip $(GARNAME)) 
$(COOKIEDIR)/sysinstall-*; false)
@@ -1140,7 +1140,7 @@
 sysinstall-install:
        @printf "[$(OK)sysinstall-install$(OFF)] $(MSG)Installing to 
$(prefix)$(OFF)\n"
        (cp -r -v -f --symbolic-link --target-directory=$(prefix) 
$(packagedir)/* $(OUTPUT) && \
-               ln -n -v -f -s $(PACKAGENAME) $(dotgardir)/VERSION $(OUTPUT)) 
|| $(SYSINSTALL_FAIL) $(OUTPUT)
+        ln -n -v -f -s $(PACKAGENAME) $(dotgardir)/VERSION $(OUTPUT)) || 
$(SYSINSTALL_FAIL) $(OUTPUT)
 
 sysinstall-uninstall:
        rm -f $(COOKIEDIR)/sysinstall-*

=== modified file 'gar/gar.lib/auto.mk'
--- a/gar/gar.lib/auto.mk       2019-04-08 01:45:12 +0000
+++ b/gar/gar.lib/auto.mk       2022-09-27 05:35:42 +0000
@@ -15,8 +15,8 @@
 
 HELP_SCRIPTS ?= $(WORKSRC)/configure
 CONFIGURE_SCRIPTS ?= \
-       $(if $(USE_AUTORECONF),$(WORKSRC)/autoreconf,) \
-       $(WORKSRC)/configure
+    $(if $(USE_AUTORECONF),$(WORKSRC)/autoreconf,) \
+    $(WORKSRC)/configure
 BUILD_SCRIPTS ?= $(WORKOBJ)/Makefile
 TEST_SCRIPTS ?= $(if $(USE_TESTS),$(WORKOBJ)/Makefile,)
 INSTALL_SCRIPTS ?= $(WORKOBJ)/Makefile-DESTDIR

=== modified file 'gar/gar.lib/external.mk'
--- a/gar/gar.lib/external.mk   2016-06-17 19:08:15 +0000
+++ b/gar/gar.lib/external.mk   2022-09-27 05:35:42 +0000
@@ -42,15 +42,15 @@
 SYSLIBS = /lib:/usr/lib:/usr/local/lib$(if 
$(GCC_MULTIARCH),:/usr/lib/$(GCC_MULTIARCH))
 
 MISSING_BINFILES = $(call gar_missing,$(BINFILES),$(PATH), \
-                       $(.BINPATTERNS))
+         $(.BINPATTERNS))
 MISSING_LIBFILES = $(call 
gar_missing,$(LIBFILES),$(LD_LIBRARY_PATH):$(SYSLIBS), \
-                       $(.LIBPATTERNS))
+         $(.LIBPATTERNS))
 MISSING_PYFILES  = $(call gar_missing,$(PYFILES) ,$(PYTHONPATH), \
-                       $(.PYPATTERNS))
+         $(.PYPATTERNS))
 MISSING_PKGFILES = $(call gar_missing,$(PKGFILES),$(PKG_CONFIG_PATH), \
-                       $(.PKGPATTERNS))
+         $(.PKGPATTERNS))
 MISSING_MANFILES = $(call gar_missing,$(MANFILES),$(MANPATH), \
-                       $(.MANPATTERNS))
+         $(.MANPATTERNS))
 
 MISSING_FILES = $(strip \
     $(MISSING_BINFILES) \
@@ -94,17 +94,17 @@
 ifeq '$(USER)' 'root'
 else ifeq '$(UID)' '0'
 else
-SUDO = $(if $(call gar_pathsearch,sudo,$(PATH),$(.BINPATTERNS)),sudo)
+    SUDO = $(if $(call gar_pathsearch,sudo,$(PATH),$(.BINPATTERNS)),sudo)
 endif
 
 ifneq ($(strip $(call gar_pathsearch,apt-get,$(PATH),$(.BINPATTERNS))),)
-INSTALL_CMD ?= eg: $(SUDO) apt-get install $(GARNAME) $(GARNAME)-dev
+    INSTALL_CMD ?= eg: $(SUDO) apt-get install $(GARNAME) $(GARNAME)-dev
 endif
 
 ifneq ($(strip $(call gar_pathsearch,yum,$(PATH),$(.BINPATTERNS))),)
-INSTALL_CMD ?= eg: $(SUDO) yum install $(GARNAME)
+    INSTALL_CMD ?= eg: $(SUDO) yum install $(GARNAME)
 endif
 
 ifneq ($(strip $(call gar_pathsearch,pacman,$(PATH),$(.BINPATTERNS))),)
-INSTALL_CMD ?= eg: $(SUDO) pacman -S $(GARNAME)
+    INSTALL_CMD ?= eg: $(SUDO) pacman -S $(GARNAME)
 endif

=== modified file 'gar/gar.lib/info.mk'
--- a/gar/gar.lib/info.mk       2022-09-22 21:13:51 +0000
+++ b/gar/gar.lib/info.mk       2022-09-27 05:35:42 +0000
@@ -23,20 +23,22 @@
 post-install:
        @printf "[$(OK)install-info$(OFF)] $(MSG)Installing entries to the Info 
directory$(OFF)\n"
        @if $(SHELL) -c 'install-info --version' >/dev/null; then \
-               for f in $(INFO_FILES); do \
-                       install-info --debug 
--dir-file="$(prefix)/share/info/dir" \
-                               "$(prefix)/share/info/$$f"; \
-                               printf "installing $$f\n"; \
-               done; \
-       else true; fi
+          for f in $(INFO_FILES); do \
+               install-info --debug --dir-file="$(prefix)/share/info/dir" \
+                    "$(prefix)/share/info/$$f"; \
+                    printf "installing $$f\n"; \
+          done; \
+     else true; fi
 
 pre-uninstall:
        @printf "[$(OK)uninstall-info$(OFF)] $(MSG)Removing entries from the 
Info directory$(OFF)\n"
        @if $(SHELL) -c 'install-info --version' >/dev/null; then \
-               for f in $(INFO_FILES); do \
-                       if test -e "$(prefix)/share/info/$$f"; then \
-                               install-info 
--dir-file="$(prefix)/share/info/dir" \
-                                       --remove "$(prefix)/share/info/$$f"; \
-                       fi; \
-               done; \
-       else true; fi
+          for f in $(INFO_FILES); do \
+               if test -e "$(prefix)/share/info/$$f"; then \
+                    install-info --dir-file="$(prefix)/share/info/dir" \
+                         --remove "$(prefix)/share/info/$$f"; \
+               fi; \
+          done; \
+     else true; fi
+
+

=== modified file 'gar/gar.lib/mesonninja.mk'
--- a/gar/gar.lib/mesonninja.mk 2022-02-15 06:53:04 +0000
+++ b/gar/gar.lib/mesonninja.mk 2022-09-27 05:35:42 +0000
@@ -48,13 +48,13 @@
 #  by meson , due to double destination dir...... arghg
 #  kludge, outdated
 #post-configure: configure-mes
-#      @echo find----- a little hairy for make , maybe, but it works 
---------------------------
-#      for fi in `find -name \*.pc`; do \
-#         echo $$fi ; \
-#         sed -i 's*$(packageprefix)*$(prefix)*g' $$fi ; \
-#         done
-#      @echo end find----------------------------------------------
-#      $(MAKECOOKIE)
+#   @echo find----- a little hairy for make , maybe, but it works 
---------------------------
+#   for fi in `find -name \*.pc`; do \
+#      echo $$fi ; \
+#      sed -i 's*$(packageprefix)*$(prefix)*g' $$fi ; \
+#      done
+#   @echo end find----------------------------------------------
+#   $(MAKECOOKIE)
 
 # below, for testing:  ninja -j 1 -v   -C $(WORKOBJ) 
 # was#ninja  -v   -C $(WORKOBJ) 

=== modified file 'gar/gar.lib/wrong_arch.mk'
--- a/gar/gar.lib/wrong_arch.mk 2016-06-17 19:08:15 +0000
+++ b/gar/gar.lib/wrong_arch.mk 2022-09-27 05:35:42 +0000
@@ -2,6 +2,6 @@
 
 pre-configure:
        @echo -e "[$(ERR)pre-everything$(OFF)] $(MSG)$(GARNAME) does not 
support \
-your CPU architecture ($(GARARCH)).$(OFF)" 
+      your CPU architecture ($(GARARCH)).$(OFF)" 
        @echo
        @exit 1

=== modified file 'gar/gar.master.mk'
--- a/gar/gar.master.mk 2022-07-25 02:36:16 +0000
+++ b/gar/gar.master.mk 2022-09-27 05:35:42 +0000
@@ -13,123 +13,123 @@
 # these variables if you have local mirrors that you prefer to use.
 
 MASTER_APACHE ?= \
-       http://www.apache.org/dist/ \
-       http://archive.apache.org/dist/
+    http://www.apache.org/dist/ \
+    http://archive.apache.org/dist/
 MASTER_BERLIOS ?= \
-       http://download.berlios.de/ \
-       http://download2.berlios.de/
+    http://download.berlios.de/ \
+    http://download2.berlios.de/
 MASTER_CPAN ?= \
-       ftp://ftp.cpan.org/pub/CPAN/ \
-       http://search.cpan.org/CPAN/
+    ftp://ftp.cpan.org/pub/CPAN/ \
+    http://search.cpan.org/CPAN/
 MASTER_CTAN ?= \
-       ftp://tug.ctan.org/tex-archive/ \
-       ftp://cam.ctan.org/tex-archive/ \
-       ftp://dante.ctan.org/tex-archive/
+    ftp://tug.ctan.org/tex-archive/ \
+    ftp://cam.ctan.org/tex-archive/ \
+    ftp://dante.ctan.org/tex-archive/
 MASTER_DEBIAN ?= \
-       ftp://ftp.us.debian.org/debian/pool/ \
-       ftp://ftp.de.debian.org/debian/pool/ \
-       http://archive.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/
+    http://offog.org/files/garstow-distfiles/ \
+    ftp://ftp.i-scream.org/pub/offog.org/files/garstow-distfiles/
 MASTER_GENTOO ?= \
-       http://www.ibiblio.org/gentoo/distfiles/ \
-       http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/
+    http://www.ibiblio.org/gentoo/distfiles/ \
+    http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/
 MASTER_GITHUB ?= \
-       https://github.com/
+    https://github.com/
 MASTER_GITHUB_GIT ?= \
-       git://github.com/
+    git://github.com/
 MASTER_GNOME ?= \
         https://download.gnome.org/sources/  \
         http://ftp-osl.osuosl.org/pub/gnome/  \
-       http://ftp.gnome.org/pub/GNOME/sources/ \
-       http://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/
+    http://ftp.gnome.org/pub/GNOME/sources/ \
+    http://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/
 MASTER_GNU ?= \
-                         https://mirrors.ocf.berkeley.edu/gnu/  \
-                         https://ftpmirror.gnu.org/  
+              https://mirrors.ocf.berkeley.edu/gnu/  \
+              https://ftpmirror.gnu.org/  
 MASTER_GNU_ALPHA ?= \
-       https://alpha.gnu.org/gnu/
+    https://alpha.gnu.org/gnu/
 MASTER_GNUE ?= \
-       http://www.gnuenterprise.org/downloads/
+    http://www.gnuenterprise.org/downloads/
 MASTER_GNUPG ?= \
-       https://gnupg.org/ftp/gcrypt/ 
+    https://gnupg.org/ftp/gcrypt/ 
 
-       #http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/
+    #http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/
 MASTER_GNUSTEP ?= \
-       http://ftpmain.gnustep.org/pub/gnustep/
+    http://ftpmain.gnustep.org/pub/gnustep/
 MASTER_GNUSTEP_GAP ?= \
     http://download.savannah.nongnu.org/releases/gap/
 MASTER_GNUSTEP_NONFSF ?= \
     http://download.savannah.nongnu.org/releases/gnustep-nonfsf/
-# gna defunct  http://download.gna.org/gnustep-nonfsf/
+# gna defunct    http://download.gna.org/gnustep-nonfsf/
 #
 MASTER_GNUTLS ?= \
     https://gnupg.org/ftp/
     # ftp://ftp.gnutls.org/ 
-       # above also works , at gnupg.org
+    # above also works , at gnupg.org
 MASTER_KDE ?= \
-       http://www.mirrorservice.org/sites/ftp.kde.org/pub/kde/ \
-       ftp://ibiblio.org/pub/packages/desktops/kde/ \
-       ftp://ftp.uni-kl.de/pub/linux/kde/ \
-       ftp://ftp.kde.org/pub/kde/
+    http://www.mirrorservice.org/sites/ftp.kde.org/pub/kde/ \
+    ftp://ibiblio.org/pub/packages/desktops/kde/ \
+    ftp://ftp.uni-kl.de/pub/linux/kde/ \
+    ftp://ftp.kde.org/pub/kde/
 MASTER_KERNEL ?= \
-       http://www.mirrorservice.org/sites/ftp.kernel.org/pub/ \
-       http://www.kernel.org/pub/
+    http://www.mirrorservice.org/sites/ftp.kernel.org/pub/ \
+    http://www.kernel.org/pub/
 MASTER_MOZILLA ?= \
-       http://www.mirrorservice.org/sites/ftp.mozilla.org/pub/mozilla.org/ \
-       ftp://releases.mozilla.org/pub/mozilla.org/ \
-       http://ftp.mozilla.org/pub/mozilla.org/ \
-       ftp://130.206.1.5/pub/mozilla.org/
+    http://www.mirrorservice.org/sites/ftp.mozilla.org/pub/mozilla.org/ \
+    ftp://releases.mozilla.org/pub/mozilla.org/ \
+    http://ftp.mozilla.org/pub/mozilla.org/ \
+    ftp://130.206.1.5/pub/mozilla.org/
 MASTER_MUSICBRAINZ ?= \
-       http://ftp.uk.musicbrainz.org/pub/musicbrainz/ \
-       http://ftp.musicbrainz.org/pub/musicbrainz/
+    http://ftp.uk.musicbrainz.org/pub/musicbrainz/ \
+    http://ftp.musicbrainz.org/pub/musicbrainz/
 MASTER_OPENOFFICE ?= \
-       http://www.mirrorservice.org/sites/ny1.mirror.openoffice.org/
+    http://www.mirrorservice.org/sites/ny1.mirror.openoffice.org/
 MASTER_PORTAGE ?= \
-       http://mirror.pudas.net/gentoo-x86-portage/ \
-       http://ftp.tiscali.nl/gentoo-x86-portage/ \
-       http://ftp.hol.gr/mirror/gentoo/gentoo-x86-portage/ \
-       http://gentoo.kems.net/gentoo-x86-portage/ \
-       rsync://rsync.gentoo.org/gentoo-x86-portage/
+    http://mirror.pudas.net/gentoo-x86-portage/ \
+    http://ftp.tiscali.nl/gentoo-x86-portage/ \
+    http://ftp.hol.gr/mirror/gentoo/gentoo-x86-portage/ \
+    http://gentoo.kems.net/gentoo-x86-portage/ \
+    rsync://rsync.gentoo.org/gentoo-x86-portage/
 MASTER_SANE ?= \
-       ftp://ftp.sane-project.org/pub/sane/ \
-       ftp://ftp3.sane-project.org/pub/sane/ \
-       http://gd.tuwien.ac.at/hci/sane/
+    ftp://ftp.sane-project.org/pub/sane/ \
+    ftp://ftp3.sane-project.org/pub/sane/ \
+    http://gd.tuwien.ac.at/hci/sane/
 MASTER_SAVANNAH ?= \
-       https://savannah.nongnu.org/download/
+    https://savannah.nongnu.org/download/
 MASTER_SAVANNAH_RELEASES ?= \
-       https://download.savannah.gnu.org/releases/
+    https://download.savannah.gnu.org/releases/
 MASTER_SAVANNAH_NONGNU_RELEASES ?= \
-       https://download.savannah.nongnu.org/releases/
+    https://download.savannah.nongnu.org/releases/
 MASTER_SAVANNAH_CVS ?= \
-       pserver:anonymous@cvs.savannah.gnu.org:/sources/
+    pserver:anonymous@cvs.savannah.gnu.org:/sources/
 MASTER_SAVANNAH_GIT ?= \
-       http://git.savannah.nongnu.org/cgit/
-       #???
+    http://git.savannah.nongnu.org/cgit/
+    #???
 MASTER_SAVANNAH_GNU_GIT ?= \
-       https://git.savannah.gnu.org/git/
+    https://git.savannah.gnu.org/git/
 MASTER_SOURCEFORGE ?= \
-       http://sourceforge.net/projects/
+    http://sourceforge.net/projects/
 MASTER_SOURCEFORGE_JP ?= \
-       http://osdn.dl.sourceforge.jp/ \
-       http://keihanna.dl.sourceforge.jp/ \
-       http://qgpop.dl.sourceforge.jp/
+    http://osdn.dl.sourceforge.jp/ \
+    http://keihanna.dl.sourceforge.jp/ \
+    http://qgpop.dl.sourceforge.jp/
 MASTER_UBUNTU ?= \
-       http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/pool/ \
-       http://archive.ubuntu.com/ubuntu/pool/
+    http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/pool/ \
+    http://archive.ubuntu.com/ubuntu/pool/
 MASTER_WHEREVER ?= \
-       http://search.mirrorservice.org/wherever/
+    http://search.mirrorservice.org/wherever/
 MASTER_XORG ?= \
         https://xorg.freedesktop.org/ \
-       http://www.mirrorservice.org/sites/ftp.x.org/pub/ \
-       http://ftp.gwdg.de/pub/x11/x.org/pub/ \
-       http://ftp.skynet.be/pub/ftp.x.org/pub/ \
-       ftp://ftp.opengroup.org/pub/x.org/pub/ \
-       http://www2.x.org/pub/ \
-       ftp://ftp.x.org/pub/
+    http://www.mirrorservice.org/sites/ftp.x.org/pub/ \
+    http://ftp.gwdg.de/pub/x11/x.org/pub/ \
+    http://ftp.skynet.be/pub/ftp.x.org/pub/ \
+    ftp://ftp.opengroup.org/pub/x.org/pub/ \
+    http://www2.x.org/pub/ \
+    ftp://ftp.x.org/pub/
 MASTER_FREEDESKTOP ?= \
-       http://freedesktop.org/
+    http://freedesktop.org/
 MASTER_GSTREAMER ?= \
-       http://gstreamer.freedesktop.org
+    http://gstreamer.freedesktop.org
 MASTER_XORG_INDIVIDUAL ?= \
-       http://xorg.freedesktop.org/releases/individual/
+    http://xorg.freedesktop.org/releases/individual/

=== modified file 'gar/gar.mk'
--- a/gar/gar.mk        2022-09-26 04:05:16 +0000
+++ b/gar/gar.mk        2022-09-27 05:35:42 +0000
@@ -31,23 +31,25 @@
 
 endef
 
-BASEDIRABS = $(shell pwd)
+BASEDIRABS := $(shell pwd)
 GARDIR ?= ../../../gar
 GARPKGDIR ?= ../..
-PKGGROUPS ?= bio freedesktop gnome gnu gnualpha gnustep  gstreamer  other xorg 
libs tools dev external
+PKGGROUPS ?= bio freedesktop gnome gnu gnualpha gnustep  gstreamer  other xorg 
    external libs tools dev 
 # not all of those exist currently
 PKGGROUPDIRS ?= $(foreach GROUP,$(PKGGROUPS),$(GARPKGDIR)/$(GROUP))
 GARDIR_ABSOLUTE := $(shell cd $(GARDIR) && pwd)
-SCRIPTSDIR = $(GARDIR_ABSOLUTE)/gar.scripts
-TEMPDIR = $(GARDIR_ABSOLUTE)/gar.tmp
+SCRIPTSDIR := $(GARDIR_ABSOLUTE)/gar.scripts
+TEMPDIR := $(GARDIR_ABSOLUTE)/gar.tmp
 FILEDIR ?= files
 DOWNLOADDIR ?= download
 DOWNLOADDIRGIT ?= download-git
+UPSTREAMNAME ?= $(strip $(GARNAME))
+DISTNAME ?= $(UPSTREAMNAME)-$(strip $(GARVERSION))
 COOKIEDIR ?= cookies/$(DISTNAME)$(strip $(GARPROFILE))
 WORKDIR ?= work
-LOGDIR ?= logs
 WORKSRC ?= $(WORKDIR)/$(DISTNAME)
 EXTRACTDIR ?= $(WORKDIR)
+LOGDIR ?= logs
 SCRATCHDIR ?= tmp
 CHECKSUM_FILE ?= sha256sums
 CHECKSUM_CMD = $(if $(findstring sha256,$(CHECKSUM_FILE)),sha256sum,md5sum)
@@ -60,14 +62,11 @@
 # and know how to get back out of it to the port dir.
 # old WORKOBJ ?= $(WORKSRC)
 # cwh
-#WORKOBJ ?= $(WORKDIR)/$(GARNANE)-build
 WORKOBJ ?= $(WORKSRC)-build
 WORKOBJ_CHANGED_P = $(filter-out $(WORKSRC),$(WORKOBJ))
 LEAVE_WORKOBJ = $(subst $(strip ) ,/,$(patsubst %,..,$(subst /, ,$(WORKOBJ))))
 #  note: do I need this?
 
-UPSTREAMNAME ?= $(strip $(GARNAME))
-DISTNAME ?= $(UPSTREAMNAME)-$(strip $(GARVERSION))
 
 ALLFILES ?= $(DISTFILES) $(PATCHFILES) $(SIGFILES)
 
@@ -91,14 +90,14 @@
 $(sort $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR) $(WORKSRC) $(WORKOBJ) $(WORKDIR) 
$(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(DOWNLOADDIRGIT)) :
        @echo ------ check $@
        @if test -d "$@"; then : ; else \
-               mkdir -p "$@"; \
-       fi
+       mkdir -p "$@"; \
+     fi
 
 $(COOKIEDIR)/%:
        @echo ------ check $@
        @if test -d "$@"; then : ; else \
-               mkdir -p "$@"; \
-       fi
+        mkdir -p "$@"; \
+     fi
 
 
 # include the configuration file to override any of these variables
@@ -107,6 +106,9 @@
 include $(GARDIR)/gar.env.mk
 include $(GARDIR)/gar.master.mk
 include $(GARDIR)/gar.lib.mk
+# for maintainance; anyone could be one
+include $(GARDIR)/gsrc-maint.mk
+
 -include $(GARDIR)/gar.site.mk
 
 # These stubs are wildcarded, so that the port maintainer can
@@ -130,20 +132,20 @@
 # The main rules are the ones that the user can specify as a
 # target on the "make" command-line.  Currently, they are:
 #       pkg-info pkg-info-curt
-#      fetch-list fetch checksum makesum keyring extract checkpatch patch
-#      build install reinstall uninstall package
+#    fetch-list fetch checksum makesum keyring extract checkpatch patch
+#    build install reinstall uninstall package
 # (some may not be complete yet).
 #
 # Each of these rules has dependencies that run in the following
 # order:
-#      - run the previous main rule in the chain (e.g., install
-#        depends on build)
-#      - run the pre- rule for the target (e.g., configure would
-#        then run pre-configure)
-#      - generate a set of files to depend on.  These are typically
-#        cookie files in $(COOKIEDIR), but in the case of fetch are
-#        actual downloaded files in $(DOWNLOADDIR) |GIT
-#      - run the post- rule for the target
+#    - run the previous main rule in the chain (e.g., install
+#    depends on build)
+#    - run the pre- rule for the target (e.g., configure would
+#    then run pre-configure)
+#    - generate a set of files to depend on.  These are typically
+#    cookie files in $(COOKIEDIR), but in the case of fetch are
+#    actual downloaded files in $(DOWNLOADDIR) |GIT
+#    - run the post- rule for the target
 #
 # The main rules also run the $(DONADA) code, which prints out
 # what just happened when all the dependencies are finished.
@@ -157,10 +159,10 @@
        @printf ' $(if $(BLURB),$(subst %,%%,$(subst $(newline),\n ,$(BLURB))), 
$(DESCRIPTION))\n'
        @printf "$(MSG)License:$(OFF)     $(LICENSE)\n"
        @($(MAKE) install-p >/dev/null 2>/dev/null && \
-               printf "$(MSG)Status$(OFF):      installed (stowed)\n") || \
-               ($(MAKE) reinstall-p >/dev/null 2>/dev/null && \
-                       printf "$(MSG)Status:$(OFF)      installed (not 
stowed)\n") || \
-                       printf "$(MSG)Status:$(OFF)      not installed\n"
+        printf "$(MSG)Status$(OFF):      installed (stowed)\n") || \
+        ($(MAKE) reinstall-p >/dev/null 2>/dev/null && \
+        printf "$(MSG)Status:$(OFF)      installed (not stowed)\n") || \
+        printf "$(MSG)Status:$(OFF)      not installed\n"
 
 pkg-info-curt:
        @printf "$(OK)$(lastword $(subst /, ,$(dir $(shell 
pwd))))/$(MSG2)$(GARNAME) $(OFF)$(GARVERSION)\n"
@@ -185,7 +187,7 @@
        @for i in $(LIBDEPS); do printf "Lib_dep: $$i\n"; done
        @for i in $(TESTDEPS); do printf "Test_dep: $$i\n"; done
 
-# fetch-list   - Show list of files that would be retrieved by fetch.
+# fetch-list       - Show list of files that would be retrieved by fetch.
 # NOTE: DOES NOT RUN pre-everything!
 fetch-list:
        @printf "$(MSG)Name:$(OFF)     $(GARNAME)\n"
@@ -194,17 +196,18 @@
        @printf "$(MSG)Distribution files:$(OFF)\n"
        @for i in $(DISTFILES); do printf "          $$i\n"; done
        @printf "$(MSG)Patch files:$(OFF)\n"
-       @for i in $(PATCHFILES); do printf "      $$i\n"; done
+       @for i in $(PATCHFILES); do printf "   $$i\n"; done
        @printf "$(MSG)Signature files:$(OFF)\n"
-       @for i in $(SIGFILES); do printf "        $$i\n"; done
+       @for i in $(SIGFILES); do printf "     $$i\n"; done
        @printf "$(MSG)Dependencies:$(OFF) \n"
        @for i in $(LIBDEPS) $(BUILDDEPS) $(if $(USE_TESTS),$(TESTDEPS),) ; do 
printf "          $$i\n"; done
 
-# fetch                        - Retrieves $(DISTFILES) (and $(PATCHFILES) if 
defined)
-#                                into $(DOWNLOADDIR) as necessary.
-fetch: pre-everything custom-pre-everything $(COOKIEDIR) $(DOWNLOADDIR) 
$(DOWNLOADDIRGIT) \
-               $(WORKDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-fetch 
custom-pre-fetch \
-               $(addprefix $(DOWNLOADDIR)/,$(ALLFILES)) post-fetch 
custom-post-fetch
+# fetch    - Retrieves $(DISTFILES) (and $(PATCHFILES) if defined)
+#    into $(DOWNLOADDIR) as necessary.
+#fetch:        pre-everything custom-pre-everything $(COOKIEDIR) 
$(DOWNLOADDIR) $(DOWNLOADDIRGIT) 
+fetch:      pre-everything custom-pre-everything $(COOKIEDIR) $(DOWNLOADDIR)  \
+        $(WORKDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-fetch 
custom-pre-fetch \
+        $(addprefix $(DOWNLOADDIR)/,$(ALLFILES)) post-fetch custom-post-fetch
        $(DONADA)
 
 # returns true if fetch has completed successfully, false
@@ -212,8 +215,8 @@
 fetch-p:
        $(foreach COOKIEFILE,$(addprefix 
$(COOKIEDIR)/dep-$(GARDIR)/,$(FETCHDEPS)), test -e $(COOKIEFILE) ;)
 
-# checksum             - Use $(CHECKSUMFILE) to ensure that your
-#                                distfiles are valid.
+# checksum    - Use $(CHECKSUMFILE) to ensure that your
+#     distfiles are valid.
 checksum: fetch pre-checksum custom-pre-checksum $(addprefix 
checksum-,$(filter-out $(NOCHECKSUM),$(ALLFILES))) post-checksum 
custom-post-checksum
        $(DONADA)
 
@@ -222,11 +225,11 @@
 checksum-p:
        $(foreach COOKIEFILE,$(addprefix $(COOKIEDIR)/checksum-,$(filter-out 
$(NOCHECKSUM),$(ALLFILES))), test -e $(COOKIEFILE) ;)
 
-# makesum              - Generate distinfo (only do this for your own ports!).
+# makesum    - Generate distinfo (only do this for your own ports!).
 makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(filter-out 
$(NOCHECKSUM),$(ALLFILES))) checksig
        if test "x$(addprefix $(DOWNLOADDIR)/,$(filter-out 
$(NOCHECKSUM),$(ALLFILES)))" != "x"; then \
-               $(CHECKSUM_CMD) $(addprefix $(DOWNLOADDIR)/,$(filter-out 
$(NOCHECKSUM),$(ALLFILES))) > $(CHECKSUM_FILE); \
-       fi
+       $(CHECKSUM_CMD) $(addprefix $(DOWNLOADDIR)/,$(filter-out 
$(NOCHECKSUM),$(ALLFILES))) > $(CHECKSUM_FILE); \
+    fi
 
 # I am always typing this by mistake
 makesums: makesum
@@ -242,7 +245,7 @@
 garchive: checksum $(COOKIEDIR) pre-garchive custom-pre-garchive $(addprefix 
garchive-,$(ALLFILES))  post-garchive custom-post-garchive
        $(DONADA)
 
-# extract              - Unpacks $(DISTFILES) into $(EXTRACTDIR) (patches are 
"zcatted" into the patch program)
+# extract    - Unpacks $(DISTFILES) into $(EXTRACTDIR) (patches are "zcatted" 
into the patch program)
 extract: garchive $(EXTRACTDIR) $(COOKIEDIR) $(addprefix 
dep-$(GARDIR)/,$(EXTRACTDEPS)) pre-extract custom-pre-extract $(addprefix 
extract-,$(filter-out $(NOEXTRACT),$(DISTFILES))) post-extract 
custom-post-extract
        $(DONADA)
 
@@ -251,7 +254,7 @@
 extract-p:
        $(foreach COOKIEFILE,$(addprefix $(COOKIEDIR)/extract-,$(filter-out 
$(NOEXTRACT),$(DISTFILES))), test -e $(COOKIEFILE) ;)
 
-# patch                        - Apply any provided patches to the source.
+# patch   - Apply any provided patches to the source.
 patch: extract $(WORKSRC) pre-patch custom-pre-patch $(addprefix 
patch-,$(PATCHFILES)) post-patch custom-post-patch
        $(DONADA)
 
@@ -260,9 +263,9 @@
 patch-p:
        $(foreach COOKIEFILE,$(addprefix $(COOKIEDIR)/patch-,$(PATCHFILES)), 
test -e $(COOKIEFILE) ;)
 
-# makepatch            - Grab the upstream source and diff against $(WORKSRC). 
 Since
-#                                diff returns 1 if there are differences, we 
remove the patch
-#                                file on "success".  Goofy diff.
+# makepatch    - Grab the upstream source and diff against $(WORKSRC).  Since
+#  diff returns 1 if there are differences, we remove the patch
+#  file on "success".  Goofy diff.
 makepatch: $(SCRATCHDIR) $(FILEDIR) $(FILEDIR)/gar-base.diff
        $(DONADA)
 
@@ -288,9 +291,9 @@
        $(DONADA)
 
 
-# configure            - Runs either GNU configure, one or more local
-#                                configure scripts or nothing, depending on
-#                                what's available.
+# configure    - Runs either GNU configure, one or more local
+#   configure scripts or nothing, depending on
+#   what's available.
 configure: patch $(addprefix dep-$(GARDIR)/,$(LIBDEPS) $(BUILDDEPS) $(if 
$(USE_TESTS),$(TESTDEPS),)) $(addprefix checkdep-,$(filter-out 
$(CHECKDEP_IGNORE),$(CHECKDEP_TARGETS))) pre-configure custom-pre-configure 
$(addprefix configure-,$(ALL_CONFIGURE_SCRIPTS)) post-configure 
custom-post-configure
        $(DONADA)
 
@@ -299,7 +302,7 @@
 configure-p:
        $(foreach COOKIEFILE,$(addprefix 
$(COOKIEDIR)/configure-,$(ALL_CONFIGURE_SCRIPTS)), test -e $(COOKIEFILE) ;)
 
-# build                        - Actually compile the sources.
+# build     - Actually compile the sources.
 build: configure pre-build custom-pre-build $(addprefix 
build-,$(ALL_BUILD_SCRIPTS)) post-build custom-post-build
        $(DONADA)
 
@@ -320,7 +323,7 @@
 test-p:
        $(foreach COOKIEFILE,$(addprefix 
$(COOKIEDIR)/test-,$(ALL_TEST_SCRIPTS)), test -e $(COOKIEFILE) ;)
 
-# install              - Install the results of a build.
+# install     - Install the results of a build.
 install: $(if $(USE_TESTS),test,build) $(addprefix 
dep-$(GARDIR)/,$(INSTALLDEPS)) prepare-install pre-install custom-pre-install 
$(addprefix install-,$(ALL_INSTALL_SCRIPTS)) finish-install pre-stow 
custom-pre-stow $(addprefix sysinstall-,$(filter-out 
$(SYSINSTALL_IGNORE),$(SYSINSTALL_TARGETS))) post-install custom-post-install
        $(DONADA)
 
@@ -346,15 +349,15 @@
 uninstall-src:
        @printf "[$(OK)uninstall-src$(OK)] $(MSG)Uninstalling 
$(GARNAME)-$(GARVERSION) source code$(OFF)\n"
        [ -d $(SRCDIR)/$(strip $(GARNAME))-$(strip $(GARVERSION)) ] && \
-               rm -rvf $(SRCDIR)/$(strip $(GARNAME))-$(strip $(GARVERSION))
+           rm -rvf $(SRCDIR)/$(strip $(GARNAME))-$(strip $(GARVERSION))
        $(MAKECOOKIE)
 
 uninstall-src-old:
        for v in $(OLDVERSIONS); do \
-               $(MAKE) uninstall-src GARVERSION=$$v; \
+            $(MAKE) uninstall-src GARVERSION=$$v; \
        done
 
-# uninstall            - Remove the installation.
+# uninstall     - Remove the installation.
 uninstall: pre-uninstall custom-pre-uninstall sysinstall-uninstall 
post-uninstall custom-post-uninstall
        $(DONADA)
 
@@ -363,8 +366,8 @@
 
 uninstall-pkg-old:
        for v in $(OLDVERSIONS); do \
-               $(MAKE) uninstall-pkg GARVERSION=$$v; \
-       done
+         $(MAKE) uninstall-pkg GARVERSION=$$v; \
+     done
 
 # Update a package: clean out the old stuff, download a new version,
 # rebuild the checksums and install it.
@@ -414,11 +417,11 @@
 clean:
        @printf "[$(OK)clean$(OFF)] $(MSG)Removing working files and 
directories$(OFF)\n"
        rm --preserve-root=all -rf $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR) 
$(WORKDIR) \
-               $(EXTRACTDIR) $(SCRATCHDIR) $(SCRATCHDIR)-$(COOKIEDIR) *~
+        $(EXTRACTDIR) $(SCRATCHDIR) $(SCRATCHDIR)-$(COOKIEDIR) *~
 
 # cwh changed 6-2022 rm --preserve-root=all -rf $(DOWNLOADDIR) $(COOKIEDIR) 
$(LOGDIR) $(WORKSRC) $(WORKDIR) $(EXTRACTDIR) $(SCRATCHDIR) 
$(SCRATCHDIR)-$(COOKIEDIR) *~
 #  took out WORKSRC, a subdir of WORK anyway, usually
-# could be dangerous....
+# could be dangerous in previous case....
 
 
 # these targets do not have actual corresponding files
@@ -430,10 +433,10 @@
 
 test-logs:
        @for f in `find . -name 'test*.log'` ; do \
-               printf "$(MSG)===> test log start: $$f <===$(OFF)\n" ; \
-               cat $$f ; \
-               printf "$(MSG)===> test log end: $$f <===\n$(OFF)\n" ;  \
-       done
+        printf "$(MSG)===> test log start: $$f <===$(OFF)\n" ; \
+        cat $$f ; \
+        printf "$(MSG)===> test log end: $$f <===\n$(OFF)\n" ;  \
+    done
 
 .PHONY: $(addsuffix fetch checksum extract patch configure build test 
install,-log)
 
@@ -443,56 +446,3 @@
 
 
 
-# added
-
-# -*- coding: utf-8 -*-
-#
-#       gsrc-maint.mk
-#
-#       Copyright © 2013, 2014 Brandon Invergo <brandon@invergo.net>
-#
-#       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/>.
-
-#id=`gpg --verify $(DOWNLOADDIR)/$(SIGFILES) 2>&1 | grep -o -E "[0-9A-Z]{8}"` \
-
-# FIXME
-keyring: fetch
-       id=`gpg --verify $(DOWNLOADDIR)/$(SIGFILES) 2>&1 | grep -o -E 
"[0-9A-Z]{8}"` \
-               && gpg -v    --keyserver keys.gnupg.net  --recv-keys $$id && 
gpg -v --export $$id > gpg-keyring
-
-
-# 2020 Nov 17 2020 changed back above
-#&& gpg -v  --recv-keys $$id ; gpg -v --export $$id > gpg-keyring
-#              && gpg -v    --keyserver keys.gnupg.net  --recv-keys $$id && 
gpg --export $$id > gpg-keyring
-#c. change
-#&& gpg --recv-keys $$id && gpg --export $$id > gpg-keyring
-# 2020.01.21   grep ... [0-9A-Z]{16}
-
-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 

=== added file 'gar/gsrc-maint.mk'
--- a/gar/gsrc-maint.mk 1970-01-01 00:00:00 +0000
+++ b/gar/gsrc-maint.mk 2022-09-27 05:35:42 +0000
@@ -0,0 +1,55 @@
+
+# -*- coding: utf-8 -*-
+#
+#       gsrc-maint.mk
+#
+#       Copyright © 2013, 2014 Brandon Invergo <brandon@invergo.net>
+#
+#       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/>.
+
+#id=`gpg --verify $(DOWNLOADDIR)/$(SIGFILES) 2>&1 | grep -o -E "[0-9A-Z]{8}"` \
+
+# FIXME
+keyring: fetch
+       id=`gpg --verify $(DOWNLOADDIR)/$(SIGFILES) 2>&1 | grep -o -E 
"[0-9A-Z]{8}"` \
+        && gpg -v    --keyserver keys.gnupg.net  --recv-keys $$id && gpg -v 
--export $$id > gpg-keyring
+
+
+# 2020 Nov 17 2020 changed back above
+#&& gpg -v  --recv-keys $$id ; gpg -v --export $$id > gpg-keyring
+#        && gpg -v    --keyserver keys.gnupg.net  --recv-keys $$id && gpg 
--export $$id > gpg-keyring
+#c. change
+#&& gpg --recv-keys $$id && gpg --export $$id > gpg-keyring
+# 2020.01.21   grep ... [0-9A-Z]{16}
+
+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 
+
+
+


reply via email to

[Prev in Thread] Current Thread [Next in Thread]