From 9d778a658df350c4dbd265698cd6716864706b11 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Mon, 10 Jun 2013 11:38:52 +0200
Subject: [PATCH] ports/libports: Avoid multi-target rules

This patch splits the download of signatures from the download of the
archive to improve robustness. This way, signature files will be
downloaded even if the corresponding archive is already in place.

Issue #748
---
 libports/ports/curl.mk     |  4 +++-
 libports/ports/freetype.mk |  4 +++-
 libports/ports/fribidi.mk  |  8 +++++++-
 libports/ports/gmp.mk      |  4 +++-
 libports/ports/libav.mk    | 12 +++++++++---
 libports/ports/libiconv.mk |  5 ++++-
 libports/ports/libssh.mk   |  5 ++++-
 libports/ports/mpc.mk      |  5 ++++-
 libports/ports/mpfr.mk     |  5 ++++-
 libports/ports/ncurses.mk  |  5 ++++-
 libports/ports/openssl.mk  |  5 ++++-
 libports/ports/pcre.mk     |  5 ++++-
 libports/ports/python.mk   |  4 +++-
 libports/ports/readline.mk |  5 ++++-
 libports/ports/sdl.mk      |  5 ++++-
 libports/ports/stdcxx.mk   |  5 ++++-
 ports/ports/bash.mk        |  5 ++++-
 ports/ports/binutils.mk    |  5 ++++-
 ports/ports/coreutils.mk   |  5 ++++-
 ports/ports/findutils.mk   |  5 ++++-
 ports/ports/gcc.mk         |  5 ++++-
 ports/ports/gdb.mk         |  5 ++++-
 ports/ports/lighttpd.mk    |  5 ++++-
 ports/ports/lynx.mk        |  4 +++-
 ports/ports/make.mk        |  5 ++++-
 ports/ports/openssh.mk     |  5 ++++-
 ports/ports/which.mk       |  5 ++++-
 27 files changed, 111 insertions(+), 29 deletions(-)

diff --git a/libports/ports/curl.mk b/libports/ports/curl.mk
index c37336c96..ee3b7f30d 100644
--- a/libports/ports/curl.mk
+++ b/libports/ports/curl.mk
@@ -21,9 +21,11 @@ $(CONTRIB_DIR)/$(CURL): clean-curl
 #
 $(DOWNLOAD_DIR)/$(CURL_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(CURL_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(CURL_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(CURL_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(CURL_TGZ).verified: $(DOWNLOAD_DIR)/$(CURL_TGZ)
+$(DOWNLOAD_DIR)/$(CURL_TGZ).verified: $(DOWNLOAD_DIR)/$(CURL_TGZ) $(DOWNLOAD_DIR)/$(CURL_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(CURL_TGZ) $(DOWNLOAD_DIR)/$(CURL_SIG) $(CURL_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/libports/ports/freetype.mk b/libports/ports/freetype.mk
index e84d4fcb6..5ab6f5401 100644
--- a/libports/ports/freetype.mk
+++ b/libports/ports/freetype.mk
@@ -20,9 +20,11 @@ $(CONTRIB_DIR)/$(FREETYPE): clean-freetype
 #
 $(DOWNLOAD_DIR)/$(FREETYPE_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(FREETYPE_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(FREETYPE_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(FREETYPE_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(FREETYPE_TGZ).verified: $(DOWNLOAD_DIR)/$(FREETYPE_TGZ)
+$(DOWNLOAD_DIR)/$(FREETYPE_TGZ).verified: $(DOWNLOAD_DIR)/$(FREETYPE_TGZ) $(DOWNLOAD_DIR)/$(FREETYPE_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(FREETYPE_TGZ) $(DOWNLOAD_DIR)/$(FREETYPE_SIG) $(FREETYPE_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/libports/ports/fribidi.mk b/libports/ports/fribidi.mk
index 8082aec01..879a10882 100644
--- a/libports/ports/fribidi.mk
+++ b/libports/ports/fribidi.mk
@@ -23,10 +23,16 @@ $(CONTRIB_DIR)/$(FRIBIDI):clean-fribidi
 #
 $(DOWNLOAD_DIR)/$(FRIBIDI_TBZ2):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(FRIBIDI_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(FRIBIDI_SHA):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(FRIBIDI_URL_SHA) && touch $@
+
+$(DOWNLOAD_DIR)/$(FRIBIDI_SHA_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(FRIBIDI_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(FRIBIDI_TBZ2).verified: $(DOWNLOAD_DIR)/$(FRIBIDI_TBZ2)
+$(DOWNLOAD_DIR)/$(FRIBIDI_TBZ2).verified: $(DOWNLOAD_DIR)/$(FRIBIDI_TBZ2) \
+                                          $(DOWNLOAD_DIR)/$(FRIBIDI_SHA) \
+                                          $(DOWNLOAD_DIR)/$(FRIBIDI_SHA_SIG)
 	# XXX fribidi does NOT create a detached signature and thus the signature
 	# checking is useless !!! -- somebody should inform them
 	# see http://blog.terryburton.co.uk/2006/11/falling-into-trap-with-gpg.html
diff --git a/libports/ports/gmp.mk b/libports/ports/gmp.mk
index 4fb048019..f875fe9a8 100644
--- a/libports/ports/gmp.mk
+++ b/libports/ports/gmp.mk
@@ -34,9 +34,11 @@ $(CONTRIB_DIR)/$(GMP): clean-gmp
 #
 $(DOWNLOAD_DIR)/$(GMP_TBZ2):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(GMP_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(GMP_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(GMP_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(GMP_TBZ2).verified: $(DOWNLOAD_DIR)/$(GMP_TBZ2)
+$(DOWNLOAD_DIR)/$(GMP_TBZ2).verified: $(DOWNLOAD_DIR)/$(GMP_TBZ2) $(DOWNLOAD_DIR)/$(GMP_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(GMP_TBZ2) $(DOWNLOAD_DIR)/$(GMP_SIG) $(GMP_KEY)
 
 $(CONTRIB_DIR)/$(GMP): $(DOWNLOAD_DIR)/$(GMP_TBZ2).verified
diff --git a/libports/ports/libav.mk b/libports/ports/libav.mk
index 93921deb6..08ad83789 100644
--- a/libports/ports/libav.mk
+++ b/libports/ports/libav.mk
@@ -30,10 +30,16 @@ $(CONTRIB_DIR)/$(LIBAV): clean-libav
 #
 $(DOWNLOAD_DIR)/$(LIBAV_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIBAV_URL) && touch $@
-	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIBAV_URL_SHA) && touch $@
-	#$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIBAV_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(LIBAV_TGZ).verified: $(DOWNLOAD_DIR)/$(LIBAV_TGZ)
+$(DOWNLOAD_DIR)/$(LIBAV_SHA):
+	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIBAV_URL_SHA) && touch $@
+
+$(DOWNLOAD_DIR)/$(LIBAV_SIG):
+	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIBAV_URL_SIG) && touch $@
+
+$(DOWNLOAD_DIR)/$(LIBAV_TGZ).verified: $(DOWNLOAD_DIR)/$(LIBAV_TGZ) \
+                                       $(DOWNLOAD_DIR)/$(LIBAV_SHA) \
+                                       $(DOWNLOAD_DIR)/$(LIBAV_SIG)
 	# XXX Hash verification of libav does not ensure authenticity
 	$(VERBOSE)$(HASHVERIFIER) $(DOWNLOAD_DIR)/$(LIBAV_TGZ) $(DOWNLOAD_DIR)/$(LIBAV_SHA) sha1
 	$(VERBOSE)touch $@
diff --git a/libports/ports/libiconv.mk b/libports/ports/libiconv.mk
index 0b10a4561..1c6d5263b 100644
--- a/libports/ports/libiconv.mk
+++ b/libports/ports/libiconv.mk
@@ -18,9 +18,12 @@ prepare-libiconv: $(CONTRIB_DIR)/$(LIBICONV) include/iconv
 #
 $(DOWNLOAD_DIR)/$(LIBICONV_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIBICONV_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(LIBICONV_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIBICONV_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(LIBICONV_TGZ).verified: $(DOWNLOAD_DIR)/$(LIBICONV_TGZ)
+$(DOWNLOAD_DIR)/$(LIBICONV_TGZ).verified: $(DOWNLOAD_DIR)/$(LIBICONV_TGZ) \
+                                          $(DOWNLOAD_DIR)/$(LIBICONV_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(LIBICONV_TGZ) $(DOWNLOAD_DIR)/$(LIBICONV_SIG) $(LIBICONV_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/libports/ports/libssh.mk b/libports/ports/libssh.mk
index 37ff68ffc..1911990d2 100644
--- a/libports/ports/libssh.mk
+++ b/libports/ports/libssh.mk
@@ -26,9 +26,12 @@ $(CONTRIB_DIR)/$(LIBSSH): clean-libssh
 #
 $(DOWNLOAD_DIR)/$(LIBSSH_TGZ):
 	$(VERBOSE)wget --no-check-certificate -c -P $(DOWNLOAD_DIR) $(LIBSSH_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(LIBSSH_SIG):
 	$(VERBOSE)wget --no-check-certificate -c -P $(DOWNLOAD_DIR) $(LIBSSH_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(LIBSSH_TGZ).verified: $(DOWNLOAD_DIR)/$(LIBSSH_TGZ)
+$(DOWNLOAD_DIR)/$(LIBSSH_TGZ).verified: $(DOWNLOAD_DIR)/$(LIBSSH_TGZ) \
+                                        $(DOWNLOAD_DIR)/$(LIBSSH_SIG)
 	# XXX We have no key for libssh at the moment
 	#$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(LIBSSH_TGZ) $(DOWNLOAD_DIR)/$(LIBSSH_SIG) $(LIBSSH_KEY)
 	$(VERBOSE)touch $@
diff --git a/libports/ports/mpc.mk b/libports/ports/mpc.mk
index c9df4565e..4ba109fd6 100644
--- a/libports/ports/mpc.mk
+++ b/libports/ports/mpc.mk
@@ -25,9 +25,12 @@ $(CONTRIB_DIR)/$(MPC): clean-mpc
 #
 $(DOWNLOAD_DIR)/$(MPC_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(MPC_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(MPC_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(MPC_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(MPC_TGZ).verified: $(DOWNLOAD_DIR)/$(MPC_TGZ)
+$(DOWNLOAD_DIR)/$(MPC_TGZ).verified: $(DOWNLOAD_DIR)/$(MPC_TGZ) \
+                                     $(DOWNLOAD_DIR)/$(MPC_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(MPC_TGZ) $(DOWNLOAD_DIR)/$(MPC_SIG) $(MPC_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/libports/ports/mpfr.mk b/libports/ports/mpfr.mk
index 3bea2e636..57051841f 100644
--- a/libports/ports/mpfr.mk
+++ b/libports/ports/mpfr.mk
@@ -22,9 +22,12 @@ $(CONTRIB_DIR)/$(MPFR): clean-mpfr
 #
 $(DOWNLOAD_DIR)/$(MPFR_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(MPFR_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(MPFR_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(MPFR_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(MPFR_TGZ).verified: $(DOWNLOAD_DIR)/$(MPFR_TGZ)
+$(DOWNLOAD_DIR)/$(MPFR_TGZ).verified: $(DOWNLOAD_DIR)/$(MPFR_TGZ) \
+                                      $(DOWNLOAD_DIR)/$(MPFR_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(MPFR_TGZ) $(DOWNLOAD_DIR)/$(MPFR_SIG) $(MPFR_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/libports/ports/ncurses.mk b/libports/ports/ncurses.mk
index d7dbfb543..1bed012f3 100644
--- a/libports/ports/ncurses.mk
+++ b/libports/ports/ncurses.mk
@@ -42,9 +42,12 @@ $(NCURSES_GEN_SYMLINKS) $(NCURSES_GEN_FILES): $(CONTRIB_DIR)/$(NCURSES) src/lib/
 #
 $(DOWNLOAD_DIR)/$(NCURSES_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(NCURSES_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(NCURSES_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(NCURSES_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(NCURSES_TGZ).verified: $(DOWNLOAD_DIR)/$(NCURSES_TGZ)
+$(DOWNLOAD_DIR)/$(NCURSES_TGZ).verified: $(DOWNLOAD_DIR)/$(NCURSES_TGZ) \
+                                         $(DOWNLOAD_DIR)/$(NCURSES_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(NCURSES_TGZ) $(DOWNLOAD_DIR)/$(NCURSES_SIG) $(NCURSES_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/libports/ports/openssl.mk b/libports/ports/openssl.mk
index 49de79d13..231711fbb 100644
--- a/libports/ports/openssl.mk
+++ b/libports/ports/openssl.mk
@@ -24,9 +24,12 @@ prepare-openssl: $(CONTRIB_DIR)/$(OPENSSL) include/openssl generate_asm
 #
 $(DOWNLOAD_DIR)/$(OPENSSL_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(OPENSSL_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(OPENSSL_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(OPENSSL_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(OPENSSL_TGZ).verified: $(DOWNLOAD_DIR)/$(OPENSSL_TGZ)
+$(DOWNLOAD_DIR)/$(OPENSSL_TGZ).verified: $(DOWNLOAD_DIR)/$(OPENSSL_TGZ) \
+                                         $(DOWNLOAD_DIR)/$(OPENSSL_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(OPENSSL_TGZ) $(DOWNLOAD_DIR)/$(OPENSSL_SIG) $(OPENSSL_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/libports/ports/pcre.mk b/libports/ports/pcre.mk
index 556a5c6ca..68f5800d9 100644
--- a/libports/ports/pcre.mk
+++ b/libports/ports/pcre.mk
@@ -21,9 +21,12 @@ $(CONTRIB_DIR)/$(PCRE): clean-pcre
 #
 $(DOWNLOAD_DIR)/$(PCRE_TBZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(PCRE_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(PCRE_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(PCRE_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(PCRE_TBZ).verified: $(DOWNLOAD_DIR)/$(PCRE_TBZ)
+$(DOWNLOAD_DIR)/$(PCRE_TBZ).verified: $(DOWNLOAD_DIR)/$(PCRE_TBZ) \
+                                      $(DOWNLOAD_DIR)/$(PCRE_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(PCRE_TBZ) $(DOWNLOAD_DIR)/$(PCRE_SIG) $(PCRE_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/libports/ports/python.mk b/libports/ports/python.mk
index 98f6eb83a..3722a3b89 100644
--- a/libports/ports/python.mk
+++ b/libports/ports/python.mk
@@ -21,13 +21,15 @@ $(CONTRIB_DIR)/$(PYTHON): clean-python
 $(DOWNLOAD_DIR)/$(PYTHON_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(PYTHON_URL) && touch $@
 
+$(DOWNLOAD_DIR)/$(PYTHON_SIG):
+	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(PYTHON_URL_SIG) && touch $@
+
 $(DOWNLOAD_DIR)/$(PYTHON_TGZ).verified: $(DOWNLOAD_DIR)/$(PYTHON_TGZ)
 	#
 	# As signatures are only provided for versions 2.7.3 and newer, the check
 	# is yet disabled. Just remove the comment sign once the newer version is
 	# used.
 	#
-	#$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(PYTHON_URL_SIG) && touch $@
 	#$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(PYTHON_TGZ) $(DOWNLOAD_DIR)/$(PYTHON_SIG) $(PYTHON_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/libports/ports/readline.mk b/libports/ports/readline.mk
index c55c8fc49..1398683bd 100644
--- a/libports/ports/readline.mk
+++ b/libports/ports/readline.mk
@@ -20,9 +20,12 @@ $(CONTRIB_DIR)/$(READLINE): clean-readline
 #
 $(DOWNLOAD_DIR)/$(READLINE_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(READLINE_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(READLINE_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(READLINE_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(READLINE_TGZ).verified: $(DOWNLOAD_DIR)/$(READLINE_TGZ)
+$(DOWNLOAD_DIR)/$(READLINE_TGZ).verified: $(DOWNLOAD_DIR)/$(READLINE_TGZ) \
+                                          $(DOWNLOAD_DIR)/$(READLINE_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(READLINE_TGZ) $(DOWNLOAD_DIR)/$(READLINE_SIG) $(READLINE_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/libports/ports/sdl.mk b/libports/ports/sdl.mk
index c1fd920d7..96546adf2 100644
--- a/libports/ports/sdl.mk
+++ b/libports/ports/sdl.mk
@@ -24,9 +24,12 @@ $(CONTRIB_DIR)/$(SDL): clean-sdl
 #
 $(DOWNLOAD_DIR)/$(SDL_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(SDL_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(SDL_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(SDL_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(SDL_TGZ).verified: $(DOWNLOAD_DIR)/$(SDL_TGZ)
+$(DOWNLOAD_DIR)/$(SDL_TGZ).verified: $(DOWNLOAD_DIR)/$(SDL_TGZ) \
+                                     $(DOWNLOAD_DIR)/$(SDL_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(SDL_TGZ) $(DOWNLOAD_DIR)/$(SDL_SIG) $(SDL_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/libports/ports/stdcxx.mk b/libports/ports/stdcxx.mk
index c19f8b733..81446cbd2 100644
--- a/libports/ports/stdcxx.mk
+++ b/libports/ports/stdcxx.mk
@@ -44,9 +44,12 @@ $(CONTRIB_DIR)/$(STDCXX): clean-stdcxx
 #
 $(DOWNLOAD_DIR)/$(STDCXX_TBZ2):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) -O$@ $(STDCXX_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(STDCXX_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(STDCXX_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(STDCXX_TBZ2).verified: $(DOWNLOAD_DIR)/$(STDCXX_TBZ2)
+$(DOWNLOAD_DIR)/$(STDCXX_TBZ2).verified: $(DOWNLOAD_DIR)/$(STDCXX_TBZ2) \
+                                         $(DOWNLOAD_DIR)/$(STDCXX_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(STDCXX_TBZ2) $(DOWNLOAD_DIR)/$(STDCXX_SIG) $(STDCXX_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/ports/ports/bash.mk b/ports/ports/bash.mk
index 8074a0a2b..5831e6123 100644
--- a/ports/ports/bash.mk
+++ b/ports/ports/bash.mk
@@ -18,9 +18,12 @@ prepare:: $(CONTRIB_DIR)/$(BASH)
 #
 $(DOWNLOAD_DIR)/$(BASH_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(BASH_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(BASH_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(BASH_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(BASH_TGZ).verified: $(DOWNLOAD_DIR)/$(BASH_TGZ)
+$(DOWNLOAD_DIR)/$(BASH_TGZ).verified: $(DOWNLOAD_DIR)/$(BASH_TGZ) \
+                                      $(DOWNLOAD_DIR)/$(BASH_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(BASH_TGZ) $(DOWNLOAD_DIR)/$(BASH_SIG) $(BASH_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/ports/ports/binutils.mk b/ports/ports/binutils.mk
index 41642acbf..1448333dc 100644
--- a/ports/ports/binutils.mk
+++ b/ports/ports/binutils.mk
@@ -18,9 +18,12 @@ prepare:: $(CONTRIB_DIR)/$(BINUTILS)
 #
 $(DOWNLOAD_DIR)/$(BINUTILS_TBZ2):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(BINUTILS_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(BINUTILS_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(BINUTILS_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(BINUTILS_TBZ2).verified: $(DOWNLOAD_DIR)/$(BINUTILS_TBZ2)
+$(DOWNLOAD_DIR)/$(BINUTILS_TBZ2).verified: $(DOWNLOAD_DIR)/$(BINUTILS_TBZ2) \
+                                           $(DOWNLOAD_DIR)/$(BINUTILS_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(BINUTILS_TBZ2) $(DOWNLOAD_DIR)/$(BINUTILS_SIG) $(BINUTILS_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/ports/ports/coreutils.mk b/ports/ports/coreutils.mk
index b46e37807..74d694273 100644
--- a/ports/ports/coreutils.mk
+++ b/ports/ports/coreutils.mk
@@ -18,9 +18,12 @@ prepare:: $(CONTRIB_DIR)/$(COREUTILS)
 #
 $(DOWNLOAD_DIR)/$(COREUTILS_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(COREUTILS_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(COREUTILS_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(COREUTILS_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(COREUTILS_TGZ).verified: $(DOWNLOAD_DIR)/$(COREUTILS_TGZ)
+$(DOWNLOAD_DIR)/$(COREUTILS_TGZ).verified: $(DOWNLOAD_DIR)/$(COREUTILS_TGZ) \
+                                           $(DOWNLOAD_DIR)/$(COREUTILS_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(COREUTILS_TGZ) $(DOWNLOAD_DIR)/$(COREUTILS_SIG) $(COREUTILS_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/ports/ports/findutils.mk b/ports/ports/findutils.mk
index 1891a6f0a..c156661e6 100644
--- a/ports/ports/findutils.mk
+++ b/ports/ports/findutils.mk
@@ -18,9 +18,12 @@ prepare:: $(CONTRIB_DIR)/$(FINDUTILS)
 #
 $(DOWNLOAD_DIR)/$(FINDUTILS_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(FINDUTILS_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(FINDUTILS_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(FINDUTILS_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(FINDUTILS_TGZ).verified: $(DOWNLOAD_DIR)/$(FINDUTILS_TGZ)
+$(DOWNLOAD_DIR)/$(FINDUTILS_TGZ).verified: $(DOWNLOAD_DIR)/$(FINDUTILS_TGZ) \
+                                           $(DOWNLOAD_DIR)/$(FINDUTILS_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(FINDUTILS_TGZ) $(DOWNLOAD_DIR)/$(FINDUTILS_SIG) $(FINDUTILS_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/ports/ports/gcc.mk b/ports/ports/gcc.mk
index 17e8aaf1f..9ede85e85 100644
--- a/ports/ports/gcc.mk
+++ b/ports/ports/gcc.mk
@@ -18,9 +18,12 @@ prepare:: $(CONTRIB_DIR)/$(GCC)/configure
 
 $(DOWNLOAD_DIR)/$(GCC_TGZ):
 	$(VERBOSE)wget -P $(DOWNLOAD_DIR) $(GCC_URL)/$(GCC)/$(GCC_TGZ) && touch $@
+
+$(DOWNLOAD_DIR)/$(GCC_SIG):
 	$(VERBOSE)wget -P $(DOWNLOAD_DIR) $(GCC_URL)/$(GCC)/$(GCC_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(GCC_TGZ).verified: $(DOWNLOAD_DIR)/$(GCC_TGZ)
+$(DOWNLOAD_DIR)/$(GCC_TGZ).verified: $(DOWNLOAD_DIR)/$(GCC_TGZ) \
+                                     $(DOWNLOAD_DIR)/$(GCC_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(GCC_TGZ) $(DOWNLOAD_DIR)/$(GCC_SIG) $(GCC_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/ports/ports/gdb.mk b/ports/ports/gdb.mk
index e4a67acde..87c93ad71 100644
--- a/ports/ports/gdb.mk
+++ b/ports/ports/gdb.mk
@@ -53,9 +53,12 @@ prepare:: $(CONTRIB_DIR)/$(GDB)/configure generated_files
 
 $(DOWNLOAD_DIR)/$(GDB_TBZ2):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(GDB_URL)/$(GDB_TBZ2) && touch $@
+
+$(DOWNLOAD_DIR)/$(GDB_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(GDB_URL)/$(GDB_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(GDB_TBZ2).verified: $(DOWNLOAD_DIR)/$(GDB_TBZ2)
+$(DOWNLOAD_DIR)/$(GDB_TBZ2).verified: $(DOWNLOAD_DIR)/$(GDB_TBZ2) \
+                                      $(DOWNLOAD_DIR)/$(GDB_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(GDB_TBZ2) $(DOWNLOAD_DIR)/$(GDB_SIG) $(GDB_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/ports/ports/lighttpd.mk b/ports/ports/lighttpd.mk
index db407506a..5709e8c03 100644
--- a/ports/ports/lighttpd.mk
+++ b/ports/ports/lighttpd.mk
@@ -19,9 +19,12 @@ prepare:: $(CONTRIB_DIR)/$(LIGHTTPD)
 #
 $(DOWNLOAD_DIR)/$(LIGHTTPD_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIGHTTPD_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(LIGHTTPD_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIGHTTPD_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(LIGHTTPD_TGZ).verified: $(DOWNLOAD_DIR)/$(LIGHTTPD_TGZ)
+$(DOWNLOAD_DIR)/$(LIGHTTPD_TGZ).verified: $(DOWNLOAD_DIR)/$(LIGHTTPD_TGZ) \
+                                          $(DOWNLOAD_DIR)/$(LIGHTTPD_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(LIGHTTPD_TGZ) $(DOWNLOAD_DIR)/$(LIGHTTPD_SIG) $(LIGHTTPD_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/ports/ports/lynx.mk b/ports/ports/lynx.mk
index 9f66e4a9e..31669c4a2 100644
--- a/ports/ports/lynx.mk
+++ b/ports/ports/lynx.mk
@@ -17,7 +17,9 @@ prepare:: $(CONTRIB_DIR)/$(LYNX)
 #
 $(DOWNLOAD_DIR)/$(LYNX_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) -O $@ $(LYNX_URL) && touch $@
-	#$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LYNX_URL_SIG) && touch $@
+
+$(DOWNLOAD_DIR)/$(LYNX_SIG):
+	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LYNX_URL_SIG) && touch $@
 
 $(DOWNLOAD_DIR)/$(LYNX_TGZ).verified: $(DOWNLOAD_DIR)/$(LYNX_TGZ)
 	#
diff --git a/ports/ports/make.mk b/ports/ports/make.mk
index 7f23085e3..3fe403c90 100644
--- a/ports/ports/make.mk
+++ b/ports/ports/make.mk
@@ -18,9 +18,12 @@ prepare:: $(CONTRIB_DIR)/$(GNUMAKE)
 #
 $(DOWNLOAD_DIR)/$(GNUMAKE_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(GNUMAKE_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(GNUMAKE_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(GNUMAKE_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(GNUMAKE_TGZ).verified: $(DOWNLOAD_DIR)/$(GNUMAKE_TGZ)
+$(DOWNLOAD_DIR)/$(GNUMAKE_TGZ).verified: $(DOWNLOAD_DIR)/$(GNUMAKE_TGZ) \
+                                         $(DOWNLOAD_DIR)/$(GNUMAKE_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(GNUMAKE_TGZ) $(DOWNLOAD_DIR)/$(GNUMAKE_SIG) $(GNUMAKE_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/ports/ports/openssh.mk b/ports/ports/openssh.mk
index 36fe42e4c..b918c9bc1 100644
--- a/ports/ports/openssh.mk
+++ b/ports/ports/openssh.mk
@@ -18,9 +18,12 @@ prepare:: $(CONTRIB_DIR)/$(OPENSSH)
 #
 $(DOWNLOAD_DIR)/$(OPENSSH_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(OPENSSH_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(OPENSSH_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(OPENSSH_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(OPENSSH_TGZ).verified: $(DOWNLOAD_DIR)/$(OPENSSH_TGZ)
+$(DOWNLOAD_DIR)/$(OPENSSH_TGZ).verified: $(DOWNLOAD_DIR)/$(OPENSSH_TGZ) \
+                                         $(DOWNLOAD_DIR)/$(OPENSSH_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(OPENSSH_TGZ) $(DOWNLOAD_DIR)/$(OPENSSH_SIG) $(OPENSSH_KEY)
 	$(VERBOSE)touch $@
 
diff --git a/ports/ports/which.mk b/ports/ports/which.mk
index 156b4349a..10b4f6325 100644
--- a/ports/ports/which.mk
+++ b/ports/ports/which.mk
@@ -18,9 +18,12 @@ prepare:: $(CONTRIB_DIR)/$(WHICH)
 #
 $(DOWNLOAD_DIR)/$(WHICH_TGZ):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) -O $@ $(WHICH_URL) && touch $@
+
+$(DOWNLOAD_DIR)/$(WHICH_SIG):
 	$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(WHICH_URL_SIG) && touch $@
 
-$(DOWNLOAD_DIR)/$(WHICH_TGZ).verified: $(DOWNLOAD_DIR)/$(WHICH_TGZ)
+$(DOWNLOAD_DIR)/$(WHICH_TGZ).verified: $(DOWNLOAD_DIR)/$(WHICH_TGZ) \
+                                       $(DOWNLOAD_DIR)/$(WHICH_SIG)
 	$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(WHICH_TGZ) $(DOWNLOAD_DIR)/$(WHICH_SIG) $(WHICH_KEY)
 	$(VERBOSE)touch $@