- Use homebrew/versions/gcc49 instead of

  https://raw.githubusercontent.com/veprbl/homebrew-x11/imake-fix/imake.rb.
(chise_cc): New variable.
- Use chise/misc/berkeley-db5 instead of berkeley-db.
- Run `brew -v link canna'.

diff --git a/bootstrap.homebrew b/bootstrap.homebrew
index cd8e263..9bc7d5d 100755 (executable)
--- a/bootstrap.homebrew
+++ b/bootstrap.homebrew
@@ -12,12 +12,24 @@ brew_prefix=`brew --prefix`
 #brew install gcc
 #export IMAKECPP=${brew_prefix}/bin/cpp
 #export IMAKECPP=${brew_prefix}/bin/cpp-4.9
-brew install https://raw.githubusercontent.com/veprbl/homebrew-x11/imake-fix/imake.rb
+brew install homebrew/versions/gcc49
+#brew install homebrew/versions/gcc5
+#brew install homebrew/versions/gcc6
+chise_cc=${brew_prefix}/bin/gcc-4.9
+
+#brew install https://raw.githubusercontent.com/veprbl/homebrew-x11/imake-fix/imake.rb
+brew tap homebrew/x11
+brew install imake
 
 brew -v install libtiff
 brew -v install openjpeg
-brew -v install berkeley-db
-brew -v install xaw3d
+
+#brew -v install berkeley-db
+brew tap chise/misc
+#HOMEBREW_CC=gcc-4.9 brew -v install --without-java berkeley-db5
+brew -v install --without-java berkeley-db5
+
+#brew -v install xaw3d
 brew -v install gettext
 
 if [ -f /Library/LaunchDaemons/homebrew.mxcl.canna.plist ]
@@ -29,8 +41,8 @@ then
     sudo ${brew_prefix}/sbin/cannakill
 fi
 
-brew tap chise/misc
 brew -v install canna
+brew -v link canna
 
 
 sudo sh -c "sed 's/rc\.canna/rc.canna-root/' \
@@ -42,7 +54,7 @@ sudo launchctl load -w /Library/LaunchDaemons/homebrew.mxcl.canna.plist
 
 brew -v install wget
 
-CC=${brew_prefix}/bin/gcc-4.9 ./configure \
+CC=${chise_cc} ./configure \
     --with-site-includes=/usr/X11/include \
     --with-site-libraries=/usr/X11/lib \
     --with-canna