head	1.15;
access;
symbols
	RELEASE_7_3_0:1.14
	RELEASE_8_0_0:1.14
	RELEASE_7_2_0:1.14
	RELEASE_7_0_0:1.11
	RELEASE_6_3_0:1.11
	PRE_XORG_7:1.8
	RELEASE_4_EOL:1.7
	RELEASE_6_2_0:1.6
	RELEASE_5_0_0:1.1;
locks; strict;
comment	@# @;


1.15
date	2010.03.15.15.30.56;	author olgeni;	state dead;
branches;
next	1.14;

1.14
date	2008.11.05.23.32.22;	author olgeni;	state Exp;
branches;
next	1.13;

1.13
date	2008.11.01.19.09.27;	author olgeni;	state Exp;
branches;
next	1.12;

1.12
date	2008.02.07.22.40.17;	author olgeni;	state dead;
branches;
next	1.11;

1.11
date	2007.07.31.21.22.04;	author olgeni;	state Exp;
branches;
next	1.10;

1.10
date	2007.07.02.20.47.53;	author olgeni;	state Exp;
branches;
next	1.9;

1.9
date	2007.05.28.23.48.29;	author olgeni;	state dead;
branches;
next	1.8;

1.8
date	2007.02.02.13.06.22;	author olgeni;	state Exp;
branches;
next	1.7;

1.7
date	2006.11.25.16.47.07;	author olgeni;	state Exp;
branches;
next	1.6;

1.6
date	2006.09.12.22.41.00;	author olgeni;	state Exp;
branches;
next	1.5;

1.5
date	2006.09.07.11.59.56;	author olgeni;	state dead;
branches;
next	1.4;

1.4
date	2006.05.28.14.20.46;	author olgeni;	state Exp;
branches;
next	1.3;

1.3
date	2006.03.20.23.13.39;	author olgeni;	state Exp;
branches;
next	1.2;

1.2
date	2003.03.05.19.23.46;	author olgeni;	state dead;
branches;
next	1.1;

1.1
date	2002.11.02.18.40.49;	author olgeni;	state Exp;
branches;
next	;


desc
@@


1.15
log
@Upgrade to version r13b04.

Obtained from:	vanilla (with additional SCTP fix)
@
text
@
$FreeBSD: ports/lang/erlang/files/patch-erts_configure,v 1.14 2008/11/05 23:32:22 olgeni Exp $

--- erts/configure.orig
+++ erts/configure
@@@@ -10620,7 +10620,7 @@@@
 
 
 
-if test "x$enable_sctp" == "xyes" ; then
+if test "x$enable_sctp" = "xyes" ; then
     echo "$as_me:$LINENO: checking for netinet/sctp.h" >&5
 echo $ECHO_N "checking for netinet/sctp.h... $ECHO_C" >&6
 if test "${ac_cv_header_netinet_sctp_h+set}" = set; then
@


1.14
log
@Upgrade to version R12B-5.
@
text
@d2 1
a2 1
$FreeBSD$
@


1.13
log
@Unbreak SCTP support and bump PORTREVISION.
@
text
@a14 8
@@@@ -10679,7 +10679,6 @@@@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsctp  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@


1.12
log
@Upgrade to version R12B-1.
@
text
@d2 1
a2 1
$FreeBSD: ports/lang/erlang/files/patch-erts_configure,v 1.11 2007/07/31 21:22:04 olgeni Exp $
d6 1
a6 1
@@@@ -11040,6 +11040,125 @@@@
a8 120
 fi
+echo "$as_me:$LINENO: checking for struct sctp_event_subscribe.sctp_adaptation_layer_event" >&5
+echo $ECHO_N "checking for struct sctp_event_subscribe.sctp_adaptation_layer_event... $ECHO_C" >&6
+if test "${ac_cv_member_struct_sctp_event_subscribe_sctp_adaptation_layer_event+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if HAVE_SYS_SOCKET_H
+         #include <sys/socket.h>
+         #endif
+         #include <netinet/sctp.h>
+
+
+int
+main ()
+{
+static struct sctp_event_subscribe ac_aggr;
+if (ac_aggr.sctp_adaptation_layer_event)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_member_struct_sctp_event_subscribe_sctp_adaptation_layer_event=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if HAVE_SYS_SOCKET_H
+         #include <sys/socket.h>
+         #endif
+         #include <netinet/sctp.h>
+
+
+int
+main ()
+{
+static struct sctp_event_subscribe ac_aggr;
+if (sizeof ac_aggr.sctp_adaptation_layer_event)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_member_struct_sctp_event_subscribe_sctp_adaptation_layer_event=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_member_struct_sctp_event_subscribe_sctp_adaptation_layer_event=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_member_struct_sctp_event_subscribe_sctp_adaptation_layer_event" >&5
+echo "${ECHO_T}$ac_cv_member_struct_sctp_event_subscribe_sctp_adaptation_layer_event" >&6
+if test $ac_cv_member_struct_sctp_event_subscribe_sctp_adaptation_layer_event = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE_SCTP_ADAPTATION_LAYER_EVENT 1
+_ACEOF
+
+
+fi
d10 13
a22 20
 fi
 
@@@@ -19219,7 +19338,7 @@@@
 		DED_LD_FLAG_RUNTIME_LIBRARY_PATH=
 		STATIC_CFLAGS="-mdynamic-no-pic"
 	;;
-	linux*)
+	linux*|freebsd*)
 		DED_LD="$CC"
 		DED_LDFLAGS="-shared"
 	;;
@@@@ -19530,7 +19649,7 @@@@
   /bin/rm -f $ERL_TOP/lib/$a/SKIP
 done
 
-SSL_DYNAMIC_ONLY=no
+SSL_DYNAMIC_ONLY=yes
 
 if test "x$with_ssl" = "xno"; then
     SSL_APP=
@


1.11
log
@Force use of libcrypto.so. This will fix the build on amd64 (tested on sledge).

PR:		ports/114022
Submitted by:	benno
@
text
@d2 1
a2 1
$FreeBSD$
@


1.10
log
@* Use gcc(1) rather than ld(1) to link the crypto_drv.so port driver, else the Erlang runtime would fail to load it.

* Use the correct struct member when compiling SCTP support (this should unbreak CURRENT).

Submitted by:	dumbbell
@
text
@d132 1
a132 1
@@@@ -19219,7 +19219,7 @@@@
d141 9
@


1.9
log
@Upgrade to version R11B-4.
@
text
@d2 1
a2 1
$FreeBSD: ports/lang/erlang/files/patch-erts_configure,v 1.8 2007/02/02 13:06:22 olgeni Exp $
d6 1
a6 1
@@@@ -7069,7 +7069,9 @@@@
d8 133
a140 9
 echo $ac_n "checking for unreliable floating point execptions""... $ac_c" 1>&6
 echo "configure:7072: checking for unreliable floating point execptions" >&5
-if test "$cross_compiling" = yes; then
+if test "${ARCH}" = amd64; then
+  erl_ok=reliable
+elif test "$cross_compiling" = yes; then
   erl_ok=unreliable
 else
   cat > conftest.$ac_ext <<EOF
@


1.8
log
@Upgrade to version R11B-3.
@
text
@d2 1
a2 1
$FreeBSD$
@


1.7
log
@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."
@
text
@d6 1
a6 1
@@@@ -6895,7 +6895,9 @@@@
d9 1
a9 1
 echo "configure:6898: checking for unreliable floating point execptions" >&5
@


1.6
log
@Restore patch-erts_configure: this should fix the amd64 build.

Noticed by:	infofarmer
@
text
@d6 1
a6 9
@@@@ -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 @@@@
d9 1
a9 1
 echo "configure:6877: checking for unreliable floating point execptions" >&5
@


1.5
log
@Upgrade to version R11B-1.
@
text
@d1 6
a6 3
--- erts/configure.orig	Tue May 16 19:39:04 2006
+++ erts/configure	Thu May 18 15:40:47 2006
@@@@ -1319,6 +1319,7 @@@@
d14 1
a14 1
@@@@ -6799,7 +6800,9 @@@@
d17 1
a17 1
 echo "configure:6802: checking for unreliable floating point execptions" >&5
@


1.4
log
@Upgrade to release R11B-0.
@
text
@@


1.3
log
@Add support for amd64 (from ports/83001, modified).

PR:		ports/83001
Submitted by:	Rasmus Kaj <kaj(at)kth.se>
@
text
@d1 3
a3 6

$FreeBSD$

--- erts/configure.orig
+++ erts/configure
@@@@ -1283,6 +1283,7 @@@@
d11 1
a11 1
@@@@ -5804,7 +5805,9 @@@@
d14 1
a14 1
 echo "configure:5807: checking for unreliable floating point execptions" >&5
@


1.2
log
@Update to R9B-1.
@
text
@d1 14
a14 3
--- erts/configure.orig	Wed Oct 16 10:41:01 2002
+++ erts/configure	Sat Nov  2 15:43:52 2002
@@@@ -3960,7 +3960,7 @@@@
d16 9
a24 7
 
 for ac_func in ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlopen \
-		poll pread pwrite writev memmove strerror strncasecmp \
+		poll pread pwrite writev memmove strerror strerror_r strncasecmp \
 		gethrtime localtime_r gmtime_r mremap memcpy mallopt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@


1.1
log
@Update to version R9B-0, use ${SHAREOWN}:${SHAREGRP} rather
than hardcoding root:wheel.
@
text
@@

