[Gsrc-commit] trunk r8579: fixes for gsrc code itself etc

[Carl Hansen]

------------------------------------------------------------
revno: 8579
revision-id: carlhansen1234@gmail.com-20220907172524-3t4f12z8aph604kq
parent: carlhansen1234@gmail.com-20220907164938-hz85wsu73jj9gx93
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Wed 2022-09-07 10:25:24 -0700
message:
  fixes for gsrc code itself etc
modified:
  bootstrap                      bootstrap-20101224104906-944zl9r9mzosdo7z-1
  gar/gar.conf.mk                gar.conf.mk-20160617013739-fyi5aiwubjgbbvfn-2
  gar/gar.lib.mk                 gar.lib.mk-20160617013741-ul4q527k85thcz4p-1
  gar/gar.mk                     gar.mk-20160617013745-r4h3dj0kiuppihsx-1
  pkg/gnu/binutils/Makefile      makefile-20160617014725-uokjfnggs70iry9h-456
  pkg/gnu/config/Makefile        makefile-20170430231231-0lbw966hs16oxlmd-2
  pkg/gnu/ncurses/Makefile       makefile-20160617014725-uokjfnggs70iry9h-1464
  pkg/gnu/ncurses/sha256sums     sha256sums-20160617014725-uokjfnggs70iry9h-1469

=== modified file 'bootstrap'
--- a/bootstrap 2010-12-24 10:49:27 +0000
+++ b/bootstrap 2022-09-07 17:25:24 +0000
@@ -1,2 +1,3 @@
 #!/bin/sh
+set -x
 autoreconf -vif

=== modified file 'gar/gar.conf.mk'
--- a/gar/gar.conf.mk   2019-05-09 18:19:42 +0000
+++ b/gar/gar.conf.mk   2022-09-07 17:25:24 +0000
@@ -23,19 +23,19 @@
 # packages you build.  The default colors are bold white for messages,
 # red for errors, and green for success. If you don't want colors, you
 # can insert symbols to designate GSRC output.
-USE_COLOR ?= y
+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"
+       OFF  =  "\\033[00m"
+       MSG  =  "\\033[01\;37m"
+       MSG2 =  "\\033[01\;37m"
+       ERR  =  "\\033[01\;31m"
+       OK   =  "\\033[00\;32m"
 else
-       OFF =
-       MSG = ==>
+       OFF  =
+       MSG  = ==>
        MSG2 =
-       ERR = ***
-       OK =
+       ERR  = ***
+       OK   =
 endif
 
 # If you want to redirect the output of most of the build process
@@ -43,9 +43,11 @@
 # not a good idea, since you won't be able to monitor the build
 # process.  If you change REDIRECT_OUTPUT to anything other than n,
 # the default is to suppress normal output and only print errors.
+# redirect or pipe > |
 REDIRECT_OUTPUT ?= n
 ifeq ($(REDIRECT_OUTPUT),n)
-       OUTPUT =
+       OUTPUT = 
+
 else
        OUTPUT = 1>/dev/null 2>&1
 endif

=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk    2022-09-05 15:45:13 +0000
+++ b/gar/gar.lib.mk    2022-09-07 17:25:24 +0000
@@ -1,4 +1,3 @@
-
 # Standard rules for GARStow ports.
 #
 # Copyright (C) 2012, 2013, 2014, 2016 Brandon Invergo
@@ -64,7 +63,7 @@
 # checksum file.  Loop through available URLs and stop when you
 # get one that doesn't return an error code.
 $(DOWNLOADDIR)/%:
-       if test -f $(COOKIEDIR)/checksum-$*; then : ; else \
+       @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"; \
@@ -109,14 +108,15 @@
                false; \
        fi $(OUTPUT)
 
+# carl FIXME seems this: confused with above, the %
 # link to a local copy of the file
 # (relative path)
-file//%:
-       if test -f $*; then \
-               ln -sf $(CURDIR)/$* $(DOWNLOADDIR)/$(notdir $*); \
-       else \
-               false; \
-       fi $(OUTPUT)
+## file//%:
+##     if test -f $*; then \
+##             ln -sf $(CURDIR)/$* $(DOWNLOADDIR)/$(notdir $*); \
+##     else \
+##             false; \
+##     fi $(OUTPUT)
 
 # Using Jeff Waugh's rsync rule.
 # DOES NOT PRESERVE SYMLINKS!
@@ -245,7 +245,7 @@
 
 checksum-%: $(CHECKSUM_FILE)
        @printf "[$(OK)checksum$(OFF)] $(MSG)Running $(CHECKSUM_CMD) on 
$(OFF)$*\n"
-       if grep -- '  $(DOWNLOADDIR)/$*$$' $(CHECKSUM_FILE); then \
+       @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); \
@@ -326,6 +326,7 @@
 # while we're here, let's just handle how to back up our
 # checksummed files
 
+# as currently writen, doesn;t deal with git downloads
 garchive-%:
        -test -d $(GARCHIVEDIR)/ || mkdir -p $(GARCHIVEDIR)
        -test -h $(DOWNLOADDIR)/$* || cp -f $(DOWNLOADDIR)/$* $(GARCHIVEDIR)/
@@ -443,16 +444,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)
@@ -584,7 +585,8 @@
 # build from a standard gnu-style makefile's default rule.
 build-%/Makefile build-%/makefile build-%/GNUmakefile:
        @printf "[$(OK)build$(OFF)] $(MSG)Running make in $(OFF)$*\n"
-       $(BUILD_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(BUILD_ARGS) $(OUTPUT) ||  
$(BUILD_FAIL)
+       @printf "$(BUILD_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(BUILD_ARGS)\n"
+       @$(BUILD_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(BUILD_ARGS) $(OUTPUT) ||  
$(BUILD_FAIL)
        $(MAKECOOKIE)
 
 build-%/Makefile-BSD:
@@ -715,8 +717,10 @@
        set -e; \
                set -- $(CREATED_MERGE_DIRS); \
                while [ "$$1" != "" ]; do \
+                   echo 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; \
@@ -726,7 +730,7 @@
 
 finish-install:
        @printf "[$(OK)finish-install$(OFF)] $(MSG)Moving files from staging 
area$(OFF)\n"
-       set -e; \
+       @set -e; \
                set -- $(CREATED_MERGE_DIRS); \
                while [ "$$1" != "" ]; do \
                        rmdir -v $(packagedotgardir)/$$1 $(OUTPUT) || true; \
@@ -887,12 +891,15 @@
 # Standard deps install into the standard install dir.  For the
 # BBC, we set the includedir to the build tree and the libdir to
 # the install tree.  Most dependencies work this way.
+# [What?]
 dep-$(GARDIR)/%:
-       if [ "$(filter $*,$(IGNORE_DEPS))" != "" ] ; then \
+       @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); \
+               $(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
 
 ######################################
@@ -965,7 +972,7 @@
 NEED_GROUPS ?=
 
 checkdep-users:
-       set -e; for user in $(NEED_USERS) -; do \
+       @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 
|| \
@@ -976,7 +983,7 @@
        $(MAKECOOKIE)
 
 checkdep-groups:
-       set -e; for group in $(NEED_GROUPS) -; do \
+       @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  
|| \
@@ -1081,7 +1088,7 @@
 
 sysinstall-normalise:
        @printf "[$(OK)sysinstall-normalise$(OFF)] $(MSG)Normalising directory 
layout$(OFF)\n"
-       set -e; \
+       @set -e; \
        normalise () { \
                rmdir $$1 2>/dev/null || true; \
                if [ -d $$1 ]; then \
@@ -1099,8 +1106,8 @@
 
 sysinstall-packagevars:
        @printf "[$(OK)sysinstall-packagevars$(OFF)] $(MSG)Writing package 
metadata$(OFF)\n"
-       test -d $(dotgardir) || mkdir -p $(dotgardir);
-       (cd $(packagedir) \
+       @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)
@@ -1110,7 +1117,8 @@
 
 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)
+       (cp -r -v -f --symbolic-link --target-directory=$(prefix) 
$(packagedir)/* $(OUTPUT) && \
+               ln -n -v -f -s $(PACKAGENAME) $(dotgardir)/VERSION $(OUTPUT)) 
|| $(SYSINSTALL_FAIL) $(OUTPUT)
 
 sysinstall-uninstall:
        rm -f $(COOKIEDIR)/sysinstall-*

=== modified file 'gar/gar.mk'
--- a/gar/gar.mk        2022-08-31 01:59:36 +0000
+++ b/gar/gar.mk        2022-09-07 17:25:24 +0000
@@ -1,6 +1,6 @@
 # Top-level make includes for GARStow ports.
 #
-# Copyright (C) 2020, 2021, Carl Hansen <carlhansen@gnu.org>
+# Copyright (C) 2020, 2021, 2022 Carl Hansen 
 # Copyright (C) 2012, 2013, 2014 Brandon Invergo <brandon@invergo.net>
 # Copyright (C) 2010, 2011 Brian Gough
 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Adam Sampson
@@ -20,6 +20,9 @@
 
 else
 # No library files to include.
+#
+#  endif at end of this file
+
 
 # Comment this out to make much verbosity
 #.SILENT:
@@ -81,13 +84,14 @@
 
 # This is to make dirs as needed by the base rules
 $(sort $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR) $(WORKSRC) $(WORKDIR) 
$(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(DOWNLOADDIRGIT)) :
-       if test -d "$@"; then : ; else \
+       @echo ------ check $@
+       @if test -d "$@"; then : ; else \
                mkdir -p "$@"; \
        fi
 
 $(COOKIEDIR)/%:
-       echo ------ $@
-       if test -d "$@"; then : ; else \
+       @echo ------ check $@
+       @if test -d "$@"; then : ; else \
                mkdir -p "$@"; \
        fi
 
@@ -315,7 +319,7 @@
 # returns true if install has completed successfully, false
 # otherwise
 install-p:
-       test -h $(dotgardir)/VERSION && test "`readlink $(dotgardir)/VERSION`" 
= $(PACKAGENAME)
+       @test -h $(dotgardir)/VERSION && test "$(shell readlink 
$(dotgardir)/VERSION)" = $(PACKAGENAME)
 
 reinstall-p:
        @test -d $(packagesdir)/$(PACKAGENAME)
@@ -402,8 +406,8 @@
 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) *~
-       # cwh changed 6-2022 rm --preserve-root=all -rf $(DOWNLOADDIR) 
$(COOKIEDIR) $(LOGDIR) $(WORKSRC) $(WORKDIR) $(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....
 
 
@@ -415,7 +419,7 @@
        $(MAKE) $*-p >/dev/null 2>&1 || $(MAKE) $* >$(LOGDIR)/$*.log 2>&1
 
 test-logs:
-       for f in `find . -name 'test*.log'` ; do \
+       @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" ;  \

=== modified file 'pkg/gnu/binutils/Makefile'
--- a/pkg/gnu/binutils/Makefile 2022-08-06 02:04:37 +0000
+++ b/pkg/gnu/binutils/Makefile 2022-09-07 17:25:24 +0000
@@ -42,7 +42,8 @@
 MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.lz
 SIGFILES = $(DISTFILES).sig
-#WORKOBJ = $(WORKDIR)/$(DISTNAME)-build/
+
+WORKOBJ = $(WORKDIR)/$(DISTNAME)-build/
 INFO_FILES = as.info bfd.info binutils.info gprof.info ld.info
 
 

=== modified file 'pkg/gnu/config/Makefile'
--- a/pkg/gnu/config/Makefile   2022-08-11 18:35:05 +0000
+++ b/pkg/gnu/config/Makefile   2022-09-07 17:25:24 +0000
@@ -60,15 +60,16 @@
 .PHONY: manpages check gitpull fetch-my build-my pre-install  install-my
 
 gitpull:
-       (cd $(PWD)/$(WORKSRC)  &&  git pull)
+       (cd $(WORKSRC)  &&  git pull)
 
 fetch-my:  
-       if [ -d $(PWD)/$(WORKSRC)/.git ]; then    $(MAKE) gitpull ;  else  \
-         (cd $(DOWNLOADDIRGIT) &&  git clone 
https://git.savannah.gnu.org/git/$(GARNAME).git)  ; \
+       if [ -d $(WORKSRC)/.git ]; then    $(MAKE) gitpull ;  else  \
+         (cd $(DOWNLOADDIRGIT) &&  \
+         git clone https://git.savannah.gnu.org/git/$(GARNAME).git)  ; \
+          ( cd $(WORKSRC) &&  git checkout $(GIT_REVISION)  ;)  
             fi
        $(MAKECOOKIE)
  
-#(   cd $(WORKSRC) &&  git checkout $(GIT_REVISION)  ;)  fi 
 
 # needs help2man  for manpages
 manpages:

=== modified file 'pkg/gnu/ncurses/Makefile'
--- a/pkg/gnu/ncurses/Makefile  2022-08-21 23:45:18 +0000
+++ b/pkg/gnu/ncurses/Makefile  2022-09-07 17:25:24 +0000
@@ -22,7 +22,7 @@
 
 NAME = Ncurses
 GARNAME = ncurses
-GARVERSION = 6.3-20220820
+GARVERSION = 6.3-20220903
 GARVERSIONMAJOR = 6.3
 
 HOME_URL = http://www.gnu.org/software/ncurses/

=== modified file 'pkg/gnu/ncurses/sha256sums'
--- a/pkg/gnu/ncurses/sha256sums        2022-08-21 23:45:18 +0000
+++ b/pkg/gnu/ncurses/sha256sums        2022-09-07 17:25:24 +0000
@@ -1,2 +1,2 @@
-7b810b01f71609fd31107a0b7794d0940d3ecc10c98ba19e83749419ba0934b9  
download/ncurses-6.3-20220820.tgz
-9f7e82f1cd64e771e54e909d8ca9c4a0203f5bfed829ef7d0e844d770cd80e88  
download/ncurses-6.3-20220820.tgz.asc
+8ccfb30e825fa22a6bef38d5ba1ec7f15d7982c3df7b6bd08543730ef565de46  
download/ncurses-6.3-20220903.tgz
+97db55ba816a95887483d430fefa7fad066905430b4ecb6deacd1b970f8cc23e  
download/ncurses-6.3-20220903.tgz.asc