OS-2125 multilib: gcc package name has changed; configure is lost

configure

@@ -75,10 +75,25 @@ function source_vars
 
 function install_pkgin
 {
+	local pkglist=
+
+	#
+	# Newer images have a pkgin repo with a 'build-essential' package
+	# that pulls in several of the packages we need.  This is useful since
+	# it allows us to not worry about things like gcc46 vs. gcc47 etc.
+	#
 	$conf_priv pkgin -f update || fatal "failed to update pkgsrc repository"
-	for pkg in gmake binutils autoconf automake bison flex libtool-base \
-	    python26 py26-expat libxslt gcc-compiler sun-jre6 sun-jdk6 gmp \
-	    mpfr nodejs p5-XML-Parser gettext; do
+	if pkgin se build-essential | grep build-essential >/dev/null; then
+		pkglist="build-essential"
+	else
+		pkglist="gmake binutils autoconf automake bison"
+		pkglist="$pkglist libtool-base gcc-compiler"
+	fi
+
+	pkglist="$pkglist flex libxslt sun-jre6 sun-jdk6 nodejs"
+	pkglist="$pkglist p5-XML-Parser gettext python26 py26-expat"
+
+	for pkg in $pkglist; do
 		if ! pkg_info -qe $pkg; then
 			$conf_priv pkgin -y install $pkg || fatal \
 		    "failed to install $pkg"