Upgrade to release R11B-2.

Support for kqueue has been disabled. From the release notes:

http://www.erlang.org/download/otp_src_R11B-2.readme

"Note: configure will refuse to enable kernel poll support on FreeBSD since kqueue have problems with (at least) pipes on all version of FreeBSD that we have tested."
This commit is contained in:
Jimmy Olgeni 2006-11-25 16:47:07 +00:00
parent d5e3867768
commit 68d867330e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=178027
12 changed files with 100 additions and 86 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= erlang
PORTVERSION= r11b1
PORTVERSION= r11b2
PORTEPOCH= 1
CATEGORIES= lang parallel
MASTER_SITES= http://www.erlang.org/download/ \
@ -14,7 +14,7 @@ MASTER_SITES= http://www.erlang.org/download/ \
http://www.erlang.org/download/ \
http://erlang.stacken.kth.se/download/ \
http://www.csd.uu.se/ftp/mirror/erlang/download/
DISTNAME= otp_src_R11B-1
DISTNAME= otp_src_R11B-2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
DIST_SUBDIR= erlang
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@ -64,9 +64,9 @@ LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
.endif
.endif
ERLANG_MAN= otp_doc_man_R11B-1.tar.gz
ERLANG_MAN= otp_doc_man_R11B-2.tar.gz
.if !defined(NOPORTDOCS)
ERLANG_DOCS= otp_doc_html_R11B-1.tar.gz
ERLANG_DOCS= otp_doc_html_R11B-2.tar.gz
.endif
ERLANG_PLIST= ${WRKDIR}/pkg-plist
@ -77,7 +77,7 @@ ONLY_FOR_ARCHS= i386 amd64 sparc64
REINPLACE_ARGS= -i
CONFIGURE_TARGET= # Empty
CONFIGURE_ARGS+= --enable-threads --enable-kernel-poll
CONFIGURE_ARGS+= --enable-threads
.if ${ARCH} == "i386"
CONFIGURE_ARGS+= --enable-hipe
.endif
@ -135,11 +135,11 @@ post-install:
.if !defined(NOPORTDOCS)
@${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
-C ${PREFIX}/lib/erlang
@${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
${LOCALBASE}/lib/erlang/lib/dialyzer-*/doc/
.endif
@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/erlang
@${CHMOD} -R o+rX-w,g+rX-w ${PREFIX}/lib/erlang
@${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
${LOCALBASE}/lib/erlang/lib/dialyzer-*/doc/
# All non-library files.

View File

@ -1,9 +1,9 @@
# $FreeBSD$
ERTS_VSN= 5.5.1
ERTS_VSN= 5.5.2
OTP_LIBS= appmon-2.1.6 \
asn1-1.4.4.11 \
compiler-4.4.1 \
compiler-4.4.2 \
cosEvent-2.1 \
cosEventDomain-1.1 \
cosFileTransfer-1.1.2 \
@ -13,37 +13,37 @@ OTP_LIBS= appmon-2.1.6 \
cosTransactions-1.2 \
crypto-1.5 \
debugger-3.1 \
dialyzer-1.4.2 \
dialyzer-1.5.0 \
edoc-0.6.9 \
erl_interface-3.5.5.1 \
erl_interface-3.5.5.2 \
et-1.0 \
gs-1.5.5 \
hipe-3.5.6 \
hipe-3.6.0 \
ic-4.2.11 \
inets-4.7.5 \
inets-4.7.6 \
inviso-0.1 \
jinterface-1.3 \
kernel-2.11.1 \
megaco-3.4.3 \
kernel-2.11.2 \
megaco-3.5 \
mnemosyne-1.2.6 \
mnesia-4.3.2 \
mnesia-4.3.3 \
mnesia_session-1.1.6 \
observer-0.9.7 \
observer-0.9.7.1 \
odbc-2.0.6 \
orber-3.6.3 \
os_mon-2.1.1 \
otp_mibs-1.0.4 \
parsetools-1.4 \
pman-2.5.2 \
runtime_tools-1.6 \
sasl-2.1.3 \
snmp-4.8.1 \
ssh-0.9.4 \
runtime_tools-1.6.1 \
sasl-2.1.4 \
snmp-4.8.2 \
ssh-0.9.5 \
ssl-3.0.12 \
stdlib-1.14.1 \
stdlib-1.14.2 \
syntax_tools-1.5.0 \
toolbar-1.3 \
tools-2.5.1 \
tools-2.5.2 \
tv-2.1.3 \
webtool-0.8.3 \
xmerl-1.0.5

View File

@ -1,9 +1,9 @@
MD5 (erlang/otp_src_R11B-1.tar.gz) = 1fe3707d9bed898bc51444cb529fdd79
SHA256 (erlang/otp_src_R11B-1.tar.gz) = d5a8530dfee0b2348c4ad0107409fa73ac3233f31e2300ece625a2abd9eb4da7
SIZE (erlang/otp_src_R11B-1.tar.gz) = 11144896
MD5 (erlang/otp_doc_man_R11B-1.tar.gz) = dbd2d3da878fed7474b7a9aa03e13c7d
SHA256 (erlang/otp_doc_man_R11B-1.tar.gz) = 706e7da589cddee06b9d0a24a09e2105ae719bbfb8b6a08fe55ae45d5dbf4bd6
SIZE (erlang/otp_doc_man_R11B-1.tar.gz) = 627132
MD5 (erlang/otp_doc_html_R11B-1.tar.gz) = f5d3b25821f6d0763defd09f1dd4f51f
SHA256 (erlang/otp_doc_html_R11B-1.tar.gz) = 225212891e2290d0ea21e489445113d7f79ad51e4b3e3e4f0042f8876383a7bc
SIZE (erlang/otp_doc_html_R11B-1.tar.gz) = 4717809
MD5 (erlang/otp_src_R11B-2.tar.gz) = 7d7cca1d2f392a8a317cb4c0bd904726
SHA256 (erlang/otp_src_R11B-2.tar.gz) = 3dd483ee568c31655361474aa54a28cf11575c3b1b984f0b7a6980e083a8e44b
SIZE (erlang/otp_src_R11B-2.tar.gz) = 11244153
MD5 (erlang/otp_doc_man_R11B-2.tar.gz) = c81023f591c1bace836de3aa874f3c2a
SHA256 (erlang/otp_doc_man_R11B-2.tar.gz) = 643fb8210a2059b2c283c17601a0d5893f5cf409f05ed4852fbf2b0607693ac9
SIZE (erlang/otp_doc_man_R11B-2.tar.gz) = 632153
MD5 (erlang/otp_doc_html_R11B-2.tar.gz) = e2c45ced77ec63b9b1dd95c8f5396f7d
SHA256 (erlang/otp_doc_html_R11B-2.tar.gz) = 588514c6b96b33dbaffd40aa5b51b9c0be65d02b6e81644c53b4c705a866db47
SIZE (erlang/otp_doc_html_R11B-2.tar.gz) = 4739895

View File

@ -3,18 +3,10 @@ $FreeBSD$
--- erts/configure.orig
+++ erts/configure
@@ -1355,6 +1355,7 @@
i586) ARCH=x86;;
i686) ARCH=x86;;
x86_64) ARCH=amd64;;
+amd64) ARCH=amd64;;
ppc) ARCH=ppc;;
ppc64) ARCH=ppc64;;
"Power Macintosh") ARCH=ppc;;
@@ -6874,7 +6875,9 @@
@@ -6895,7 +6895,9 @@
echo $ac_n "checking for unreliable floating point execptions""... $ac_c" 1>&6
echo "configure:6877: checking for unreliable floating point execptions" >&5
echo "configure:6898: checking for unreliable floating point execptions" >&5
-if test "$cross_compiling" = yes; then
+if test "${ARCH}" = amd64; then
+ erl_ok=reliable

View File

@ -0,0 +1,15 @@
$FreeBSD$
--- lib/erl_interface/src/connect/ei_resolve.c.orig
+++ lib/erl_interface/src/connect/ei_resolve.c
@@ -621,7 +621,8 @@
return result;
#else
- return gethostbyname_r(name,hostp,buffer,buflen,h_errnop);
+ struct hostent *dummy;
+ return gethostbyname_r(name,hostp,buffer,buflen,&dummy,h_errnop);
#endif
#endif
#endif

View File

@ -7,7 +7,7 @@ Installation tips:
You can find an emacs mode for Erlang here:
${LOCALBASE}/lib/erlang/lib/tools-2.5.1/emacs
${LOCALBASE}/lib/erlang/lib/tools-2.5.2/emacs
You may wish to add the following line to /etc/manpath.config:

View File

@ -6,7 +6,7 @@
#
PORTNAME= erlang
PORTVERSION= r11b1
PORTVERSION= r11b2
PORTEPOCH= 1
CATEGORIES= lang parallel
MASTER_SITES= http://www.erlang.org/download/ \
@ -14,7 +14,7 @@ MASTER_SITES= http://www.erlang.org/download/ \
http://www.erlang.org/download/ \
http://erlang.stacken.kth.se/download/ \
http://www.csd.uu.se/ftp/mirror/erlang/download/
DISTNAME= otp_src_R11B-1
DISTNAME= otp_src_R11B-2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
DIST_SUBDIR= erlang
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@ -64,9 +64,9 @@ LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
.endif
.endif
ERLANG_MAN= otp_doc_man_R11B-1.tar.gz
ERLANG_MAN= otp_doc_man_R11B-2.tar.gz
.if !defined(NOPORTDOCS)
ERLANG_DOCS= otp_doc_html_R11B-1.tar.gz
ERLANG_DOCS= otp_doc_html_R11B-2.tar.gz
.endif
ERLANG_PLIST= ${WRKDIR}/pkg-plist
@ -77,7 +77,7 @@ ONLY_FOR_ARCHS= i386 amd64 sparc64
REINPLACE_ARGS= -i
CONFIGURE_TARGET= # Empty
CONFIGURE_ARGS+= --enable-threads --enable-kernel-poll
CONFIGURE_ARGS+= --enable-threads
.if ${ARCH} == "i386"
CONFIGURE_ARGS+= --enable-hipe
.endif
@ -135,11 +135,11 @@ post-install:
.if !defined(NOPORTDOCS)
@${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
-C ${PREFIX}/lib/erlang
@${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
${LOCALBASE}/lib/erlang/lib/dialyzer-*/doc/
.endif
@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/erlang
@${CHMOD} -R o+rX-w,g+rX-w ${PREFIX}/lib/erlang
@${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
${LOCALBASE}/lib/erlang/lib/dialyzer-*/doc/
# All non-library files.

View File

@ -1,9 +1,9 @@
# $FreeBSD$
ERTS_VSN= 5.5.1
ERTS_VSN= 5.5.2
OTP_LIBS= appmon-2.1.6 \
asn1-1.4.4.11 \
compiler-4.4.1 \
compiler-4.4.2 \
cosEvent-2.1 \
cosEventDomain-1.1 \
cosFileTransfer-1.1.2 \
@ -13,37 +13,37 @@ OTP_LIBS= appmon-2.1.6 \
cosTransactions-1.2 \
crypto-1.5 \
debugger-3.1 \
dialyzer-1.4.2 \
dialyzer-1.5.0 \
edoc-0.6.9 \
erl_interface-3.5.5.1 \
erl_interface-3.5.5.2 \
et-1.0 \
gs-1.5.5 \
hipe-3.5.6 \
hipe-3.6.0 \
ic-4.2.11 \
inets-4.7.5 \
inets-4.7.6 \
inviso-0.1 \
jinterface-1.3 \
kernel-2.11.1 \
megaco-3.4.3 \
kernel-2.11.2 \
megaco-3.5 \
mnemosyne-1.2.6 \
mnesia-4.3.2 \
mnesia-4.3.3 \
mnesia_session-1.1.6 \
observer-0.9.7 \
observer-0.9.7.1 \
odbc-2.0.6 \
orber-3.6.3 \
os_mon-2.1.1 \
otp_mibs-1.0.4 \
parsetools-1.4 \
pman-2.5.2 \
runtime_tools-1.6 \
sasl-2.1.3 \
snmp-4.8.1 \
ssh-0.9.4 \
runtime_tools-1.6.1 \
sasl-2.1.4 \
snmp-4.8.2 \
ssh-0.9.5 \
ssl-3.0.12 \
stdlib-1.14.1 \
stdlib-1.14.2 \
syntax_tools-1.5.0 \
toolbar-1.3 \
tools-2.5.1 \
tools-2.5.2 \
tv-2.1.3 \
webtool-0.8.3 \
xmerl-1.0.5

View File

@ -1,9 +1,9 @@
MD5 (erlang/otp_src_R11B-1.tar.gz) = 1fe3707d9bed898bc51444cb529fdd79
SHA256 (erlang/otp_src_R11B-1.tar.gz) = d5a8530dfee0b2348c4ad0107409fa73ac3233f31e2300ece625a2abd9eb4da7
SIZE (erlang/otp_src_R11B-1.tar.gz) = 11144896
MD5 (erlang/otp_doc_man_R11B-1.tar.gz) = dbd2d3da878fed7474b7a9aa03e13c7d
SHA256 (erlang/otp_doc_man_R11B-1.tar.gz) = 706e7da589cddee06b9d0a24a09e2105ae719bbfb8b6a08fe55ae45d5dbf4bd6
SIZE (erlang/otp_doc_man_R11B-1.tar.gz) = 627132
MD5 (erlang/otp_doc_html_R11B-1.tar.gz) = f5d3b25821f6d0763defd09f1dd4f51f
SHA256 (erlang/otp_doc_html_R11B-1.tar.gz) = 225212891e2290d0ea21e489445113d7f79ad51e4b3e3e4f0042f8876383a7bc
SIZE (erlang/otp_doc_html_R11B-1.tar.gz) = 4717809
MD5 (erlang/otp_src_R11B-2.tar.gz) = 7d7cca1d2f392a8a317cb4c0bd904726
SHA256 (erlang/otp_src_R11B-2.tar.gz) = 3dd483ee568c31655361474aa54a28cf11575c3b1b984f0b7a6980e083a8e44b
SIZE (erlang/otp_src_R11B-2.tar.gz) = 11244153
MD5 (erlang/otp_doc_man_R11B-2.tar.gz) = c81023f591c1bace836de3aa874f3c2a
SHA256 (erlang/otp_doc_man_R11B-2.tar.gz) = 643fb8210a2059b2c283c17601a0d5893f5cf409f05ed4852fbf2b0607693ac9
SIZE (erlang/otp_doc_man_R11B-2.tar.gz) = 632153
MD5 (erlang/otp_doc_html_R11B-2.tar.gz) = e2c45ced77ec63b9b1dd95c8f5396f7d
SHA256 (erlang/otp_doc_html_R11B-2.tar.gz) = 588514c6b96b33dbaffd40aa5b51b9c0be65d02b6e81644c53b4c705a866db47
SIZE (erlang/otp_doc_html_R11B-2.tar.gz) = 4739895

View File

@ -3,18 +3,10 @@ $FreeBSD$
--- erts/configure.orig
+++ erts/configure
@@ -1355,6 +1355,7 @@
i586) ARCH=x86;;
i686) ARCH=x86;;
x86_64) ARCH=amd64;;
+amd64) ARCH=amd64;;
ppc) ARCH=ppc;;
ppc64) ARCH=ppc64;;
"Power Macintosh") ARCH=ppc;;
@@ -6874,7 +6875,9 @@
@@ -6895,7 +6895,9 @@
echo $ac_n "checking for unreliable floating point execptions""... $ac_c" 1>&6
echo "configure:6877: checking for unreliable floating point execptions" >&5
echo "configure:6898: checking for unreliable floating point execptions" >&5
-if test "$cross_compiling" = yes; then
+if test "${ARCH}" = amd64; then
+ erl_ok=reliable

View File

@ -0,0 +1,15 @@
$FreeBSD$
--- lib/erl_interface/src/connect/ei_resolve.c.orig
+++ lib/erl_interface/src/connect/ei_resolve.c
@@ -621,7 +621,8 @@
return result;
#else
- return gethostbyname_r(name,hostp,buffer,buflen,h_errnop);
+ struct hostent *dummy;
+ return gethostbyname_r(name,hostp,buffer,buflen,&dummy,h_errnop);
#endif
#endif
#endif

View File

@ -7,7 +7,7 @@ Installation tips:
You can find an emacs mode for Erlang here:
${LOCALBASE}/lib/erlang/lib/tools-2.5.1/emacs
${LOCALBASE}/lib/erlang/lib/tools-2.5.2/emacs
You may wish to add the following line to /etc/manpath.config: