# HG changeset patch
# User t_mrc-ct@users.sourceforge.jp
# Date 1384096796 -32400
# Branch GECKO2450_2014042411_RELBRANCH
# Node ID 4fdc697aff9f8fa12a18d4083894889c60212293
# Parent  b258fa13584ba26db0068b893b00202ad4fef65b
display cpu info on about-dialog and finder's 'get info' (with v24 fix)

diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -223,17 +223,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/%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,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 PowerPC %TENFOURBIRD_TUNED%</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>
@@ -58,21 +58,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>
@@ -94,31 +94,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/configure.in b/mail/configure.in
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -139,8 +139,44 @@
     dnl The cache file needs to be an absolute path to work properly.
     cache_file_base=`dirname $cache_file`
     cache_file=`cd $cache_file_base && pwd`/`basename $cache_file`
 
     AC_OUTPUT_SUBDIRS(../ldap/sdks/c-sdk)
     ac_configure_args="$_save_ac_configure_args"
 fi # COMPILE_ENVIRONMENT && MOZ_LDAP_XPCOM
 
+dnl Tenfourbird specific configs.
+case "$target" in
+*-darwin*)
+    # What Tenfourbird tuned for
+    if test "$CC"
+    then
+        changequote(,)
+        TENFOURBIRD_TUNED="`echo "$CC" | sed -E -ne "s#.*[[:blank:]]-mtune='([[:alnum:]]+)'([[:blank:]].*)?\\$#\\1#p" -e 's#.*[[:blank:]]-mtune="([[:alnum:]]+)"([[:blank:]].*)?$#\1#p' -e 's#.*[[:blank:]]-mtune=([[:alnum:]]+)([[:blank:]].*)?$#\1#p' -e d | sed -E -e 's/^([gG]3|740|750)$/G3/' -e 's/^([gG]4|7400)$/7400/' -e 's/^7450$/7450/' -e 's/^([gG]5|970)$/G5/'`"
+
+        changequote([,])
+
+        AC_SUBST([TENFOURBIRD_TUNED])
+
+        # XXX AC_DEFINE_UNQUOTED don't work because of error :-<
+
+        case "$TENFOURBIRD_TUNED" in
+        G3)
+            AC_DEFINE([TENFOURBIRD_TUNED],["G3"])
+            ;;
+        7400)
+            AC_DEFINE([TENFOURBIRD_TUNED],["7400"])
+            ;;
+        7450)
+            AC_DEFINE([TENFOURBIRD_TUNED],["7450"])
+            ;;
+        G5)
+            AC_DEFINE([TENFOURBIRD_TUNED],["G5"])
+            ;;
+        esac
+
+    fi # TENFOURBIRD_TUNED
+
+    MOZ_PKG_APPNAME=Tenfourbird
+    AC_SUBST([MOZ_PKG_APPNAME])
+    ;;
+esac
\ No newline at end of file
