Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1637646813209370"
MIME-Version: 1.0
Date: Tue, 23 Nov 2021 05:53:33 +0000
From: "Masatake Daimon" <pho@netbsd.org>
Subject: CVS commit: pkgsrc/sysutils
To: pkgsrc-changes@NetBSD.org
Reply-To: pho@netbsd.org
Message-Id: <20211123055333.A14C5FAEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1637646813209370
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	pho
Date:		Tue Nov 23 05:53:33 UTC 2021

Modified Files:
	pkgsrc/sysutils: Makefile
Added Files:
	pkgsrc/sysutils/yadm: DESCR Makefile PLIST distinfo options.mk

Log Message:
Import yadm-3.1.1

yadm is a tool for managing dotfiles.

* Based on Git, with full range of Git's features
* Supports system-specific alternative files or templated files
* Encryption of private data using GnuPG, OpenSSL, transcrypt, or
  git-crypt
* Customizable initialization (bootstrapping)
* Customizable hooks for before and after any operation

Complete features, usage, examples and installation instructions can
be found on the yadm.io website.


To generate a diff of this commit:
cvs rdiff -u -r1.972 -r1.973 pkgsrc/sysutils/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/yadm/DESCR \
    pkgsrc/sysutils/yadm/Makefile pkgsrc/sysutils/yadm/PLIST \
    pkgsrc/sysutils/yadm/distinfo pkgsrc/sysutils/yadm/options.mk

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


--_----------=_1637646813209370
Content-Disposition: inline
Content-Length: 6854
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/sysutils/Makefile
diff -u pkgsrc/sysutils/Makefile:1.972 pkgsrc/sysutils/Makefile:1.973
--- pkgsrc/sysutils/Makefile:1.972	Wed Nov 17 17:13:30 2021
+++ pkgsrc/sysutils/Makefile	Tue Nov 23 05:53:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.972 2021/11/17 17:13:30 sjmulder Exp $
+# $NetBSD: Makefile,v 1.973 2021/11/23 05:53:33 pho Exp $
 #
 
 COMMENT=	System utilities
@@ -887,6 +887,7 @@ SUBDIR+=	xosview
 SUBDIR+=	xplr
 SUBDIR+=	xps
 SUBDIR+=	xuvmstat
+SUBDIR+=	yadm
 SUBDIR+=	yank
 SUBDIR+=	ytree
 SUBDIR+=	zabbix

Added files:

Index: pkgsrc/sysutils/yadm/DESCR
diff -u /dev/null pkgsrc/sysutils/yadm/DESCR:1.1
--- /dev/null	Tue Nov 23 05:53:33 2021
+++ pkgsrc/sysutils/yadm/DESCR	Tue Nov 23 05:53:33 2021
@@ -0,0 +1,11 @@
+yadm is a tool for managing dotfiles.
+
+* Based on Git, with full range of Git's features
+* Supports system-specific alternative files or templated files
+* Encryption of private data using GnuPG, OpenSSL, transcrypt, or
+  git-crypt
+* Customizable initialization (bootstrapping)
+* Customizable hooks for before and after any operation
+
+Complete features, usage, examples and installation instructions can
+be found on the yadm.io website.
Index: pkgsrc/sysutils/yadm/Makefile
diff -u /dev/null pkgsrc/sysutils/yadm/Makefile:1.1
--- /dev/null	Tue Nov 23 05:53:33 2021
+++ pkgsrc/sysutils/yadm/Makefile	Tue Nov 23 05:53:33 2021
@@ -0,0 +1,82 @@
+# $NetBSD: Makefile,v 1.1 2021/11/23 05:53:33 pho Exp $
+
+DISTNAME=	yadm-3.1.1
+CATEGORIES=	sysutils
+MASTER_SITES=	${MASTER_SITE_GITHUB:=TheLocehiliosan/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://yadm.io/
+COMMENT=	Yet Another Dotfiles Manager
+LICENSE=	gnu-gpl-v3
+
+USE_TOOLS+=	bash:run gawk:run tar:run
+NO_BUILD=	yes
+
+DEPENDS+=	git-base-[0-9]*:../../devel/git-base
+
+# yadm by default initially launches as a /bin/sh script and then
+# exec's bash that happens to be in $PATH. Prevent it from doing that.
+REPLACE_BASH+=	yadm
+
+# Embed paths to external programs and don't try to find ones in $PATH.
+YADM_PROGS=	# empty
+YADM_PROGS+=	GIT_PROGRAM="${PREFIX:Q}/bin/git"
+YADM_PROGS+=	AWK_PROGRAM=("${TOOLS_PATH.gawk:Q}")
+
+# These programs are not in pkgsrc (yet).
+YADM_PROGS+=	GIT_CRYPT_PROGRAM="/nonexistent"
+YADM_PROGS+=	TRANSCRYPT_PROGRAM="/nonexistent"
+YADM_PROGS+=	J2CLI_PROGRAM="/nonexistent"
+YADM_PROGS+=	ENVTPL_PROGRAM="/nonexistent"
+YADM_PROGS+=	ESH_PROGRAM="/nonexistent"
+
+SUBST_CLASSES+=		progs
+SUBST_STAGE.progs=	pre-configure
+SUBST_FILES.progs=	yadm
+# We can't use .for here, because variables like TOOLS_PATH.* are not
+# defined yet. Even bsd.prefs.mk doesn't define them.
+SUBST_SED.progs+=	${YADM_PROGS:@pair@-e 's|${pair:C/=.*//}=.*$$|${pair}|'@}
+
+# These scripts are intended to be copied into yadm repositories which
+# can possibly be cloned onto systems without pkgsrc. It is therefore
+# inappropriate to use pkgsrc-specific interpreter paths.
+REPLACE_INTERPRETER+=		env-bash
+REPLACE.env-bash.old=		.*bash
+REPLACE.env-bash.new=		${TOOLS_PATH.env} bash
+REPLACE_FILES.env-bash=		contrib/bootstrap/bootstrap-in-dir
+REPLACE_FILES.env-bash+=	contrib/hooks/parsing_full_command_example/pre_log
+
+.include "options.mk"
+
+INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1
+INSTALLATION_DIRS+=	share/bash-completion/completions
+INSTALLATION_DIRS+=	share/fish/completions
+INSTALLATION_DIRS+=	share/zsh/site-functions
+INSTALLATION_DIRS+=	share/doc/yadm
+INSTALLATION_DIRS+=	share/examples/yadm
+do-install:
+	${INSTALL_SCRIPT} \
+		"${WRKSRC}/yadm" \
+		"${DESTDIR}${PREFIX}/bin/"
+	${INSTALL_MAN} \
+		"${WRKSRC}/yadm.1" \
+		"${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/"
+	${INSTALL_DATA} \
+		"${WRKSRC}/completion/bash/yadm" \
+		"${DESTDIR}${PREFIX}/share/bash-completion/completions/"
+	${INSTALL_DATA} \
+		"${WRKSRC}/completion/fish/yadm.fish" \
+		"${DESTDIR}${PREFIX}/share/fish/completions/"
+	${INSTALL_DATA} \
+		"${WRKSRC}/completion/zsh/_yadm" \
+		"${DESTDIR}${PREFIX}/share/zsh/site-functions/"
+	for f in CHANGES CONTRIBUTORS LICENSE README.md; do \
+		${INSTALL_DATA} \
+			"${WRKSRC}/$${f}" \
+			"${DESTDIR}${PREFIX}/share/doc/yadm/"; \
+	done
+	( cd "${WRKSRC}/contrib" && ${TAR} -cf - . ) | \
+		( cd "${DESTDIR}${PREFIX}/share/examples/yadm" && ${TAR} -xf - )
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/yadm/PLIST
diff -u /dev/null pkgsrc/sysutils/yadm/PLIST:1.1
--- /dev/null	Tue Nov 23 05:53:33 2021
+++ pkgsrc/sysutils/yadm/PLIST	Tue Nov 23 05:53:33 2021
@@ -0,0 +1,18 @@
+@comment $NetBSD: PLIST,v 1.1 2021/11/23 05:53:33 pho Exp $
+bin/yadm
+man/man1/yadm.1
+share/bash-completion/completions/yadm
+share/doc/yadm/CHANGES
+share/doc/yadm/CONTRIBUTORS
+share/doc/yadm/LICENSE
+share/doc/yadm/README.md
+share/examples/yadm/bootstrap/bootstrap-in-dir
+share/examples/yadm/hooks/README.md
+share/examples/yadm/hooks/encrypt_with_checksums/README.md
+share/examples/yadm/hooks/encrypt_with_checksums/post_encrypt
+share/examples/yadm/hooks/encrypt_with_checksums/post_list
+share/examples/yadm/hooks/encrypt_with_checksums/post_status
+share/examples/yadm/hooks/parsing_full_command_example/README.md
+share/examples/yadm/hooks/parsing_full_command_example/pre_log
+share/fish/completions/yadm.fish
+share/zsh/site-functions/_yadm
Index: pkgsrc/sysutils/yadm/distinfo
diff -u /dev/null pkgsrc/sysutils/yadm/distinfo:1.1
--- /dev/null	Tue Nov 23 05:53:33 2021
+++ pkgsrc/sysutils/yadm/distinfo	Tue Nov 23 05:53:33 2021
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2021/11/23 05:53:33 pho Exp $
+
+BLAKE2s (yadm-3.1.1.tar.gz) = 52047f27c74e92144406cd48db154eb52ff99e86015657c8e85c69eed514abc4
+SHA512 (yadm-3.1.1.tar.gz) = 6be40ff6b1130be93649bb533d63ddc2dad626bb3022392863b600b31eef2529df443a9eb24915979bef2d1ea4ef04124668723ffb0ce0f86727f481a3997c74
+Size (yadm-3.1.1.tar.gz) = 106890 bytes
Index: pkgsrc/sysutils/yadm/options.mk
diff -u /dev/null pkgsrc/sysutils/yadm/options.mk:1.1
--- /dev/null	Tue Nov 23 05:53:33 2021
+++ pkgsrc/sysutils/yadm/options.mk	Tue Nov 23 05:53:33 2021
@@ -0,0 +1,35 @@
+# $NetBSD: options.mk,v 1.1 2021/11/23 05:53:33 pho Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.yadm
+PKG_SUPPORTED_OPTIONS=	openssl
+PKG_SUGGESTED_OPTIONS=	gnupg2
+
+PKG_OPTIONS_OPTIONAL_GROUPS=	gpg
+PKG_OPTIONS_GROUP.gpg=		gnupg1 gnupg2
+
+.include "../../mk/bsd.options.mk"
+
+###
+### openssl support
+###
+.if !empty(PKG_OPTIONS:Mopenssl)
+USE_TOOLS+=	openssl:run
+YADM_PROGS+=	OPENSSL_PROGRAM="${TOOLS_PATH.openssl}"
+.else
+YADM_PROGS+=	OPENSSL_PROGRAM="/nonexistent"
+.endif
+
+###
+### gnupg1 or gnupg2 support
+###
+.if !empty(PKG_OPTIONS:Mgnupg1)
+DEPENDS+=	gnupg-[0-9]*:../../security/gnupg
+YADM_PROGS+=	GPG_PROGRAM="${PREFIX}/bin/gpg"
+
+.elif !empty(PKG_OPTIONS:Mgnupg2)
+DEPENDS+=	gnupg2-[0-9]*:../../security/gnupg2
+YADM_PROGS+=	GPG_PROGRAM="${PREFIX}/bin/gpg2"
+
+.else
+YADM_PROGS+=	GPG_PROGRAM="/nonexistent"
+.endif


--_----------=_1637646813209370--