rcm: Update wip/rcm to 1.3.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: rcm: Update wip/rcm to 1.3.1
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Sun, 20 Aug 2017 12:12:54 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Aug 20 14:12:54 2017 +0200
Changeset:	f274a647328b1cec5c5926d0b66099cf12ca9496

Modified Files:
	rcm/Makefile
	rcm/distinfo
Added Files:
	rcm/patches/patch-bin_mkrc
	rcm/patches/patch-bin_mkrc.in
	rcm/patches/patch-bin_rcup
	rcm/patches/patch-bin_rcup.in

Log Message:
rcm: Update wip/rcm to 1.3.1

pkgsrc changes:
 - Use https for MASTER_SITES
 - Add MAINTAINER (NFC)
 - Empty USE_LANGUAGES definition, a C compiler isn't needed to build this
   package.

Changes:
rcm (1.3.1) unstable; urgency=low

  * BUGFIX: Handle dotfile names with spaces in them (Eric Collins, Mike Burns).
  * BUGFIX: Relative exclude globs now work (Eric Collins, Mike Burns).
  * BUGFIX: Use $LOGNAME instead of $USER for compatibility (Mike Burns).
  * BUGFIX: rcdn(1) stops at DEST_DIR (Kyle Cook, Mike Burns).
  * BUGFIX: Symlink existing files, even when identical (Graham Bennett).
  * BUGFIX: Sort hooks by filename before execution instead of arbitrary order
    (David Alexander).
  * Documentation improvements (Nick Novitski, Ben Stephens, Casey Rodarmor).

 -- Mike Burns <mburns%thoughtbot.com@localhost>  Sat, 26 Dec 2016 17:00:00 -0500

rcm (1.3.0) unstable; urgency=low

  * BUGFIX: Control whether hooks should run in rcdn(1) with the -K and -k
    flags (Ben Turrubiates, Christopher Koch, Mike Burns, Mikkel Fahnøe
    Jørgensen).
  * Massive documentation fixes and updates (Christopher Koch, David Alexander,
    Jason Daniel Augustine Gilliland, Martin Frost, Melissa Xie, Mike Burns,
    Scott Stevenson, Jarkko Kniivilä, Blake Williams, Carl van Tonder, Teo
    Ljungberg, Zach Latta, Devraj Mehta, Vlad GURDIGA, Joe Ferris).
  * Host-specific files take priority, then tags, then default (Christian
    Höltje).
  * Run hooks in the directory in which they are located (Jarkko Kniivilä).
  * Generate a minimal standalone rcup(1) script with the -g flag (Mike Burns).
  * Support rc files without leading dots via the -U and -u flags in lsrc(1),
    rcup(1), and rcdn(1), and the UNDOTTED setting in rcrc(5) (Christopher
    Koch).
  * Improved Solaris support (Jarkko Kniivilä).
  * Override `SYMLINK_DIRS` or -S with -s (Mike Burns).
  * Show usage information when given bad arguments (Mike Burns).

 -- Mike Burns <mburns%thoughtbot.com@localhost>  Thu, 08 Jan 2015 14:50:00 +0200

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f274a647328b1cec5c5926d0b66099cf12ca9496

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rcm/Makefile                  |  7 +++++--
 rcm/distinfo                  | 11 ++++++++---
 rcm/patches/patch-bin_mkrc    | 21 +++++++++++++++++++++
 rcm/patches/patch-bin_mkrc.in | 21 +++++++++++++++++++++
 rcm/patches/patch-bin_rcup    | 30 ++++++++++++++++++++++++++++++
 rcm/patches/patch-bin_rcup.in | 30 ++++++++++++++++++++++++++++++
 6 files changed, 115 insertions(+), 5 deletions(-)

diffs:
diff --git a/rcm/Makefile b/rcm/Makefile
index 880d50e513..087ec3ab98 100644
--- a/rcm/Makefile
+++ b/rcm/Makefile
@@ -1,13 +1,16 @@
 # $NetBSD: Makefile,v 1.1 2015/05/03 14:00:20 jonthn Exp $
 
-DISTNAME=	rcm-1.2.3
+DISTNAME=	rcm-1.3.1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://thoughtbot.github.io/rcm/dist/
+MASTER_SITES=	https://thoughtbot.github.io/rcm/dist/
 
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://thoughtbot.github.io/rcm/
 COMMENT=	Tools for rc file (dotfile) management
 LICENSE=	modified-bsd
 
 GNU_CONFIGURE=	yes
 
+USE_LANGUAGES=	# none
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/rcm/distinfo b/rcm/distinfo
index 8c4344225d..8b02c1823b 100644
--- a/rcm/distinfo
+++ b/rcm/distinfo
@@ -1,5 +1,10 @@
 $NetBSD: distinfo,v 1.1 2015/05/03 14:00:20 jonthn Exp $
 
-SHA1 (rcm-1.2.3.tar.gz) = f89e64f45d714567f54474b3b4cc825b130ab114
-RMD160 (rcm-1.2.3.tar.gz) = 7e41b370fa2bd6308a632175c4d5469a3bbcc10b
-Size (rcm-1.2.3.tar.gz) = 83947 bytes
+SHA1 (rcm-1.3.1.tar.gz) = de369b032f66e3cfed2ed72e92159b89a4f0f0b0
+RMD160 (rcm-1.3.1.tar.gz) = 27ddc40aff4f9d14a5d5e0a9fc27d9afd6dccd7a
+SHA512 (rcm-1.3.1.tar.gz) = 1fd8ad6f8bee16177444469bddbef8d9b99f0b2bedc82c9833523370dfda4583c425f1ab8f2195f11236d1385553a2a49ead6d4c5f0803deeb56737b6836a0d9
+Size (rcm-1.3.1.tar.gz) = 89437 bytes
+SHA1 (patch-bin_mkrc) = 964990cd47008579e39e8fb043d7477e0b7bdd8a
+SHA1 (patch-bin_mkrc.in) = 947926fc645f072cd6d1afba5b50b872bd1590d2
+SHA1 (patch-bin_rcup) = 7afba5cba44bb00a2845a66118649b52bf4269fb
+SHA1 (patch-bin_rcup.in) = 90c563c11728986e3a2aa23240ffc337e12ac643
diff --git a/rcm/patches/patch-bin_mkrc b/rcm/patches/patch-bin_mkrc
new file mode 100644
index 0000000000..be86942b04
--- /dev/null
+++ b/rcm/patches/patch-bin_mkrc
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Quote more variable initializations.
+
+Part of upstream:
+
+ <https://github.com/thoughtbot/rcm/commit/f4f6a0722a3f75b2b1e0d820eb6fc3c9d33fa0eb>
+
+--- bin/mkrc.orig	2017-01-07 19:44:47.000000000 +0000
++++ bin/mkrc
+@@ -5,8 +5,8 @@
+ 
+ destination() {
+   local dotfiles_dir="$1"
+-  local dotless=$2
+-  local in_host=$3
++  local dotless="$2"
++  local in_host="$3"
+   local tag="$4"
+ 
+   $DEBUG "destination $dotfiles_dir $dotless $in_host $tag"
diff --git a/rcm/patches/patch-bin_mkrc.in b/rcm/patches/patch-bin_mkrc.in
new file mode 100644
index 0000000000..f84cf26102
--- /dev/null
+++ b/rcm/patches/patch-bin_mkrc.in
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Quote more variable initializations.
+
+Part of upstream:
+
+ <https://github.com/thoughtbot/rcm/commit/f4f6a0722a3f75b2b1e0d820eb6fc3c9d33fa0eb>
+
+--- bin/mkrc.in.orig	2016-12-26 21:56:47.000000000 +0000
++++ bin/mkrc.in
+@@ -5,8 +5,8 @@
+ 
+ destination() {
+   local dotfiles_dir="$1"
+-  local dotless=$2
+-  local in_host=$3
++  local dotless="$2"
++  local in_host="$3"
+   local tag="$4"
+ 
+   $DEBUG "destination $dotfiles_dir $dotless $in_host $tag"
diff --git a/rcm/patches/patch-bin_rcup b/rcm/patches/patch-bin_rcup
new file mode 100644
index 0000000000..95f512723e
--- /dev/null
+++ b/rcm/patches/patch-bin_rcup
@@ -0,0 +1,30 @@
+$NetBSD$
+
+- Avoid to use the `==' (non-POSIX) operator in test(1).
+- Quote args initialization. This fixes a problem with NetBSD sh(1) leading to
+  `local: ${HOME}/.dotfiles: bad variable name' error.
+
+Part of upstream:
+
+ <https://github.com/thoughtbot/rcm/commit/f4f6a0722a3f75b2b1e0d820eb6fc3c9d33fa0eb>
+
+--- bin/rcup.orig	2017-01-07 19:44:47.000000000 +0000
++++ bin/rcup
+@@ -136,7 +136,7 @@ is_linked() {
+ 
+   if [ -h "$dest" ]; then
+     local link_dest=$(readlink $dest)
+-    [ "$link_dest" == "$src" ]
++    [ "$link_dest" = "$src" ]
+   else
+     return 1
+   fi  
+@@ -208,7 +208,7 @@ handle_command_line() {
+   local never_symlink_dirs=
+   local hostname=
+   local generate=0
+-  local args=$*
++  local args="$*"
+   local undotted=
+   local never_undotted=
+   REPLACE_ALL=0
diff --git a/rcm/patches/patch-bin_rcup.in b/rcm/patches/patch-bin_rcup.in
new file mode 100644
index 0000000000..30cdc256bb
--- /dev/null
+++ b/rcm/patches/patch-bin_rcup.in
@@ -0,0 +1,30 @@
+$NetBSD$
+
+- Avoid to use the `==' (non-POSIX) operator in test(1).
+- Quote args initialization. This fixes a problem with NetBSD sh(1) leading to
+  `local: ${HOME}/.dotfiles: bad variable name' error.
+
+Part of upstream:
+
+ <https://github.com/thoughtbot/rcm/commit/f4f6a0722a3f75b2b1e0d820eb6fc3c9d33fa0eb>
+
+--- bin/rcup.in.orig	2016-12-26 21:56:47.000000000 +0000
++++ bin/rcup.in
+@@ -136,7 +136,7 @@ is_linked() {
+ 
+   if [ -h "$dest" ]; then
+     local link_dest=$(readlink $dest)
+-    [ "$link_dest" == "$src" ]
++    [ "$link_dest" = "$src" ]
+   else
+     return 1
+   fi  
+@@ -208,7 +208,7 @@ handle_command_line() {
+   local never_symlink_dirs=
+   local hostname=
+   local generate=0
+-  local args=$*
++  local args="$*"
+   local undotted=
+   local never_undotted=
+   REPLACE_ALL=0
Prev by Date: compiler-rt-netbsd: Fixes in tsan
Next by Date: compiler-rt-netbsd: Implement dirfd(3) on NetBSD
Previous by Thread: compiler-rt-netbsd: Fixes in tsan
Next by Thread: compiler-rt-netbsd: Implement dirfd(3) on NetBSD
Indexes:
Home | Main Index | Thread Index | Old Index