[Gsrc-commit] trunk r2634: do not preserve timestamps when symlinking since it may cause permissions issues

[Brandon Invergo]

------------------------------------------------------------
revno: 2634
revision-id: address@hidden
parent: address@hidden
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2013-11-05 09:28:01 +0100
message:
  do not preserve timestamps when symlinking since it may cause permissions 
issues
modified:
  ChangeLog                      changelog-20100709141706-qgja2j0qu34ekbcd-1
  gar.lib.mk                     gar.lib.mk-20100602191336-d3df1ggfm1r56woa-4

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-11-04 12:47:28 +0000
+++ b/ChangeLog 2013-11-05 08:28:01 +0000
@@ -1,3 +1,9 @@
+2013-11-05  Brandon Invergo  <address@hidden>
+
+       * gar.lib.mk (sysinstall-install): Don't preserve timestamps when
+       installing symlinks since it may cause permissions issues in some
+       cases
+
 2013-11-04  Brandon Invergo  <address@hidden>
 
        * gar.mk (install-p): Fix boolean statement grouping

=== modified file 'gar.lib.mk'
--- a/gar.lib.mk        2013-10-28 23:27:45 +0000
+++ b/gar.lib.mk        2013-11-05 08:28:01 +0000
@@ -16,7 +16,7 @@
 
 # So these targets are all loaded into bbc.port.mk at the end,
 # and provide actions that would be written often, such as
-# running configure, automake, makemaker, etc.  
+# running configure, automake, makemaker, etc.
 #
 # The do- targets depend on these, and they can be overridden by
 # a port maintainer, since they'e pattern-based.  Thus:
@@ -62,7 +62,7 @@
 # Download the file if and only if it doesn't have a preexisting
 # checksum file.  Loop through available URLs and stop when you
 # get one that doesn't return an error code.
-$(DOWNLOADDIR)/%:  
+$(DOWNLOADDIR)/%:
        if test -f $(COOKIEDIR)/checksum-$*; then : ; else \
                printf "[$(OK)fetch$(OFF)] $(MSG)Grabbing 
$(OFF)address@hidden"; \
                for i in $(filter %/$*,$(URLS)); do  \
@@ -74,7 +74,7 @@
                        printf "[$(ERR)fetch$(OFF)] $(MSG)Failed to download 
$(OFF)address@hidden(MSG)!$(OFF)\n" 1>&2; \
                        false; \
                fi; \
-       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
@@ -85,23 +85,23 @@
 WGET_OPTS = -c --no-check-certificate --passive-ftp -U "GSRC/1.0"
 
 # download an http URL (colons omitted)
-http//%: 
+http//%:
        wget $(WGET_OPTS) -O $(DOWNLOADDIR)/$(notdir $*).partial http://$*
        mv $(DOWNLOADDIR)/$(notdir $*).partial $(DOWNLOADDIR)/$(notdir $*)
 
 # download an https URL (colons omitted)
-https//%: 
+https//%:
        wget $(WGET_OPTS) -O $(DOWNLOADDIR)/$(notdir $*).partial https://$*
        mv $(DOWNLOADDIR)/$(notdir $*).partial $(DOWNLOADDIR)/$(notdir $*)
 
 # download an ftp URL (colons omitted)
-ftp//%: 
+ftp//%:
        wget $(WGET_OPTS) -O $(DOWNLOADDIR)/$(notdir $*).partial ftp://$*
        mv $(DOWNLOADDIR)/$(notdir $*).partial $(DOWNLOADDIR)/$(notdir $*)
 
 # link to a local copy of the file
 # (absolute path)
-file///%: 
+file///%:
        if test -f /$*; then \
                ln -sf "/$*" $(DOWNLOADDIR)/$(notdir $*); \
        else \
@@ -110,7 +110,7 @@
 
 # link to a local copy of the file
 # (relative path)
-file//%: 
+file//%:
        if test -f $*; then \
                ln -sf $(CURDIR)/$* $(DOWNLOADDIR)/$(notdir $*); \
        else \
@@ -119,7 +119,7 @@
 
 # Using Jeff Waugh's rsync rule.
 # DOES NOT PRESERVE SYMLINKS!
-rsync//%: 
+rsync//%:
        rsync -azvL --progress rsync://$* $(DOWNLOADDIR)/
 
 # Download a directory tree as a tarball.
@@ -200,7 +200,7 @@
        @printf "make -C $(shell pwd) makesums GPGV=true$(OFF)\n"
        @exit 1
 
-checksum-%: $(CHECKSUM_FILE) 
+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 \
@@ -283,13 +283,13 @@
        --no-same-permissions
 
 # rule to extract files with tar xzf
-extract-%.tar.Z extract-%.tgz extract-%.tar.gz extract-%.taz: 
+extract-%.tar.Z extract-%.tgz extract-%.tar.gz extract-%.taz:
        @printf "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst 
extract-%,$(DOWNLOADDIR)/%,$@)\n"
        gzip -dc $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) | tar xf - 
$(TAR_OPTS) -C $(EXTRACTDIR)
        $(MAKECOOKIE)
 
 # rule to extract files with tar and bzip
-extract-%.tar.bz extract-%.tar.bz2 extract-%.tbz: 
+extract-%.tar.bz extract-%.tar.bz2 extract-%.tbz:
        @printf "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst 
extract-%,$(DOWNLOADDIR)/%,$@)\n"
        bzip2 -dc $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) | tar xf - 
$(TAR_OPTS) -C $(EXTRACTDIR)
        $(MAKECOOKIE)
@@ -346,19 +346,19 @@
 PATCH = patch $(PATCHOPTS) -d $(PATCHDIR)
 
 # apply bzipped patches
-patch-%.bz patch-%.bz2: 
+patch-%.bz patch-%.bz2:
        @printf "[$(OK)patch$(OFF)] $(MSG)Applying patch $(OFF)$(patsubst 
patch-%,$(DOWNLOADDIR)/%,$@)\n"
        bzip2 -dc $(patsubst patch-%,$(DOWNLOADDIR)/%,$@) | $(PATCH)
        $(MAKECOOKIE)
 
 # apply gzipped patches
-patch-%.gz: 
+patch-%.gz:
        @printf "[$(OK)patch$(OFF)] $(MSG)Applying patch $(OFF)$(patsubst 
patch-%,$(DOWNLOADDIR)/%,$@)\n"
        gzip -dc $(patsubst patch-%,$(DOWNLOADDIR)/%,$@) | $(PATCH)
        $(MAKECOOKIE)
 
 # apply normal patches
-patch-%: 
+patch-%:
        @printf "[$(OK)patch$(OFF)] $(MSG)Applying patch $(OFF)$(patsubst 
patch-%,$(DOWNLOADDIR)/%,$@)\n"
        $(PATCH) < $(patsubst patch-%,$(DOWNLOADDIR)/%,$@)
        $(MAKECOOKIE)
@@ -419,10 +419,10 @@
 
 # configure a package that has an autoconf-style configure script, coping
 # correctly when WORKOBJ is set to something other than WORKDIR.
-configure-%/configure: 
+configure-%/configure:
        @printf "[$(OK)configure$(OFF)] $(MSG)Running $(CONFIGURE_NAME) in 
$(OFF)$*\n"
        mkdir -p $(WORKOBJ)
-       cd $(if $(WORKOBJ_CHANGED_P),$(WORKOBJ),$*) && $(CONFIGURE_ENV) $(if 
$(WORKOBJ_CHANGED_P),$(LEAVE_WORKOBJ)/$*,.)/$(CONFIGURE_NAME) $(CONFIGURE_ARGS) 
$(OUTPUT) 
+       cd $(if $(WORKOBJ_CHANGED_P),$(WORKOBJ),$*) && $(CONFIGURE_ENV) $(if 
$(WORKOBJ_CHANGED_P),$(LEAVE_WORKOBJ)/$*,.)/$(CONFIGURE_NAME) $(CONFIGURE_ARGS) 
$(OUTPUT)
        $(MAKECOOKIE)
 
 XMKMF_ARGS ?= -a
@@ -430,7 +430,7 @@
 # configure a package that uses imake
 # FIXME: untested and likely not the right way to handle the
 # arguments
-configure-%/Imakefile: 
+configure-%/Imakefile:
        @printf "[$(OK)configure$(OFF)] $(MSG)Running xmkmf in $(OFF)$*\n"
        cd $* && $(CONFIGURE_ENV) xmkmf $(XMKMF_ARGS) $(OUTPUT)
        $(MAKECOOKIE)
@@ -518,7 +518,7 @@
 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) 
+               $(BUILD_FAIL)
        $(MAKECOOKIE)
 
 build-%/Makefile-BSD:
@@ -631,10 +631,10 @@
 # Directories that should have pristine versions stored to be merged upon
 # installation.
 #      Removed: sysconf $(sysconfdir) (etc/)
-#      var $(vardir) 
-#      boot $(bootdir) 
+#      var $(vardir)
+#      boot $(bootdir)
 #      rootlib /lib
-CREATED_MERGE_DIRS = 
+CREATED_MERGE_DIRS =
 
 # Directories that will be merged if created by a package, but won't be
 # created automatically.
@@ -682,7 +682,7 @@
 INSTALL_ARGS ?= $(GNU_INSTALL_ARGS)
 
 # Use "make install" with prefix-changing.
-install-%/Makefile install-%/makefile install-%/GNUmakefile: 
+install-%/Makefile install-%/makefile install-%/GNUmakefile:
        @printf "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) in 
$(OFF)$*\n"
        $(INSTALL_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(INSTALL_ARGS) 
$(INSTALL_TARGET) $(OUTPUT)
        $(MAKECOOKIE)
@@ -770,25 +770,25 @@
 
 # Okay, so for the benefit of future generations, this is how it
 # works:
-# 
+#
 # First of all, we have this file with colon-separated lines.
 # The $(shell cat foo) routine turns it into a space-separated
 # list of words.  The foreach iterates over this list, putting a
 # colon-separated record in $(ZORCH) on each pass through.
-# 
+#
 # Next, we have the macro $(MANIFEST_LINE), which splits a record
 # into a space-separated list, and $(MANIFEST_SIZE), which
 # determines how many elements are in such a list.  These are
 # purely for convenience, and could be inserted inline if need
 # be.
-MANIFEST_LINE = $(subst :, ,$(ZORCH)) 
+MANIFEST_LINE = $(subst :, ,$(ZORCH))
 MANIFEST_SIZE = $(words $(MANIFEST_LINE))
 
 # So the install command takes a variable number of parameters,
 # and our records have from two to five elements.  Gmake can't do
 # any sort of arithmetic, so we can't do any really intelligent
 # indexing into the list of parameters.
-# 
+#
 # Since the last three elements of the $(MANIFEST_LINE) are what
 # we're interested in, we make a parallel list with the parameter
 # switch text (note the dummy elements at the beginning):
@@ -798,7 +798,7 @@
 # of the $(MANIFEST_LINE), starting at 3 and going to
 # $(MANIFEST_SIZE).  That's where all the real magic happens,
 # right there!
-# 
+#
 # following that, we just splat elements one and two of
 # $(MANIFEST_LINE) on the end, since they're the ones that are
 # always there.  Slap a semicolon on the end, and you've got a
@@ -825,7 +825,7 @@
        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 
+       fi
 
 ######################################
 # Commands for installing different types of files
@@ -1041,7 +1041,7 @@
 
 sysinstall-install:
        @printf "[$(OK)sysinstall$(OFF)] $(MSG)Installing to $(prefix)$(OFF)\n"
-       (cp -a -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-*
@@ -1050,7 +1050,7 @@
        test -f $(dotgardir)/FILES && rm -f -- `cat $(dotgardir)/FILES` 
$(OUTPUT); \
        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)) 
+       rmdir $(dotgardir) $(OUTPUT))
        rm -f $(packagesdir)/$(GARNAME)
 
 sysinstall-uninstall-pkg: