[Gsrc-commit] trunk r8493: more git systems fixes

[Carl Hansen]

------------------------------------------------------------
revno: 8493
revision-id: carlhansen1234@gmail.com-20220724202104-25mq3ac4ubw9j2zs
parent: carlhansen1234@gmail.com-20220724184557-rk8fdnfm7zs8qlin
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Sun 2022-07-24 13:21:04 -0700
message:
  more git systems fixes
modified:
  pkg/gnu/config/Makefile        makefile-20170430231231-0lbw966hs16oxlmd-2
  pkg/gnu/epsilon/Makefile       makefile-20220711205825-36zy9s82dj28g69b-3
  pkg/gnu/hello/config.mk        config.mk-20160617020235-c04qzy71nfkilxqt-1

=== modified file 'pkg/gnu/config/Makefile'
--- a/pkg/gnu/config/Makefile   2022-07-24 17:32:32 +0000
+++ b/pkg/gnu/config/Makefile   2022-07-24 20:21:04 +0000
@@ -40,6 +40,7 @@
 
 GIT_REVISION = master  
 
+# needs help2man  for doc
 BUILDDEPS = help2man
 LIBDEPS =
 
@@ -49,8 +50,8 @@
 INSTALL_SCRIPTS = my
 
 WORKSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
-
-# needs help2man  for doc
+# no WORKOBJ in this pkg
+ 
 ######################################################################
 
 include ../../../gar/gar.mk
@@ -75,7 +76,7 @@
 
 
 
-build-my:   fetch-my gitpull check manpages
+build-my:   fetch-my   manpages check
        $(MAKECOOKIE)
 
 pre-install-my:

=== modified file 'pkg/gnu/epsilon/Makefile'
--- a/pkg/gnu/epsilon/Makefile  2022-07-24 17:32:32 +0000
+++ b/pkg/gnu/epsilon/Makefile  2022-07-24 20:21:04 +0000
@@ -27,26 +27,27 @@
 define BLURB
 endef
 
+#TODO: installation
+
 ######################################################################
 #    git clone https://git.savannah.gnu.org/git/epsilon.git
 #    cd epsilon/
 #    ./autogen.sh 
 #    ./configure 
 #    make
-MASTER_SITES = https://git.savannah.gnu.org/
+MASTER_SITES = https://git.savannah.gnu.org
        #$(MASTER_SAVANNAH_GNU_GIT)
-MASTER_SUBDIR = git/
-GIT_REVISION = master  
-GIT_PATH = $(MASTER_SITES)$(MASTER_SUBDIR)$(GARNAME).git
-#DISTFILES = $(DISTNAME).tar.gz
+MASTER_SUBDIR = git
+GIT_PATH = $(MASTER_SITES)/$(MASTER_SUBDIR)/$(GARNAME).git
 NOCHECKSUM = $(DISTFILES)
 SIGFILES =
+GIT_REVISION = master  
 
 BUILDDEPS =
 LIBDEPS =
 
-WORKSRC = $(DOWNLOADDIRGIT)/$(DISTNAME)
-WORKOBJ = $(WORKDIR)/$(DISTNAME)
+WORKSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
+WORKOBJ = $(WORKDIR)/$(GARNAME)
 ######################################################################
 
 include ../../../gar/gar.lib/auto.mk
@@ -55,13 +56,21 @@
 
 .PHONY: fetch-my
 
-fetch-my:
+
+
+gitpull:
+       (cd $(WORKSRC)  &&  git pull)
+
+fetch-my:  
        @echo gitting it
-       cd $(DOWNLOADDIRGIT) && \
-               git clone $(GIT_PATH) $(DISTNAME) && \
-               (cd $(DISTNAME) && git checkout $(GIT_REVISION)) 
+       if [ -d $(WORKSRC)/.git ]; then    $(MAKE) gitpull ;  else  \
+         cd $(DOWNLOADDIRGIT) &&  git clone 
https://git.savannah.gnu.org/git/$(GARNAME).git  ; \
+             ( cd $(GARNAME) &&  git checkout $(GIT_REVISION) ) ;  fi 
        $(MAKECOOKIE)
 
+#git clone $(GIT_PATH) $(GARNAME) && 
+
+
 pre-configure: fetch-my
        cd $(WORKSRC) &&  ./autogen.sh
        $(MAKECOOKIE)

=== modified file 'pkg/gnu/hello/config.mk'
--- a/pkg/gnu/hello/config.mk   2022-05-31 03:06:30 +0000
+++ b/pkg/gnu/hello/config.mk   2022-07-24 20:21:04 +0000
@@ -1,4 +1,5 @@
 ## Configuration options for hello ##
 
 CONFIGURE_OPTS ?= 
-BUILD_OPTS ?= LDFLAGS=-liconv
+BUILD_OPTS ?=
+#LDFLAGS=-liconv