Use the new project URL to let the application attach coorectly to the

project, and some cleanups:
- use optionsNG
- update commands in pkg-install.in
- improve %%AMD64%% comment handling
- convert Makefile header
- remove unused variable SIMAP_URL

Bump PORTREVISION

PR:		ports/174748
Submitted by:	myself
Approved by:	maintainer (pav@)

2 files changed, 15 insertions, 18 deletions

diff --git a/biology/boinc-simap/Makefile b/biology/boinc-simap/Makefile
index 756366c51054..448dd47fee22 100644
--- a/biology/boinc-simap/Makefile
+++ b/biology/boinc-simap/Makefile
@@ -1,12 +1,10 @@
-# New ports collection makefile for:	boinc-simap
-# Date created:				29 May 2006
-# Whom:					Pav Lucistnik <pav@FreeBSD.org>
+# Created by: Pav Lucistnik <pav@FreeBSD.org>
 # $FreeBSD$
 #
 
 PORTNAME=	boinc-simap
 PORTVERSION=	${SIMAP_VERSION}.${HMMER_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	biology
 MASTER_SITES=	http://boincsimap.org/boincsimap/download/
 DISTNAME=	${SIMAP_BINARY} ${HMMER_BINARY}
@@ -26,8 +24,7 @@ BOINC_CLIENT_USER?=	boinc
 BOINC_CLIENT_GROUP?=	nobody
 BOINC_CLIENT_HOME?=	/var/db/boinc
 
-SIMAP_SITE=	boinc.bio.wzw.tum.de_boincsimap
-SIMAP_URL=	boinc.bio.wzw.tum.de/boincsimap
+SIMAP_SITE=	boincsimap.org_boincsimap
 SIMAP_BINARY=	simap_${SIMAP_VERSION}_${MACH}-pc-freebsd
 SIMAP_VERSION=	5.10
 HMMER_BINARY=	hmmer_${HMMER_VERSION}_${MACH}-pc-freebsd
@@ -38,11 +35,11 @@ PLIST_SUB=	SIMAP_BINARY=${SIMAP_BINARY} HMMER_BINARY=${HMMER_BINARY} SIMAP_SITE=
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-OPTIONS=	SSE "SSE optimized app (warning! your CPU must support SSE)" off
+OPTIONS_DEFINE=	SSE
 
 .include <bsd.port.pre.mk>
 
-.ifdef WITH_SSE
+.if ${PORT_OPTIONS:MSSE}
 MACH=		i686
 .else
 MACH=		i386
@@ -52,15 +49,15 @@ MACH=		i386
 AMD64=		""
 .if ${OSVERSION} < 800000
 AMD64_BEFORE_8000000=		""
-AMD64_AFTER_8000000=		"@comment"
+AMD64_AFTER_8000000=		"@comment "
 .else
-AMD64_BEFORE_8000000=		"@comment"
+AMD64_BEFORE_8000000=		"@comment "
 AMD64_AFTER_8000000=		""
 .endif
 .else
-AMD64=		"@comment"
-AMD64_BEFORE_8000000=		"@comment"
-AMD64_AFTER_8000000=		"@comment"
+AMD64=		"@comment "
+AMD64_BEFORE_8000000=		"@comment "
+AMD64_AFTER_8000000=		"@comment "
 .endif
 
 SUB_FILES=	app_info.xml pkg-message
diff --git a/biology/boinc-simap/files/pkg-message.in b/biology/boinc-simap/files/pkg-message.in
index 40dc001a677d..7b114964286a 100644
--- a/biology/boinc-simap/files/pkg-message.in
+++ b/biology/boinc-simap/files/pkg-message.in
@@ -1,18 +1,18 @@
 *****************************************************************************
 ATTACHING PROJECT
 
-Just run boinc_gui, choose Attach, and follow instructions.
-Project URL is boinc.bio.wzw.tum.de/boincsimap
+Just run boincmgr, choose Attach, and follow instructions.
+Project URL is boincsimap.org/boincsimap
 
 MANUAL INSTALLATION
  *) If this is your first time in any BOINC project, create a new account at
-    http://boinc.bio.wzw.tum.de/boincsimap/create_account_form.php
+    http://boincsimap.org/boincsimap/create_account_form.php
 
- *) Or get your account key at http://boinc.bio.wzw.tum.de/boincsimap/get_passwd.php
+ *) Or get your account key at http://boincsimap.org/boincsimap/get_passwd.php
 
  *) Attach to the project:
     cd /var/db/boinc
-    boinc_cmd --project_attach boinc.bio.wzw.tum.de/boincsimap <account key>
+    boinccmd --project_attach boincsimap.org/boincsimap <account key>
 *****************************************************************************
 %%AMD64%%  IMPORTANT NOTICE FOR AMD64 USERS:
 %%AMD64%%