3 files changed, 31 insertions, 14 deletions

diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile
index a4ae142ddf7f..aeb4946cee53 100644
--- a/astro/boinc-setiathome-enhanced/Makefile
+++ b/astro/boinc-setiathome-enhanced/Makefile
@@ -37,6 +37,15 @@ BOINC_HOME?=	/var/db/boinc
 SETI_SITE=	setiathome.berkeley.edu
 SETI_BINARY=	setiathome-${PORTVERSION}.i386-unknown-freebsd
 
+.if ${ARCH} == amd64 && ${OSVERSION} >= 600000
+AMD64=		""
+.else
+AMD64=		"@comment "
+.endif
+
+SUB_FILES=	pkg-message
+SUB_LIST=	AMD64=${AMD64}
+
 PLIST_SUB=	SETI_BINARY="${SETI_BINARY}" SETI_SITE=${SETI_SITE} \
 		BOINC_HOME=${BOINC_HOME}
 
diff --git a/astro/boinc-setiathome-enhanced/files/pkg-message.in b/astro/boinc-setiathome-enhanced/files/pkg-message.in
new file mode 100644
index 000000000000..ec1fba67304e
--- /dev/null
+++ b/astro/boinc-setiathome-enhanced/files/pkg-message.in
@@ -0,0 +1,22 @@
+*****************************************************************************
+ATTACHING PROJECT
+
+Just run boinc_gui, choose Attach, and follow instructions.
+Project URL is setiathome.berkeley.edu
+
+MANUAL INSTALLATION
+ *) If this is your first time in any BOINC project, create a new account at
+    http://setiathome.berkeley.edu/create_account_form.php
+
+ *) Or get your account key at http://setiathome.berkeley.edu/get_passwd.php
+
+ *) Attach to the project:
+    cd /var/db/boinc
+    boinc_cmd --project_attach setiathome.berkeley.edu <account key>
+*****************************************************************************
+%%AMD64%%  IMPORTANT NOTICE FOR AMD64 USERS RUNNING 6.X:
+%%AMD64%%
+%%AMD64%% You have to have this line in /etc/libmap32.conf:
+%%AMD64%%   libpthread.so.1	libc_r.so.5
+%%AMD64%% before you attach the project.  Otherwise it will not work.
+%%AMD64%%*****************************************************************************
diff --git a/astro/boinc-setiathome-enhanced/pkg-message b/astro/boinc-setiathome-enhanced/pkg-message
deleted file mode 100644
index 4601876835b1..000000000000
--- a/astro/boinc-setiathome-enhanced/pkg-message
+++ /dev/null
@@ -1,14 +0,0 @@
-ATTACHING PROJECT
-
-Just run boinc_gui, choose Attach, and follow instructions.
-Project URL is setiathome.berkeley.edu
-
-MANUAL INSTALLATION
- *) If this is your first time in any BOINC project, create a new account at
-    http://setiathome.berkeley.edu/create_account_form.php
-
- *) Or get your account key at http://setiathome.berkeley.edu/get_passwd.php
-
- *) Attach to the project:
-    cd /var/db/boinc
-    boinc_cmd --project_attach setiathome.berkeley.edu <account key>