# HG changeset patch
# User t_mrc-ct@sourceforge.jp
# Date 1335442629 -32400
# Branch GECKO10011_2012111513_RELBRANCH
# Node ID ce443dd8365a95a003345bc20c6f70f728962205
# Parent  a5ba9fd4c237708d6f935e8bd74bee0f15c984b7
display cpu info on about dialog and finder's 'get info'

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -543,3 +543,5 @@
 $(error MSYS-style srcdir being used with PyMake. Did you mean to run GNU-Make instead? [see-also: https://developer.mozilla.org/en/Gmake_vs._Pymake])
 endif
 endif # Windows
+
+TENFOURBIRD_CPUTYPE=@TENFOURBIRD_CPUTYPE@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -1943,6 +1943,30 @@
         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*)
@@ -7362,3 +7386,4 @@
     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
@@ -294,7 +294,7 @@
 	rsync -a --exclude CVS --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 CVS --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/MacOS
 	rm -f $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(PROGRAM)
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
@@ -7,11 +7,11 @@
 	<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>
@@ -59,11 +59,11 @@
 	<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>
@@ -95,14 +95,14 @@
 			</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>
@@ -111,7 +111,7 @@
 			    <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>
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
@@ -78,7 +78,11 @@
     <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"/>
 
