[Gsrc-commit] trunk r8477: gnulib and git reorganization of directories and etc

[Carl Hansen]

------------------------------------------------------------
revno: 8477
revision-id: carlhansen1234@gmail.com-20220711204511-gn0zlfvs3l38qkbs
parent: carlhansen1234@gmail.com-20220711144652-d2fqyu4p9pckmlau
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Mon 2022-07-11 13:45:11 -0700
message:
  gnulib and git reorganization of directories and etc
modified:
  gar/gar.lib.mk                 gar.lib.mk-20160617013741-ul4q527k85thcz4p-1
  pkg/gnu/config/Makefile        makefile-20170430231231-0lbw966hs16oxlmd-2
  pkg/gnu/gnulib/Makefile        makefile-20160617014725-uokjfnggs70iry9h-828
  pkg/gnu/jitter/Makefile        makefile-20220624184352-xeatiuetn4p2h6rv-3
  pkg/gnu/ncurses/Makefile       makefile-20160617014725-uokjfnggs70iry9h-1464

=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk    2022-07-10 21:17:27 +0000
+++ b/gar/gar.lib.mk    2022-07-11 20:45:11 +0000
@@ -166,7 +166,7 @@
 GIT_REVISION ?= v$(strip $(GARVERSION))
 git//%:
        mkdir -p $(DOWNLOADDIRGIT)
-       cd $(DOWNLOADDIR)/git && \
+       cd $(DOWNLOADDIRGIT) && \
                git clone $(GIT_PATH) $(DISTNAME) && \
                (cd $(DISTNAME) && git checkout $(GIT_REVISION)) && \
                tar czvf ../$(notdir $*) $(DISTNAME)

=== modified file 'pkg/gnu/config/Makefile'
--- a/pkg/gnu/config/Makefile   2022-07-10 21:19:39 +0000
+++ b/pkg/gnu/config/Makefile   2022-07-11 20:45:11 +0000
@@ -21,7 +21,7 @@
 
 NAME = config
 GARNAME = config
-GARVERSION = $(strip 2022-7 )
+GARVERSION = $(strip 2022-7-11 )
 HOME_URL = http://www.gnu.org/software/config/
 DESCRIPTION =  config.guess and config.sub scripts
 define BLURB
@@ -47,6 +47,7 @@
 CONFIGURE_SCRIPTS = 
 BUILD_SCRIPTS = my
 INSTALL_SCRIPTS = my
+GIT_REVISION = master
 
 WORKSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
 
@@ -63,8 +64,9 @@
        (cd $(WORKSRC)  &&  git pull)
 
 fetch-my:  
-       if [ -d $(DOWNLOADDIRGIT)/$(GARNAME)/.git ]; then    $(MAKE) gitpull ;  
else  \
-         (cd $(DOWNLOADDIRGIT) &&  git clone 
https://git.savannah.gnu.org/git/$(GARNAME).git)  fi 
+       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)
  
 # needs help2man  for manpages

=== modified file 'pkg/gnu/gnulib/Makefile'
--- a/pkg/gnu/gnulib/Makefile   2022-06-30 21:21:32 +0000
+++ b/pkg/gnu/gnulib/Makefile   2022-07-11 20:45:11 +0000
@@ -46,42 +46,44 @@
 
 BUILDDEPS =
 LIBDEPS =
-
-
-DOWNLOADDIRGIT =  $(DOWNLOADDIR)-git
+GIT_REVISION = master
+
+
 WORKSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
 WORKOBJ = $(WORKSRC)
 
-######################################################################
-
+# put GNULIB_SRCDIR = into you .bashrc to use GNULIB the way it is intended
+GNULIB_SRCDIR = $(WORKSRC)  
 # HINT: set GNULIB_SRCDIR= to the DOWNLOADDIRGIT/GARNAME (download-git/gnulib) 
in your .bashrc
 # for other programs to use it
 
+######################################################################
+
 include ../../../gar/gar.mk
 include config.mk
 
-#  download directory is download-git/gnulib/.git/, not normally removed.
-#  $(DOWNLOADDIRGIT)/$(GARNAME)/
-
-.PHONY:  gitpull fetch-gl   makedoc build-gl install-gl 
+
+.PHONY:  gitpull fetch-my   makedoc build-gl install-gl 
+
+build-gl:  
+       $(MAKE) fetch-my
+       $(MAKE) makedoc
+       $(MAKECOOKIE)
+
 
 gitpull:
-       (cd $(DOWNLOADDIRGIT)/$(GARNAME) &&  git pull)
+       (cd $(WORKSRC)   &&  git pull  )
 
-fetch-gl::
-       if [ -d $(DOWNLOADDIRGIT) ]; then    $(MAKE) gitpull ;  else  \
-         (mkdir -p $(DOWNLOADDIRGIT)/$(GARNAME)  &&  cd $(DOWNLOADDIRGIT)/  && 
 git clone https://git.savannah.gnu.org/git/$(GARNAME).git)  fi 
+fetch-my::
+       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)
 
-makedoc: fetch-gl
+makedoc: fetch-my
        make -C $(WORKSRC)/doc/
        $(MAKECOOKIE)
 
-build-gl:  
-       $(MAKE) fetch-gl
-       $(MAKE) makedoc
-       $(MAKECOOKIE)
-
 
 #install:
 pre-install: build-gl
@@ -92,4 +94,11 @@
        $(INSTALL_BIN)  $(WORKSRC)/gnulib-tool
        $(MAKECOOKIE)
 
+post-install:
+       @echo =============================================================
+       @echo =============================================================
+       @echo Put GNULIB_SRCDIR  into your .bashrc to use GNULIB the way it is 
intended.
+       @echo GNULIB_SRCDIR=$(PWD)/$(WORKSRC)  
+       @echo =============================================================
+       @echo =============================================================
 

=== modified file 'pkg/gnu/jitter/Makefile'
--- a/pkg/gnu/jitter/Makefile   2022-06-24 22:49:22 +0000
+++ b/pkg/gnu/jitter/Makefile   2022-07-11 20:45:11 +0000
@@ -38,7 +38,7 @@
 DISTFILES = $(DISTNAME).tar.xz
 SIGFILES =
 
-BUILDDEPS =
+BUILDDEPS = gnulib
 LIBDEPS =
 
 ######################################################################

=== modified file 'pkg/gnu/ncurses/Makefile'
--- a/pkg/gnu/ncurses/Makefile  2022-07-11 14:46:52 +0000
+++ b/pkg/gnu/ncurses/Makefile  2022-07-11 20:45:11 +0000
@@ -60,6 +60,7 @@
 LIBDEPS =
 
 WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)
+WORKOBJ = $(WORKDIR)/$(GARNAME)-$(GARVERSION)-build
 
 include ../../../gar/gar.lib/auto.mk
 include config.mk