aboutsummaryrefslogtreecommitdiffstats
path: root/biology
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2010-07-29 16:30:24 +0800
committerpav <pav@FreeBSD.org>2010-07-29 16:30:24 +0800
commit343d2c8916c1c3211f44bca3a5f13e25a8a81ca8 (patch)
tree21c28c60f42c12f752e9e706f6d46e5a7327b4f1 /biology
parent831ceaf6c1e71a9eb6a9ddfd85f51f53be82d79c (diff)
downloadfreebsd-ports-gnome-343d2c8916c1c3211f44bca3a5f13e25a8a81ca8.tar.gz
freebsd-ports-gnome-343d2c8916c1c3211f44bca3a5f13e25a8a81ca8.tar.zst
freebsd-ports-gnome-343d2c8916c1c3211f44bca3a5f13e25a8a81ca8.zip
- Update the libmap instructions for amd64/8
Submitted by: Rick van der Zwet <info@rickvanderzwet.nl>
Diffstat (limited to 'biology')
-rw-r--r--biology/boinc-simap/Makefile15
-rw-r--r--biology/boinc-simap/files/pkg-message.in3
2 files changed, 14 insertions, 4 deletions
diff --git a/biology/boinc-simap/Makefile b/biology/boinc-simap/Makefile
index 754ffa52e00e..6492674061ca 100644
--- a/biology/boinc-simap/Makefile
+++ b/biology/boinc-simap/Makefile
@@ -48,14 +48,23 @@ MACH= i686
MACH= i386
.endif
-.if ${ARCH} == amd64 && ${OSVERSION} < 800000
+.if ${ARCH} == amd64
AMD64= ""
+.if ${OSVERSION} < 800000
+AMD64_BEFORE_8000000= ""
+AMD64_AFTER_8000000= "@comment"
.else
-AMD64= "@comment "
+AMD64_BEFORE_8000000= "@comment"
+AMD64_AFTER_8000000= ""
+.endif
+.else
+AMD64= "@comment"
+AMD64_BEFORE_8000000= "@comment"
+AMD64_AFTER_8000000= "@comment"
.endif
SUB_FILES= app_info.xml pkg-message
-SUB_LIST= SIMAP_BINARY=${SIMAP_BINARY} HMMER_BINARY=${HMMER_BINARY} SIMAP_APPVERSION=${SIMAP_VERSION:S/.//} HMMER_APPVERSION=${HMMER_VERSION:S/.//} AMD64=${AMD64}
+SUB_LIST= SIMAP_BINARY=${SIMAP_BINARY} HMMER_BINARY=${HMMER_BINARY} SIMAP_APPVERSION=${SIMAP_VERSION:S/.//} HMMER_APPVERSION=${HMMER_VERSION:S/.//} AMD64=${AMD64} AMD64_BEFORE_8000000=${AMD64_BEFORE_8000000} AMD64_AFTER_8000000=${AMD64_AFTER_8000000}
.if ${OSVERSION} >= 700043
LIB_DEPENDS+= c.6:${PORTSDIR}/misc/compat6x
diff --git a/biology/boinc-simap/files/pkg-message.in b/biology/boinc-simap/files/pkg-message.in
index 77850e802d85..40dc001a677d 100644
--- a/biology/boinc-simap/files/pkg-message.in
+++ b/biology/boinc-simap/files/pkg-message.in
@@ -17,6 +17,7 @@ MANUAL INSTALLATION
%%AMD64%% IMPORTANT NOTICE FOR AMD64 USERS:
%%AMD64%%
%%AMD64%% You have to have this line in /etc/libmap32.conf:
-%%AMD64%% libpthread.so.2 libc_r.so.6
+%%AMD64_BEFORE_8000000%% libpthread.so.2 libc_r.so.6
+%%AMD64_AFTER_8000000%% libpthread.so.2 libthr.so.2
%%AMD64%% before you attach the project. Otherwise it will not work.
%%AMD64%%*****************************************************************************