diff options
Diffstat (limited to 'lang/erlang14')
24 files changed, 0 insertions, 975 deletions
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile deleted file mode 100644 index 252635012826..000000000000 --- a/lang/erlang14/Makefile +++ /dev/null @@ -1,191 +0,0 @@ -# New ports collection makefile for: erlang -# Date created: 11 Dec 1998 -# Whom: ruslan@shevchenko.kiev.ua -# -# $FreeBSD$ -# - -PORTNAME= erlang -PORTVERSION= r11b2 -PORTREVISION= 2 -PORTEPOCH= 1 -CATEGORIES= lang parallel -MASTER_SITES= http://www.erlang.org/download/ \ - ftp://ftp.erlang.org/pub/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-2 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS} -DIST_SUBDIR= erlang -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= olgeni@FreeBSD.org -COMMENT= A functional programming language from Ericsson - -CONFLICTS?= erlang-lite-r[0-9]* - -SUB_FILES= pkg-message - -# The Java applications that are part of the Erlang distribution are -# not strictly necessary - it is included for completeness sake. A -# problem with the Erlang build procedure is that it only checks if -# javac is in the regular path - and then assumes that all of the jdk -# utilities is in the path as well. The only way to make sure that -# this is the case (that I could think of at least) was to make sure -# ${JAVA_HOME}/bin is added to the PATH, using the *_ENV macros. - -.if !defined(WITHOUT_JAVA) -USE_JAVA= yes -JAVA_VERSION= 1.4+ -# Make sure ${JAVA_HOME}/bin is in the path -CONFIGURE_ENV+= PATH=${PATH}:${JAVA_HOME}/bin -MAKE_ENV+= PATH=${PATH}:${JAVA_HOME}/bin -SCRIPT_ENV+= PATH=${PATH}:${JAVA_HOME}/bin -.endif - -.if !defined(WITHOUT_X11) -USE_TK= yes -.endif - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "sparc64" -BROKEN= Does not build on sparc64 -.endif - -.if ${OSVERSION} < 502102 -WITHOUT_ODBC= yes -.endif - -.if !defined(WITHOUT_ODBC) -DRIVER_MANAGER?= iodbc -.if ${DRIVER_MANAGER} == "unixodbc" -LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC -.else # assume we're using iodbc -LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc -.endif -.endif - -ERLANG_MAN= otp_doc_man_R11B-2.tar.gz -.if !defined(NOPORTDOCS) -ERLANG_DOCS= otp_doc_html_R11B-2.tar.gz -.endif -ERLANG_PLIST= ${WRKDIR}/pkg-plist - -USE_GMAKE= yes -USE_PERL5= yes -GNU_CONFIGURE= yes -ONLY_FOR_ARCHS= i386 amd64 sparc64 -REINPLACE_ARGS= -i - -CONFIGURE_TARGET= # Empty -CONFIGURE_ARGS+= --enable-threads -.if ${ARCH} == "i386" -CONFIGURE_ARGS+= --enable-hipe -.endif -NOPRECIOUSMAKEVARS= yes # Prevent exporting of "ARCH" - -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -PLIST_SUB+= ERTS_VSN=${ERTS_VSN} TOOLS_VSN=${TOOLS_VSN} - -# The man-pages are put (in spite of FreeBSD's port convention) in a private -# subdir. This is to avoid cluttering up the man page name space. Also the -# Erlang man pages are more of internal documentation using the man format than -# actual system man pages. (erl.1 and epmd.1 perhaps being the exception). - -NOMANCOMPRESS= yes - -MAN1PREFIX= ${TARGETDIR}/lib/erlang -MAN3PREFIX= ${TARGETDIR}/lib/erlang -MAN4PREFIX= ${TARGETDIR}/lib/erlang -MAN6PREFIX= ${TARGETDIR}/lib/erlang - -# Workaround for a ./configure recursion bug which leads to INSTALL being -# set to "../../../../[...]" -post-patch: - @cd ${WRKSRC} && ${CAT} ${FILESDIR}/post-patch-configure | ${PATCH} - -pre-configure: -# Check if ${JAVAC} exists. -.if !defined(WITHOUT_JAVA) - @if [ ! -x ${JAVAC} ]; then \ - ${ECHO_MSG} ">> Error: cannot find ${JAVAC}."; \ - exit 1; \ - fi -.endif - -# If X11 is not used, skip the gs application. -.if defined(WITHOUT_X11) - @${ECHO_CMD} "WITHOUT_X11 defined" > ${WRKSRC}/lib/gs/SKIP -.endif - -# If ODBC is not used, skip the odbc application. -.if defined(WITHOUT_ODBC) - @${ECHO_CMD} "WITHOUT_ODBC defined" > ${WRKSRC}/lib/odbc/SKIP -.endif - -# Install documentation. (HTML docs need to be in same dir as the -# rest, not in share/doc/erlang as it should, because of relative -# links in the documentation. -post-install: - @${LN} -sf ${LOCALBASE}/lib/erlang/lib/erl_interface-*/bin/erl_call ${LOCALBASE}/bin/erl_call - @${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \ - -C ${PREFIX}/lib/erlang - @${RM} -rf ${PREFIX}/lib/erlang/man/cat? -.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 - -# All non-library files. - - @cd ${PREFIX} ; ${FIND} lib/erlang/* -type f -o -type l \ - | ${GREP} -v "^lib/erlang/man" \ - | ${GREP} -v "^lib/erlang/lib" \ - | ${SORT} \ - > ${ERLANG_PLIST} - -# Stock OTP libraries. - - @for LIBRARY in ${OTP_LIBS}; do \ - cd ${PREFIX} ; ${FIND} lib/erlang/lib/$${LIBRARY} -type f -o -type l; \ - done | ${SORT} >> ${ERLANG_PLIST} - -# Stock OTP library directories. - - @for LIBRARY in ${OTP_LIBS}; do \ - cd ${PREFIX} ; ${FIND} lib/erlang/lib/$${LIBRARY} -type d -empty \ - | ${SED} -e 's#^#@exec ${MKDIR} %D/#g'; \ - done | ${SORT} >> ${ERLANG_PLIST} - - @for LIBRARY in ${OTP_LIBS}; do \ - cd ${PREFIX} ; ${FIND} lib/erlang/lib/$${LIBRARY} -type d \ - | ${SED} -e 's/^/@dirrm /g'; \ - done | ${SORT} -r >> ${ERLANG_PLIST} - -# Other directories. - - @cd ${PREFIX} ; ${FIND} lib/erlang/* -type d | ${SORT} -r \ - | ${GREP} -v "^lib/erlang/man" \ - | ${GREP} -v "^lib/erlang/lib" \ - | ${SED} -e 's/^/@dirrm /g' \ - >> ${ERLANG_PLIST} - - @${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script - @${ECHO_CMD} "/Insert PLIST here" >> ${WRKDIR}/ex.script - @${ECHO_CMD} "d" >> ${WRKDIR}/ex.script - @${ECHO_CMD} "r ${ERLANG_PLIST}" >> ${WRKDIR}/ex.script - @${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script - @cd ${WRKDIR} ; ex < ex.script - -.include "Makefile.lib" -.include "Makefile.man" - -.include <bsd.port.post.mk> diff --git a/lang/erlang14/Makefile.lib b/lang/erlang14/Makefile.lib deleted file mode 100644 index 3f8751174ac0..000000000000 --- a/lang/erlang14/Makefile.lib +++ /dev/null @@ -1,50 +0,0 @@ -# $FreeBSD$ - -ERTS_VSN= 5.5.2 -TOOLS_VSN= 2.5.2 -OTP_LIBS= appmon-2.1.6 \ - asn1-1.4.4.11 \ - compiler-4.4.2 \ - cosEvent-2.1 \ - cosEventDomain-1.1 \ - cosFileTransfer-1.1.2 \ - cosNotification-1.1.3 \ - cosProperty-1.1.1 \ - cosTime-1.1 \ - cosTransactions-1.2 \ - crypto-1.5 \ - debugger-3.1 \ - dialyzer-1.5.0 \ - edoc-0.6.9 \ - erl_interface-3.5.5.2 \ - et-1.0 \ - gs-1.5.5 \ - hipe-3.6.0 \ - ic-4.2.11 \ - inets-4.7.6 \ - inviso-0.1 \ - jinterface-1.3 \ - kernel-2.11.2 \ - megaco-3.5 \ - mnemosyne-1.2.6 \ - mnesia-4.3.3 \ - mnesia_session-1.1.6 \ - 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.1 \ - sasl-2.1.4 \ - snmp-4.8.2 \ - ssh-0.9.5 \ - ssl-3.0.12 \ - stdlib-1.14.2 \ - syntax_tools-1.5.0 \ - toolbar-1.3 \ - tools-2.5.2 \ - tv-2.1.3 \ - webtool-0.8.3 \ - xmerl-1.0.5 diff --git a/lang/erlang14/Makefile.man b/lang/erlang14/Makefile.man deleted file mode 100644 index df2c5f512f67..000000000000 --- a/lang/erlang14/Makefile.man +++ /dev/null @@ -1,332 +0,0 @@ -# $FreeBSD$ - -MAN1= epmd.1 \ - driver_entry.1 \ - erl.1 \ - erl_call.1 \ - erl_driver.1 \ - erlc.1 \ - erlsrv.1 \ - run_erl.1 \ - start.1 \ - start_erl.1 \ - start_webtool.1 \ - werl.1 - -MAN3= CosEventChannelAdmin.3 \ - CosEventChannelAdmin_ConsumerAdmin.3 \ - CosEventChannelAdmin_EventChannel.3 \ - CosEventChannelAdmin_ProxyPullConsumer.3 \ - CosEventChannelAdmin_ProxyPullSupplier.3 \ - CosEventChannelAdmin_ProxyPushConsumer.3 \ - CosEventChannelAdmin_ProxyPushSupplier.3 \ - CosEventChannelAdmin_SupplierAdmin.3 \ - CosEventDomainAdmin.3 \ - CosEventDomainAdmin_EventDomain.3 \ - CosEventDomainAdmin_EventDomainFactory.3 \ - CosFileTransfer_Directory.3 \ - CosFileTransfer_File.3 \ - CosFileTransfer_FileIterator.3 \ - CosFileTransfer_FileTransferSession.3 \ - CosFileTransfer_VirtualFileSystem.3 \ - CosNaming.3 \ - CosNaming_BindingIterator.3 \ - CosNaming_NamingContext.3 \ - CosNaming_NamingContextExt.3 \ - CosNotification.3 \ - CosNotification_AdminPropertiesAdmin.3 \ - CosNotification_QoSAdmin.3 \ - CosNotifyChannelAdmin_ConsumerAdmin.3 \ - CosNotifyChannelAdmin_EventChannel.3 \ - CosNotifyChannelAdmin_EventChannelFactory.3 \ - CosNotifyChannelAdmin_ProxyConsumer.3 \ - CosNotifyChannelAdmin_ProxyPullConsumer.3 \ - CosNotifyChannelAdmin_ProxyPullSupplier.3 \ - CosNotifyChannelAdmin_ProxyPushConsumer.3 \ - CosNotifyChannelAdmin_ProxyPushSupplier.3 \ - CosNotifyChannelAdmin_ProxySupplier.3 \ - CosNotifyChannelAdmin_SequenceProxyPullConsumer.3 \ - CosNotifyChannelAdmin_SequenceProxyPullSupplier.3 \ - CosNotifyChannelAdmin_SequenceProxyPushConsumer.3 \ - CosNotifyChannelAdmin_SequenceProxyPushSupplier.3 \ - CosNotifyChannelAdmin_StructuredProxyPullConsumer.3 \ - CosNotifyChannelAdmin_StructuredProxyPullSupplier.3 \ - CosNotifyChannelAdmin_StructuredProxyPushConsumer.3 \ - CosNotifyChannelAdmin_StructuredProxyPushSupplier.3 \ - CosNotifyChannelAdmin_SupplierAdmin.3 \ - CosNotifyComm_NotifyPublish.3 \ - CosNotifyComm_NotifySubscribe.3 \ - CosNotifyFilter_Filter.3 \ - CosNotifyFilter_FilterAdmin.3 \ - CosNotifyFilter_FilterFactory.3 \ - CosNotifyFilter_MappingFilter.3 \ - CosPropertyService_PropertiesIterator.3 \ - CosPropertyService_PropertyNamesIterator.3 \ - CosPropertyService_PropertySet.3 \ - CosPropertyService_PropertySetDef.3 \ - CosPropertyService_PropertySetDefFactory.3 \ - CosPropertyService_PropertySetFactory.3 \ - CosTime_TIO.3 \ - CosTime_TimeService.3 \ - CosTime_UTO.3 \ - CosTimerEvent_TimerEventHandler.3 \ - CosTimerEvent_TimerEventService.3 \ - CosTransactions_Control.3 \ - CosTransactions_Coordinator.3 \ - CosTransactions_RecoveryCoordinator.3 \ - CosTransactions_Resource.3 \ - CosTransactions_SubtransactionAwareResource.3 \ - CosTransactions_Terminator.3 \ - CosTransactions_TransactionFactory.3 \ - Module_Interface.3 \ - alarm_handler.3 \ - any.3 \ - application.3 \ - appmon.3 \ - asn1ct.3 \ - asn1rt.3 \ - auth.3 \ - beam_lib.3 \ - c.3 \ - calendar.3 \ - code.3 \ - compile.3 \ - corba.3 \ - corba_object.3 \ - cosEventApp.3 \ - cosEventDomainApp.3 \ - cosFileTransferApp.3 \ - cosNotificationApp.3 \ - cosProperty.3 \ - cosTime.3 \ - cosTransactions.3 \ - cover.3 \ - cprof.3 \ - cpu_sup.3 \ - crashdump.3 \ - crypto.3 \ - dbg.3 \ - debugger.3 \ - dets.3 \ - dialyzer.3 \ - dict.3 \ - digraph.3 \ - digraph_utils.3 \ - disk_log.3 \ - disksup.3 \ - ei.3 \ - ei_connect.3 \ - epp.3 \ - eprof.3 \ - erl_boot_server.3 \ - erl_connect.3 \ - erl_ddll.3 \ - erl_error.3 \ - erl_eterm.3 \ - erl_eval.3 \ - erl_expand_records.3 \ - erl_format.3 \ - erl_global.3 \ - erl_id_trans.3 \ - erl_internal.3 \ - erl_lint.3 \ - erl_malloc.3 \ - erl_marshal.3 \ - erl_parse.3 \ - erl_pp.3 \ - erl_prim_loader.3 \ - erl_scan.3 \ - erl_set_memory_block.3 \ - erl_tar.3 \ - erlang.3 \ - erlang_mode.3 \ - error_handler.3 \ - error_logger.3 \ - erts_alloc.3 \ - et.3 \ - et_collector.3 \ - et_selector.3 \ - et_viewer.3 \ - etop.3 \ - ets.3 \ - file.3 \ - file_sorter.3 \ - filelib.3 \ - filename.3 \ - fixed.3 \ - fprof.3 \ - ftp.3 \ - gb_sets.3 \ - gb_trees.3 \ - gen_event.3 \ - gen_fsm.3 \ - gen_server.3 \ - gen_tcp.3 \ - gen_udp.3 \ - global.3 \ - global_group.3 \ - gs.3 \ - heart.3 \ - http.3 \ - http_base_64.3 \ - httpd.3 \ - httpd_conf.3 \ - httpd_socket.3 \ - httpd_util.3 \ - i.3 \ - ic.3 \ - ic_c_protocol.3 \ - ic_clib.3 \ - inet.3 \ - init.3 \ - instrument.3 \ - int.3 \ - interceptors.3 \ - inviso.3 \ - inviso_as_lib.3 \ - inviso_lfm.3 \ - inviso_lfm_tpfreader.3 \ - inviso_rt.3 \ - io.3 \ - io_lib.3 \ - lib.3 \ - lists.3 \ - lname.3 \ - lname_component.3 \ - log_mf_h.3 \ - make.3 \ - math.3 \ - megaco.3 \ - megaco_codec_meas.3 \ - megaco_codec_transform.3 \ - megaco_encoder.3 \ - megaco_flex_scanner.3 \ - megaco_tcp.3 \ - megaco_transport.3 \ - megaco_udp.3 \ - megaco_user.3 \ - memsup.3 \ - mnemosyne.3 \ - mnesia.3 \ - mnesia_frag_hash.3 \ - mnesia_registry.3 \ - mnesia_session.3 \ - mod_alias.3 \ - mod_auth.3 \ - mod_esi.3 \ - mod_security.3 \ - ms_transform.3 \ - net_adm.3 \ - net_kernel.3 \ - nteventlog.3 \ - odbc.3 \ - orber.3 \ - orber_acl.3 \ - orber_diagnostics.3 \ - orber_ifr.3 \ - orber_tc.3 \ - orddict.3 \ - ordsets.3 \ - os.3 \ - os_mon.3 \ - os_mon_mib.3 \ - os_sup.3 \ - otp_mib.3 \ - overload.3 \ - packages.3 \ - pg.3 \ - pg2.3 \ - pman.3 \ - pool.3 \ - proc_lib.3 \ - proplists.3 \ - qlc.3 \ - queue.3 \ - random.3 \ - rb.3 \ - regexp.3 \ - registry.3 \ - release_handler.3 \ - rpc.3 \ - seq_trace.3 \ - sets.3 \ - shell.3 \ - shell_default.3 \ - slave.3 \ - snmp.3 \ - snmp_community_mib.3 \ - snmp_framework_mib.3 \ - snmp_generic.3 \ - snmp_index.3 \ - snmp_notification_mib.3 \ - snmp_pdus.3 \ - snmp_standard_mib.3 \ - snmp_target_mib.3 \ - snmp_user_based_sm_mib.3 \ - snmp_view_based_acm_mib.3 \ - snmpa.3 \ - snmpa_error.3 \ - snmpa_error_io.3 \ - snmpa_error_logger.3 \ - snmpa_error_report.3 \ - snmpa_local_db.3 \ - snmpa_mpd.3 \ - snmpa_network_interface.3 \ - snmpa_notification_filter.3 \ - snmpa_supervisor.3 \ - snmpc.3 \ - snmpm.3 \ - snmpm_mpd.3 \ - snmpm_network_interface.3 \ - snmpm_user.3 \ - sofs.3 \ - ssh.3 \ - ssh_cli.3 \ - ssh_cm.3 \ - ssh_sftp.3 \ - ssh_sftpd.3 \ - ssh_ssh.3 \ - ssh_sshd.3 \ - ssh_transport.3 \ - ssl.3 \ - ssl_pkix.3 \ - string.3 \ - supervisor.3 \ - supervisor_bridge.3 \ - sys.3 \ - systools.3 \ - tags.3 \ - tftp.3 \ - timer.3 \ - toolbar.3 \ - ttb.3 \ - tv.3 \ - user.3 \ - webtool.3 \ - win32reg.3 \ - wrap_log_reader.3 \ - xmerl.3 \ - xmerl_eventp.3 \ - xmerl_scan.3 \ - xmerl_xpath.3 \ - xmerl_xs.3 \ - xref.3 \ - yecc.3 \ - zip.3 \ - zlib.3 - -MAN4= app.4 \ - appup.4 \ - config.4 \ - rel.4 \ - relup.4 \ - script.4 - -MAN6= crypto.6 \ - kernel.6 \ - observer.6 \ - runtime_tools.6 \ - sasl.6 \ - snmp.6 \ - ssl.6 \ - stdlib.6 diff --git a/lang/erlang14/distinfo b/lang/erlang14/distinfo deleted file mode 100644 index 55410c57ebfc..000000000000 --- a/lang/erlang14/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/lang/erlang14/files/patch-aj b/lang/erlang14/files/patch-aj deleted file mode 100644 index c3b2f87f73c6..000000000000 --- a/lang/erlang14/files/patch-aj +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- erts/etc/unix/Install.src.orig Thu Oct 7 15:45:43 2004 -+++ erts/etc/unix/Install.src Thu Oct 7 15:45:59 2004 -@@ -157,4 +157,4 @@ - ./misc/format_man_pages $ERL_ROOT - fi - -- -+exit 0 diff --git a/lang/erlang14/files/patch-erts_configure b/lang/erlang14/files/patch-erts_configure deleted file mode 100644 index e53372908e06..000000000000 --- a/lang/erlang14/files/patch-erts_configure +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- erts/configure.orig -+++ erts/configure -@@ -6895,7 +6895,9 @@ - - echo $ac_n "checking for unreliable floating point execptions""... $ac_c" 1>&6 - echo "configure:6898: 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 diff --git a/lang/erlang14/files/patch-erts_emulator_beam_utils.c b/lang/erlang14/files/patch-erts_emulator_beam_utils.c deleted file mode 100644 index 58e675168a85..000000000000 --- a/lang/erlang14/files/patch-erts_emulator_beam_utils.c +++ /dev/null @@ -1,36 +0,0 @@ - -$FreeBSD$ - ---- erts/emulator/beam/utils.c.orig -+++ erts/emulator/beam/utils.c -@@ -2999,15 +2999,16 @@ - static void - ptimer_timeout(ErtsSmpPTimer *ptimer) - { -- if (!(ptimer->timer.flags & ERTS_PTMR_FLG_CANCELLED)) { - if (is_internal_pid(ptimer->timer.id)) { - Process *p; -- p = erts_pid2proc(NULL, -- 0, -- ptimer->timer.id, -- ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_STATUS); -+ p = erts_pid2proc_opt(NULL, -+ 0, -+ ptimer->timer.id, -+ ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_STATUS, -+ ERTS_P2P_FLG_ALLOW_OTHER_X); - if (p) { -- if (!(ptimer->timer.flags & ERTS_PTMR_FLG_CANCELLED)) { -+ if (!p->is_exiting -+ && !(ptimer->timer.flags & ERTS_PTMR_FLG_CANCELLED)) { - ASSERT(*ptimer->timer.timer_ref == ptimer); - *ptimer->timer.timer_ref = NULL; - (*ptimer->timer.timeout_func)(p); -@@ -3028,7 +3029,6 @@ - erts_smp_io_unlock(); - } - } -- } - free_ptimer(ptimer); - } - diff --git a/lang/erlang14/files/patch-erts_emulator_hipe_hipe__x86.c b/lang/erlang14/files/patch-erts_emulator_hipe_hipe__x86.c deleted file mode 100644 index b7086a076357..000000000000 --- a/lang/erlang14/files/patch-erts_emulator_hipe_hipe__x86.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- erts/emulator/hipe/hipe_x86.c.orig -+++ erts/emulator/hipe/hipe_x86.c -@@ -106,7 +106,7 @@ - abort(); - map_start = mmap(map_hint, map_bytes, - PROT_EXEC|PROT_READ|PROT_WRITE, -- MAP_PRIVATE|MAP_ANONYMOUS -+ MAP_PRIVATE|MAP_ANON - #ifdef __x86_64__ - |MAP_32BIT - #endif diff --git a/lang/erlang14/files/patch-lib_asn1_c__src_Makefile.in b/lang/erlang14/files/patch-lib_asn1_c__src_Makefile.in deleted file mode 100644 index 7ae33c2bc61d..000000000000 --- a/lang/erlang14/files/patch-lib_asn1_c__src_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/asn1/c_src/Makefile.in.orig Sun Aug 31 14:45:35 2003 -+++ lib/asn1/c_src/Makefile.in Sun Aug 31 14:45:42 2003 -@@ -131,7 +131,7 @@ - $(CC) -c $(CFLAGS) -o $(OBJ_FILES) $(C_FILES) - - $(SHARED_OBJ_FILES): $(OBJ_FILES) $(LIBDIR) -- $(LD) $(LDFLAGS) $(LD_INCL_EI) -o $(SHARED_OBJ_FILES) $(OBJ_FILES) $(LD_EI) $(CLIB_FLAGS) $(LIBS) -+ $(LD) $(LDFLAGS) $(LD_INCL_EI) -o $(SHARED_OBJ_FILES) $(OBJ_FILES) $(LD_EI) - - $(LIBDIR): - -mkdir -p $(LIBDIR) diff --git a/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in deleted file mode 100644 index 81e0ce9e83b3..000000000000 --- a/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/crypto/c_src/Makefile.in.orig Thu Oct 7 12:11:06 2004 -+++ lib/crypto/c_src/Makefile.in Thu Oct 7 12:11:07 2004 -@@ -121,7 +121,7 @@ - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/obj - $(INSTALL_DIR) $(RELSYSDIR)/priv/lib -- $(INSTALL_PROGRAM) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj -+ $(INSTALL_DATA) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj - $(INSTALL_PROGRAM) $(OBJS) $(RELSYSDIR)/priv/obj - $(INSTALL_PROGRAM) $(DYN_DRIVER) $(RELSYSDIR)/priv/lib - diff --git a/lang/erlang14/files/patch-lib_dialyzer_src_Makefile b/lang/erlang14/files/patch-lib_dialyzer_src_Makefile deleted file mode 100644 index de6ac4c165d6..000000000000 --- a/lang/erlang14/files/patch-lib_dialyzer_src_Makefile +++ /dev/null @@ -1,42 +0,0 @@ - -$FreeBSD$ - ---- lib/dialyzer/src/Makefile.orig -+++ lib/dialyzer/src/Makefile -@@ -66,8 +66,6 @@ - dialyzer_succ_typings \ - dialyzer_typesig - --EXTRA_FILES= ../plt/dialyzer_init_plt ## automatically generated -- - HRL_FILES= dialyzer.hrl - ERL_FILES= $(MODULES:%=%.erl) - INSTALL_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET) -@@ -91,13 +89,12 @@ - # Targets - # ---------------------------------------------------- - --debug opt: $(TARGET_FILES) $(DIALYZER_DIR)/plt/dialyzer_init_plt -+debug opt: $(TARGET_FILES) - - docs: - - clean: - rm -f $(TARGET_FILES) -- rm -f $(EXTRA_FILES) - rm -f core - - # ---------------------------------------------------- -@@ -149,11 +146,10 @@ - - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \ -+ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) \ - $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/plt -- $(INSTALL_DATA) ../plt/dialyzer_init_plt $(RELSYSDIR)/plt - - release_docs_spec: diff --git a/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer__cl.erl b/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer__cl.erl deleted file mode 100644 index 4c2e014af58e..000000000000 --- a/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer__cl.erl +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/dialyzer/src/dialyzer_cl.erl.orig -+++ lib/dialyzer/src/dialyzer_cl.erl -@@ -93,7 +93,7 @@ - check_if_installed() -> - case filename:basename(code:lib_dir(dialyzer)) of - "dialyzer" -> false; -- "dialyzer-" ++ _Version -> true -+ "dialyzer-" ++ _Version -> false - end. - - create_init_plt(MD5, Libs, InitPlt, IncludeDirs) -> diff --git a/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer__cl__parse.erl b/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer__cl__parse.erl deleted file mode 100644 index 53c869623278..000000000000 --- a/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer__cl__parse.erl +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- lib/dialyzer/src/dialyzer_cl_parse.erl.orig -+++ lib/dialyzer/src/dialyzer_cl_parse.erl -@@ -155,8 +155,7 @@ - put(dialyzer_options_from, byte_code), - put(dialyzer_options_libs, ?DEFAULT_LIBS), - -- InitPltDir = filename:join([code:lib_dir(dialyzer), -- "plt","dialyzer_init_plt"]), -+ InitPltDir = filename:join([os:getenv ("HOME"), ".dialyzer_init_plt"]), - put(dialyzer_init_plt, InitPltDir), - put(dialyzer_warnings, []). - diff --git a/lang/erlang14/files/patch-lib_erl__interface_src_connect_ei__resolve.c b/lang/erlang14/files/patch-lib_erl__interface_src_connect_ei__resolve.c deleted file mode 100644 index d8454c710f69..000000000000 --- a/lang/erlang14/files/patch-lib_erl__interface_src_connect_ei__resolve.c +++ /dev/null @@ -1,15 +0,0 @@ - -$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 diff --git a/lang/erlang14/files/patch-lib_et_src_et__contents__viewer.erl b/lang/erlang14/files/patch-lib_et_src_et__contents__viewer.erl deleted file mode 100644 index 683358dbf6da..000000000000 --- a/lang/erlang14/files/patch-lib_et_src_et__contents__viewer.erl +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- lib/et/src/et_contents_viewer.erl.orig Sat Jul 24 15:04:01 2004 -+++ lib/et/src/et_contents_viewer.erl Sat Jul 24 15:04:31 2004 -@@ -346,7 +346,6 @@ - 'Caps_Lock' -> - {noreply, S}; - _ -> -- io:format("~p: ignored: ~p~n", [?MODULE, KeySym]), - {noreply, S} - end; - handle_info({gs, _Obj, configure, [], [W, H | _]}, S) -> diff --git a/lang/erlang14/files/patch-lib_et_src_et__viewer.erl b/lang/erlang14/files/patch-lib_et_src_et__viewer.erl deleted file mode 100644 index 8cc3212e49e2..000000000000 --- a/lang/erlang14/files/patch-lib_et_src_et__viewer.erl +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- lib/et/src/et_viewer.erl.orig Sat Jul 24 15:02:18 2004 -+++ lib/et/src/et_viewer.erl Sat Jul 24 15:04:38 2004 -@@ -982,8 +982,7 @@ - noreply(S). - - click_error(Click, S) -> -- gs:config(S#state.canvas, beep), -- io:format("~p: ignored: ~p~n", [?MODULE, Click]). -+ gs:config(S#state.canvas, beep). - - %%%---------------------------------------------------------------------- - %%% Clone viewer diff --git a/lang/erlang14/files/patch-lib_gs_src_tool__utils.erl b/lang/erlang14/files/patch-lib_gs_src_tool__utils.erl deleted file mode 100644 index ddc1ecb98b12..000000000000 --- a/lang/erlang14/files/patch-lib_gs_src_tool__utils.erl +++ /dev/null @@ -1,87 +0,0 @@ - -$FreeBSD$ - ---- lib/gs/src/tool_utils.erl.orig -+++ lib/gs/src/tool_utils.erl -@@ -27,6 +27,9 @@ - -export([file_dialog/1]). - -export([notify/2, confirm/2, confirm_yesno/2, request/2]). - -+%% Browser executable list (openURL command line protocol required) -+-define(BROWSERS, ["netscape", "mozilla", "MozillaFirebird", "opera"]). -+ - %%---------------------------------------------------------------------- - %% open_help(GS, File) - %% GS = gsobj() (GS root object returned by gs:start/0,1) -@@ -67,7 +70,7 @@ - {unix,Type} -> - case Type of - darwin -> "open " ++ File; -- _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" -+ _Else -> unix_url_command("file:" ++ File) - end; - {win32,_AnyType} -> - "start " ++ filename:nativename(File); -@@ -82,7 +85,7 @@ - {unix,Type} -> - case Type of - darwin -> "open " ++ File; -- _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" -+ _Else -> unix_url_command("file:" ++ File) - end; - {win32,_AnyType} -> - "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/"); -@@ -342,3 +345,53 @@ - [Last]; - insert_newlines(Other) -> - Other. -+ -+%% find_browser(BrowserList) => string() | false -+%% BrowserList - [string()] -+%% Given a list of basenames, find the first available executable. -+ -+find_browser([]) -> -+ false; -+ -+find_browser([H | T]) -> -+ case os:find_executable(H) of -+ false -> -+ find_browser(T); -+ Browser -> -+ Browser -+ end. -+ -+%% unix_url_command(URL) => string() -+%% URL - string() -+%% Open an URL, using a browser which supports the openURL command -+%% line protocol. If no browser is found, the empty string will be -+%% returned. -+ -+unix_url_command(URL) -> -+ Template = "BROWSER -remote \"openURL(" ++ URL ++ ")\" || BROWSER " ++ URL ++ "&", -+ -+ case os:getenv("BROWSER") of -+ false -> -+ %% look for a compatible browser -+ case find_browser(?BROWSERS) of -+ false -> -+ ""; -+ Browser -> -+ case regexp:gsub(Template, "BROWSER", Browser) of -+ {ok, Command, 0} -> -+ %% Template does not contain "BROWSER" placeholder -+ ""; -+ {ok, Command, _} -> -+ Command -+ end -+ end; -+ -+ Value -> -+ case regexp:gsub(Template, "BROWSER", Value) of -+ {ok, Command2, 0} -> -+ %% no placeholder -+ ""; -+ {ok, Command2, _} -> -+ Command2 -+ end -+ end. diff --git a/lang/erlang14/files/patch-lib_odbc_c_src_odbcserver.c b/lang/erlang14/files/patch-lib_odbc_c_src_odbcserver.c deleted file mode 100644 index 985785bd8e26..000000000000 --- a/lang/erlang14/files/patch-lib_odbc_c_src_odbcserver.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/odbc/c_src/odbcserver.c.orig Sat Jun 25 17:34:20 2005 -+++ lib/odbc/c_src/odbcserver.c Sat Jun 25 17:34:33 2005 -@@ -107,6 +107,7 @@ - #include <sys/socket.h> - #include <sys/uio.h> - #include <netdb.h> -+#include <netinet/in.h> - #endif - - #include "ei.h" diff --git a/lang/erlang14/files/patch-lib_sasl_src_rb.erl b/lang/erlang14/files/patch-lib_sasl_src_rb.erl deleted file mode 100644 index 79b3961b0f00..000000000000 --- a/lang/erlang14/files/patch-lib_sasl_src_rb.erl +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/sasl/src/rb.erl.orig -+++ lib/sasl/src/rb.erl -@@ -414,7 +414,7 @@ - Ref = make_ref(), - case (catch {Ref,binary_to_term(Bin)}) of - {'EXIT',_} -> -- {error, "Inclomplete erlang term in log"}; -+ {error, "Incomplete erlang term in log"}; - {Ref,Term} -> - {ok, Term} - end diff --git a/lang/erlang14/files/patch-lib_snmp_src_misc_snmp__config.erl b/lang/erlang14/files/patch-lib_snmp_src_misc_snmp__config.erl deleted file mode 100644 index 732aef70634f..000000000000 --- a/lang/erlang14/files/patch-lib_snmp_src_misc_snmp__config.erl +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/snmp/src/misc/snmp_config.erl.orig -+++ lib/snmp/src/misc/snmp_config.erl -@@ -1722,7 +1722,7 @@ - "%% {\"standard inform\", \"std_inform\", inform}.\n" - "%%\n\n", - Hdr = header() ++ Comment, -- Conf = [{"stadard_trap", "std_trap", NotifyType}], -+ Conf = [{"standard trap", "std_trap", NotifyType}], - write_agent_notify_config(Dir, Hdr, Conf). - - write_agent_notify_config(Dir, Hdr, Conf) diff --git a/lang/erlang14/files/pkg-message.in b/lang/erlang14/files/pkg-message.in deleted file mode 100644 index 6abe1f5611f3..000000000000 --- a/lang/erlang14/files/pkg-message.in +++ /dev/null @@ -1,15 +0,0 @@ -=========================================================================== -This package requires a properly configured nsswitch.conf on FreeBSD -5.x, else nameserver queries (and the distribution protocol) will -not work. - -Installation tips: - -You can find an emacs mode for Erlang here: - - %%LOCALBASE%%/lib/erlang/lib/tools-2.5.2/emacs - -You may wish to add the following line to /etc/manpath.config: - -OPTIONAL_MANPATH %%LOCALBASE%%/lib/erlang/man -=========================================================================== diff --git a/lang/erlang14/files/post-patch-configure b/lang/erlang14/files/post-patch-configure deleted file mode 100644 index 355f4493a797..000000000000 --- a/lang/erlang14/files/post-patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Fri Dec 7 16:13:39 2001 -+++ configure Fri Dec 7 16:19:33 2001 -@@ -1081,6 +1081,7 @@ - *) # Relative path. - ac_sub_cache_file="$ac_dots$cache_file" ;; - esac -+ ac_given_INSTALL="$INSTALL" - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; diff --git a/lang/erlang14/pkg-descr b/lang/erlang14/pkg-descr deleted file mode 100644 index 2627e5e60209..000000000000 --- a/lang/erlang14/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Erlang is a small concurrent functional programming language -developed by Ericsson. It is being used by Ericsson as a systems -programming language for large concurrent distributed systems. - -WWW: http://www.erlang.org/ diff --git a/lang/erlang14/pkg-plist b/lang/erlang14/pkg-plist deleted file mode 100644 index 1dd0772416d7..000000000000 --- a/lang/erlang14/pkg-plist +++ /dev/null @@ -1,19 +0,0 @@ -bin/dialyzer -bin/epmd -bin/erl -bin/erl_call -bin/erlc -bin/run_erl -bin/to_erl -@comment Insert PLIST here -@comment -=[ begin PLIST.lib-erlang ]=- -@comment -=[ end PLIST.lib-erlang ]=- -@exec mkdir %D/lib/erlang/erts-%%ERTS_VSN%%/man -@exec mkdir %D/lib/erlang/usr/lib -@dirrm lib/erlang/man/man6 -@dirrm lib/erlang/man/man4 -@dirrm lib/erlang/man/man3 -@dirrm lib/erlang/man/man1 -@dirrm lib/erlang/man -@dirrmtry lib/erlang/lib -@dirrmtry lib/erlang |