- Update to 4.61

Approved by:	Rene Ladan <r.c.ladan@gmail.com> (maintainer)

4 files changed, 42 insertions, 25 deletions

diff --git a/astro/boinc-einsteinathome/Makefile b/astro/boinc-einsteinathome/Makefile
index 39e9a0b3d27d..30022ac2498c 100644
--- a/astro/boinc-einsteinathome/Makefile
+++ b/astro/boinc-einsteinathome/Makefile
@@ -5,7 +5,7 @@
 #
 
 PORTNAME=	boinc-einsteinathome
-PORTVERSION=	0.40
+PORTVERSION=	4.61
 CATEGORIES=	astro
 MASTER_SITES=	http://einstein.phys.uwm.edu/app_test/FreeBSD/
 DISTNAME=	albert_${PORTVERSION}_i386-unknown-freebsd
@@ -17,14 +17,14 @@ COMMENT=	Einstein@Home for BOINC
 .include <bsd.port.pre.mk>
 
 ONLY_FOR_ARCHS=	i386 amd64
-# Binary is built on 4.9 :
-.if ${OSVERSION} >= 500000
-.if ${ARCH} == "amd64"
-RUN_DEPENDS+=	compat4x-i386>0:${PORTSDIR}/misc/compat4x
-.else
-LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
+
+# Binary is built for 5.X :
+.if ${OSVERSION} < 500000
+IGNORE=		only supports FreeBSD 5.X and newer
 .endif
-# also depends on libm.so.2
+
+.if ${OSVERSION} >= 600000
+LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
 .endif
 
 RUN_DEPENDS+=	boinc_client:${PORTSDIR}/net/boinc-client
@@ -40,6 +40,15 @@ BOINC_HOME?=	/var/db/boinc
 EINSTEIN_SITE=	einstein.phys.uwm.edu
 EINSTEIN_BINARY=${DISTNAME}
 
+.if ${ARCH} == amd64 && ${OSVERSION} >= 600000
+AMD64=		""
+.else
+AMD64=		"@comment "
+.endif
+
+SUB_FILES=	pkg-message
+SUB_LIST=	AMD64=${AMD64}
+
 PLIST_SUB=	EINSTEIN_BINARY="${EINSTEIN_BINARY}" EINSTEIN_SITE=${EINSTEIN_SITE} \
 		BOINC_HOME=${BOINC_HOME}
 
diff --git a/astro/boinc-einsteinathome/distinfo b/astro/boinc-einsteinathome/distinfo
index 43b397f441f5..236017b51105 100644
--- a/astro/boinc-einsteinathome/distinfo
+++ b/astro/boinc-einsteinathome/distinfo
@@ -1,3 +1,3 @@
-MD5 (albert_0.40_i386-unknown-freebsd.tgz) = ba2e87d5c3a4c3c04c2f3df4cf4ad84a
-SHA256 (albert_0.40_i386-unknown-freebsd.tgz) = 5f910c5e41ab8eac23e808ee627ed26d63e6672c34a5979dbd3edb7c6ce464ed
-SIZE (albert_0.40_i386-unknown-freebsd.tgz) = 446520
+MD5 (albert_4.61_i386-unknown-freebsd.tgz) = d21630ac6abe657837db8e8709980869
+SHA256 (albert_4.61_i386-unknown-freebsd.tgz) = 77e7ceb6eb2981ece9667e59310379edb7f10777ebfdaaff25aa141c3054857a
+SIZE (albert_4.61_i386-unknown-freebsd.tgz) = 402427
diff --git a/astro/boinc-einsteinathome/files/pkg-message.in b/astro/boinc-einsteinathome/files/pkg-message.in
new file mode 100644
index 000000000000..b82a3241c33d
--- /dev/null
+++ b/astro/boinc-einsteinathome/files/pkg-message.in
@@ -0,0 +1,22 @@
+*****************************************************************************
+ATTACHING PROJECT
+
+Just run boinc_gui, choose Attach, and follow instructions.
+Project URL is einstein.phys.uwm.edu
+
+MANUAL INSTALLATION
+ *) If this is your first time in any BOINC project, create a new account at
+    http://einstein.phys.uwm.edu/create_account_form.php
+
+ *) Or get your account key at http://einstein.phys.uwm.edu/get_passwd.php
+
+ *) Attach to the project:
+    cd /var/db/boinc
+    boinc_cmd --project_attach einstein.phys.uwm.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-einsteinathome/pkg-message b/astro/boinc-einsteinathome/pkg-message
deleted file mode 100644
index 0d5e7fc396f9..000000000000
--- a/astro/boinc-einsteinathome/pkg-message
+++ /dev/null
@@ -1,14 +0,0 @@
-ATTACHING PROJECT
-
-Just run boinc_gui, choose Attach, and follow instructions.
-Project URL is einstein.phys.uwm.edu
-
-MANUAL INSTALLATION
- *) If this is your first time in any BOINC project, create a new account at
-    http://einstein.phys.uwm.edu/create_account_form.php
-
- *) Or get your account key at http://einstein.phys.uwm.edu/get_passwd.php
-
- *) Attach to the project:
-    cd /var/db/boinc
-    boinc_cmd --project_attach einstein.phys.uwm.edu <account key>