# HG changeset patch
# User t_mrc-ct@sourceforge.jp
# Date 1349093723 -32400
# Branch GECKO1709esr_2013091117_RELBRANCH
# Node ID 35c551d98f3face544522dda65cb0c9ac191634d
# Parent  6e280a67f024010ef7457ba6235ae398326f97e4
display proper cpu info on About dialog and Finder's Get Info (with v17 fix)

diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -1794,36 +1794,39 @@
         
         LDFLAGS=$_SAVE_LDFLAGS
     fi
     MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
 
     # What Tenfourbird tuned for
     if test "$CC"
     then
-     case "`echo "$CC" | sed -E -e 's/.*-mtune=([0-9a-zA-Z]+).*/\1/p' -e 'd'`" in
+     changequote(,)
+     tenfourbird_mtune_test="`echo "$CC" | sed -E -ne 's|.*-mtune=([0-9a-zA-Z]+).*|\1|p' -e 'd'`" 
+     changequote([,])
+     case "$tenfourbird_mtune_test" in
      "G3"|"740"|"750")
-      TENFOURBIRD_CPUTYPE="PowerPC G3"
+      TENFOURBIRD_TUNED="PowerPC G3"
      ;;
      "G4"|"7400")
-      TENFOURBIRD_CPUTYPE="PowerPC G4"
+      TENFOURBIRD_TUNED="PowerPC G4"
      ;;
      "7450")
-      TENFOURBIRD_CPUTYPE="PowerPC G4e"
+      TENFOURBIRD_TUNED="PowerPC G4e"
      ;;
      "G5"|"970")
-      TENFOURBIRD_CPUTYPE="PowerPC G5"
+      TENFOURBIRD_TUNED="PowerPC G5"
      ;;
      *)
-      TENFOURBIRD_CPUTYPE="PowerPC"
+      TENFOURBIRD_TUNED="PowerPC"
      ;;
      esac
-     AC_DEFINE_UNQUOTED(TENFOURBIRD_CPUTYPE, "$TENFOURBIRD_CPUTYPE")
-     AC_SUBST(TENFOURBIRD_CPUTYPE)
-    fi # TENFOURBIRD_CPUTYPE
+     AC_DEFINE_UNQUOTED(TENFOURBIRD_TUNED, "$TENFOURBIRD_TUNED")
+     AC_SUBST(TENFOURBIRD_TUNED)
+    fi # TENFOURBIRD_TUNED
     ;;
 
 *-freebsd*)
     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
 	DLL_SUFFIX=".so.1.0"
 	DSO_LDOPTS="-shared"
     fi
     if test ! "$GNU_CC"; then
diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -227,17 +227,17 @@
 APPFILES = MacOS
 endif
 
 libs repackage:: $(PROGRAM)
 	$(MKDIR) -p $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS
 	rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(MOZ_MACBUNDLE_NAME) --exclude English.lproj
 	$(MKDIR) -p $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj
 	rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj
-	sed -e "s/%APP_VERSION%/$(MOZ_APP_VERSION)/" -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" -e "s/%LOWER_MAC_APP_NAME%/$(LOWER_MAC_APP_NAME)/" -e "s/%MAC_APP_CPU_TYPE%/$(TENFOURBIRD_CPUTYPE)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Info.plist
+	sed -e "s/%APP_VERSION%/$(MOZ_APP_VERSION)/" -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" -e "s/%LOWER_MAC_APP_NAME%/$(LOWER_MAC_APP_NAME)/" -e "s/%TENFOURBIRD_TUNED%/$(TENFOURBIRD_TUNED)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Info.plist
 	sed -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj/InfoPlist.strings
 	rsync -a $(DIST)/bin/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)
 ifdef LIBXUL_SDK
 	cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/thunderbird
 else
 	$(RM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(PROGRAM)
 	rsync -aL $(PROGRAM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS
 endif
diff --git a/mail/app/macbuild/Contents/Info.plist.in b/mail/app/macbuild/Contents/Info.plist.in
--- a/mail/app/macbuild/Contents/Info.plist.in
+++ b/mail/app/macbuild/Contents/Info.plist.in
@@ -2,17 +2,17 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>thunderbird</string>
 	<key>CFBundleGetInfoString</key>
-	<string>%MAC_APP_NAME% %APP_VERSION% for %MAC_APP_CPU_TYPE%</string>
+	<string>%MAC_APP_NAME% %APP_VERSION% for %TENFOURBIRD_TUNED%</string>
 	<key>CFBundleIconFile</key>
 	<string>thunderbird</string>
 	<key>CFBundleIdentifier</key>
 	<string>jp.sourceforge.%LOWER_MAC_APP_NAME%</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>%MAC_APP_NAME%</string>
diff --git a/mail/base/content/aboutDialog.xul b/mail/base/content/aboutDialog.xul
--- a/mail/base/content/aboutDialog.xul
+++ b/mail/base/content/aboutDialog.xul
@@ -38,21 +38,17 @@
   <script type="application/javascript" src="chrome://messenger/content/specialTabs.js"/>
   <!-- This one is for openURL -->
   <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
 
   <vbox id="aboutDialogContainer">
     <hbox id="clientBox">
       <vbox id="leftBox" flex="1"/>
       <vbox id="rightBox" flex="1">
-#ifdef TENFOURBIRD_CPUTYPE
-#expand <label id="version" value="__MOZ_APP_VERSION__ for __TENFOURBIRD_CPUTYPE__"/>
-#else
-#expand <label id="version" value="__MOZ_APP_VERSION__"/>
-#endif
+#expand <label id="version" value="__MOZ_APP_VERSION__ for __TENFOURBIRD_TUNED__"/>
         <label id="distribution" class="text-blurb"/>
         <label id="distributionId" class="text-blurb"/>
 
         <vbox id="detailsBox">
           <vbox id="updateBox">
 #ifdef MOZ_UPDATER
             <deck id="updateDeck" orient="vertical">
               <hbox id="updateButtonBox" align="center">
