From 9362dfcb9fc63e107a1c0fbf4ab8fcb5f6b07cfc Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Tue, 31 Dec 2019 03:38:22 -0600
Subject: [PATCH 1/2] New pacakge: tldr-0.6.1

---
 srcpkgs/tldr/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/tldr/template

diff --git a/srcpkgs/tldr/template b/srcpkgs/tldr/template
new file mode 100644
index 00000000000..ca745d485ba
--- /dev/null
+++ b/srcpkgs/tldr/template
@@ -0,0 +1,19 @@
+# Template file for 'tldr'
+pkgname=tldr
+version=0.6.1
+revision=1
+build_style=go
+go_import_path="github.com/isacikgoz/tldr"
+hostmakedepends="git"
+short_desc="Fast and interactive TLDR client written in Go"
+maintainer="Nathan Owens <ndowens04@gmail.com>"
+license="MIT"
+homepage="https://isacikgoz.me/tldr/"
+distfiles="https://github.com/isacikgoz/tldr/archive/v${version}.tar.gz"
+checksum=e377942c6dd9cbe3f9f55b7614e17b7c5f0694b326ad3993d0cde59aca8dc8fa
+alternatives="tldr:tldr:/usr/bin/gtldr"
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/tldr ${DESTDIR}/usr/bin/gtldr
+	vlicense LICENSE
+}

From c89da42ad17edc6c94b07652cf2a9978c6143197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 1 Jan 2020 18:54:17 -0300
Subject: [PATCH 2/2] tealdeer: make tealdeer a tldr alternative

Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
 srcpkgs/tealdeer/template | 12 ++++++++++--
 srcpkgs/tldr/template     |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 676aa940448..fbf9d7af254 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,18 +1,24 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="libressl-devel"
 depends="libressl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
-license="MIT license or Apache License, Version 2"
+license="MIT, Apache-2.0"
 homepage="https://github.com/dbrgn/tealdeer"
 changelog="https://raw.githubusercontent.com/dbrgn/tealdeer/v${version}/CHANGELOG.md"
 distfiles="https://github.com/dbrgn/tealdeer/archive/v${version}.tar.gz"
 checksum=5cf286059b823501d05da445b9b7a609ec2da91d711d990df76397f79d800c52
+alternatives="tldr:/usr/bin/tldr:/usr/bin/tealdeer"
+
+pre_build() {
+	cargo update --package openssl --precise 0.10.26
+	cargo update --package openssl-sys --precise 0.9.53
+}
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.53
@@ -20,4 +26,6 @@ pre_build() {
 
 post_install() {
 	vlicense LICENSE-MIT
+	vlicense LICENSE-APACHE
+	mv ${DESTDIR}/usr/bin/tldr ${DESTDIR}/usr/bin/tealdeer
 }
diff --git a/srcpkgs/tldr/template b/srcpkgs/tldr/template
index ca745d485ba..6c94e84a503 100644
--- a/srcpkgs/tldr/template
+++ b/srcpkgs/tldr/template
@@ -12,6 +12,7 @@ homepage="https://isacikgoz.me/tldr/"
 distfiles="https://github.com/isacikgoz/tldr/archive/v${version}.tar.gz"
 checksum=e377942c6dd9cbe3f9f55b7614e17b7c5f0694b326ad3993d0cde59aca8dc8fa
 alternatives="tldr:tldr:/usr/bin/gtldr"
+conflicts="tealdeer<=1.2.0_1"
 
 post_install() {
 	mv ${DESTDIR}/usr/bin/tldr ${DESTDIR}/usr/bin/gtldr