From 20072aff7777df7310fc0a00053158b6f0505c2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
Date: Tue, 13 Sep 2016 14:25:42 +0000
Subject: [PATCH] mpbb: Remove --port and --prefix from subcommands

The updated Buildbot configuration is now live.

Shortest deprecation periods ever!

git-svn-id: https://svn.macports.org/repository/macports/contrib/mp-buildbot@152624 d073be05-634f-4543-b044-5fe20cf6d1d6
---
 mpbb                      | 1 -
 mpbb-checkout             | 2 +-
 mpbb-cleanup              | 7 +------
 mpbb-gather-archives      | 2 +-
 mpbb-install-dependencies | 9 +--------
 mpbb-install-port         | 9 +--------
 mpbb-selfupdate           | 5 -----
 7 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/mpbb b/mpbb
index ba35765..ef8a161 100755
--- a/mpbb
+++ b/mpbb
@@ -47,7 +47,6 @@ parseopt prefix:,work-dir: "$@" || exit
 # Use sensible defaults for options that weren't set on the command line.
 # shellcheck disable=SC2154
 {
-    : "${option_port=}"
     : "${option_prefix=/opt/local}"
     : "${option_work_dir=${PWD:-/tmp/mp-buildbot}}"
 }
diff --git a/mpbb-checkout b/mpbb-checkout
index b912e88..5a48d27 100644
--- a/mpbb-checkout
+++ b/mpbb-checkout
@@ -130,7 +130,7 @@ svn-checkout() {
 
 checkout() {
     local args
-    parseopt git::,jobs-url:,ports-branch:,ports-commit:,ports-url:,prefix:,svn::,svn-url: "$@" \
+    parseopt git::,jobs-url:,ports-branch:,ports-commit:,ports-url:,svn::,svn-url: "$@" \
         || return
     # shellcheck disable=SC2086
     set -- ${args+"${args[@]}"}
diff --git a/mpbb-cleanup b/mpbb-cleanup
index 244775e..6891276 100644
--- a/mpbb-cleanup
+++ b/mpbb-cleanup
@@ -18,13 +18,8 @@ EOF
 }
 
 cleanup() {
-    local args
-    parseopt prefix: "$@" || return
-    # shellcheck disable=SC2086
-    set -- ${args+"${args[@]}"}
-
     # if this is the very first build, selfupdate did not install port yet
-    # $option_prefix is set by parseopt
+    # $option_prefix is set in mpbb
     # shellcheck disable=SC2154
     if [ ! -e "${option_prefix}/bin/port" ]; then
         echo "---> Skipping cleanup"
diff --git a/mpbb-gather-archives b/mpbb-gather-archives
index d193e8d..e854265 100644
--- a/mpbb-gather-archives
+++ b/mpbb-gather-archives
@@ -31,7 +31,7 @@ EOF
 
 gather-archives() {
     local args
-    parseopt archive-site:,prefix:,staging-dir: "$@" || return
+    parseopt archive-site:,staging-dir: "$@" || return
     : "${option_archive_site=https://packages.macports.org}"
     # shellcheck disable=SC2154
     : "${option_staging_dir=${option_work_dir}/archive-staging}"
diff --git a/mpbb-install-dependencies b/mpbb-install-dependencies
index 725ac2c..62c8469 100644
--- a/mpbb-install-dependencies
+++ b/mpbb-install-dependencies
@@ -26,14 +26,7 @@ get-maintainers() {
 }
 
 install-dependencies() {
-    local args
-    parseopt port:,prefix: "$@" || return
-    # shellcheck disable=SC2154
-    : "${option_port=}"
-    # shellcheck disable=SC2086
-    set -- ${args+"${args[@]}"}
-
-    local port=${1-${option_port}}
+    local port=${1-}
     if [[ -z $port ]]; then
         err "Must specify a port"
         return 1
diff --git a/mpbb-install-port b/mpbb-install-port
index 3fcb970..2fec535 100644
--- a/mpbb-install-port
+++ b/mpbb-install-port
@@ -26,14 +26,7 @@ get-maintainers() {
 }
 
 install-port() {
-    local args
-    parseopt port:,prefix: "$@" || return
-    # shellcheck disable=SC2154
-    : "${option_port=}"
-    # shellcheck disable=SC2086
-    set -- ${args+"${args[@]}"}
-
-    local port=${1-${option_port}}
+    local port=${1-}
     if [[ -z $port ]]; then
         err "Must specify a port"
         return 1
diff --git a/mpbb-selfupdate b/mpbb-selfupdate
index c95bc48..12a420f 100644
--- a/mpbb-selfupdate
+++ b/mpbb-selfupdate
@@ -19,11 +19,6 @@ EOF
 }
 
 selfupdate() {
-    local args
-    parseopt prefix: "$@" || return
-    # shellcheck disable=SC2086
-    set -- ${args+"${args[@]}"}
-
     # $option_prefix is set in mpbb
     # shellcheck disable=SC2154
     if [ ! -f "${option_prefix}/bin/port" ]; then