diff --git a/checkin_notes b/checkin_notes
index 0725272e84..2da9c7d16a 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6902,3 +6902,22 @@ David 20 Aug 2008
str_util.C
samples/multi_thread/
multi_thread.C
+
+Rom 20 Aug 2008
+ - web: fix a parsing error in sample_index.php which would
+ cause new projects to report an error when they first
+ attempt to start up.
+ - tools: Add the missing x86_64-apple-darwin platform type
+ used for 64-bit Mac OS X applications. I used the
+ description from the alpha project.
+ - MGR: delete obselete make files.
+
+
+ clientgui/
+ Makefile.linux.fedora
+ Makefile.linux.suse
+ Makefile.linux.ubuntu
+ html/user/
+ sample_index.php
+ tools/
+ project.xml
diff --git a/clientgui/Makefile.linux.fedora b/clientgui/Makefile.linux.fedora
deleted file mode 100644
index 357c82713d..0000000000
--- a/clientgui/Makefile.linux.fedora
+++ /dev/null
@@ -1,103 +0,0 @@
-## Berkeley Open Infrastructure for Network Computing
-## http://boinc.berkeley.edu
-## Copyright (C) 2005 University of California
-##
-## This is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation;
-## either version 2.1 of the License, or (at your option) any later version.
-##
-## This software is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-## See the GNU Lesser General Public License for more details.
-##
-## To view the GNU Lesser General Public License visit
-## http://www.gnu.org/copyleft/lesser.html
-## or write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-##
-## Provide a specially constructed binary for the Linux Fedora environment
-## using GTK 2.x and wxWidgets. This should produce a stock client for Fedora
-## 5 or better and is intended to be built with the BOINC-Build-Fedora
-## virtual machine
-##
-
-CXX=g++ -g
-CXXFLAGS=-DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA
-CXXINCLUDES=-I../ -I../lib/ -I/usr/local/lib/wx/include/gtk2-unicode-release-static-2.8 -I/usr/local/include/wx-2.8
-
-stdwx.h.gch: stdwx.h
- $(CXX) $(CXXINCLUDES) $(CXXFLAGS) -c stdwx.h -o stdwx.h.gch
-
-.cpp.o:
- $(CXX) $(CXXINCLUDES) $(CXXFLAGS) -c -o $*.o $<
-
-OBJ = \
- stdwx.o \
- BOINCBaseFrame.o \
- BOINCBaseView.o \
- BOINCDialupManager.o \
- BOINCGUIApp.o \
- BOINCTaskBar.o \
- DlgAbout.o \
- DlgGenericMessage.o \
- DlgOptions.o \
- DlgSelectComputer.o \
- ValidateAccountKey.o \
- ValidateEmailAddress.o \
- ValidateURL.o \
- LogBOINC.o \
- hyperlink.o \
- MainDocument.o \
- AdvancedFrame.o \
- BOINCTaskCtrl.o \
- BOINCListCtrl.o \
- ViewMessages.o \
- ViewProjects.o \
- ViewResources.o \
- ViewStatistics.o \
- ViewTransfers.o \
- ViewWork.o \
- wizardex.o \
- BOINCBaseWizard.o \
- WizardAccountManager.o \
- WizardAttachProject.o \
- AccountInfoPage.o \
- AccountKeyPage.o \
- AccountManagerInfoPage.o \
- AccountManagerProcessingPage.o \
- AccountManagerPropertiesPage.o \
- AlreadyAttachedPage.o \
- AlreadyExistsPage.o \
- CompletionErrorPage.o \
- CompletionPage.o \
- NoInternetConnectionPage.o \
- NotDetectedPage.o \
- NotFoundPage.o \
- ProjectInfoPage.o \
- ProjectProcessingPage.o \
- ProjectPropertiesPage.o \
- ProxyInfoPage.o \
- ProxyPage.o \
- UnavailablePage.o \
- WelcomePage.o
-
-LIBS = -pthread -L/usr/X11R6/lib -L/opt/gnome/lib ../lib/libboinc.a /usr/local/lib/libwx_gtk2u_xrc-2.8.a /usr/local/lib/libwx_gtk2u_qa-2.8.a /usr/local/lib/libwx_gtk2u_html-2.8.a /usr/local/lib/libwx_gtk2u_adv-2.8.a /usr/local/lib/libwx_gtk2u_core-2.8.a /usr/local/lib/libwx_baseu_xml-2.8.a /usr/local/lib/libwx_baseu_net-2.8.a /usr/local/lib/libwx_baseu-2.8.a -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lXinerama -lXxf86vm /usr/lib/libpng.a /usr/lib/libjpeg.a /usr/lib/libtiff.a /usr/lib/libexpat.a /usr/local/lib/libwxregexu-2.8.a /usr/local/lib/libz.a -ldl -lm /usr/lib/gcc/i386-redhat-linux/3.4.4/libstdc++.a /usr/lib/gcc/i386-redhat-linux/3.4.4/libgcc.a
-
-clean:
- rm stdwx.h.gch
- rm boincmgr
- rm boincmgr.unmodified
- rm $(PROGS) $(OBJ)
-
-boincmgr: stdwx.h.gch $(OBJ)
- $(CC) $(OBJ) $(INCLUDES) $(WXINCLUDES) $(DEFINES) $(WXDEFINES) $(LIBS) -o boincmgr
-
-boincmgr_strip: boincmgr
- cp boincmgr boincmgr.unmodified
- strip boincmgr
-
-PROGS = boincmgr_strip
-
-all: $(PROGS)
diff --git a/clientgui/Makefile.linux.suse b/clientgui/Makefile.linux.suse
deleted file mode 100644
index f79ae9dfed..0000000000
--- a/clientgui/Makefile.linux.suse
+++ /dev/null
@@ -1,103 +0,0 @@
-## Berkeley Open Infrastructure for Network Computing
-## http://boinc.berkeley.edu
-## Copyright (C) 2005 University of California
-##
-## This is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation;
-## either version 2.1 of the License, or (at your option) any later version.
-##
-## This software is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-## See the GNU Lesser General Public License for more details.
-##
-## To view the GNU Lesser General Public License visit
-## http://www.gnu.org/copyleft/lesser.html
-## or write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-##
-## Provide a specially constructed binary for the Linux SUSE environment
-## using GTK 2.x and wxWidgets. This should produce a stock client for SUSE
-## 10.1 or better and is intended to be built with the BOINC-Build-SUSE
-## virtual machine
-##
-
-CXX=g++ -g
-CXXFLAGS=-DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA
-CXXINCLUDES=-I../ -I../lib/ -I/usr/local/lib/wx/include/gtk2-unicode-release-static-2.6 -I/usr/local/include/wx-2.6
-
-stdwx.h.gch: stdwx.h
- $(CXX) $(CXXINCLUDES) $(CXXFLAGS) -c stdwx.h -o stdwx.h.gch
-
-.cpp.o:
- $(CXX) $(CXXINCLUDES) $(CXXFLAGS) -c -o $*.o $<
-
-OBJ = \
- stdwx.o \
- BOINCBaseFrame.o \
- BOINCBaseView.o \
- BOINCDialupManager.o \
- BOINCGUIApp.o \
- BOINCTaskBar.o \
- DlgAbout.o \
- DlgGenericMessage.o \
- DlgOptions.o \
- DlgSelectComputer.o \
- ValidateAccountKey.o \
- ValidateEmailAddress.o \
- ValidateURL.o \
- LogBOINC.o \
- hyperlink.o \
- MainDocument.o \
- AdvancedFrame.o \
- BOINCTaskCtrl.o \
- BOINCListCtrl.o \
- ViewMessages.o \
- ViewProjects.o \
- ViewResources.o \
- ViewStatistics.o \
- ViewTransfers.o \
- ViewWork.o \
- wizardex.o \
- BOINCBaseWizard.o \
- WizardAccountManager.o \
- WizardAttachProject.o \
- AccountInfoPage.o \
- AccountKeyPage.o \
- AccountManagerInfoPage.o \
- AccountManagerProcessingPage.o \
- AccountManagerPropertiesPage.o \
- AlreadyAttachedPage.o \
- AlreadyExistsPage.o \
- CompletionErrorPage.o \
- CompletionPage.o \
- NoInternetConnectionPage.o \
- NotDetectedPage.o \
- NotFoundPage.o \
- ProjectInfoPage.o \
- ProjectProcessingPage.o \
- ProjectPropertiesPage.o \
- ProxyInfoPage.o \
- ProxyPage.o \
- UnavailablePage.o \
- WelcomePage.o
-
-LIBS = -pthread -L/usr/X11R6/lib -L/opt/gnome/lib ../lib/libboinc.a /usr/local/lib/libwx_gtk2u_xrc-2.6.a /usr/local/lib/libwx_gtk2u_qa-2.6.a /usr/local/lib/libwx_gtk2u_html-2.6.a /usr/local/lib/libwx_gtk2u_adv-2.6.a /usr/local/lib/libwx_gtk2u_core-2.6.a /usr/local/lib/libwx_baseu_xml-2.6.a /usr/local/lib/libwx_baseu_net-2.6.a /usr/local/lib/libwx_baseu-2.6.a -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lfreetype -lfontconfig -lXrender -lX11 -lXext -lglitz -lgthread-2.0 -lglib-2.0 -lXinerama -lXxf86vm /usr/lib/libpng12.a /usr/lib/libjpeg.a /usr/lib/libtiff.a /usr/lib/libexpat.a /usr/local/lib/libwxregexu-2.6.a /usr/lib/libz.a -ldl -lm /usr/lib/libstdc++.a /usr/lib/gcc/i586-suse-linux/4.1.0/libgcc.a
-
-clean:
- rm stdwx.h.gch
- rm boincmgr
- rm boincmgr.unmodified
- rm $(PROGS) $(OBJ)
-
-boincmgr: stdwx.h.gch $(OBJ)
- $(CC) $(OBJ) $(INCLUDES) $(WXINCLUDES) $(DEFINES) $(WXDEFINES) $(LIBS) -o boincmgr
-
-boincmgr_strip: boincmgr
- cp boincmgr boincmgr.unmodified
- strip boincmgr
-
-PROGS = boincmgr_strip
-
-all: $(PROGS)
diff --git a/clientgui/Makefile.linux.ubuntu b/clientgui/Makefile.linux.ubuntu
deleted file mode 100644
index 0de2a70ce5..0000000000
--- a/clientgui/Makefile.linux.ubuntu
+++ /dev/null
@@ -1,103 +0,0 @@
-## Berkeley Open Infrastructure for Network Computing
-## http://boinc.berkeley.edu
-## Copyright (C) 2005 University of California
-##
-## This is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation;
-## either version 2.1 of the License, or (at your option) any later version.
-##
-## This software is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-## See the GNU Lesser General Public License for more details.
-##
-## To view the GNU Lesser General Public License visit
-## http://www.gnu.org/copyleft/lesser.html
-## or write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-##
-## Provide a specially constructed binary for the Linux Ubuntu environment
-## using GTK 2.x and wxWidgets. This should produce a stock client for Ubuntu
-## 6.06 or better and is intended to be built with the BOINC-Build-Ubuntu
-## virtual machine
-##
-
-CXX=g++ -g
-CXXFLAGS=-DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA
-CXXINCLUDES=-I../ -I../lib/ -I/usr/local/lib/wx/include/gtk2-unicode-release-static-2.6 -I/usr/local/include/wx-2.6
-
-stdwx.h.gch: stdwx.h
- $(CXX) $(CXXINCLUDES) $(CXXFLAGS) -c stdwx.h -o stdwx.h.gch
-
-.cpp.o:
- $(CXX) $(CXXINCLUDES) $(CXXFLAGS) -c -o $*.o $<
-
-OBJ = \
- stdwx.o \
- BOINCBaseFrame.o \
- BOINCBaseView.o \
- BOINCDialupManager.o \
- BOINCGUIApp.o \
- BOINCTaskBar.o \
- DlgAbout.o \
- DlgGenericMessage.o \
- DlgOptions.o \
- DlgSelectComputer.o \
- ValidateAccountKey.o \
- ValidateEmailAddress.o \
- ValidateURL.o \
- LogBOINC.o \
- hyperlink.o \
- MainDocument.o \
- AdvancedFrame.o \
- BOINCTaskCtrl.o \
- BOINCListCtrl.o \
- ViewMessages.o \
- ViewProjects.o \
- ViewResources.o \
- ViewStatistics.o \
- ViewTransfers.o \
- ViewWork.o \
- wizardex.o \
- BOINCBaseWizard.o \
- WizardAccountManager.o \
- WizardAttachProject.o \
- AccountInfoPage.o \
- AccountKeyPage.o \
- AccountManagerInfoPage.o \
- AccountManagerProcessingPage.o \
- AccountManagerPropertiesPage.o \
- AlreadyAttachedPage.o \
- AlreadyExistsPage.o \
- CompletionErrorPage.o \
- CompletionPage.o \
- NoInternetConnectionPage.o \
- NotDetectedPage.o \
- NotFoundPage.o \
- ProjectInfoPage.o \
- ProjectProcessingPage.o \
- ProjectPropertiesPage.o \
- ProxyInfoPage.o \
- ProxyPage.o \
- UnavailablePage.o \
- WelcomePage.o
-
-LIBS = -pthread -L/usr/X11R6/lib -L/opt/gnome/lib ../lib/libboinc.a /usr/local/lib/libwx_gtk2u_xrc-2.6.a /usr/local/lib/libwx_gtk2u_qa-2.6.a /usr/local/lib/libwx_gtk2u_html-2.6.a /usr/local/lib/libwx_gtk2u_adv-2.6.a /usr/local/lib/libwx_gtk2u_core-2.6.a /usr/local/lib/libwx_baseu_xml-2.6.a /usr/local/lib/libwx_baseu_net-2.6.a /usr/local/lib/libwx_baseu-2.6.a -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lfontconfig -lXext -lXrender -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lX11 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lXinerama /usr/lib/libpng.a /usr/lib/libjpeg.a /usr/lib/libtiff.a /usr/lib/libexpat.a /usr/local/lib/libwxregexu-2.6.a /usr/lib/libz.a -ldl -lm /usr/lib/gcc/i486-linux-gnu/4.0.3/libstdc++.a /usr/lib/gcc/i486-linux-gnu/4.0.3/libgcc.a
-
-clean:
- rm stdwx.h.gch
- rm boincmgr
- rm boincmgr.unmodified
- rm $(PROGS) $(OBJ)
-
-boincmgr: stdwx.h.gch $(OBJ)
- $(CC) $(OBJ) $(INCLUDES) $(WXINCLUDES) $(DEFINES) $(WXDEFINES) $(LIBS) -o boincmgr
-
-boincmgr_strip: boincmgr
- cp boincmgr boincmgr.unmodified
- strip boincmgr
-
-PROGS = boincmgr_strip
-
-all: $(PROGS)
diff --git a/html/user/sample_index.php b/html/user/sample_index.php
index 81d68ba10b..48fcf0ee42 100644
--- a/html/user/sample_index.php
+++ b/html/user/sample_index.php
@@ -93,7 +93,7 @@ if ($charset != "CHARSET") {
header("Content-type: text/html; charset=$charset");
}
-echo ";
+echo "";
echo "
diff --git a/tools/project.xml b/tools/project.xml
index a295a595d9..cb5dc9d25d 100644
--- a/tools/project.xml
+++ b/tools/project.xml
@@ -23,6 +23,10 @@
i686-apple-darwin
Mac OS 10.4 or later running on Intel
+
+ x86_64-apple-darwin
+ Intel 64-bit Mac OS 10.5 or later
+
sparc-sun-solaris2.7
Solaris 2.7 running on a SPARC-compatible CPU