From 6252f228774605f2c38d3908f6d9a6bbf8c6c013 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@gmail.com>
Date: Tue, 8 Mar 2016 08:16:40 +0100
Subject: [PATCH] simplify $VERSION in build manifests

---
 support/build/apache                                  |  2 +-
 support/build/apache-2.4.18                           |  2 --
 support/build/composer                                |  2 +-
 support/build/composer-1.0.0-beta1                    |  2 --
 .../extensions/no-debug-non-zts-20121212/apcu-4.0.10  |  2 --
 .../extensions/no-debug-non-zts-20121212/blackfire    | 11 ++++++-----
 .../no-debug-non-zts-20121212/blackfire-1.9.2         |  2 --
 .../extensions/no-debug-non-zts-20121212/event-2.0.0  |  2 --
 .../no-debug-non-zts-20121212/memcached-2.2.0         |  2 +-
 .../no-debug-non-zts-20121212/memcached-bare          |  6 +++---
 .../no-debug-non-zts-20121212/memcached-bare-2.2.0    |  2 --
 .../extensions/no-debug-non-zts-20121212/mongo-1.6.12 |  2 --
 .../no-debug-non-zts-20121212/mongodb-1.1.3           |  2 --
 .../extensions/no-debug-non-zts-20121212/newrelic     |  2 +-
 .../no-debug-non-zts-20121212/newrelic-4.23.4.113     |  2 --
 .../extensions/no-debug-non-zts-20121212/oauth-1.2.3  |  2 --
 .../extensions/no-debug-non-zts-20121212/phalcon      |  2 +-
 .../no-debug-non-zts-20121212/phalcon-2.0.10          |  2 --
 .../extensions/no-debug-non-zts-20121212/redis-2.2.7  |  2 --
 .../extensions/no-debug-non-zts-20131226/apcu-4.0.10  |  2 --
 .../no-debug-non-zts-20131226/blackfire-1.9.2         |  2 --
 .../extensions/no-debug-non-zts-20131226/event-2.0.0  |  2 --
 .../no-debug-non-zts-20131226/imagick-3.4.1           |  2 --
 .../no-debug-non-zts-20131226/memcached-2.2.0         |  2 +-
 .../no-debug-non-zts-20131226/memcached-bare-2.2.0    |  2 --
 .../extensions/no-debug-non-zts-20131226/mongo-1.6.12 |  2 --
 .../no-debug-non-zts-20131226/mongodb-1.1.3           |  2 --
 .../no-debug-non-zts-20131226/newrelic-4.23.4.113     |  2 --
 .../extensions/no-debug-non-zts-20131226/oauth-1.2.3  |  2 --
 .../no-debug-non-zts-20131226/phalcon-2.0.10          |  2 --
 .../extensions/no-debug-non-zts-20131226/redis-2.2.7  |  2 --
 .../extensions/no-debug-non-zts-20151012/apcu-5.1.3   |  2 --
 .../no-debug-non-zts-20151012/blackfire-1.9.2         |  2 --
 .../extensions/no-debug-non-zts-20151012/event-2.0.0  |  2 --
 .../no-debug-non-zts-20151012/imagick-3.4.1           |  2 --
 .../no-debug-non-zts-20151012/mongodb-1.1.3           |  2 --
 .../extensions/no-debug-non-zts-20151012/oauth-2.0.0  |  2 --
 support/build/extensions/pecl                         |  2 +-
 support/build/hhvm                                    |  2 +-
 support/build/hhvm-3.5.1                              |  2 --
 support/build/nginx                                   |  2 +-
 support/build/nginx-1.8.1                             |  2 --
 support/build/php                                     |  2 +-
 support/build/php-5.5.33                              |  2 --
 support/build/php-5.6.19                              |  2 --
 support/build/php-7.0.4                               |  2 --
 46 files changed, 19 insertions(+), 86 deletions(-)

diff --git a/support/build/apache b/support/build/apache
index 3678faa08..80726484c 100755
--- a/support/build/apache
+++ b/support/build/apache
@@ -12,7 +12,7 @@ source $(dirname $BASH_SOURCE)/_util/include/manifest.sh
 
 dep_formula=${0#$WORKSPACE_DIR/}
 dep_name=$(basename $BASH_SOURCE)
-dep_version=${VERSION}
+dep_version=${dep_formula#"${dep_name}-"}
 dep_package=${dep_name}-${dep_version}
 dep_dirname=httpd-${dep_version}
 dep_archive_name=${dep_dirname}.tar.gz
diff --git a/support/build/apache-2.4.18 b/support/build/apache-2.4.18
index e9a8ce12e..bb636eadc 100755
--- a/support/build/apache-2.4.18
+++ b/support/build/apache-2.4.18
@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
 
-VERSION=2.4.18
-
 source $(dirname $0)/apache
diff --git a/support/build/composer b/support/build/composer
index 8760d191a..a043f41a3 100755
--- a/support/build/composer
+++ b/support/build/composer
@@ -11,7 +11,7 @@ set -eu
 
 dep_formula=${0#$WORKSPACE_DIR/}
 dep_name=$(basename $BASH_SOURCE)
-dep_version=${VERSION}
+dep_version=${dep_formula#"${dep_name}-"}
 dep_package=${dep_name}-${dep_version}
 
 echo "-----> Bundling Composer (${dep_version})..."
diff --git a/support/build/composer-1.0.0-beta1 b/support/build/composer-1.0.0-beta1
index 09fcf7dfa..a93b8e296 100755
--- a/support/build/composer-1.0.0-beta1
+++ b/support/build/composer-1.0.0-beta1
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-min
 
-VERSION=1.0.0-beta1
-
 source $(dirname $0)/composer
diff --git a/support/build/extensions/no-debug-non-zts-20121212/apcu-4.0.10 b/support/build/extensions/no-debug-non-zts-20121212/apcu-4.0.10
index baa5dfecb..f156af0a9 100755
--- a/support/build/extensions/no-debug-non-zts-20121212/apcu-4.0.10
+++ b/support/build/extensions/no-debug-non-zts-20121212/apcu-4.0.10
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.5.33
 
-VERSION=4.0.10
-
 source $(dirname $0)/apcu
\ No newline at end of file
diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire b/support/build/extensions/no-debug-non-zts-20121212/blackfire
index a3477c629..92e60adc0 100755
--- a/support/build/extensions/no-debug-non-zts-20121212/blackfire
+++ b/support/build/extensions/no-debug-non-zts-20121212/blackfire
@@ -34,9 +34,10 @@ bin_dir=${OUT_PREFIX}/bin
 
 dep_formula=${0#$WORKSPACE_DIR/}
 dep_name=$(basename $BASH_SOURCE)
-if [[ -n "${VERSION:-}" ]]; then
-	probe_version=${VERSION}
-	echo "Using explicit version ${VERSION}"
+if [[ "$dep_formula" != "$dep_name" ]]; then
+	probe_version=${dep_formula##*"/${dep_name}-"}
+	
+	echo "Using explicit version ${probe_version}"
 else
 	probe_version=`curl -I -A "Heroku" -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/${series/\./} | grep 'X-Blackfire-Release-Version: ' | sed "s%X-Blackfire-Release-Version: %%" | sed s%.$%%`
 	cat <<-EOF
@@ -55,7 +56,7 @@ else
 fi
 dep_version=${probe_version}
 dep_package=ext-${dep_name}-${dep_version}
-if [[ -n "${VERSION:-}" ]]; then
+if [[ "$dep_formula" != "$dep_name" ]]; then
 	dep_manifest=${dep_package}_php-$series.composer.json
 else
 	dep_manifest=ext-${dep_name}_php-$series.composer.json
@@ -113,7 +114,7 @@ python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-e
 
 print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")"
 
-if [[ -z "${VERSION:-}" ]]; then
+if [[ "$dep_formula" == "$dep_name" ]]; then
 	cat <<-EOF
 		
 		!!! WARNING !!! If you just deployed using --overwrite and without --publish:
diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.9.2 b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.9.2
index 7d4caacf5..e093375c3 100755
--- a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.9.2
+++ b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.9.2
@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
 
-VERSION=1.9.2
-
 source $(dirname $0)/blackfire
diff --git a/support/build/extensions/no-debug-non-zts-20121212/event-2.0.0 b/support/build/extensions/no-debug-non-zts-20121212/event-2.0.0
index e260eecc9..d45fce647 100755
--- a/support/build/extensions/no-debug-non-zts-20121212/event-2.0.0
+++ b/support/build/extensions/no-debug-non-zts-20121212/event-2.0.0
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.5.33
 
-VERSION=2.0.0
-
 source $(dirname $0)/event
\ No newline at end of file
diff --git a/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0
index 911e1872f..a803accef 100755
--- a/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0
+++ b/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0
@@ -17,7 +17,7 @@ echo "-----> Merging dependencies..."
 
 dep_formula=${0#$WORKSPACE_DIR/}
 dep_name=memcached
-dep_version=2.2.0
+dep_version=${dep_formula##*"/${dep_name}-"}
 dep_package=ext-${dep_name}-${dep_version}
 series=5.5
 dep_manifest=${dep_package}_php-$series.composer.json
diff --git a/support/build/extensions/no-debug-non-zts-20121212/memcached-bare b/support/build/extensions/no-debug-non-zts-20121212/memcached-bare
index 011a80fdc..ae47c5479 100755
--- a/support/build/extensions/no-debug-non-zts-20121212/memcached-bare
+++ b/support/build/extensions/no-debug-non-zts-20121212/memcached-bare
@@ -11,8 +11,8 @@ set -eu
 export PATH=${OUT_PREFIX}/bin:${PATH}
 
 dep_formula=${0#$WORKSPACE_DIR/}
-dep_name=memcached
-dep_version=${VERSION}
+dep_name=memcached-bare
+dep_version=${dep_formula##*"/${dep_name}-"}
 dep_package=ext-${dep_name}-${dep_version}
 dep_dirname=php-memcached-${dep_version}
 dep_archive_name=${dep_version}.tar.gz
@@ -30,7 +30,7 @@ pushd ${dep_dirname}
 phpize
 ./configure \
     --prefix=${OUT_PREFIX} \
-    --enable-${dep_name} \
+    --enable-memcached \
     --with-libmemcached-dir=${OUT_PREFIX}
 make -s -j 9
 # php was a build dep, and it's in $OUT_PREFIX. nuke that, then make install so all we're left with is the extension
diff --git a/support/build/extensions/no-debug-non-zts-20121212/memcached-bare-2.2.0 b/support/build/extensions/no-debug-non-zts-20121212/memcached-bare-2.2.0
index 2f5f903eb..813ad2b03 100755
--- a/support/build/extensions/no-debug-non-zts-20121212/memcached-bare-2.2.0
+++ b/support/build/extensions/no-debug-non-zts-20121212/memcached-bare-2.2.0
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.5.33, libraries/libmemcached
 
-VERSION=2.2.0
-
 source $(dirname $0)/memcached-bare
\ No newline at end of file
diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.12 b/support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.12
index 98e1527f7..3e854566d 100755
--- a/support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.12
+++ b/support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.12
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.5.33
 
-VERSION=1.6.12
-
 source $(dirname $0)/mongo
\ No newline at end of file
diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.1.3 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.1.3
index 9547b5e6a..e74581ba9 100755
--- a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.1.3
+++ b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.1.3
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.5.33
 
-VERSION=1.1.3
-
 source $(dirname $0)/mongodb
\ No newline at end of file
diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic b/support/build/extensions/no-debug-non-zts-20121212/newrelic
index d46b7c40c..39cfcc4a0 100755
--- a/support/build/extensions/no-debug-non-zts-20121212/newrelic
+++ b/support/build/extensions/no-debug-non-zts-20121212/newrelic
@@ -15,7 +15,7 @@ ZEND_MODULE_API_VERSION=${ZEND_MODULE_API_VERSION#no-debug-non-zts-}
 
 dep_formula=${0#$WORKSPACE_DIR/}
 dep_name=$(basename $BASH_SOURCE)
-dep_version=${VERSION}
+dep_version=${dep_formula##*"/${dep_name}-"}
 dep_package=ext-${dep_name}-${dep_version}
 dep_dirname=newrelic-php5-${dep_version}-linux
 dep_archive_name=${dep_dirname}.tar.gz
diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic-4.23.4.113 b/support/build/extensions/no-debug-non-zts-20121212/newrelic-4.23.4.113
index ea1400dba..42e7c7180 100755
--- a/support/build/extensions/no-debug-non-zts-20121212/newrelic-4.23.4.113
+++ b/support/build/extensions/no-debug-non-zts-20121212/newrelic-4.23.4.113
@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
 
-VERSION=4.23.4.113
-
 source $(dirname $0)/newrelic
\ No newline at end of file
diff --git a/support/build/extensions/no-debug-non-zts-20121212/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20121212/oauth-1.2.3
index bf7b21076..fe031b375 100755
--- a/support/build/extensions/no-debug-non-zts-20121212/oauth-1.2.3
+++ b/support/build/extensions/no-debug-non-zts-20121212/oauth-1.2.3
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.5.33
 
-VERSION=1.2.3
-
 source $(dirname $0)/oauth
\ No newline at end of file
diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon b/support/build/extensions/no-debug-non-zts-20121212/phalcon
index 9e1dd9fc4..660b09475 100755
--- a/support/build/extensions/no-debug-non-zts-20121212/phalcon
+++ b/support/build/extensions/no-debug-non-zts-20121212/phalcon
@@ -15,7 +15,7 @@ export PATH=${OUT_PREFIX}/bin:${PATH}
 
 dep_formula=${0#$WORKSPACE_DIR/}
 dep_name=$(basename $BASH_SOURCE)
-dep_version=${VERSION}
+dep_version=${dep_formula##*"/${dep_name}-"}
 dep_package=ext-${dep_name}-${dep_version}
 dep_dirname=cphalcon-${dep_name}-v${dep_version}
 dep_archive_name=${dep_name}-v${dep_version}.tar.gz
diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-2.0.10 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-2.0.10
index 9e85f22ad..bdca96f1d 100755
--- a/support/build/extensions/no-debug-non-zts-20121212/phalcon-2.0.10
+++ b/support/build/extensions/no-debug-non-zts-20121212/phalcon-2.0.10
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.5.33
 
-VERSION=2.0.10
-
 source $(dirname $0)/phalcon
\ No newline at end of file
diff --git a/support/build/extensions/no-debug-non-zts-20121212/redis-2.2.7 b/support/build/extensions/no-debug-non-zts-20121212/redis-2.2.7
index 006f46fc0..96cd6f225 100755
--- a/support/build/extensions/no-debug-non-zts-20121212/redis-2.2.7
+++ b/support/build/extensions/no-debug-non-zts-20121212/redis-2.2.7
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.5.33
 
-VERSION=2.2.7
-
 source $(dirname $0)/redis
\ No newline at end of file
diff --git a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.10 b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.10
index 9491b4cfa..bc485b3e2 100755
--- a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.10
+++ b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.10
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.6.19
 
-VERSION=4.0.10
-
 source $(dirname $0)/../no-debug-non-zts-20121212/apcu
diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.9.2 b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.9.2
index 7d4caacf5..e093375c3 100755
--- a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.9.2
+++ b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.9.2
@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
 
-VERSION=1.9.2
-
 source $(dirname $0)/blackfire
diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.0.0 b/support/build/extensions/no-debug-non-zts-20131226/event-2.0.0
index 4cbabcf8e..b7a296aef 100755
--- a/support/build/extensions/no-debug-non-zts-20131226/event-2.0.0
+++ b/support/build/extensions/no-debug-non-zts-20131226/event-2.0.0
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.6.19
 
-VERSION=2.0.0
-
 source $(dirname $0)/../no-debug-non-zts-20121212/event
\ No newline at end of file
diff --git a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.1 b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.1
index fcdf99215..4353fea1b 100755
--- a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.1
+++ b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.1
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.6.19
 
-VERSION=3.4.1
-
 source $(dirname $0)/../no-debug-non-zts-20121212/imagick
diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0
index 594ac9e2b..5688370d4 100755
--- a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0
+++ b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0
@@ -17,7 +17,7 @@ echo "-----> Merging dependencies..."
 
 dep_formula=${0#$WORKSPACE_DIR/}
 dep_name=memcached
-dep_version=2.2.0
+dep_version=${dep_formula##*"/${dep_name}-"}
 dep_package=ext-${dep_name}-${dep_version}
 series=5.6
 dep_manifest=${dep_package}_php-$series.composer.json
diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-bare-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-bare-2.2.0
index e0a4f96e5..d36e15844 100755
--- a/support/build/extensions/no-debug-non-zts-20131226/memcached-bare-2.2.0
+++ b/support/build/extensions/no-debug-non-zts-20131226/memcached-bare-2.2.0
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.6.19, libraries/libmemcached
 
-VERSION=2.2.0
-
 source $(dirname $0)/../no-debug-non-zts-20121212/memcached-bare
diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.12 b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.12
index c6d8e1d30..8dd6fa8f5 100755
--- a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.12
+++ b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.12
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.6.19
 
-VERSION=1.6.12
-
 source $(dirname $0)/../no-debug-non-zts-20121212/mongo
diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.1.3 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.1.3
index 8e6d522c5..4a0b9fc9e 100755
--- a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.1.3
+++ b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.1.3
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.6.19
 
-VERSION=1.1.3
-
 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb
diff --git a/support/build/extensions/no-debug-non-zts-20131226/newrelic-4.23.4.113 b/support/build/extensions/no-debug-non-zts-20131226/newrelic-4.23.4.113
index f2d0095c1..42faa757d 100755
--- a/support/build/extensions/no-debug-non-zts-20131226/newrelic-4.23.4.113
+++ b/support/build/extensions/no-debug-non-zts-20131226/newrelic-4.23.4.113
@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
 
-VERSION=4.23.4.113
-
 source $(dirname $0)/../no-debug-non-zts-20121212/newrelic
diff --git a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3
index 3ec3d24b5..eebdb8250 100755
--- a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3
+++ b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.6.19
 
-VERSION=1.2.3
-
 source $(dirname $0)/../no-debug-non-zts-20121212/oauth
diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.10 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.10
index 79ca3fe0b..f30b16e97 100755
--- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.10
+++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.10
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.6.19
 
-VERSION=2.0.10
-
 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon
\ No newline at end of file
diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-2.2.7 b/support/build/extensions/no-debug-non-zts-20131226/redis-2.2.7
index 9268a0716..32fa26d15 100755
--- a/support/build/extensions/no-debug-non-zts-20131226/redis-2.2.7
+++ b/support/build/extensions/no-debug-non-zts-20131226/redis-2.2.7
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.6.19
 
-VERSION=2.2.7
-
 source $(dirname $0)/../no-debug-non-zts-20121212/redis
diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.3 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.3
index 424844084..7e5554696 100755
--- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.3
+++ b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.3
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-7.0.4
 
-VERSION=5.1.3
-
 source $(dirname $0)/../no-debug-non-zts-20121212/apcu
diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.9.2 b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.9.2
index 7d4caacf5..e093375c3 100755
--- a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.9.2
+++ b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.9.2
@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
 
-VERSION=1.9.2
-
 source $(dirname $0)/blackfire
diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/event-2.0.0
index 341c0792e..e5a3be20b 100755
--- a/support/build/extensions/no-debug-non-zts-20151012/event-2.0.0
+++ b/support/build/extensions/no-debug-non-zts-20151012/event-2.0.0
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-7.0.4
 
-VERSION=2.0.0
-
 source $(dirname $0)/../no-debug-non-zts-20121212/event
\ No newline at end of file
diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.1 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.1
index 38872a0c2..86839249c 100755
--- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.1
+++ b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.1
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-7.0.4
 
-VERSION=3.4.1
-
 source $(dirname $0)/../no-debug-non-zts-20121212/imagick
diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.1.3 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.1.3
index a87d89876..84732b831 100755
--- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.1.3
+++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.1.3
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-7.0.4
 
-VERSION=1.1.3
-
 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb
diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.0
index a1d180b89..87093fe30 100755
--- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.0
+++ b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.0
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-7.0.4
 
-VERSION=2.0.0
-
 source $(dirname $0)/../no-debug-non-zts-20121212/oauth
diff --git a/support/build/extensions/pecl b/support/build/extensions/pecl
index ae871a81b..c804fbec6 100755
--- a/support/build/extensions/pecl
+++ b/support/build/extensions/pecl
@@ -12,7 +12,7 @@ OUT_PREFIX=$1
 export PATH=${OUT_PREFIX}/bin:${PATH}
 
 dep_formula=${0#$WORKSPACE_DIR/}
-dep_version=${VERSION}
+dep_version=${dep_formula##*"/${dep_name}-"}
 dep_package=ext-${dep_name}-${dep_version}
 dep_dirname=${dep_name}-${dep_version}
 dep_archive_name=${dep_dirname}.tgz
diff --git a/support/build/hhvm b/support/build/hhvm
index 5403bedc3..55e067514 100755
--- a/support/build/hhvm
+++ b/support/build/hhvm
@@ -14,7 +14,7 @@ STACK=${STACK:-"cedar"}
 
 dep_formula=${0#$WORKSPACE_DIR/}
 dep_name=$(basename $BASH_SOURCE)
-dep_version=${VERSION}
+dep_version=${dep_formula#"${dep_name}-"}
 dep_package=${dep_name}-${dep_version}
 dep_dirname=hhvm_${dep_version}
 if [[ $STACK == "cedar" ]]; then
diff --git a/support/build/hhvm-3.5.1 b/support/build/hhvm-3.5.1
index 1c17d9580..3a7479106 100755
--- a/support/build/hhvm-3.5.1
+++ b/support/build/hhvm-3.5.1
@@ -73,6 +73,4 @@
 #  libxslt1.1
 #  zlib1g
 
-VERSION=3.5.1
-
 source $(dirname $0)/hhvm
diff --git a/support/build/nginx b/support/build/nginx
index 6c45e637c..4e43d6288 100755
--- a/support/build/nginx
+++ b/support/build/nginx
@@ -12,7 +12,7 @@ source $(dirname $BASH_SOURCE)/_util/include/manifest.sh
 
 dep_formula=${0#$WORKSPACE_DIR/}
 dep_name=$(basename $BASH_SOURCE)
-dep_version=${VERSION}
+dep_version=${dep_formula#"${dep_name}-"}
 dep_package=${dep_name}-${dep_version}
 dep_dirname=nginx-${dep_version}
 dep_archive_name=${dep_dirname}.tar.gz
diff --git a/support/build/nginx-1.8.1 b/support/build/nginx-1.8.1
index 8a36294d7..b69627606 100755
--- a/support/build/nginx-1.8.1
+++ b/support/build/nginx-1.8.1
@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
 
-VERSION=1.8.1
-
 source $(dirname $0)/nginx
diff --git a/support/build/php b/support/build/php
index ab20f7ebe..3723f4f63 100755
--- a/support/build/php
+++ b/support/build/php
@@ -13,7 +13,7 @@ OUT_PREFIX=$1
 
 dep_formula=${0#$WORKSPACE_DIR/}
 dep_name=$(basename $BASH_SOURCE)
-dep_version=${VERSION}
+dep_version=${dep_formula#"${dep_name}-"}
 dep_package=${dep_name}-${dep_version}
 dep_dirname=php-${dep_version}
 dep_archive_name=${dep_dirname}.tar.gz
diff --git a/support/build/php-5.5.33 b/support/build/php-5.5.33
index c04a6e461..c78687f79 100755
--- a/support/build/php-5.5.33
+++ b/support/build/php-5.5.33
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: libraries/libmcrypt, libraries/gettext
 
-VERSION=5.5.33
-
 source $(dirname $0)/php
diff --git a/support/build/php-5.6.19 b/support/build/php-5.6.19
index 1b63716eb..c78687f79 100755
--- a/support/build/php-5.6.19
+++ b/support/build/php-5.6.19
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: libraries/libmcrypt, libraries/gettext
 
-VERSION=5.6.19
-
 source $(dirname $0)/php
diff --git a/support/build/php-7.0.4 b/support/build/php-7.0.4
index 1afc815d3..c78687f79 100755
--- a/support/build/php-7.0.4
+++ b/support/build/php-7.0.4
@@ -2,6 +2,4 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: libraries/libmcrypt, libraries/gettext
 
-VERSION=7.0.4
-
 source $(dirname $0)/php