From 4ed66b274663ef20dbe613b319e8c4549bad6411 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Tue, 25 Jun 2019 00:57:55 -0400
Subject: source.mk: Support patch versions again

---
(limited to 'source.mk')

diff --git a/source.mk b/source.mk
index 8357921..ad726ac 100644
--- a/source.mk
+++ b/source.mk
@@ -1,5 +1,8 @@
-upstream_archive = $(OPK_SOURCE)-$(OPK_SOURCE_VERSION_UPSTREAM).tar.gz
-upstream_url = http://invisible-mirror.net/archives/ncurses/$(upstream_archive)
+upstream_version = $$(printf '%s\n' '$(OPK_SOURCE_VERSION_UPSTREAM)' | \
+	sed 's/+/-/')
+upstream_archive = $(OPK_SOURCE)-$(upstream_version).tgz
+upstream_url_base = http://invisible-mirror.net/archives/ncurses/current
+upstream_url = $(upstream_url_base)/$(upstream_archive)
 source_archive = ../$(OPK_SOURCE)-$(OPK_SOURCE_VERSION_UPSTREAM).orig.tar.gz
 
 gpg = GNUPGHOME=gnupghome/ gpg --no-default-keyring --keyring ../keyring.gpg
@@ -7,17 +10,17 @@ keys = \
 	'C520 48C0 C074 8FEE 227D  47A2 7023 53E0 F7E4 8EDB'
 
 $(source_archive):
-	wget -c '$(upstream_url)' '$(upstream_url).asc'
+	wget -c "$(upstream_url)" "$(upstream_url).asc"
 	install -m 0700 -d gnupghome/
 	[ -e ../keyring.gpg ] || \
 		$(gpg) --keyserver hkp://pool.sks-keyservers.net \
 			--recv-keys $(keys); \
 	rm -f ../keyring.gpg~; \
-	if ! $(gpg) --verify '$(upstream_archive).asc'; then \
+	if ! $(gpg) --verify "$(upstream_archive).asc"; then \
 		rm -Rf gnupghome/; \
 		exit 1; \
 	fi
 	rm -Rf gnupghome/
-	mv '$(upstream_archive)' '$(source_archive)'
+	mv "$(upstream_archive)" '$(source_archive)'
 
 source: $(source_archive)
--
cgit v0.9.1