From 25c2583c45b673e48f779a2de5c6529635f414c2 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Wed, 11 Jan 2017 13:38:51 +0000
Subject: [PATCH] projects-dir.mk: Replace mimencode by base64

Use base64 instead of mimencode utility to en-/decode
bootstrap CVS directory, in the hope to better support
Ubuntu, which lacks mimencode.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/projects-dir.mk | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index 6cc50090..6dd6c779 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -1,16 +1,16 @@
 # ------------ initial CVS subdir
 
 define CVSDIR_MIME =
-QlpoOTFBWSZTWSqR0W8AALh/ks+QASBAAf/yb9JbRH9/32AMACAICEhAAjxQBTCUkmTEZGh6
-gAAAAA0AGgHMAmAmRgBGJiYTCYIaYmmBzAJgJkYARiYmEwmCGmJpgFURNE2k1NGlPT1NJmoH
-qDRtBPSY0I9TR6n6p8j3nf86/pWteXvN7hPE0JUJ5YTMwTtERHTg8nDZ0+T+jE0KkjIqYGLY
-j68pmazwxI0CJEWvZzd3Xhgtn9ms8+kQrl216NSKHhymW4MJOHhtxqk83C6M+7jCRlKVA7Df
-cvI+EtcgH0UyCAsieckg3yQUPRw8/p9vb2/xsP1JIXJN0ih1fV6N8RKTFNHLz5E+WlejKqqY
-uMqecnZPYRJtmvih5oUUMDStS9ojVghha1bbdCfGv+Q/43GyGhbYV1msRrKmYwK81tDV1MsY
-vfKFMq3Iuknk3aVdmV4mtG3PsX2ozRgRqMyMqYItEYzFCJU1vuLIrEUiio5Ga2JgzuWL4riY
-Mr1WyjFSxU2M7kXLmO3DGq1LZ3VK9V8/v+7Ajs3ePwceOyrpxxcKeomsJk7hNPaJQ2nw9MQ3
-DH9rncZeypb3eb5H0/zuoE7B2i0DQRFcTJBKgPSwTie7gOeQW6t9tQJQKw5ESj6OT/d7c8F2
-915wWWwLJccyauIwKMqOvoHe8qZtFKU3uZxFnOWM9XWDYXckU4UJAqkdFvA==
+QlpoOTFBWSZTWWJXrDwAALh/ks+QASBAAf/yX0pbRH9/32AMACAICEhAAjxTRLQJSU0MQ0ZGg0NA
+NAABoAYgEoKZqaUZAGIaADQMCAyAGhzCYBMAJhMJpgAAEyaaBgqiIBTU8TQJpiaD1A000NBtQZBp
+6n3Pqd34r6q1rp7jU4p2m4SoTphMzBOYREcazicanaSYFSRyFSwyWry+k1mk8FxGIRIi3mcu7s14
+2XTclqxiGevXXfzEUO/G9pLy18RsGVPNLwrkuTDKRZSlOMwwMQJTB6g4CkUsCBwEb5QQSdHs6fd8
+fl1/PA6SSGRJEm/zzG9nNLlt4+bA5eGliSzcFOglxEOpQlCcxMZVZCFsFBaS1ahpTLYOJOgkrVZd
+WlOoD+DIxNBSklznplYwKIlRNcjVdbDcUWXoXBUzUMLixVoSiM+DqyZl5dPUqYRGJYZlzElgviit
+1xKt9IqrbFGckvqrFw8kGqHCGgFgUJxaEokJQTYmqJYIUJI6KjDLJpOQFkqxIR4t6nC78vJUCYda
+7+mnTW5enMuNjE1hMmwTT6CUMx2e+IaBd7cjYX9dS3stdgij8qBNgeI9ZMCMfEzt0WyJ0E5kmAGI
+gdZdavkjhKwzolGxn/upod7Jqa8YLVthaltxJq2iwovo18A5HatmlIpTU3W0WN4uMfA1g/4u5Ipw
+oSDEr1h4
 endef
 
 define newline
@@ -68,6 +68,7 @@ BUILD_PY       = python $(MOD_SCRIPT_DIR)/build.py -b $(shell pwd) $(BUILD_PY_EX
 PURGE_SH       = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge-stale-projects.sh /opt/ytools/bin/purge-stale-projects.sh) purge-not-found)
 RELEASE_SH     = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/build-release.sh /opt/ytools/bin/build-release.sh) release-not-found)
 BROWSER       ?= firefox
+THIS_MAKEFILE  = $(lastword $(MAKEFILE_LIST))
 
 # ------------ targets
   
@@ -182,13 +183,19 @@ links.done:
 
 cvsdir.done:
 	if [ ! -d CVS ]; then \
-		echo -e '$(subst $(newline),\n,${CVSDIR_MIME})' | mimencode -u | tar -xjf - ;\
+		echo -e '$(subst $(newline),\n,${CVSDIR_MIME})' | base64 -d | tar -xjf - ;\
 	fi
 	if grep -q "^:ext:jan@cvs.jannet.de:" CVS/Root; then \
 		echo $(CVSROOT) > CVS/Root ;\
 	fi
 	touch $@
 
+re-encode:
+	tar -cjf - CVS | base64 | \
+		sed '/^define CVSDIR_MIME =/,/^endef/ {//!d}; /^define CVSDIR_MIME =/r/dev/stdin' \
+		$(THIS_MAKEFILE) > $(THIS_MAKEFILE).tmp
+	mv $(THIS_MAKEFILE).tmp $(THIS_MAKEFILE)
+
 cvs-update.done: cvsdir.done
 	cvs update -dP $(CVS_PROJECTS)
 	touch $@