# HG changeset patch
# User t_mrc-ct@sourceforge.jp
# Date 1349093394 -32400
# Branch GECKO1709esr_2013091117_RELBRANCH
# Node ID 1f1bf9836f9069f4ee233b24740744697cfe0444
# Parent  2344ba0b70792e57ff6170a4981feb2938f7a1f6
display 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
@@ -1790,16 +1790,40 @@
             MOZ_OPTIMIZE_LDFLAGS="-Wl,-dead_strip"
         else
             AC_MSG_RESULT([no])
         fi
         
         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
+     "G3"|"740"|"750")
+      TENFOURBIRD_CPUTYPE="PowerPC G3"
+     ;;
+     "G4"|"7400")
+      TENFOURBIRD_CPUTYPE="PowerPC G4"
+     ;;
+     "7450")
+      TENFOURBIRD_CPUTYPE="PowerPC G4e"
+     ;;
+     "G5"|"970")
+      TENFOURBIRD_CPUTYPE="PowerPC G5"
+     ;;
+     *)
+      TENFOURBIRD_CPUTYPE="PowerPC"
+     ;;
+     esac
+     AC_DEFINE_UNQUOTED(TENFOURBIRD_CPUTYPE, "$TENFOURBIRD_CPUTYPE")
+     AC_SUBST(TENFOURBIRD_CPUTYPE)
+    fi # TENFOURBIRD_CPUTYPE
     ;;
 
 *-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
@@ -7101,8 +7125,9 @@
         ac_configure_args="$ac_configure_args --enable-64bit"
     fi
     if test -n "$LIBXUL_SDK"; then
         ac_configure_args="$ac_configure_args --with-nspr=$LIBXUL_DIST"
     fi
     AC_OUTPUT_SUBDIRS(ldap/sdks/c-sdk)
     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 fi # COMPILE_ENVIRONMENT && MOZ_LDAP_XPCOM
+
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)/" $(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/%MAC_APP_CPU_TYPE%/$(TENFOURBIRD_CPUTYPE)/" $(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,21 +2,21 @@
 <!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%</string>
+	<string>%MAC_APP_NAME% %APP_VERSION% for %MAC_APP_CPU_TYPE%</string>
 	<key>CFBundleIconFile</key>
 	<string>thunderbird</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.mozilla.%LOWER_MAC_APP_NAME%</string>
+	<string>jp.sourceforge.%LOWER_MAC_APP_NAME%</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>%MAC_APP_NAME%</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>%APP_VERSION%</string>
@@ -56,21 +56,21 @@
         <key>NSSupportsAutomaticGraphicsSwitching</key>
         <true/>
         <key>NSPrincipalClass</key>
         <string>GeckoNSApplication</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>
 			<key>UTTypeIdentifier</key>
-			<string>com.mozilla.thunderbird.mozeml</string>
+			<string>jp.sourceforge.%LOWER_MAC_APP_NAME%.mozeml</string>
 			<key>UTTypeReferenceURL</key>
-			<string>http://www.mozilla.com/Thunderbird</string>
+			<string>http://sourceforge.jp/projects/tenfourbird/</string>
 			<key>UTTypeDescription</key>
-			<string>Thunderbird Mail Message</string>
+			<string>%MAC_APP_NAME% Mail Message</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
 				<string>public.content</string>
 				<string>public.email-message</string>
 			</array>
 			<key>UTTypeTagSpecification</key>
 			<dict>
@@ -92,31 +92,31 @@
 				<string>mozeml</string>
 			</array>
 			<key>CFBundleTypeOSTypes</key>
 			<array>
 				<string>TBMZ</string>
 			</array>
 
 			<key>CFBundleTypeName</key>
-			<string>Thunderbird Mail Message</string>
+			<string>%MAC_APP_NAME% Mail Message</string>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 			<key>LSTypeIsPackage</key>
 			<false/>
 			<key>LSItemContentTypes</key>
 			<array>
-				<string>com.mozilla.thunderbird.mozeml</string>
+				<string>jp.sourceforge.%LOWER_MAC_APP_NAME%.mozeml</string>
 			</array>
 		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
 			    <string>eml</string>
 			</array>
 			<key>CFBundleTypeName</key>
-			<string>Thunderbird E-mail</string>
+			<string>%MAC_APP_NAME% E-mail</string>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
 	</array>
 </dict>
 </plist>
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,17 +38,21 @@
   <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
         <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">
