Version bump

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 340 insertions, 15 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index b65418a22426..9c95c5f26525 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.223 2012/05/08 10:27:47 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.224 2012/05/29 20:17:08 xarthisius Exp $
+
+*doxygen-1.8.1 (29 May 2012)
+
+  29 May 2012; Kacper Kowalik <xarthisius@gentoo.org> +doxygen-1.8.1.ebuild,
+  +files/doxygen-1.8.1-prefix-misc-alt.patch:
+  Version bump
 
   08 May 2012; Kacper Kowalik <xarthisius@gentoo.org> doxygen-1.4.7.ebuild,
   doxygen-1.5.4.ebuild, doxygen-1.5.8-r1.ebuild, doxygen-1.6.3.ebuild,
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index dc184d86498a..0400e506c68f 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -14,6 +14,7 @@ AUX doxygen-1.5.8-kdedocs.patch 854 RMD160 945e07ab7f5f168d63f5a99423a56d9b12477
 AUX doxygen-1.6.2-dot-eps.patch 2449 RMD160 f8ca2a81af9dbe4fb709528b1f4146fe53aa338e SHA1 408b5119043a35d31b7d55b7f183a0dbae54d678 SHA256 fd62eda9dba9fad7a17c6afdb637178d28b7be7218c975f252a0a3de204c2b87
 AUX doxygen-1.7.1-dot-eps.patch 1359 RMD160 588347d4145638e6309395b8ad7cb4f441fc61ef SHA1 7b6ef31f3e1bc0835f8f9ffcc28d965cbf2d99aa SHA256 d45f040844707d439ee738f03ad81469df15cf14444f701fadf7eb97898771fd
 AUX doxygen-1.7.5.1-dot-eps.patch 1263 RMD160 ee56be1b40acee4cb6af7420826fc6e14404e5d8 SHA1 cee4cd0d9d475605869c8c86c192f9549c97df72 SHA256 d824ec94f2b5234f2434870c9025f1806adbc45512cae652d5ac234b4f4c61b5
+AUX doxygen-1.8.1-prefix-misc-alt.patch 2119 RMD160 7f15e0a79e0185fa0b4a6e78618b022bf5fc4f89 SHA1 5c21c50c95578927488d181f533ec06290174eeb SHA256 3e888815a63ff804053711cf31f25130abc509e9b52cb4263b209764b70b633b
 DIST doxygen-1.4.7-utf8-ru.patch.gz 14755 RMD160 8d83de95c416a352caa101277874caa1f68347f1 SHA1 ad1d388686b9cd9f330bc5091f15ccc485c8d614 SHA256 a4293ad1687c911ec6074677292172897bdec386f142c9af4b2f0726b91f2069
 DIST doxygen-1.4.7.src.tar.gz 2928354 RMD160 4de02b866cef53a7fd6f54e0ba90111814a9d77a SHA1 42a33d676fbd471165d02f531bfe98f433ecb432 SHA256 5db0e9ddf6fe74273096419d53d3835e9f1822581f20f5f20c057500a5e512ed
 DIST doxygen-1.5.4.src.tar.gz 3762535 RMD160 263e2287da4fbe91a429dc53fe3569b150c76fdf SHA1 1a815f7de6b412f7852d57dec9eb50f7c4b03268 SHA256 12e6a2166b8c78a991d4ceef1dd9042117b24b76e20ccfdfdfc30bc4a7e31df2
@@ -25,6 +26,7 @@ DIST doxygen-1.7.3.src.tar.gz 4507887 RMD160 52f0826451535754c77b7984e580f02f1c7
 DIST doxygen-1.7.5.1.src.tar.gz 4689511 RMD160 cd0552ea3e2e810dfb943700af70bb1cf9e0b6ae SHA1 15671defd1eefe255aa564b6f3097e30ab07ff55 SHA256 fdaec929502e3c4490bfcc87b48a916dab29310d3c7ef88d06f2806436e9ccd0
 DIST doxygen-1.7.6.1.src.tar.gz 4791654 RMD160 bd31ec5e62786683f0350f3e59f8d0835b4d88e3 SHA1 6203d4423d12315f1094b56a4d7393347104bc4a SHA256 0e60e794fb172d3fa4a9a9535f0b8e0eeb04e8366153f6b417569af0bcd61fcd
 DIST doxygen-1.8.0.src.tar.gz 5636443 RMD160 b93293f6bbea725382e5ee10f40fd5a84f7df0ec SHA1 7f4348418dc3efefd357b32a2b5c8010211ab284 SHA256 70fa9034bbe964654e95bdeffcefeb28cd4bf2f73dea8b951143f3cbd19cd533
+DIST doxygen-1.8.1.src.tar.gz 5997245 RMD160 8cd9da572e45207e362a20fffd22ecb5fabb48f9 SHA1 7a340a866ba9f55d941fb1de30dfb8a3d23109b2 SHA256 af9e9c0e2ab8ec31498119e86eea7ece0948a30134f5c3b4e9dc9586bacab762
 DIST doxywizard.png 4231 RMD160 b194049b42aad3466a5ef9c69ff3504536223dae SHA1 0902260c7169e60a504b29feec419b3a4183081f SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209
 EBUILD doxygen-1.4.7.ebuild 3763 RMD160 7fea04be337684fe632a6bb46fec5ebb4a820642 SHA1 8768dc78a49a0df4fdceb38ab44af113dd1e5241 SHA256 9ea68529c5d394994b9c65453e740171ce2e8edacb02a4662df21a36674c72fb
 EBUILD doxygen-1.5.4.ebuild 4594 RMD160 488369aeee3e74c4fad1b83ee80f701cc6b792c0 SHA1 fcbb9078a4c48d1df58ad0acf6679be3d9d1e3f0 SHA256 1034daf69bd03ad173bd0b0eb9773a903c20d822c3e1c6989844aa5d69f48cb5
@@ -35,22 +37,23 @@ EBUILD doxygen-1.7.3.ebuild 5797 RMD160 38767c0ac5053edc2df7175ab8d3dc9a2843fd64
 EBUILD doxygen-1.7.5.1.ebuild 5242 RMD160 f95b07349dfe4214f5224e60fe58fe29b56a484a SHA1 efc7e40502e10ebaddb14a22e30dde80281ef9cb SHA256 7f6e74083687553e59369c5f92d9eaa4850a748032a842b2e89c0547ff0ae40f
 EBUILD doxygen-1.7.6.1.ebuild 6298 RMD160 ab2aef9dfc44f4df2dbab9dbbb6cf78cec0d5f6d SHA1 9b250bd058d8e3f37947870544abe1fd6eb6cb1b SHA256 2dfefe58df5a2cb236c252fe163d0dc3a799f6c68b0df8fcc316cf309c542cf4
 EBUILD doxygen-1.8.0.ebuild 6542 RMD160 1ed84558a0e93726b5c59ed1fa9bfcacd02c3b1f SHA1 8c2a330ccfac5f029b67f65c9eb1f80aa9157c81 SHA256 a64cceb3e500d640a30a0e104f068c51ce84d2e151e39a620d6a5760cc859ae6
-MISC ChangeLog 37782 RMD160 2f84b442aa56ef02e542626bcdd19dc397aaadfc SHA1 029385e47de511376f6562b9e8b046ab58cf3c9b SHA256 472ad1723d0e799e3148817c799688f4f0ee5f8b52bcb1958055ce13e95e9029
+EBUILD doxygen-1.8.1.ebuild 6535 RMD160 05a8c0228010ddb5f22be5a262c76851b6c82d25 SHA1 012ec0860f1202cd85f31df2dc55cfb297dac481 SHA256 3776c446e3065bded8a8a66ed637e7c456342aadebe9cb82d8b0457450507a72
+MISC ChangeLog 37951 RMD160 7fb76c4de5f3fce535f6bb148bcf3d39c8317843 SHA1 47a0f7c99ac01ad7a836e5bf66541927f5ad515b SHA256 4a49d96ba2522641329d76ae52fc972a41e72c73b4b58de48f3243cb351b7e70
 MISC metadata.xml 1019 RMD160 b1d14f64119ee8cb68eeee22aa6178614438db9b SHA1 f2c94632397b23f9ebb778bd3814d939333ba32c SHA256 2f5b46f26e8aebd41be7ff37d05a0cb1de1e9b409a19e60bc26218306766384f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPqPUuAAoJEF0huFKJUZL5SkwP/R2OlLBTEZRYXaIlSbgQXgBl
-qCaiEJEfQwzej2qToWVNd6n48nRVMD0wFAZekP0xXE4YZY5T4oB6nYCDTPYSc9cf
-Q3P6tsckR9Cotg6pB9iErKctwkCs2xwQEp7eNAV9IOwB69OuAWU+UqsZFFUFbW4/
-RNC/M2oiMNkslDSbqiMQ2aw/63ifZxGy6M4MNw3bnZk7sfuRoRLVByxqySo+qStU
-cVwKoIH8zR0gwM+8rgsWc5JDSoPVWaVU5DoN5F3byo5ZaIvflMAoMTmswOo5wbaE
-RslYBftnTjQ7JAlXVKzZaVPkhC6H9lyM5DpAgj9dSH9QnvD5ClwU2OVprn42iKzR
-dJBghW3zgzxbHgllIh0FUC4/aIDVzXWqBC1RVIRI7hxPL0Fa/EZHK8lq2+ZDJEUt
-xEYrtFkJkIdJoCsxZ0nlD3/7zy58que8f7AMpYRsLp/1YIr3Ic7lzv0I0YM2Zdzj
-kxNx7cANec9U69ilI4MFqY92pj4tpzTy+AITlu1E7/Uw3+0Tj9T2SN6K928nuq1C
-+rwGWpxSr6A+P8us6/3lrU0eemvYnHnmIcfy7HLJoWE47HcLHZ7M5tuETA+NGC9F
-siiyugzpb5xoWV3GD8cO1lRGu7CexNtZTZv5o4iLqzxLcAhPfg+y07b0TJ+1A+U1
-sPV6N5knsoEhBCQ0BLSV
-=Ytk7
+iQIcBAEBCAAGBQJPxS7PAAoJEF0huFKJUZL55CwP/1O4rm7GgQddEMhtQHoiykic
+ZASB/DloR9MwO4zjdKaG7/xBcvKrJInISezDuf10X/Uo9dZC/Jm/neg7Mpzd1lZy
+W87XerZpPDr2s/LLLMkfEsjuRSUwOwApf/us7hDBa3M71EVpm4gjLXvXuyD2rgiL
+jlKeid03FgK9GUX6Pmf/tgqiqb7zqWmB82LexJRx8YDDkSSJ1uEqH316NhIuypc0
+a6uLOJRhRX+ayvXrx00DorVmz/SraxCjzRxDfKBCuFGovYeAohIU0fdqXdvRvMiu
+JLHUrO1/sWy/5xPXPDyfq6fKz89jW7uBgboifL+MZQKaHhX8ZpuG9E/Ez8gmx9fc
+Xfx66gkTkG8Kk/Sy+AVuX0zRQlpw3oJ/bharUVpfsm8TGIfJPX+N/xUwxcyx3bf5
+ZLbNux+fPuio9dgsA4EEmS8ndxQWGHzEZjVvhFnn8DxJC5MMWgk17F/27Bms6uMp
+O0X8MwH4I7/jo+Qt6nmkwMn6hZ6yonPBlsnJOc13w24blWzaaBCAlInYNmdw3r3O
+35RRbtSz3vTFods/bUOMXCwSx/JMB1unlMXkuTIshP9KjK3SSwosibCxz7KRLs4F
+YXldEB95/q7EGX/FAK04WslkGIHYxIhIklswQQZM2h+Zb/UlAxYMiCnUW9DAxmO1
+zU+xB3+1BN5A/d/DYCVe
+=v54u
 -----END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.8.1.ebuild b/app-doc/doxygen/doxygen-1.8.1.ebuild
new file mode 100644
index 000000000000..082a6ce47f6d
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.1.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.1.ebuild,v 1.1 2012/05/29 20:17:08 xarthisius Exp $
+
+EAPI=4
+
+inherit eutils fdo-mime flag-o-matic python qt4-r2 toolchain-funcs
+
+DESCRIPTION="Documentation system for most programming languages"
+HOMEPAGE="http://www.doxygen.org/"
+SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
+	http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc dot qt4 latex elibc_FreeBSD userland_GNU"
+
+#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional
+
+LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk
+nl nb pl pt ro ru sl sk sr sv tr uk vi af)
+for X in "${LANGS[@]}" ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="qt4? ( x11-libs/qt-gui:4 )
+	latex? ( app-text/texlive[extra] )
+	dev-lang/perl
+	virtual/libiconv
+	media-libs/libpng
+	app-text/ghostscript-gpl
+	dot? (
+		media-gfx/graphviz
+		media-libs/freetype
+	)"
+
+DEPEND="sys-apps/sed
+	sys-devel/flex
+	sys-devel/bison
+	doc? ( =dev-lang/python-2* )
+	${RDEPEND}"
+
+RESTRICT="mirror"
+EPATCH_SUFFIX="patch"
+
+get_langs() {
+	# using only user set linguas also fixes #263641
+	my_linguas=()
+	for lingua in ${LINGUAS}; do
+		if has ${lingua} "${LANGS[@]}"; then
+			case ${lingua} in
+				hy) lingua=am ;;
+			    pt_BR) lingua=br ;;
+				zh*) lingua=cn ;;
+				cs) lingua=cz ;;
+				da) lingua=dk ;;
+				el*) lingua=gr ;;
+				ja*) lingua=jp ;;
+				ko) lingua=kr ;;
+				nb) lingua=no ;;
+				sl) lingua=si ;;
+			    tr*) lingua=tr ;;
+			    uk) lingua=ua ;;
+			    af) lingua=za ;;
+			esac
+			has ${lingua} "${my_linguas[@]}" ||
+				my_linguas+=(${lingua})
+		fi
+	done
+	f_langs="${my_linguas[@]}"
+	echo ${f_langs// /,}
+}
+
+pkg_setup() {
+	tc-export CC CXX
+	if use doc; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# use CFLAGS, CXXFLAGS, LDFLAGS
+	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
+
+	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
+		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
+		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
+		-e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCXX):" \
+		-e "s:^\(TMAKE_LINK\s*\)=.*$:\1= $(tc-getCXX):" \
+		-e "s:^\(TMAKE_LINK_SHLIB\s*\)=.*$:\1= $(tc-getCXX):" \
+		-e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCC):" \
+		tmake/lib/{{linux,gnu,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++,linux-64}/tmake.conf \
+		|| die
+
+	# Ensure we link to -liconv
+	if use elibc_FreeBSD; then
+		for pro in */*.pro.in */*/*.pro.in; do
+		echo "unix:LIBS += -liconv" >> "${pro}"
+		done
+	fi
+
+	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
+	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
+
+	# prefix search tools patch, plus OSX fixes
+	epatch "${FILESDIR}"/${P}-prefix-misc-alt.patch
+
+	# fix final DESTDIR issue
+	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
+		-e "s/all: Makefile.doxywizard/all:/g" \
+		addon/doxywizard/Makefile.in || die
+
+	# fix pdf doc
+	sed -i.orig -e "s:g_kowal:g kowal:" \
+		doc/maintainers.txt || die
+
+	if is-flagq "-O3" ; then
+		echo
+		ewarn "Compiling with -O3 is known to produce incorrectly"
+		ewarn "optimized code which breaks doxygen."
+		echo
+		elog "Continuing with -O2 instead ..."
+		echo
+		replace-flags "-O3" "-O2"
+	fi
+}
+
+src_configure() {
+	# set ./configure options (prefix, Qt based wizard, docdir)
+
+	local my_conf="--shared --enable-langs $(get_langs)"
+
+	if use debug ; then
+		my_conf="${my_conf} --debug"
+	else
+		my_conf="${my_conf} --release "
+	fi
+
+	use ppc64 && my_conf="${my_conf} --english-only" #263641
+
+	use qt4 && my_conf="${my_conf} --with-doxywizard"
+
+	# On non GNU userland (e.g. BSD), configure script picks up make and bails
+	# out because it is not GNU make, so we force the right value.
+	use userland_GNU || my_conf="${my_conf} --make ${MAKE} --install install"
+
+	export LINK="${QMAKE_LINK}"
+	export LINK_SHLIB="${QMAKE_CXX}"
+
+	if use qt4 ; then
+		pushd addon/doxywizard &> /dev/null
+		eqmake4 doxywizard.pro -o Makefile.doxywizard
+		popd &> /dev/null
+	fi
+
+	./configure --prefix "${EPREFIX}/usr" ${my_conf} \
+			|| die
+}
+
+src_compile() {
+
+	emake CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" \
+		LFLAGS+="${ELDFLAGS}" all
+
+	# generate html and pdf (if tetex in use) documents.
+	# errors here are not considered fatal, hence the ewarn message
+	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
+	# so we allow it.
+	if use doc; then
+		if ! use dot; then
+			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
+				{Doxyfile,doc/Doxyfile} \
+				|| ewarn "disabling dot failed"
+		fi
+		if use latex; then
+			addwrite /var/cache/fonts
+			addwrite /var/cache/fontconfig
+			addwrite /usr/share/texmf/fonts/pk
+			addwrite /usr/share/texmf/ls-R
+			make pdf || ewarn '"make pdf docs" failed.'
+		else
+			cp doc/Doxyfile doc/Doxyfile.orig
+			cp doc/Makefile doc/Makefile.orig
+			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" \
+				doc/Doxyfile
+			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
+				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
+				-e "s/@sed/# @sed/" doc/Makefile
+			make docs || ewarn '"make docs" failed.'
+		fi
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" MAN1DIR=share/man/man1 install
+
+	if use qt4; then
+		doicon "${DISTDIR}/doxywizard.png"
+		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
+			"/usr/share/pixmaps/doxywizard.png" \
+			"Application;Development"
+	fi
+
+	dodoc INSTALL LANGUAGE.HOWTO README
+
+	# pdf and html manuals
+	if use doc; then
+		dohtml -r html/*
+		use latex && dodoc latex/doxygen_manual.pdf
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	elog
+	elog "The USE flags qt4, doc, and latex will enable doxywizard, or"
+	elog "the html and pdf documentation, respectively.  For examples"
+	elog "and other goodies, see the source tarball.  For some example"
+	elog "output, run doxygen on the doxygen source using the Doxyfile"
+	elog "provided in the top-level source dir."
+	elog
+	elog "Disabling the dot USE flag will remove the GraphViz dependency,"
+	elog "along with Doxygen's ability to generate diagrams in the docs."
+	elog "See the Doxygen homepage for additional helper tools to parse"
+	elog "more languages."
+	elog
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-doc/doxygen/files/doxygen-1.8.1-prefix-misc-alt.patch b/app-doc/doxygen/files/doxygen-1.8.1-prefix-misc-alt.patch
new file mode 100644
index 000000000000..0ecaf4db37b4
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.1-prefix-misc-alt.patch
@@ -0,0 +1,82 @@
+* make sure we always look for tools in the path, no "do it yourself paths"
+
+--- a/configure
++++ b/configure
+@@ -170,27 +170,15 @@
+       ;;
+     Darwin:*)
+       f_platform=macosx-c++
+-      if test "$f_insttool" = NO; then
+-        f_insttool=/usr/bin/install
+-      fi
+       ;;
+     FreeBSD:*)
+       f_platform=freebsd-g++
+-      if test "$f_insttool" = NO; then
+-        f_insttool=/usr/bin/install
+-      fi
+       ;;
+     NetBSD:*)
+       f_platform=netbsd-g++
+-      if test "$f_insttool" = NO; then
+-        f_insttool=/usr/bin/install
+-      fi
+       ;;
+     HP-UX:*)
+       f_platform=hpux-g++
+-      if test "$f_insttool" = NO; then
+-        f_insttool=/usr/bin/install
+-      fi
+       ;;
+     IRIX64:*)
+       f_platform=irix-64
+@@ -221,9 +209,6 @@
+       ;;
+     SunOS:5*)
+       f_platform=solaris-g++
+-      if test "$f_insttool" = NO; then
+-        f_insttool=/usr/bin/install
+-      fi
+       ;;
+     ULTRIX:*)
+       f_platform=ultrix-g++
+@@ -323,8 +308,8 @@
+ 
+ echo -n "  Checking for GNU install tool... "
+ if test "$f_insttool" = NO; then
+-  install_names="ginstall install"
+-  install_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin /usr/ucb"
++  install_names="install"
++  install_dirs="$bin_dirs"
+   install_prog=NO
+   install_found=NO
+   for i in $install_names; do
+@@ -360,7 +345,7 @@
+ 
+ echo -n "  Checking for dot (part of GraphViz)... "
+ if test "$f_dot" = NO; then
+-  dot_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
++  dot_dirs="$bin_dirs"
+   dot_prog=NO
+   for j in $dot_dirs; do
+     if test -x "$j/dot"; then
+@@ -382,7 +367,7 @@
+ echo -n "  Checking for perl... "
+ if test "$f_perl" = NO; then
+   perl_names="perl perl5"
+-  perl_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
++  perl_dirs="$bin_dirs"
+   perl_prog=NO
+   perl_found=NO
+   for i in $perl_names; do
+@@ -546,10 +531,6 @@
+   cat >> .tmakeconfig <<EOF
+     TMAKE_LFLAGS += -non_shared
+ EOF
+-  elif test "$f_platform" = "solaris-cc"; then
+-  cat >> .tmakeconfig <<EOF
+-    TMAKE_LFLAGS += -Bstatic
+-EOF
+   elif test "$f_platform" = "hpux-cc"; then
+   cat >> .tmakeconfig <<EOF
+     TMAKE_LFLAGS += -noshared