kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upgrade to version R13B.

Browse source 
Submitted by:	Kenji Rikitake <kenji.rikitake at acm.org> (with a few changes)
This commit is contained in:
Jimmy Olgeni 2009-06-03 13:47:15 +00:00
parent 926e6d3624
commit 2db8b34da3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=235117
12 changed files with 634 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lang/erlang/Makefile
View file

@ -6,8 +6,7 @@
# #
PORTNAME= erlang PORTNAME= erlang
PORTVERSION= r12b5 PORTVERSION= r13b
PORTREVISION= 3
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= lang parallel java CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/ \ MASTER_SITES= http://www.erlang.org/download/ \
@ -15,7 +14,7 @@ MASTER_SITES= http://www.erlang.org/download/ \
http://www.erlang.org/download/ \ http://www.erlang.org/download/ \
http://erlang.stacken.kth.se/download/ \ http://erlang.stacken.kth.se/download/ \
http://www.csd.uu.se/ftp/mirror/erlang/download/ http://www.csd.uu.se/ftp/mirror/erlang/download/
DISTNAME= otp_src_R12B-5 DISTNAME= otp_src_R13B
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
DIST_SUBDIR= erlang DIST_SUBDIR= erlang
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@ -49,8 +48,15 @@ SCRIPT_ENV+= PATH=${PATH}:${JAVA_HOME}/bin
.if !defined(WITHOUT_X11) .if !defined(WITHOUT_X11)
USE_TK_RUN= yes USE_TK_RUN= yes
.if !defined(WITHOUT_WX)
USE_WX= 2.8+
WX_COMPS= wx contrib
WX_UNICODE= yes
CONFIGURE_ARGS+= --with-wx-config=${WX_CONFIG}
.endif
.endif .endif
USE_GCC= 4.3
USE_GMAKE= yes USE_GMAKE= yes
USE_PERL5= yes USE_PERL5= yes
USE_RC_SUBR= epmd.sh USE_RC_SUBR= epmd.sh
@ -69,13 +75,16 @@ LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
.endif .endif
.endif .endif
ERLANG_MAN= otp_doc_man_R12B-5.tar.gz ERLANG_MAN= otp_doc_man_R13B.tar.gz
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
ERLANG_DOCS= otp_doc_html_R12B-5.tar.gz ERLANG_DOCS= otp_doc_html_R13B.tar.gz
.endif .endif
ERLANG_PLIST= ${WRKDIR}/pkg-plist ERLANG_PLIST= ${WRKDIR}/pkg-plist
CONFIGURE_ARGS+= --enable-threads --enable-dynamic-ssl-lib --enable-sctp # enabling --enable-smp-support crashes the OS when
# net_kernel:start([node_name, shortnames]) invoked repeatedly
CONFIGURE_ARGS+= --enable-threads --enable-dynamic-ssl-lib --enable-sctp --enable-smp-support
NOPRECIOUSMAKEVARS= yes # Prevent exporting of "ARCH" NOPRECIOUSMAKEVARS= yes # Prevent exporting of "ARCH"
CFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include
@ -118,7 +127,7 @@ pre-configure:
# rest, not in share/doc/erlang as it should, because of relative # rest, not in share/doc/erlang as it should, because of relative
# links in the documentation. # links in the documentation.
post-install: post-install:
@${LN} -sf ${LOCALBASE}/lib/erlang/lib/erl_interface-*/bin/erl_call ${LOCALBASE}/bin/erl_call # @${LN} -sf ${LOCALBASE}/lib/erlang/lib/erl_interface-*/bin/erl_call ${LOCALBASE}/bin/erl_call
@${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \ @${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
-C ${PREFIX}/lib/erlang -C ${PREFIX}/lib/erlang
@${RM} -rf ${PREFIX}/lib/erlang/man/cat? @${RM} -rf ${PREFIX}/lib/erlang/man/cat?

106
lang/erlang/Makefile.lib
View file

@ -1,55 +1,57 @@
# $FreeBSD$ # $FreeBSD$
ERTS_VSN= 5.6.5 ERTS_VSN= 5.7.1
TOOLS_VSN= 2.6.2 TOOLS_VSN= 2.6.4
OTP_LIBS= appmon-2.1.9 \ OTP_LIBS= appmon-2.1.10.1 \
asn1-1.6.2 \ asn1-1.6.10 \
common_test-1.3.4 \ common_test-1.4.1 \
compiler-4.5.5 \ compiler-4.6.1 \
cosEvent-2.1.4 \ cosEvent-2.1.5 \
cosEventDomain-1.1.4 \ cosEventDomain-1.1.5 \
cosFileTransfer-1.1.6 \ cosFileTransfer-1.1.7 \
cosNotification-1.1.9 \ cosNotification-1.1.10 \
cosProperty-1.1.7 \ cosProperty-1.1.8 \
cosTime-1.1.4 \ cosTime-1.1.5 \
cosTransactions-1.2.5 \ cosTransactions-1.2.6 \
crypto-1.5.3 \ crypto-1.6 \
debugger-3.1.1.4 \ debugger-3.2 \
dialyzer-1.8.3 \ dialyzer-1.9.1 \
docbuilder-0.9.8.4 \ docbuilder-0.9.8.5 \
edoc-0.7.6.2 \ edoc-0.7.6.3 \
erl_interface-3.5.9 \ erl_interface-3.6.1 \
et-1.3 \ et-1.3.1 \
eunit-2.0 \ eunit-2.1 \
gs-1.5.9 \ gs-1.5.10 \
hipe-3.6.9 \ hipe-3.7.1 \
ic-4.2.19 \ ic-4.2.20 \
inets-5.0.12 \ inets-5.0.13 \
inviso-0.6 \ inviso-0.6 \
jinterface-1.4.2 \ jinterface-1.5.1 \
kernel-2.12.5 \ kernel-2.13.1 \
megaco-3.9.1.1 \ megaco-3.10.1 \
mnesia-4.4.7 \ mnesia-4.4.9 \
observer-0.9.7.4 \ observer-0.9.8 \
odbc-2.10.3 \ odbc-2.10.4 \
orber-3.6.10 \ orber-3.6.12 \
os_mon-2.1.8 \ os_mon-2.2.1 \
otp_mibs-1.0.4.1 \ otp_mibs-1.0.5 \
parsetools-1.4.5 \ parsetools-1.4.7 \
percept-0.7.3 \ percept-0.8.1 \
pman-2.6 \ pman-2.7 \
public_key-0.1 \ public_key-0.2 \
runtime_tools-1.7.3 \ reltool-0.2.1 \
sasl-2.1.5.4 \ runtime_tools-1.8 \
snmp-4.12 \ sasl-2.1.6 \
ssh-1.0.2 \ snmp-4.13.1 \
ssl-3.10 \ ssh-1.1.2 \
stdlib-1.15.5 \ ssl-3.10.1 \
syntax_tools-1.5.6 \ stdlib-1.16.1 \
test_server-3.2.4 \ syntax_tools-1.6 \
toolbar-1.3.0.1 \ test_server-3.3.1 \
tools-2.6.2 \ toolbar-1.4 \
tv-2.1.4.2 \ tools-2.6.4 \
typer-0.1.5 \ tv-2.1.4.3 \
webtool-0.8.3.2 \ typer-0.1.7 \
xmerl-1.1.10 webtool-0.8.4 \
wx-0.98.1 \
xmerl-1.1.12

209
lang/erlang/Makefile.man
View file

@ -112,6 +112,7 @@ MAN3= CosEventChannelAdmin.3 \
ct_master.3 \ ct_master.3 \
ct_rpc.3 \ ct_rpc.3 \
ct_snmp.3 \ ct_snmp.3 \
ct_ssh.3 \
ct_telnet.3 \ ct_telnet.3 \
dbg.3 \ dbg.3 \
debugger.3 \ debugger.3 \
@ -158,6 +159,7 @@ MAN3= CosEventChannelAdmin.3 \
erl_pp.3 \ erl_pp.3 \
erl_prettypr.3 \ erl_prettypr.3 \
erl_prim_loader.3 \ erl_prim_loader.3 \
erl_prim_loader_stub.3 \
erl_recomment.3 \ erl_recomment.3 \
erl_scan.3 \ erl_scan.3 \
erl_set_memory_block.3 \ erl_set_memory_block.3 \
@ -167,6 +169,7 @@ MAN3= CosEventChannelAdmin.3 \
erl_tidy.3 \ erl_tidy.3 \
erlang.3 \ erlang.3 \
erlang_mode.3 \ erlang_mode.3 \
erlang_stub.3 \
error_handler.3 \ error_handler.3 \
error_logger.3 \ error_logger.3 \
erts_alloc.3 \ erts_alloc.3 \
@ -193,8 +196,10 @@ MAN3= CosEventChannelAdmin.3 \
gen_server.3 \ gen_server.3 \
gen_tcp.3 \ gen_tcp.3 \
gen_udp.3 \ gen_udp.3 \
gl.3 \
global.3 \ global.3 \
global_group.3 \ global_group.3 \
glu.3 \
gs.3 \ gs.3 \
heart.3 \ heart.3 \
http.3 \ http.3 \
@ -210,6 +215,7 @@ MAN3= CosEventChannelAdmin.3 \
inet.3 \ inet.3 \
inets.3 \ inets.3 \
init.3 \ init.3 \
init_stub.3 \
instrument.3 \ instrument.3 \
int.3 \ int.3 \
interceptors.3 \ interceptors.3 \
@ -284,6 +290,7 @@ MAN3= CosEventChannelAdmin.3 \
regexp.3 \ regexp.3 \
registry.3 \ registry.3 \
release_handler.3 \ release_handler.3 \
reltool.3 \
rpc.3 \ rpc.3 \
seq_trace.3 \ seq_trace.3 \
sets.3 \ sets.3 \
@ -322,6 +329,7 @@ MAN3= CosEventChannelAdmin.3 \
snmpm_user.3 \ snmpm_user.3 \
sofs.3 \ sofs.3 \
ssh.3 \ ssh.3 \
ssh_channel.3 \
ssh_connection.3 \ ssh_connection.3 \
ssh_sftp.3 \ ssh_sftp.3 \
ssh_sftpd.3 \ ssh_sftpd.3 \
@ -340,11 +348,207 @@ MAN3= CosEventChannelAdmin.3 \
toolbar.3 \ toolbar.3 \
ttb.3 \ ttb.3 \
tv.3 \ tv.3 \
unicode.3 \
unix_telnet.3 \ unix_telnet.3 \
user.3 \ user.3 \
webtool.3 \ webtool.3 \
win32reg.3 \ win32reg.3 \
wrap_log_reader.3 \ wrap_log_reader.3 \
wx.3 \
wxAcceleratorEntry.3 \
wxAcceleratorTable.3 \
wxArtProvider.3 \
wxAuiDockArt.3 \
wxAuiManager.3 \
wxAuiNotebook.3 \
wxAuiPaneInfo.3 \
wxAuiTabArt.3 \
wxBitmap.3 \
wxBitmapButton.3 \
wxBitmapDataObject.3 \
wxBoxSizer.3 \
wxBrush.3 \
wxBufferedDC.3 \
wxBufferedPaintDC.3 \
wxButton.3 \
wxCalendarCtrl.3 \
wxCalendarDateAttr.3 \
wxCalendarEvent.3 \
wxCaret.3 \
wxCheckBox.3 \
wxCheckListBox.3 \
wxChildFocusEvent.3 \
wxChoice.3 \
wxClientDC.3 \
wxClipboard.3 \
wxCloseEvent.3 \
wxColourData.3 \
wxColourDialog.3 \
wxColourPickerCtrl.3 \
wxColourPickerEvent.3 \
wxComboBox.3 \
wxCommandEvent.3 \
wxContextMenuEvent.3 \
wxControl.3 \
wxControlWithItems.3 \
wxCursor.3 \
wxDC.3 \
wxDataObject.3 \
wxDateEvent.3 \
wxDatePickerCtrl.3 \
wxDialog.3 \
wxDirDialog.3 \
wxDirPickerCtrl.3 \
wxDisplayChangedEvent.3 \
wxEraseEvent.3 \
wxEvent.3 \
wxEvtHandler.3 \
wxFileDataObject.3 \
wxFileDialog.3 \
wxFileDirPickerEvent.3 \
wxFilePickerCtrl.3 \
wxFindReplaceData.3 \
wxFindReplaceDialog.3 \
wxFlexGridSizer.3 \
wxFocusEvent.3 \
wxFont.3 \
wxFontData.3 \
wxFontDialog.3 \
wxFontPickerCtrl.3 \
wxFontPickerEvent.3 \
wxFrame.3 \
wxGBSizerItem.3 \
wxGLCanvas.3 \
wxGauge.3 \
wxGenericDirCtrl.3 \
wxGraphicsBrush.3 \
wxGraphicsContext.3 \
wxGraphicsFont.3 \
wxGraphicsMatrix.3 \
wxGraphicsObject.3 \
wxGraphicsPath.3 \
wxGraphicsPen.3 \
wxGraphicsRenderer.3 \
wxGrid.3 \
wxGridBagSizer.3 \
wxGridCellAttr.3 \
wxGridCellEditor.3 \
wxGridCellRenderer.3 \
wxGridEvent.3 \
wxGridSizer.3 \
wxHelpEvent.3 \
wxHtmlEasyPrinting.3 \
wxIcon.3 \
wxIconBundle.3 \
wxIconizeEvent.3 \
wxIdleEvent.3 \
wxImage.3 \
wxImageList.3 \
wxJoystickEvent.3 \
wxKeyEvent.3 \
wxLayoutAlgorithm.3 \
wxListBox.3 \
wxListCtrl.3 \
wxListEvent.3 \
wxListItem.3 \
wxListView.3 \
wxMDIChildFrame.3 \
wxMDIClientWindow.3 \
wxMDIParentFrame.3 \
wxMask.3 \
wxMaximizeEvent.3 \
wxMemoryDC.3 \
wxMenu.3 \
wxMenuBar.3 \
wxMenuEvent.3 \
wxMenuItem.3 \
wxMessageDialog.3 \
wxMiniFrame.3 \
wxMirrorDC.3 \
wxMouseCaptureChangedEvent.3 \
wxMouseEvent.3 \
wxMoveEvent.3 \
wxMultiChoiceDialog.3 \
wxNavigationKeyEvent.3 \
wxNcPaintEvent.3 \
wxNotebook.3 \
wxNotebookEvent.3 \
wxNotifyEvent.3 \
wxPageSetupDialog.3 \
wxPageSetupDialogData.3 \
wxPaintDC.3 \
wxPaintEvent.3 \
wxPalette.3 \
wxPaletteChangedEvent.3 \
wxPanel.3 \
wxPasswordEntryDialog.3 \
wxPen.3 \
wxPickerBase.3 \
wxPostScriptDC.3 \
wxPreviewCanvas.3 \
wxPreviewControlBar.3 \
wxPreviewFrame.3 \
wxPrintData.3 \
wxPrintDialog.3 \
wxPrintDialogData.3 \
wxPrintPreview.3 \
wxPrinter.3 \
wxPrintout.3 \
wxProgressDialog.3 \
wxQueryNewPaletteEvent.3 \
wxRadioBox.3 \
wxRadioButton.3 \
wxRegion.3 \
wxSashEvent.3 \
wxSashLayoutWindow.3 \
wxSashWindow.3 \
wxScreenDC.3 \
wxScrollBar.3 \
wxScrollEvent.3 \
wxScrollWinEvent.3 \
wxScrolledWindow.3 \
wxSetCursorEvent.3 \
wxShowEvent.3 \
wxSingleChoiceDialog.3 \
wxSizeEvent.3 \
wxSizer.3 \
wxSizerFlags.3 \
wxSizerItem.3 \
wxSlider.3 \
wxSpinButton.3 \
wxSpinCtrl.3 \
wxSpinEvent.3 \
wxSplashScreen.3 \
wxSplitterEvent.3 \
wxSplitterWindow.3 \
wxStaticBitmap.3 \
wxStaticBox.3 \
wxStaticBoxSizer.3 \
wxStaticLine.3 \
wxStaticText.3 \
wxStatusBar.3 \
wxStdDialogButtonSizer.3 \
wxStyledTextCtrl.3 \
wxStyledTextEvent.3 \
wxSysColourChangedEvent.3 \
wxTextAttr.3 \
wxTextCtrl.3 \
wxTextDataObject.3 \
wxTextEntryDialog.3 \
wxToggleButton.3 \
wxToolBar.3 \
wxToolTip.3 \
wxTopLevelWindow.3 \
wxTreeCtrl.3 \
wxTreeEvent.3 \
wxUpdateUIEvent.3 \
wxWindow.3 \
wxWindowCreateEvent.3 \
wxWindowDC.3 \
wxWindowDestroyEvent.3 \
wxXmlResource.3 \
wx_misc.3 \
wx_object.3 \
xmerl.3 \ xmerl.3 \
xmerl_eventp.3 \ xmerl_eventp.3 \
xmerl_scan.3 \ xmerl_scan.3 \
@ -354,8 +558,9 @@ MAN3= CosEventChannelAdmin.3 \
xref.3 \ xref.3 \
yecc.3 \ yecc.3 \
zip.3 \ zip.3 \
zlib.3 zlib.3 \
zlib_stub.3
MAN4= app.4 \ MAN4= app.4 \
appup.4 \ appup.4 \
config.4 \ config.4 \

18
lang/erlang/distinfo
View file

@ -1,9 +1,9 @@
MD5 (erlang/otp_src_R12B-5.tar.gz) = 3751ea3fea669d2b25c67eeb883734bb MD5 (erlang/otp_src_R13B.tar.gz) = 6d8c256468a198458b9f08ba6aa1a384
SHA256 (erlang/otp_src_R12B-5.tar.gz) = 6ec3f344dd626bd83494fcad66db98a03f930a039b2a1499313d1a5a57aadda7 SHA256 (erlang/otp_src_R13B.tar.gz) = 2f13d77f8e29ad630934a0125048b829c83b0bc58f719d7a9a19769576424884
SIZE (erlang/otp_src_R12B-5.tar.gz) = 47470402 SIZE (erlang/otp_src_R13B.tar.gz) = 54412183
MD5 (erlang/otp_doc_man_R12B-5.tar.gz) = 6231cb172847040395cc34b20781aa3b MD5 (erlang/otp_doc_man_R13B.tar.gz) = 9265ebf3b1041be6ae18e323b0933601
SHA256 (erlang/otp_doc_man_R12B-5.tar.gz) = f7acb458b72ffa8f9b1f45501bed85d3d9fb691c601f3f6997856c501e2f0659 SHA256 (erlang/otp_doc_man_R13B.tar.gz) = e2a85964e5b381354c143284e537ad8f7db98cfe99ed89803349332e4d7fb84e
SIZE (erlang/otp_doc_man_R12B-5.tar.gz) = 822321 SIZE (erlang/otp_doc_man_R13B.tar.gz) = 952365
MD5 (erlang/otp_doc_html_R12B-5.tar.gz) = fb0c5454bbd865e881b6712295f6d41f MD5 (erlang/otp_doc_html_R13B.tar.gz) = a14b1111550ce2bce65090de5cf3b0ff
SHA256 (erlang/otp_doc_html_R12B-5.tar.gz) = db131a347217ab434ca4c483abb61dc01989e0db43e1fe6982c3067f60cf91d7 SHA256 (erlang/otp_doc_html_R13B.tar.gz) = cd54556497a02f272492288a293af3f150e2afef91e6eb38e9d735d2d4701d28
SIZE (erlang/otp_doc_html_R12B-5.tar.gz) = 5713089 SIZE (erlang/otp_doc_html_R13B.tar.gz) = 6267472

64
lang/erlang/files/patch-erts_emulator_drivers_common_inet__drv.c
View file

@ -3,38 +3,36 @@ $FreeBSD$
--- erts/emulator/drivers/common/inet_drv.c.orig --- erts/emulator/drivers/common/inet_drv.c.orig
+++ erts/emulator/drivers/common/inet_drv.c +++ erts/emulator/drivers/common/inet_drv.c
@@ -3460,9 +3460,14 @@ @@ -5305,12 +5305,15 @@
/* Check the size of SCTP AssocID -- currently both this driver and the if (pmtud_enable) cflags |= SPP_PMTUD_ENABLE;
Erlang part require 32 bit: */ if (pmtud_disable) cflags |= SPP_PMTUD_DISABLE;
ASSERT(sizeof(sctp_assoc_t)==ASSOC_ID_LEN);
-# ifndef LIBSCTP
-# error LIBSCTP not defined
-# endif
+# if defined (__FreeBSD__)
+ /* In FreeBSD, sctp_bindx belongs to libc - see sctp_bindx(3) */
+ inet_init_sctp();
+ add_driver_entry(&sctp_inet_driver_entry);
+# else
+# ifndef LIBSCTP
+# error LIBSCTP not defined
+# endif
if (erts_sys_ddll_open_noext(STRINGIFY(LIBSCTP), &h_libsctp) == 0) {
void *ptr;
if (erts_sys_ddll_sym(h_libsctp, "sctp_bindx", &ptr) == 0) {
@@ -3471,6 +3476,7 @@
add_driver_entry(&sctp_inet_driver_entry);
}
}
+# endif
# endif
#endif /* _OSE_ */
/* remove the dummy inet driver */
@@ -8997,7 +9003,7 @@
rflag = add_flag ? SCTP_BINDX_ADD_ADDR : SCTP_BINDX_REM_ADDR;
/* Invoke the call: */ +# ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_SACKDELAY
- if (p_sctp_bindx(desc->s, addrs, n, rflag) < 0) + /* The followings are missing in FreeBSD 7.1 */
+ if (sctp_bindx(desc->s, addrs, n, rflag) < 0) sackdelay_enable =eflags& SCTP_FLAG_SACDELAY_ENABLE;
return ctl_error(sock_errno(), rbuf, rsize); sackdelay_disable=eflags& SCTP_FLAG_SACDELAY_DISABLE;
if (sackdelay_enable && sackdelay_disable)
return -1;
if (sackdelay_enable) cflags |= SPP_SACKDELAY_ENABLE;
if (sackdelay_disable) cflags |= SPP_SACKDELAY_DISABLE;
+# endif
desc->state = INET_STATE_BOUND; arg.pap.spp_flags = cflags;
# endif
@@ -6211,13 +6214,15 @@
if (ap.spp_flags & SPP_PMTUD_DISABLE)
{ i = LOAD_ATOM (spec, i, am_pmtud_disable); n++; }
-
+# ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_SACKDELAY
+ /* SPP_SACKDELAY_* not in FreeBSD 7.1 */
if (ap.spp_flags & SPP_SACKDELAY_ENABLE)
{ i = LOAD_ATOM (spec, i, am_sackdelay_enable); n++; }
if (ap.spp_flags & SPP_SACKDELAY_DISABLE)
{ i = LOAD_ATOM (spec, i, am_sackdelay_disable); n++; }
# endif
+# endif
PLACE_FOR(spec, i,
LOAD_NIL_CNT + LOAD_LIST_CNT + 2*LOAD_TUPLE_CNT);

1
lang/erlang/pkg-plist
View file

@ -1,7 +1,6 @@
bin/dialyzer bin/dialyzer
bin/epmd bin/epmd
bin/erl bin/erl
bin/erl_call
bin/erlc bin/erlc
bin/escript bin/escript
bin/run_erl bin/run_erl

23
lang/erlang14/Makefile
View file

@ -6,8 +6,7 @@
# #
PORTNAME= erlang PORTNAME= erlang
PORTVERSION= r12b5 PORTVERSION= r13b
PORTREVISION= 3
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= lang parallel java CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/ \ MASTER_SITES= http://www.erlang.org/download/ \
@ -15,7 +14,7 @@ MASTER_SITES= http://www.erlang.org/download/ \
http://www.erlang.org/download/ \ http://www.erlang.org/download/ \
http://erlang.stacken.kth.se/download/ \ http://erlang.stacken.kth.se/download/ \
http://www.csd.uu.se/ftp/mirror/erlang/download/ http://www.csd.uu.se/ftp/mirror/erlang/download/
DISTNAME= otp_src_R12B-5 DISTNAME= otp_src_R13B
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
DIST_SUBDIR= erlang DIST_SUBDIR= erlang
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@ -49,8 +48,15 @@ SCRIPT_ENV+= PATH=${PATH}:${JAVA_HOME}/bin
.if !defined(WITHOUT_X11) .if !defined(WITHOUT_X11)
USE_TK_RUN= yes USE_TK_RUN= yes
.if !defined(WITHOUT_WX)
USE_WX= 2.8+
WX_COMPS= wx contrib
WX_UNICODE= yes
CONFIGURE_ARGS+= --with-wx-config=${WX_CONFIG}
.endif
.endif .endif
USE_GCC= 4.3
USE_GMAKE= yes USE_GMAKE= yes
USE_PERL5= yes USE_PERL5= yes
USE_RC_SUBR= epmd.sh USE_RC_SUBR= epmd.sh
@ -69,13 +75,16 @@ LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
.endif .endif
.endif .endif
ERLANG_MAN= otp_doc_man_R12B-5.tar.gz ERLANG_MAN= otp_doc_man_R13B.tar.gz
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
ERLANG_DOCS= otp_doc_html_R12B-5.tar.gz ERLANG_DOCS= otp_doc_html_R13B.tar.gz
.endif .endif
ERLANG_PLIST= ${WRKDIR}/pkg-plist ERLANG_PLIST= ${WRKDIR}/pkg-plist
CONFIGURE_ARGS+= --enable-threads --enable-dynamic-ssl-lib --enable-sctp # enabling --enable-smp-support crashes the OS when
# net_kernel:start([node_name, shortnames]) invoked repeatedly
CONFIGURE_ARGS+= --enable-threads --enable-dynamic-ssl-lib --enable-sctp --enable-smp-support
NOPRECIOUSMAKEVARS= yes # Prevent exporting of "ARCH" NOPRECIOUSMAKEVARS= yes # Prevent exporting of "ARCH"
CFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include
@ -118,7 +127,7 @@ pre-configure:
# rest, not in share/doc/erlang as it should, because of relative # rest, not in share/doc/erlang as it should, because of relative
# links in the documentation. # links in the documentation.
post-install: post-install:
@${LN} -sf ${LOCALBASE}/lib/erlang/lib/erl_interface-*/bin/erl_call ${LOCALBASE}/bin/erl_call # @${LN} -sf ${LOCALBASE}/lib/erlang/lib/erl_interface-*/bin/erl_call ${LOCALBASE}/bin/erl_call
@${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \ @${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
-C ${PREFIX}/lib/erlang -C ${PREFIX}/lib/erlang
@${RM} -rf ${PREFIX}/lib/erlang/man/cat? @${RM} -rf ${PREFIX}/lib/erlang/man/cat?

106
lang/erlang14/Makefile.lib
View file

@ -1,55 +1,57 @@
# $FreeBSD$ # $FreeBSD$
ERTS_VSN= 5.6.5 ERTS_VSN= 5.7.1
TOOLS_VSN= 2.6.2 TOOLS_VSN= 2.6.4
OTP_LIBS= appmon-2.1.9 \ OTP_LIBS= appmon-2.1.10.1 \
asn1-1.6.2 \ asn1-1.6.10 \
common_test-1.3.4 \ common_test-1.4.1 \
compiler-4.5.5 \ compiler-4.6.1 \
cosEvent-2.1.4 \ cosEvent-2.1.5 \
cosEventDomain-1.1.4 \ cosEventDomain-1.1.5 \
cosFileTransfer-1.1.6 \ cosFileTransfer-1.1.7 \
cosNotification-1.1.9 \ cosNotification-1.1.10 \
cosProperty-1.1.7 \ cosProperty-1.1.8 \
cosTime-1.1.4 \ cosTime-1.1.5 \
cosTransactions-1.2.5 \ cosTransactions-1.2.6 \
crypto-1.5.3 \ crypto-1.6 \
debugger-3.1.1.4 \ debugger-3.2 \
dialyzer-1.8.3 \ dialyzer-1.9.1 \
docbuilder-0.9.8.4 \ docbuilder-0.9.8.5 \
edoc-0.7.6.2 \ edoc-0.7.6.3 \
erl_interface-3.5.9 \ erl_interface-3.6.1 \
et-1.3 \ et-1.3.1 \
eunit-2.0 \ eunit-2.1 \
gs-1.5.9 \ gs-1.5.10 \
hipe-3.6.9 \ hipe-3.7.1 \
ic-4.2.19 \ ic-4.2.20 \
inets-5.0.12 \ inets-5.0.13 \
inviso-0.6 \ inviso-0.6 \
jinterface-1.4.2 \ jinterface-1.5.1 \
kernel-2.12.5 \ kernel-2.13.1 \
megaco-3.9.1.1 \ megaco-3.10.1 \
mnesia-4.4.7 \ mnesia-4.4.9 \
observer-0.9.7.4 \ observer-0.9.8 \
odbc-2.10.3 \ odbc-2.10.4 \
orber-3.6.10 \ orber-3.6.12 \
os_mon-2.1.8 \ os_mon-2.2.1 \
otp_mibs-1.0.4.1 \ otp_mibs-1.0.5 \
parsetools-1.4.5 \ parsetools-1.4.7 \
percept-0.7.3 \ percept-0.8.1 \
pman-2.6 \ pman-2.7 \
public_key-0.1 \ public_key-0.2 \
runtime_tools-1.7.3 \ reltool-0.2.1 \
sasl-2.1.5.4 \ runtime_tools-1.8 \
snmp-4.12 \ sasl-2.1.6 \
ssh-1.0.2 \ snmp-4.13.1 \
ssl-3.10 \ ssh-1.1.2 \
stdlib-1.15.5 \ ssl-3.10.1 \
syntax_tools-1.5.6 \ stdlib-1.16.1 \
test_server-3.2.4 \ syntax_tools-1.6 \
toolbar-1.3.0.1 \ test_server-3.3.1 \
tools-2.6.2 \ toolbar-1.4 \
tv-2.1.4.2 \ tools-2.6.4 \
typer-0.1.5 \ tv-2.1.4.3 \
webtool-0.8.3.2 \ typer-0.1.7 \
xmerl-1.1.10 webtool-0.8.4 \
wx-0.98.1 \
xmerl-1.1.12

209
lang/erlang14/Makefile.man
View file

@ -112,6 +112,7 @@ MAN3= CosEventChannelAdmin.3 \
ct_master.3 \ ct_master.3 \
ct_rpc.3 \ ct_rpc.3 \
ct_snmp.3 \ ct_snmp.3 \
ct_ssh.3 \
ct_telnet.3 \ ct_telnet.3 \
dbg.3 \ dbg.3 \
debugger.3 \ debugger.3 \
@ -158,6 +159,7 @@ MAN3= CosEventChannelAdmin.3 \
erl_pp.3 \ erl_pp.3 \
erl_prettypr.3 \ erl_prettypr.3 \
erl_prim_loader.3 \ erl_prim_loader.3 \
erl_prim_loader_stub.3 \
erl_recomment.3 \ erl_recomment.3 \
erl_scan.3 \ erl_scan.3 \
erl_set_memory_block.3 \ erl_set_memory_block.3 \
@ -167,6 +169,7 @@ MAN3= CosEventChannelAdmin.3 \
erl_tidy.3 \ erl_tidy.3 \
erlang.3 \ erlang.3 \
erlang_mode.3 \ erlang_mode.3 \
erlang_stub.3 \
error_handler.3 \ error_handler.3 \
error_logger.3 \ error_logger.3 \
erts_alloc.3 \ erts_alloc.3 \
@ -193,8 +196,10 @@ MAN3= CosEventChannelAdmin.3 \
gen_server.3 \ gen_server.3 \
gen_tcp.3 \ gen_tcp.3 \
gen_udp.3 \ gen_udp.3 \
gl.3 \
global.3 \ global.3 \
global_group.3 \ global_group.3 \
glu.3 \
gs.3 \ gs.3 \
heart.3 \ heart.3 \
http.3 \ http.3 \
@ -210,6 +215,7 @@ MAN3= CosEventChannelAdmin.3 \
inet.3 \ inet.3 \
inets.3 \ inets.3 \
init.3 \ init.3 \
init_stub.3 \
instrument.3 \ instrument.3 \
int.3 \ int.3 \
interceptors.3 \ interceptors.3 \
@ -284,6 +290,7 @@ MAN3= CosEventChannelAdmin.3 \
regexp.3 \ regexp.3 \
registry.3 \ registry.3 \
release_handler.3 \ release_handler.3 \
reltool.3 \
rpc.3 \ rpc.3 \
seq_trace.3 \ seq_trace.3 \
sets.3 \ sets.3 \
@ -322,6 +329,7 @@ MAN3= CosEventChannelAdmin.3 \
snmpm_user.3 \ snmpm_user.3 \
sofs.3 \ sofs.3 \
ssh.3 \ ssh.3 \
ssh_channel.3 \
ssh_connection.3 \ ssh_connection.3 \
ssh_sftp.3 \ ssh_sftp.3 \
ssh_sftpd.3 \ ssh_sftpd.3 \
@ -340,11 +348,207 @@ MAN3= CosEventChannelAdmin.3 \
toolbar.3 \ toolbar.3 \
ttb.3 \ ttb.3 \
tv.3 \ tv.3 \
unicode.3 \
unix_telnet.3 \ unix_telnet.3 \
user.3 \ user.3 \
webtool.3 \ webtool.3 \
win32reg.3 \ win32reg.3 \
wrap_log_reader.3 \ wrap_log_reader.3 \
wx.3 \
wxAcceleratorEntry.3 \
wxAcceleratorTable.3 \
wxArtProvider.3 \
wxAuiDockArt.3 \
wxAuiManager.3 \
wxAuiNotebook.3 \
wxAuiPaneInfo.3 \
wxAuiTabArt.3 \
wxBitmap.3 \
wxBitmapButton.3 \
wxBitmapDataObject.3 \
wxBoxSizer.3 \
wxBrush.3 \
wxBufferedDC.3 \
wxBufferedPaintDC.3 \
wxButton.3 \
wxCalendarCtrl.3 \
wxCalendarDateAttr.3 \
wxCalendarEvent.3 \
wxCaret.3 \
wxCheckBox.3 \
wxCheckListBox.3 \
wxChildFocusEvent.3 \
wxChoice.3 \
wxClientDC.3 \
wxClipboard.3 \
wxCloseEvent.3 \
wxColourData.3 \
wxColourDialog.3 \
wxColourPickerCtrl.3 \
wxColourPickerEvent.3 \
wxComboBox.3 \
wxCommandEvent.3 \
wxContextMenuEvent.3 \
wxControl.3 \
wxControlWithItems.3 \
wxCursor.3 \
wxDC.3 \
wxDataObject.3 \
wxDateEvent.3 \
wxDatePickerCtrl.3 \
wxDialog.3 \
wxDirDialog.3 \
wxDirPickerCtrl.3 \
wxDisplayChangedEvent.3 \
wxEraseEvent.3 \
wxEvent.3 \
wxEvtHandler.3 \
wxFileDataObject.3 \
wxFileDialog.3 \
wxFileDirPickerEvent.3 \
wxFilePickerCtrl.3 \
wxFindReplaceData.3 \
wxFindReplaceDialog.3 \
wxFlexGridSizer.3 \
wxFocusEvent.3 \
wxFont.3 \
wxFontData.3 \
wxFontDialog.3 \
wxFontPickerCtrl.3 \
wxFontPickerEvent.3 \
wxFrame.3 \
wxGBSizerItem.3 \
wxGLCanvas.3 \
wxGauge.3 \
wxGenericDirCtrl.3 \
wxGraphicsBrush.3 \
wxGraphicsContext.3 \
wxGraphicsFont.3 \
wxGraphicsMatrix.3 \
wxGraphicsObject.3 \
wxGraphicsPath.3 \
wxGraphicsPen.3 \
wxGraphicsRenderer.3 \
wxGrid.3 \
wxGridBagSizer.3 \
wxGridCellAttr.3 \
wxGridCellEditor.3 \
wxGridCellRenderer.3 \
wxGridEvent.3 \
wxGridSizer.3 \
wxHelpEvent.3 \
wxHtmlEasyPrinting.3 \
wxIcon.3 \
wxIconBundle.3 \
wxIconizeEvent.3 \
wxIdleEvent.3 \
wxImage.3 \
wxImageList.3 \
wxJoystickEvent.3 \
wxKeyEvent.3 \
wxLayoutAlgorithm.3 \
wxListBox.3 \
wxListCtrl.3 \
wxListEvent.3 \
wxListItem.3 \
wxListView.3 \
wxMDIChildFrame.3 \
wxMDIClientWindow.3 \
wxMDIParentFrame.3 \
wxMask.3 \
wxMaximizeEvent.3 \
wxMemoryDC.3 \
wxMenu.3 \
wxMenuBar.3 \
wxMenuEvent.3 \
wxMenuItem.3 \
wxMessageDialog.3 \
wxMiniFrame.3 \
wxMirrorDC.3 \
wxMouseCaptureChangedEvent.3 \
wxMouseEvent.3 \
wxMoveEvent.3 \
wxMultiChoiceDialog.3 \
wxNavigationKeyEvent.3 \
wxNcPaintEvent.3 \
wxNotebook.3 \
wxNotebookEvent.3 \
wxNotifyEvent.3 \
wxPageSetupDialog.3 \
wxPageSetupDialogData.3 \
wxPaintDC.3 \
wxPaintEvent.3 \
wxPalette.3 \
wxPaletteChangedEvent.3 \
wxPanel.3 \
wxPasswordEntryDialog.3 \
wxPen.3 \
wxPickerBase.3 \
wxPostScriptDC.3 \
wxPreviewCanvas.3 \
wxPreviewControlBar.3 \
wxPreviewFrame.3 \
wxPrintData.3 \
wxPrintDialog.3 \
wxPrintDialogData.3 \
wxPrintPreview.3 \
wxPrinter.3 \
wxPrintout.3 \
wxProgressDialog.3 \
wxQueryNewPaletteEvent.3 \
wxRadioBox.3 \
wxRadioButton.3 \
wxRegion.3 \
wxSashEvent.3 \
wxSashLayoutWindow.3 \
wxSashWindow.3 \
wxScreenDC.3 \
wxScrollBar.3 \
wxScrollEvent.3 \
wxScrollWinEvent.3 \
wxScrolledWindow.3 \
wxSetCursorEvent.3 \
wxShowEvent.3 \
wxSingleChoiceDialog.3 \
wxSizeEvent.3 \
wxSizer.3 \
wxSizerFlags.3 \
wxSizerItem.3 \
wxSlider.3 \
wxSpinButton.3 \
wxSpinCtrl.3 \
wxSpinEvent.3 \
wxSplashScreen.3 \
wxSplitterEvent.3 \
wxSplitterWindow.3 \
wxStaticBitmap.3 \
wxStaticBox.3 \
wxStaticBoxSizer.3 \
wxStaticLine.3 \
wxStaticText.3 \
wxStatusBar.3 \
wxStdDialogButtonSizer.3 \
wxStyledTextCtrl.3 \
wxStyledTextEvent.3 \
wxSysColourChangedEvent.3 \
wxTextAttr.3 \
wxTextCtrl.3 \
wxTextDataObject.3 \
wxTextEntryDialog.3 \
wxToggleButton.3 \
wxToolBar.3 \
wxToolTip.3 \
wxTopLevelWindow.3 \
wxTreeCtrl.3 \
wxTreeEvent.3 \
wxUpdateUIEvent.3 \
wxWindow.3 \
wxWindowCreateEvent.3 \
wxWindowDC.3 \
wxWindowDestroyEvent.3 \
wxXmlResource.3 \
wx_misc.3 \
wx_object.3 \
xmerl.3 \ xmerl.3 \
xmerl_eventp.3 \ xmerl_eventp.3 \
xmerl_scan.3 \ xmerl_scan.3 \
@ -354,8 +558,9 @@ MAN3= CosEventChannelAdmin.3 \
xref.3 \ xref.3 \
yecc.3 \ yecc.3 \
zip.3 \ zip.3 \
zlib.3 zlib.3 \
zlib_stub.3
MAN4= app.4 \ MAN4= app.4 \
appup.4 \ appup.4 \
config.4 \ config.4 \

18
lang/erlang14/distinfo
View file

@ -1,9 +1,9 @@
MD5 (erlang/otp_src_R12B-5.tar.gz) = 3751ea3fea669d2b25c67eeb883734bb MD5 (erlang/otp_src_R13B.tar.gz) = 6d8c256468a198458b9f08ba6aa1a384
SHA256 (erlang/otp_src_R12B-5.tar.gz) = 6ec3f344dd626bd83494fcad66db98a03f930a039b2a1499313d1a5a57aadda7 SHA256 (erlang/otp_src_R13B.tar.gz) = 2f13d77f8e29ad630934a0125048b829c83b0bc58f719d7a9a19769576424884
SIZE (erlang/otp_src_R12B-5.tar.gz) = 47470402 SIZE (erlang/otp_src_R13B.tar.gz) = 54412183
MD5 (erlang/otp_doc_man_R12B-5.tar.gz) = 6231cb172847040395cc34b20781aa3b MD5 (erlang/otp_doc_man_R13B.tar.gz) = 9265ebf3b1041be6ae18e323b0933601
SHA256 (erlang/otp_doc_man_R12B-5.tar.gz) = f7acb458b72ffa8f9b1f45501bed85d3d9fb691c601f3f6997856c501e2f0659 SHA256 (erlang/otp_doc_man_R13B.tar.gz) = e2a85964e5b381354c143284e537ad8f7db98cfe99ed89803349332e4d7fb84e
SIZE (erlang/otp_doc_man_R12B-5.tar.gz) = 822321 SIZE (erlang/otp_doc_man_R13B.tar.gz) = 952365
MD5 (erlang/otp_doc_html_R12B-5.tar.gz) = fb0c5454bbd865e881b6712295f6d41f MD5 (erlang/otp_doc_html_R13B.tar.gz) = a14b1111550ce2bce65090de5cf3b0ff
SHA256 (erlang/otp_doc_html_R12B-5.tar.gz) = db131a347217ab434ca4c483abb61dc01989e0db43e1fe6982c3067f60cf91d7 SHA256 (erlang/otp_doc_html_R13B.tar.gz) = cd54556497a02f272492288a293af3f150e2afef91e6eb38e9d735d2d4701d28
SIZE (erlang/otp_doc_html_R12B-5.tar.gz) = 5713089 SIZE (erlang/otp_doc_html_R13B.tar.gz) = 6267472

64
lang/erlang14/files/patch-erts_emulator_drivers_common_inet__drv.c
View file

@ -3,38 +3,36 @@ $FreeBSD$
--- erts/emulator/drivers/common/inet_drv.c.orig --- erts/emulator/drivers/common/inet_drv.c.orig
+++ erts/emulator/drivers/common/inet_drv.c +++ erts/emulator/drivers/common/inet_drv.c
@@ -3460,9 +3460,14 @@ @@ -5305,12 +5305,15 @@
/* Check the size of SCTP AssocID -- currently both this driver and the if (pmtud_enable) cflags |= SPP_PMTUD_ENABLE;
Erlang part require 32 bit: */ if (pmtud_disable) cflags |= SPP_PMTUD_DISABLE;
ASSERT(sizeof(sctp_assoc_t)==ASSOC_ID_LEN);
-# ifndef LIBSCTP
-# error LIBSCTP not defined
-# endif
+# if defined (__FreeBSD__)
+ /* In FreeBSD, sctp_bindx belongs to libc - see sctp_bindx(3) */
+ inet_init_sctp();
+ add_driver_entry(&sctp_inet_driver_entry);
+# else
+# ifndef LIBSCTP
+# error LIBSCTP not defined
+# endif
if (erts_sys_ddll_open_noext(STRINGIFY(LIBSCTP), &h_libsctp) == 0) {
void *ptr;
if (erts_sys_ddll_sym(h_libsctp, "sctp_bindx", &ptr) == 0) {
@@ -3471,6 +3476,7 @@
add_driver_entry(&sctp_inet_driver_entry);
}
}
+# endif
# endif
#endif /* _OSE_ */
/* remove the dummy inet driver */
@@ -8997,7 +9003,7 @@
rflag = add_flag ? SCTP_BINDX_ADD_ADDR : SCTP_BINDX_REM_ADDR;
/* Invoke the call: */ +# ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_SACKDELAY
- if (p_sctp_bindx(desc->s, addrs, n, rflag) < 0) + /* The followings are missing in FreeBSD 7.1 */
+ if (sctp_bindx(desc->s, addrs, n, rflag) < 0) sackdelay_enable =eflags& SCTP_FLAG_SACDELAY_ENABLE;
return ctl_error(sock_errno(), rbuf, rsize); sackdelay_disable=eflags& SCTP_FLAG_SACDELAY_DISABLE;
if (sackdelay_enable && sackdelay_disable)
return -1;
if (sackdelay_enable) cflags |= SPP_SACKDELAY_ENABLE;
if (sackdelay_disable) cflags |= SPP_SACKDELAY_DISABLE;
+# endif
desc->state = INET_STATE_BOUND; arg.pap.spp_flags = cflags;
# endif
@@ -6211,13 +6214,15 @@
if (ap.spp_flags & SPP_PMTUD_DISABLE)
{ i = LOAD_ATOM (spec, i, am_pmtud_disable); n++; }
-
+# ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_SACKDELAY
+ /* SPP_SACKDELAY_* not in FreeBSD 7.1 */
if (ap.spp_flags & SPP_SACKDELAY_ENABLE)
{ i = LOAD_ATOM (spec, i, am_sackdelay_enable); n++; }
if (ap.spp_flags & SPP_SACKDELAY_DISABLE)
{ i = LOAD_ATOM (spec, i, am_sackdelay_disable); n++; }
# endif
+# endif
PLACE_FOR(spec, i,
LOAD_NIL_CNT + LOAD_LIST_CNT + 2*LOAD_TUPLE_CNT);

1
lang/erlang14/pkg-plist
View file

@ -1,7 +1,6 @@
bin/dialyzer bin/dialyzer
bin/epmd bin/epmd
bin/erl bin/erl
bin/erl_call
bin/erlc bin/erlc
bin/escript bin/escript
bin/run_erl bin/run_erl