[Gsrc-commit] trunk r3739: refix something that was fix before in gsrc, using strip

[Carl Hansen]

------------------------------------------------------------
revno: 3739
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Fri 2016-06-17 17:37:20 -0700
message:
  refix something that was fix before in gsrc, using strip
modified:
  gar/gar.lib.mk                 gar.lib.mk-20160617013741-ul4q527k85thcz4p-1
  gar/gar.mk                     gar.mk-20160617013745-r4h3dj0kiuppihsx-1

=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk    2016-06-17 19:08:15 +0000
+++ b/gar/gar.lib.mk    2016-06-18 00:37:20 +0000
@@ -137,7 +137,7 @@
        scp -C $* $(DOWNLOADDIR)/
 
 # Check out source from CVS.
-CVS_CO_OPTS ?= -D$(GARVERSION) -P
+CVS_CO_OPTS ?= -D$(strip $(GARVERSION)) -P
 CVS_MODULE ?= $(GARNAME)
 cvs//%:
        mkdir -p $(DOWNLOADDIR)/cvs
@@ -146,7 +146,7 @@
                tar czvf ../$(notdir $*) $(DISTNAME)
 
 # Check out source from Subversion.
-SVN_REVISION ?= "{$(GARVERSION)}"
+SVN_REVISION ?= "{$(strip $(GARVERSION))}"
 SVN_CO_OPTS ?= -r $(SVN_REVISION)
 svnco//%:
        mkdir -p $(DOWNLOADDIR)/svn
@@ -163,7 +163,7 @@
                tar -czvf ../$(notdir $*) $(DISTNAME)
 
 # Check out source from Git.
-GIT_REVISION ?= v$(GARVERSION)
+GIT_REVISION ?= v$(strip $(GARVERSION))
 git//%:
        mkdir -p $(DOWNLOADDIR)/git
        cd $(DOWNLOADDIR)/git && \
@@ -172,7 +172,7 @@
                tar czvf ../$(notdir $*) $(DISTNAME)
 
 # Check out source from Mercurial.
-HG_REVISION ?= $(GARVERSION)
+HG_REVISION ?= $(strip $(GARVERSION))
 HG_CLONE_OPTS ?= -r "$(HG_REVISION)"
 hg//%:
        mkdir -p $(DOWNLOADDIR)/hg
@@ -181,7 +181,7 @@
                tar czvf ../$(notdir $*) $(DISTNAME)
 
 # Check out source from Bazaar.
-BZR_REVISION ?= before:date:$(GARVERSION)
+BZR_REVISION ?= before:date:$(strip $(GARVERSION))
 BZR_CHECKOUT_OPTS ?= -r "$(BZR_REVISION)" --lightweight
 bzr//%:
        mkdir -p $(DOWNLOADDIR)/bzr
@@ -233,6 +233,9 @@
        $(GPGV) $(DOWNLOADDIR)/$*-asc.txt $(DOWNLOADDIR)/$(subst -tar-,.tar.,$*)
        $(MAKECOOKIE)
 
+
+# below $(GPGV) $(DOWNLOADDIR)/$*.sig   contrary to docs, seems to be needed:
+
 checksig-%.sig:
        @printf "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*\n"
        $(GPGV) $(DOWNLOADDIR)/$*.sig $(DOWNLOADDIR)/$*
@@ -249,7 +252,7 @@
        $(MAKECOOKIE)
 
 checksig-%.md5sum:
-       @printf "[$(OK)checksig$(OFF)] $(MSG)Checking MD5 checksums $(OFF)$*\n"
+       @printf "[$(OK)checksig$(OFF)] $(MSG)Checking MD5sum checksums 
$(OFF)$*\n"
        cd $(DOWNLOADDIR) && md5sum -c $*.md5sum
        $(MAKECOOKIE)
 
@@ -624,13 +627,13 @@
 #################### INSTALL RULES ####################
 
 # The format of stow package names.
-PACKAGENAME ?= $(GARNAME)-$(GARVERSION)$(if $(PATCHNUM),-$(PATCHNUM))$(if 
$(GARPROFILE),-$(GARPROFILE))
+PACKAGENAME ?= $(strip $(GARNAME))-$(strip $(GARVERSION))$(if 
$(PATCHNUM),-$(strip $(PATCHNUM)))$(if $(GARPROFILE),-$(strip $(GARPROFILE)))
 
 # The package home directory. This'll be stowed into $(prefix).
 packagedir = $(packagesdir)/$(PACKAGENAME)
 
 # Directory containing GARstow files for the package.
-dotgardir = $(prefix)/.gar/$(GARNAME)$(if $(GARPROFILE),-$(GARPROFILE))
+dotgardir = $(prefix)/.gar/$(strip $(GARNAME))$(if $(GARPROFILE),-$(strip 
$(GARPROFILE)))
 
 # Directories to use during installation.
 packageDESTDIR = $(packagesdir)/$(PACKAGENAME)-DEST
@@ -638,8 +641,8 @@
 packagedotgardir = $(packageDESTDIR)$(dotgardir)
 packagesysconfdir = $(packageDESTDIR)$(sysconfdir)
 packagevardir = $(packageDESTDIR)$(vardir)
-packagedocs = $(packageprefix)/share/doc/$(GARNAME)
-packageexamples = $(packageprefix)/share/examples/$(GARNAME)
+packagedocs = $(packageprefix)/share/doc/$(strip $(GARNAME))
+packageexamples = $(packageprefix)/share/examples/$(strip $(GARNAME))
 
 # Directories that should have pristine versions stored to be merged upon
 # installation.
@@ -851,7 +854,7 @@
 INSTALL_CATMAN = install_catman () { for x in $$*; do v=`echo $$x | sed 
's/.*\.//'`; mkdir -p $(packageprefix)/man/cat$$v && install -m644 $$x 
$(packageprefix)/man/cat$$v; done; } && install_catman
 INSTALL_INFO = install_info () { mkdir -p $(packageprefix)/share/info && 
install -m644 $$* $(packageprefix)/share/info; } && install_info
 INSTALL_DOCS = install_docs () { mkdir -p $(packagedocs) && cp -R $$* 
$(packagedocs); } && install_docs
-FONTSNAME ?= $(GARNAME)
+FONTSNAME ?= $(strip $(GARNAME))
 INSTALL_FONTS = install_fonts () { mkdir -p 
$(packageprefix)/share/fonts/$(FONTSNAME) && cp -R "$$@" 
$(packageprefix)/share/fonts/$(FONTSNAME); } && install_fonts
 INSTALL_SYSCONF = install_sysconf () { mkdir -p $(sysconfdir) && install -m644 
$$* $(sysconfdir); } && install_sysconf
 INSTALL_LADSPA = install_ladspa () { mkdir -p $(packageprefix)/lib/ladspa && 
install -m755 $$* $(packageprefix)/lib/ladspa; } && install_ladspa
@@ -1050,7 +1053,7 @@
        || $(SYSINSTALL_FAIL)
        cat Makefile $(CHECKSUM_FILE) | sha256sum > $(dotgardir)/BUILD $(OUTPUT)
 
-SYSINSTALL_FAIL = (rm -f $(packagesdir)/$(GARNAME) $(COOKIEDIR)/sysinstall-*; 
false)
+SYSINSTALL_FAIL = (rm -f $(packagesdir)/$(strip $(GARNAME)) 
$(COOKIEDIR)/sysinstall-*; false)
 
 sysinstall-install:
        @printf "[$(OK)sysinstall$(OFF)] $(MSG)Installing to $(prefix)$(OFF)\n"
@@ -1064,7 +1067,7 @@
        test -f $(dotgardir)/DIRS && rmdir --ignore-fail-on-non-empty -v -- 
`cat $(dotgardir)/DIRS` $(OUTPUT) ; \
        rm -f $(dotgardir)/FILES $(dotgardir)/DIRS $(dotgardir)/VERSION 
$(dotgardir)/BUILD $(OUTPUT); \
        rmdir $(dotgardir) $(OUTPUT))
-       rm -f $(packagesdir)/$(GARNAME)
+       rm -f $(packagesdir)/$(strip $(GARNAME))
 
 sysinstall-uninstall-pkg:
        rm -rvf $(packagedir) $(OUTPUT)

=== modified file 'gar/gar.mk'
--- a/gar/gar.mk        2016-06-17 19:08:15 +0000
+++ b/gar/gar.mk        2016-06-18 00:37:20 +0000
@@ -29,15 +29,15 @@
 endef
 
 GARDIR ?= ../../../gar
-GARPKGDIR ?= ../../
-PKGGROUPS ?= bio libs tools dev gnu gnome gnustep external other
+GARPKGDIR ?= ../..
+PKGGROUPS ?= gnu gnome gnustep gnome bio other libs tools dev external
 PKGGROUPDIRS ?= $(foreach GROUP,$(PKGGROUPS),$(GARPKGDIR)/$(GROUP))
 GARDIR_ABSOLUTE := $(shell cd $(GARDIR) && pwd)
 SCRIPTSDIR = $(GARDIR_ABSOLUTE)/gar.scripts
 TEMPDIR = $(GARDIR_ABSOLUTE)/gar.tmp
 FILEDIR ?= files
 DOWNLOADDIR ?= download
-COOKIEDIR ?= cookies/$(DISTNAME)$(GARPROFILE)
+COOKIEDIR ?= cookies/$(DISTNAME)$(strip $(GARPROFILE))
 WORKDIR ?= work
 LOGDIR ?= logs
 WORKSRC ?= $(WORKDIR)/$(DISTNAME)
@@ -56,12 +56,12 @@
 WORKOBJ_CHANGED_P = $(filter-out $(WORKSRC),$(WORKOBJ))
 LEAVE_WORKOBJ = $(subst $(strip ) ,/,$(patsubst %,..,$(subst /, ,$(WORKOBJ))))
 
-UPSTREAMNAME ?= $(GARNAME)
-DISTNAME ?= $(UPSTREAMNAME)-$(GARVERSION)
+UPSTREAMNAME ?= $(strip $(GARNAME))
+DISTNAME ?= $(UPSTREAMNAME)-$(strip $(GARVERSION))
 
 ALLFILES ?= $(DISTFILES) $(PATCHFILES) $(SIGFILES)
 
-OLDVERSIONS ?= $(subst $(GARNAME)-,,$(filter-out $(DISTNAME),$(notdir 
$(wildcard $(packagesdir)/$(GARNAME)-*))))
+OLDVERSIONS ?= $(subst $(strip $(GARNAME))-,,$(filter-out $(DISTNAME),$(notdir 
$(wildcard $(packagesdir)/$(strip $(GARNAME))-*))))
 
 # For rules that do nothing, display what dependencies they
 # successfully completed
@@ -137,7 +137,7 @@
 
 pkg-info:
        @printf "$(MSG)Name:$(OFF)        $(NAME)\n"
-       @printf "$(MSG)Version:$(OFF)     $(GARVERSION)$(if 
$(PATCHNUM),-$(PATCHNUM))\n"
+       @printf "$(MSG)Version:$(OFF)     $(GARVERSION)$(if 
$(PATCHNUM),-$(strip $(PATCHNUM)))\n"
        @printf "$(MSG)URL:$(OFF)         $(subst %,%%,$(HOME_URL))\n"
        @printf "$(MSG)Cite:$(OFF)        $(CITE)\n" 
        @printf "$(MSG)Description:$(OFF)\n"
@@ -320,17 +320,17 @@
 
 install-src: clean extract
        @printf "[$(OK)install-src$(OK)] $(MSG)Installing 
$(GARNAME)-$(GARVERSION) source code$(OFF)\n"
-       mkdir -p $(SRCDIR)/$(GARNAME)-$(GARVERSION)
-       cp -r $(WORKSRC)/* $(SRCDIR)/$(GARNAME)-$(GARVERSION)
+       mkdir -p $(SRCDIR)/$(strip $(GARNAME))-$(strip $(GARVERSION))
+       cp -r $(WORKSRC)/* $(SRCDIR)/$(strip $(GARNAME))-$(strip $(GARVERSION))
        $(MAKECOOKIE)
 
 install-src-p:
-       @test -d $(SRCDIR)/$(GARNAME)-$(GARVERSION)
+       @test -d $(SRCDIR)/$(strip $(GARNAME))-$(strip $(GARVERSION))
 
 uninstall-src:
        @printf "[$(OK)uninstall-src$(OK)] $(MSG)Uninstalling 
$(GARNAME)-$(GARVERSION) source code$(OFF)\n"
-       [ -d $(SRCDIR)/$(GARNAME)-$(GARVERSION) ] && \
-               rm -rvf $(SRCDIR)/$(GARNAME)-$(GARVERSION)
+       [ -d $(SRCDIR)/$(strip $(GARNAME))-$(strip $(GARVERSION)) ] && \
+               rm -rvf $(SRCDIR)/$(strip $(GARNAME))-$(strip $(GARVERSION))
        $(MAKECOOKIE)
 
 uninstall-src-old: