Changed package fetching Makefiles for abusehelper, vsroom and wiki

No longer uses symlinks to manage package versions. Ppackage versions
are now recorded in /srv/puppet/files/common/packages/manifests/*.pp
instead, which must be included in the site or node manifest.

vsroom/Makefile

@@ -1,12 +1,17 @@
-VSROOM = default
-VSROOMURL = https://bitbucket.org/clarifiednetworks/vsroom/get/$(VSROOM).tar.gz
-OUT = /srv/puppet/files/common/packages
+include $(CURDIR)/../Makefile.inc
 
-all:     tarball
-tarball: vsroom.tar.gz
-.PHONY:  vsroom.tar.gz
+BRANCH = default
+SOURCE = https://bitbucket.org/clarifiednetworks/vsroom/get/$(BRANCH).tar.gz
+TARGET = vsroom-$(BRANCH)-$(TIMESTAMP).tar.gz
 
-vsroom.tar.gz:
-	@umask 022 && mkdir -p $(OUT)/vsroom && \
-	cd $(OUT)/vsroom && wget -nv -N $(VSROOMURL) && \
-	cd $(OUT) && ln -fs vsroom/$(VSROOM).tar.gz vsroom.tar.gz
+all:      tarball manifest
+tarball:  $(PACKAGES)/$(TARGET)
+manifest: $(MANIFESTS)/vsroom.pp
+
+$(PACKAGES)/$(TARGET):
+	@umask 022; echo $@; \
+	test -f $@ || curl -o $@ $(SOURCE)
+
+$(MANIFESTS)/vsroom.pp: $(PACKAGES)/$(TARGET)
+	@umask 022; echo $@; \
+	echo '$$vsroom_package = "$(TARGET)"' > $@

vsroom/manifests/init.pp

@@ -22,7 +22,7 @@ class vsroom {
         mode   => 0644,
         owner  => root,
         group  => root,
-        source => "puppet:///files/packages/vsroom.tar.gz",
+        source => "puppet:///files/packages/${vsroom_package}",
         links  => follow,
     }
     util::extract::tar { "/usr/local/src/vsroom":