Radix cross Linux 3pp sources

diff --git a/packages/n/avahi/Makefile b/packages/n/avahi/Makefile
index 592da7a..ed3d2c0 100644
--- a/packages/n/avahi/Makefile
+++ b/packages/n/avahi/Makefile
@@ -10,35 +10,62 @@
 #
 # GitHub:
 # ======
-#   https://github.com/avahi/avahi
+#   git clone https://github.com/avahi/avahi.git
 #
 
-url         = https://avahi.org/download
+url        = https://github.com/avahi
 
-versions    = 0.6.31 0.6.32 0.7 0.8
+repo_name  = avahi
+pkg_name   = avahi
+suffix     = tar.xz
 
-pkgname     = avahi
-suffix      = tar.gz
+versions   = 0.8
 
-tarballs    = $(addsuffix .$(suffix), $(addprefix $(pkgname)-, $(versions)))
-sha1s       = $(addsuffix .sha1sum, $(tarballs))
+# List of tags to be extracted:
+TAGS       = $(addprefix v, $(versions))
 
+git_repo   = .git_clone
+tarballs   = $(addsuffix .tar.xz, $(addprefix $(pkg_name)-, $(versions)))
+sha1s      = $(addsuffix .sha1sum, $(tarballs))
 
-all: $(tarballs) $(sha1s)
+TARGETS = repository_clean
 
-.PHONY: downloads_clean
 
-$(tarballs):
-	@echo -e "\n======= Downloading source tarballs =======\n"
+all: $(TARGETS)
+
+.PHONY: downloads_clean repository_clean
+
+$(git_repo):
+	@echo -e "\n======= Clone $(repo_name).git repository =======\n"
+	@rm -rf $(repo_name)
+	@git clone $(url)/$(repo_name).git $(repo_name)
+	@touch $@
+
+$(tarballs): $(git_repo)
 	@for version in $(versions) ; do \
-	  wget -N $(url)/$(pkgname)-$$version.$(suffix) ;  \
+	  tag=v`echo $$version` ; \
+	  if [ ! -f $(repo_name)-$$version.$(suffix) ]; then \
+	    echo -e "\n======= Creating '$(repo_name)-$$version.$(suffix)' snapshot =======" ; \
+	    ( cd $(repo_name) && \
+	      git archive --format=tar --prefix=$(pkg_name)-$$version/ $$tag | \
+	      xz >../$(pkg_name)-$$version.$(suffix) ) ; \
+	    tar xJf $(pkg_name)-$$version.$(suffix) ; \
+	    ( cd $(pkg_name)-$$version ; NOCONFIGURE=1 ./autogen.sh ; rm -rf autom4te.cache .git* .dir-locals.el .travis.yml *~ ) ; \
+	    tar cJf $(pkg_name)-$$version.$(suffix) $(pkg_name)-$$version ; \
+	    rm -rf $(pkg_name)-$$version ; \
+	  fi ; \
 	done
 
-$(sha1s): %.$(suffix).sha1sum : %.$(suffix)
+$(sha1s): %.tar.xz.sha1sum : %.tar.xz
 	@for tarball in $< ; do \
-	  echo -e "\n======= Calculation the '$$tarball' sha1sum =======\n" ; \
+	  echo -e "\n======= Calculation the '$$tarball' sha1sum =======" ; \
 	  sha1sum --binary $$tarball > $$tarball.sha1sum ; \
 	done
 
+repository_clean: $(sha1s)
+	@echo -e "\n======= Remove cloned $(repo_name).git repository =======\n"
+	@rm -rf $(git_repo) $(repo_name)
+
 downloads_clean:
 	@rm -rf $(tarballs) $(sha1s)
+	@rm -rf $(git_repo) $(repo_name)
diff --git a/packages/n/avahi/Makefile.clone-from-github b/packages/n/avahi/Makefile.clone-from-github
deleted file mode 100644
index ed3d2c0..0000000
--- a/packages/n/avahi/Makefile.clone-from-github
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Project Home:
-# ============
-#   https://www.avahi.org
-#
-# Downloads:
-# =========
-#   https://avahi.org/download
-#
-#
-# GitHub:
-# ======
-#   git clone https://github.com/avahi/avahi.git
-#
-
-url        = https://github.com/avahi
-
-repo_name  = avahi
-pkg_name   = avahi
-suffix     = tar.xz
-
-versions   = 0.8
-
-# List of tags to be extracted:
-TAGS       = $(addprefix v, $(versions))
-
-git_repo   = .git_clone
-tarballs   = $(addsuffix .tar.xz, $(addprefix $(pkg_name)-, $(versions)))
-sha1s      = $(addsuffix .sha1sum, $(tarballs))
-
-TARGETS = repository_clean
-
-
-all: $(TARGETS)
-
-.PHONY: downloads_clean repository_clean
-
-$(git_repo):
-	@echo -e "\n======= Clone $(repo_name).git repository =======\n"
-	@rm -rf $(repo_name)
-	@git clone $(url)/$(repo_name).git $(repo_name)
-	@touch $@
-
-$(tarballs): $(git_repo)
-	@for version in $(versions) ; do \
-	  tag=v`echo $$version` ; \
-	  if [ ! -f $(repo_name)-$$version.$(suffix) ]; then \
-	    echo -e "\n======= Creating '$(repo_name)-$$version.$(suffix)' snapshot =======" ; \
-	    ( cd $(repo_name) && \
-	      git archive --format=tar --prefix=$(pkg_name)-$$version/ $$tag | \
-	      xz >../$(pkg_name)-$$version.$(suffix) ) ; \
-	    tar xJf $(pkg_name)-$$version.$(suffix) ; \
-	    ( cd $(pkg_name)-$$version ; NOCONFIGURE=1 ./autogen.sh ; rm -rf autom4te.cache .git* .dir-locals.el .travis.yml *~ ) ; \
-	    tar cJf $(pkg_name)-$$version.$(suffix) $(pkg_name)-$$version ; \
-	    rm -rf $(pkg_name)-$$version ; \
-	  fi ; \
-	done
-
-$(sha1s): %.tar.xz.sha1sum : %.tar.xz
-	@for tarball in $< ; do \
-	  echo -e "\n======= Calculation the '$$tarball' sha1sum =======" ; \
-	  sha1sum --binary $$tarball > $$tarball.sha1sum ; \
-	done
-
-repository_clean: $(sha1s)
-	@echo -e "\n======= Remove cloned $(repo_name).git repository =======\n"
-	@rm -rf $(git_repo) $(repo_name)
-
-downloads_clean:
-	@rm -rf $(tarballs) $(sha1s)
-	@rm -rf $(git_repo) $(repo_name)
diff --git a/packages/n/avahi/Makefile.download-via-http b/packages/n/avahi/Makefile.download-via-http
new file mode 100644
index 0000000..592da7a
--- /dev/null
+++ b/packages/n/avahi/Makefile.download-via-http
@@ -0,0 +1,44 @@
+#
+# Project Home:
+# ============
+#   https://www.avahi.org
+#
+# Downloads:
+# =========
+#   https://avahi.org/download
+#
+#
+# GitHub:
+# ======
+#   https://github.com/avahi/avahi
+#
+
+url         = https://avahi.org/download
+
+versions    = 0.6.31 0.6.32 0.7 0.8
+
+pkgname     = avahi
+suffix      = tar.gz
+
+tarballs    = $(addsuffix .$(suffix), $(addprefix $(pkgname)-, $(versions)))
+sha1s       = $(addsuffix .sha1sum, $(tarballs))
+
+
+all: $(tarballs) $(sha1s)
+
+.PHONY: downloads_clean
+
+$(tarballs):
+	@echo -e "\n======= Downloading source tarballs =======\n"
+	@for version in $(versions) ; do \
+	  wget -N $(url)/$(pkgname)-$$version.$(suffix) ;  \
+	done
+
+$(sha1s): %.$(suffix).sha1sum : %.$(suffix)
+	@for tarball in $< ; do \
+	  echo -e "\n======= Calculation the '$$tarball' sha1sum =======\n" ; \
+	  sha1sum --binary $$tarball > $$tarball.sha1sum ; \
+	done
+
+downloads_clean:
+	@rm -rf $(tarballs) $(sha1s)