diff options
author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2002-11-02 18:40:49 +0000 |
---|---|---|
committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2002-11-02 18:40:49 +0000 |
commit | 034094bad9d0628cab3a23f5914eab29014c40c5 (patch) | |
tree | ad7bfeda0c532959ffdccf5a3108f9afe8d97b41 /lang/erlang | |
parent | Allow vncserver to bind to an address and bump PORTREVISION. (diff) |
Update to version R9B-0, use ${SHAREOWN}:${SHAREGRP} rather
than hardcoding root:wheel.
Notes
Notes:
svn path=/head/; revision=69303
Diffstat (limited to 'lang/erlang')
-rw-r--r-- | lang/erlang/Makefile | 121 | ||||
-rw-r--r-- | lang/erlang/Makefile.man | 308 | ||||
-rw-r--r-- | lang/erlang/distinfo | 6 | ||||
-rw-r--r-- | lang/erlang/files/patch-ac | 27 | ||||
-rw-r--r-- | lang/erlang/files/patch-af | 19 | ||||
-rw-r--r-- | lang/erlang/files/patch-ag | 33 | ||||
-rw-r--r-- | lang/erlang/files/patch-ah | 84 | ||||
-rw-r--r-- | lang/erlang/files/patch-ai | 12 | ||||
-rw-r--r-- | lang/erlang/files/patch-aj | 4 | ||||
-rw-r--r-- | lang/erlang/files/patch-an | 26 | ||||
-rw-r--r-- | lang/erlang/files/patch-ap | 7 | ||||
-rw-r--r-- | lang/erlang/files/patch-erts_boot_src_Makefile | 11 | ||||
-rw-r--r-- | lang/erlang/files/patch-erts_configure | 11 | ||||
-rw-r--r-- | lang/erlang/files/patch-erts_configure.in | 11 | ||||
-rw-r--r-- | lang/erlang/files/patch-lib_erl__interface_src_configure.in | 10 | ||||
-rw-r--r-- | lang/erlang/pkg-plist | 4 |
16 files changed, 369 insertions, 325 deletions
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 91879ac6ba8b..d76834a3f860 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -6,13 +6,13 @@ # PORTNAME= erlang -PORTVERSION= 8.1 +PORTVERSION= 9.0 CATEGORIES= lang MASTER_SITES= 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_R8B-1 +DISTNAME= otp_src_R9B-0 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -22,8 +22,6 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= olgeni@FreeBSD.org -BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 - # Set JAVABINDIR to where you have javac, if different from below JAVABINDIR?= ${LOCALBASE}/jdk1.3.1/bin JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk13 @@ -37,9 +35,9 @@ CONFIGURE_TARGET= # Empty # Don't clutter up /usr/ports/distfiles with all distfiles (including patches) DIST_SUBDIR= erlang -ERLANG_MAN= otp_man_R8B-1.tar.gz +ERLANG_MAN= otp_man_R9B-0.tar.gz .if !defined(NOPORTDOCS) -ERLANG_DOCS= otp_html_R8B-1.tar.gz +ERLANG_DOCS= otp_html_R9B-0.tar.gz .endif .if !defined(WITHOUT_X11) @@ -111,7 +109,7 @@ post-install: @${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ -C ${PREFIX}/lib/erlang .endif - @${CHOWN} -R root:wheel ${PREFIX}/lib/erlang + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/erlang @${CHMOD} -R o+rX-w,g+rX-w ${PREFIX}/lib/erlang @sslapp=`ls -d ${PREFIX}/lib/erlang/lib/ssl-* | tail -1`; \ cd $$sslapp/priv/obj && ${MAKE} && strip ../bin/ssl_esock @@ -141,116 +139,9 @@ post-install: NOMANCOMPRESS= yes MAN1PREFIX= ${PREFIX}/lib/erlang -MAN1= epmd.1 erl.1 erl_call.1 erlc.1 erlsrv.1 start_erl.1 \ - werl.1 run_erl.1 start.1 driver_entry.1 erl_driver.1 - MAN3PREFIX= ${PREFIX}/lib/erlang -MAN3= CORBA_Environment_alloc.3 CosEventChannelAdmin.3 \ - CosEventChannelAdmin_ConsumerAdmin.3 \ - CosEventChannelAdmin_EventChannel.3 \ - CosEventChannelAdmin_ProxyPullConsumer.3 \ - CosEventChannelAdmin_ProxyPullSupplier.3 \ - CosEventChannelAdmin_ProxyPushConsumer.3 \ - CosEventChannelAdmin_ProxyPushSupplier.3 \ - CosEventChannelAdmin_SupplierAdmin.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 \ - com_gen.3 comet.3 compile.3 corba.3 corba_object.3 \ - cosEventApp.3 cosFileTransferApp.3 cosNotificationApp.3 \ - cosProperty.3 cosTime.3 cosTransactions.3 cover.3 \ - cpu_sup.3 crypto.3 dbg.3 debugger.3 dets.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_com.3 \ - erl_connect.3 erl_ddll.3 erl_error.3 erl_eterm.3 \ - erl_eval.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 erlang.3 error_handler.3 \ - error_logger.3 ets.3 eva.3 eva_log.3 eva_log_snmp.3 \ - eva_server.3 eva_snmp_adaptation.3 eva_sup.3 file.3 \ - file_sorter.3 filename.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 httpd.3 httpd_conf.3 httpd_core.3 httpd_socket.3 \ - httpd_util.3 i.3 ic.3 inet.3 init.3 instrument.3 \ - int.3 interceptors.3 io.3 io_lib.3 lib.3 lists.3 \ - lname.3 lname_component.3 log.3 log_mf_h.3 log_server.3 \ - log_snmp.3 log_snmpea.3 make.3 math.3 megaco.3 \ - megaco_codec_meas.3 megaco_codec_transform.3 \ - megaco_flex_scanner.3 megaco_tcp.3 megaco_udp.3 \ - megaco_user.3 memsup.3 mnemosyne.3 mnesia.3 \ - mnesia_registry.3 mnesia_session.3 mod_actions.3 \ - mod_alias.3 mod_auth.3 mod_browser.3 mod_cgi.3 \ - mod_dir.3 mod_disk_log.3 mod_esi.3 mod_htaccess.3 \ - mod_include.3 mod_log.3 mod_security.3 net_adm.3 \ - net_kernel.3 nteventlog.3 odbc.3 orber.3 orber_ifr.3 \ - orber_tc.3 orddict.3 ordsets.3 os.3 os_mon.3 os_sup.3 \ - overload.3 pg.3 pg2.3 pman.3 pool.3 proc_lib.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 sl_alloc.3 slave.3 snmp.3 \ - snmp_community_mib.3 snmp_error.3 snmp_error_io.3 \ - snmp_error_report.3 snmp_framework_mib.3 snmp_generic.3 \ - snmp_index.3 snmp_local_db.3 snmp_mgr.3 snmp_mpd.3 \ - snmp_notification_mib.3 snmp_pdus.3 snmp_standard_mib.3 \ - snmp_supervisor.3 snmp_target_mib.3 \ - snmp_user_based_sm_mib.3 snmp_view_based_acm_mib.3 \ - sofs.3 ssl.3 ssl_socket.3 string.3 supervisor.3 \ - supervisor_bridge.3 sys.3 systools.3 tags.3 timer.3 \ - toolbar.3 tv.3 unix.3 user.3 webtool.3 win32reg.3 \ - wrap_log_reader.3 xref.3 yecc.3 - MAN4PREFIX= ${PREFIX}/lib/erlang -MAN4= app.4 appup.4 config.4 rel.4 relup.4 script.4 - MAN6PREFIX= ${PREFIX}/lib/erlang -MAN6= crypto.6 eva.6 inets.6 kernel.6 runtime_tools.6 \ - sasl.6 snmp.6 ssl.6 +.include "Makefile.man" .include <bsd.port.mk> diff --git a/lang/erlang/Makefile.man b/lang/erlang/Makefile.man new file mode 100644 index 000000000000..46e3a31e2801 --- /dev/null +++ b/lang/erlang/Makefile.man @@ -0,0 +1,308 @@ +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 \ + werl.1 + +MAN3= CORBA_Environment_alloc.3 \ + 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 \ + crypto.3 \ + dbg.3 \ + debugger.3 \ + dets.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_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 \ + erlang.3 \ + error_handler.3 \ + error_logger.3 \ + et.3 \ + et_collector.3 \ + et_selector.3 \ + et_viewer.3 \ + etop.3 \ + ets.3 \ + eva.3 \ + eva_log.3 \ + eva_log_snmp.3 \ + eva_server.3 \ + eva_snmp_adaptation.3 \ + eva_sup.3 \ + file.3 \ + file_sorter.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 \ + httpd.3 \ + httpd_conf.3 \ + httpd_core.3 \ + httpd_socket.3 \ + httpd_util.3 \ + i.3 \ + ic.3 \ + inet.3 \ + init.3 \ + instrument.3 \ + int.3 \ + interceptors.3 \ + io.3 \ + io_lib.3 \ + lib.3 \ + lists.3 \ + lname.3 \ + lname_component.3 \ + log.3 \ + log_mf_h.3 \ + log_server.3 \ + log_snmp.3 \ + log_snmpea.3 \ + make.3 \ + math.3 \ + megaco.3 \ + megaco_codec_meas.3 \ + megaco_codec_transform.3 \ + megaco_flex_scanner.3 \ + megaco_tcp.3 \ + megaco_udp.3 \ + megaco_user.3 \ + memsup.3 \ + mnemosyne.3 \ + mnesia.3 \ + mnesia_frag_hash.3 \ + mnesia_registry.3 \ + mnesia_session.3 \ + mod_actions.3 \ + mod_alias.3 \ + mod_auth.3 \ + mod_browser.3 \ + mod_cgi.3 \ + mod_dir.3 \ + mod_disk_log.3 \ + mod_esi.3 \ + mod_get.3 \ + mod_head.3 \ + mod_htaccess.3 \ + mod_include.3 \ + mod_log.3 \ + mod_range.3 \ + mod_responsecontrol.3 \ + mod_security.3 \ + mod_trace.3 \ + ms_transform.3 \ + net_adm.3 \ + net_kernel.3 \ + nteventlog.3 \ + odbc.3 \ + orber.3 \ + orber_ifr.3 \ + orber_tc.3 \ + orddict.3 \ + ordsets.3 \ + os.3 \ + os_mon.3 \ + os_sup.3 \ + overload.3 \ + pg.3 \ + pg2.3 \ + pman.3 \ + pool.3 \ + proc_lib.3 \ + proplists.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 \ + sl_alloc.3 \ + slave.3 \ + snmp.3 \ + snmp_community_mib.3 \ + snmp_error.3 \ + snmp_error_io.3 \ + snmp_error_report.3 \ + snmp_framework_mib.3 \ + snmp_generic.3 \ + snmp_index.3 \ + snmp_local_db.3 \ + snmp_mgr.3 \ + snmp_mpd.3 \ + snmp_notification_mib.3 \ + snmp_pdus.3 \ + snmp_standard_mib.3 \ + snmp_supervisor.3 \ + snmp_target_mib.3 \ + snmp_user_based_sm_mib.3 \ + snmp_view_based_acm_mib.3 \ + sofs.3 \ + ssl.3 \ + ssl_socket.3 \ + string.3 \ + supervisor.3 \ + supervisor_bridge.3 \ + sys.3 \ + systools.3 \ + tags.3 \ + timer.3 \ + toolbar.3 \ + ttb.3 \ + tv.3 \ + user.3 \ + webtool.3 \ + win32reg.3 \ + wrap_log_reader.3 \ + xref.3 \ + yecc.3 + +MAN4= app.4 \ + appup.4 \ + config.4 \ + rel.4 \ + relup.4 \ + script.4 + +MAN6= crypto.6 \ + eva.6 \ + inets.6 \ + kernel.6 \ + observer.6 \ + runtime_tools.6 \ + sasl.6 \ + snmp.6 \ + ssl.6 diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo index f04e94cd3dec..fb87e06924f3 100644 --- a/lang/erlang/distinfo +++ b/lang/erlang/distinfo @@ -1,3 +1,3 @@ -MD5 (erlang/otp_src_R8B-1.tar.gz) = cdf31c6d6b9442d1f5b6781fdfac0fc5 -MD5 (erlang/otp_man_R8B-1.tar.gz) = 01abea9881bff0d4e437a8c6a6c72370 -MD5 (erlang/otp_html_R8B-1.tar.gz) = e1effcda29f7ea1d85a5ca236c865bca +MD5 (erlang/otp_src_R9B-0.tar.gz) = 573be64365dd6cb0e83063a71ae65f70 +MD5 (erlang/otp_man_R9B-0.tar.gz) = d0d92745e4e1a1710ee05f1cc920b129 +MD5 (erlang/otp_html_R9B-0.tar.gz) = d26d9709074d7a37ef5d54e98df5f9a0 diff --git a/lang/erlang/files/patch-ac b/lang/erlang/files/patch-ac deleted file mode 100644 index b574011d6429..000000000000 --- a/lang/erlang/files/patch-ac +++ /dev/null @@ -1,27 +0,0 @@ ---- erts/etc/common/Makefile.in.orig Tue Nov 28 20:41:14 2000 -+++ erts/etc/common/Makefile.in Tue Nov 28 20:46:05 2000 -@@ -65,6 +65,7 @@ - INSTALL = @INSTALL@ - INSTALL_DIR = $(INSTALL) -d - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_DATA = @INSTALL_DATA@ - - ifeq ($(findstring solaris,$(TARGET)),solaris) -@@ -238,13 +239,13 @@ - endif - $(INSTALL_DIR) $(RELEASE_PATH)/erts-$(VSN)/bin - ifneq ($(findstring vxworks,$(TARGET)), vxworks) -- $(INSTALL_PROGRAM) erl.src $(RELEASE_PATH)/erts-$(VSN)/bin -+ $(INSTALL_SCRIPT) erl.src $(RELEASE_PATH)/erts-$(VSN)/bin - endif - $(INSTALL_PROGRAM) $(INSTALL_PROGS) $(RELEASE_PATH)/erts-$(VSN)/bin -- $(INSTALL_PROGRAM) $(INSTALL_TOP) $(RELEASE_PATH) -+ $(INSTALL_SCRIPT) $(INSTALL_TOP) $(RELEASE_PATH) - ifneq ($(INSTALL_MISC),) - $(INSTALL_DIR) $(RELEASE_PATH)/misc -- $(INSTALL_PROGRAM) $(INSTALL_MISC) $(RELEASE_PATH)/misc -+ $(INSTALL_SCRIPT) $(INSTALL_MISC) $(RELEASE_PATH)/misc - endif - ifneq ($(INSTALL_SRC),) - $(INSTALL_DIR) $(RELEASE_PATH)/erts-$(VSN)/src diff --git a/lang/erlang/files/patch-af b/lang/erlang/files/patch-af deleted file mode 100644 index 4e20d048f0aa..000000000000 --- a/lang/erlang/files/patch-af +++ /dev/null @@ -1,19 +0,0 @@ ---- lib/os_mon/c_src/Makefile.in.orig Tue Nov 23 16:14:47 1999 -+++ lib/os_mon/c_src/Makefile.in Sat Dec 2 22:35:09 2000 -@@ -53,6 +53,7 @@ - PROGRAMS = \ - memsup @os_mon_programs@ - C_FILES= $(PROGRAMS:%=%.c) -+LKSTAT= @os_mon_kstat@ - endif - - TARGET_FILES= $(PROGRAMS:%=$(BINDIR)/%) -@@ -97,7 +98,7 @@ - $(LD) $(LDFLAGS) -o $@ $< - - $(BINDIR)/cpu_sup: $(OBJDIR)/cpu_sup.o -- $(LD) $(LDFLAGS) -o $@ $< -lkstat -+ $(LD) $(LDFLAGS) -o $@ $< $(LKSTAT) - - $(OBJDIR)/%.o: %.c - $(CC) -c -o $@ $(ALL_CFLAGS) $< diff --git a/lang/erlang/files/patch-ag b/lang/erlang/files/patch-ag deleted file mode 100644 index b32003f79b65..000000000000 --- a/lang/erlang/files/patch-ag +++ /dev/null @@ -1,33 +0,0 @@ ---- lib/os_mon/c_src/memsup.c.orig Mon Sep 20 23:05:24 1999 -+++ lib/os_mon/c_src/memsup.c Sat Dec 2 22:23:25 2000 -@@ -89,6 +89,12 @@ - #include <ioLib.h> - #include <memLib.h> - #endif -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#include <sys/vmmeter.h> -+#include <vm/vm_param.h> -+#endif - - /* commands */ - #include "memsup.h" -@@ -172,6 +178,16 @@ - load_statistics(); - *tot = (latest.numBytesFree + latest.numBytesAlloc) >> shiftleft; - *used = latest.numBytesAlloc >> shiftleft; -+#elif defined(__FreeBSD__) -+ int mib[2]; -+ size_t len; -+ struct vmtotal memory; -+ mib[0] = CTL_VM; -+ mib[1] = VM_METER; -+ len = sizeof memory; -+ sysctl(mib, 2, &memory, &len, NULL, 0); -+ *tot = memory.t_vm >> shiftleft; -+ *used = memory.t_avm >> shiftleft; - #elif defined(_SC_AVPHYS_PAGES) /* Does this exist on others than Solaris2? */ - unsigned long avPhys, phys, pgSz; - -# End diff --git a/lang/erlang/files/patch-ah b/lang/erlang/files/patch-ah deleted file mode 100644 index 7da039d6bdf1..000000000000 --- a/lang/erlang/files/patch-ah +++ /dev/null @@ -1,84 +0,0 @@ ---- lib/os_mon/c_src/cpu_sup.c.orig Sat Dec 2 22:12:38 2000 -+++ lib/os_mon/c_src/cpu_sup.c Sat Dec 2 22:47:11 2000 -@@ -26,7 +26,14 @@ - */ - - #include<stdio.h> -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#include <sys/param.h> -+#include <sys/user.h> -+#else - #include<kstat.h> -+#endif - - #define FD_IN 0 - #define FD_OUT 1 -@@ -45,20 +52,23 @@ - static void send(unsigned int data); - static void error(char* err_msg); - -+#ifndef __FreeBSD__ - static kstat_ctl_t *kc; - static kstat_t *ks; -+#endif - - int main(int argc, char** argv) { -- kid_t kid; - char cmd; - int rc; -+#ifndef __FreeBSD__ -+ kid_t kid; - - kc = kstat_open(); - if(!kc) error("Can't open header kstat"); - - ks = kstat_lookup(kc,"unix",0,"system_misc"); - if(!ks) error("Can't open system_misc kstat"); -- -+#endif - - while(1) { - rc = read(FD_IN, &cmd, sizeof(cmd)); -@@ -79,6 +89,32 @@ - } - - static unsigned int measure(char* name) { -+#ifdef __FreeBSD__ -+ size_t len; -+ int mib[3]; -+ if (!strcmp (name, "nproc")) { -+ mib[0] = CTL_KERN; -+ mib[1] = KERN_PROC; -+ mib[2] = KERN_PROC_ALL; -+ sysctl(mib, 3, NULL, &len, NULL, 0); -+ return len/sizeof(struct kinfo_proc); -+ } else { -+ struct loadavg load; -+ mib[0] = CTL_VM; -+ mib[1] = VM_LOADAVG; -+ len = sizeof load; -+ sysctl(mib, 2, &load, &len, NULL, 0); -+ if (!strcmp (name, "avenrun_1min")) { -+ return load.ldavg[0] * 256 / load.fscale; -+ } else if (!strcmp (name, "avenrun_5min")) { -+ return load.ldavg[1] * 256 / load.fscale; -+ } else if (!strcmp (name, "avenrun_15min")) { -+ return load.ldavg[2] * 256 / load.fscale; -+ } else { -+ return -1; -+ } -+ } -+#else - kstat_named_t* entry; - - kstat_read(kc,ks,NULL); -@@ -90,6 +126,7 @@ - return -1; - - return entry->value.ul; -+#endif - } - - static void send(unsigned int data) { diff --git a/lang/erlang/files/patch-ai b/lang/erlang/files/patch-ai deleted file mode 100644 index 6be7b984151f..000000000000 --- a/lang/erlang/files/patch-ai +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/os_mon/c_src/ferrule.c.orig Sat Dec 2 22:13:49 2000 -+++ lib/os_mon/c_src/ferrule.c Sat Dec 2 22:14:03 2000 -@@ -17,7 +17,9 @@ - */ - #include <stdio.h> - #include <string.h> -+#ifndef __FreeBSD__ - #include <stropts.h> -+#endif - #include <poll.h> - #include <unistd.h> - #include <sys/types.h> diff --git a/lang/erlang/files/patch-aj b/lang/erlang/files/patch-aj index 2efd40c6460c..c737dadeb146 100644 --- a/lang/erlang/files/patch-aj +++ b/lang/erlang/files/patch-aj @@ -1,5 +1,5 @@ ---- ./erts/etc/unix/Install.src.orig Wed Jan 17 17:18:57 2001 -+++ ./erts/etc/unix/Install.src Wed Jan 17 17:35:40 2001 +--- erts/etc/unix/Install.src.orig Tue Oct 15 13:40:55 2002 ++++ erts/etc/unix/Install.src Sat Nov 2 15:43:51 2002 @@ -97,7 +97,8 @@ chmod 755 start_erl fi diff --git a/lang/erlang/files/patch-an b/lang/erlang/files/patch-an deleted file mode 100644 index 1a0ed1951434..000000000000 --- a/lang/erlang/files/patch-an +++ /dev/null @@ -1,26 +0,0 @@ ---- erts/configure.in.orig Mon Oct 8 10:36:08 2001 -+++ erts/configure.in Sun Jan 20 16:06:23 2002 -@@ -436,7 +436,7 @@ - dnl ---------------------------------------------------------------------- - - AC_CHECK_FUNCS([ieee_handler fpsetmask finite 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]) - AC_FUNC_SETVBUF_REVERSED - AC_FUNC_VFORK -@@ -886,10 +886,13 @@ - # Os mon stuff. - #-------------------------------------------------------------------- - AC_SUBST(os_mon_programs) --AC_CHECK_LIB(kstat, kstat_open, [os_mon_programs="$os_mon_programs cpu_sup"]) -+AC_SUBST(os_mon_kstat) -+AC_CHECK_LIB(kstat, kstat_open, [os_mon_kstat="-lkstat", os_mon_programs="$os_mon_programs cpu_sup"]) - case $host_os in - solaris2*) - os_mon_programs="$os_mon_programs ferrule mod_syslog" ;; -+ freebsd*) -+ os_mon_programs="$os_mon_programs cpu_sup ferrule mod_syslog" ;; - esac - - diff --git a/lang/erlang/files/patch-ap b/lang/erlang/files/patch-ap index bb3e0ba3c4ab..051d70948357 100644 --- a/lang/erlang/files/patch-ap +++ b/lang/erlang/files/patch-ap @@ -1,6 +1,6 @@ ---- erts/config.h.in.orig Thu Mar 28 21:53:19 2002 -+++ erts/config.h.in Thu Mar 28 21:54:07 2002 -@@ -211,6 +211,9 @@ +--- erts/config.h.in.orig Wed Oct 16 10:41:05 2002 ++++ erts/config.h.in Sat Nov 2 15:43:51 2002 +@@ -258,6 +258,9 @@ /* Define if you have the strerror function. */ #undef HAVE_STRERROR @@ -9,4 +9,3 @@ + /* Define if you have the strncasecmp function. */ #undef HAVE_STRNCASECMP - diff --git a/lang/erlang/files/patch-erts_boot_src_Makefile b/lang/erlang/files/patch-erts_boot_src_Makefile new file mode 100644 index 000000000000..75729da81402 --- /dev/null +++ b/lang/erlang/files/patch-erts_boot_src_Makefile @@ -0,0 +1,11 @@ +--- erts/boot/src/Makefile.orig Sat Nov 2 16:15:36 2002 ++++ erts/boot/src/Makefile Sat Nov 2 16:16:17 2002 +@@ -103,7 +103,7 @@ + $(INSTALL_DIR) $(RELSYSDIR) + $(INSTALL_DATA) erlang.ear $(RELSYSDIR)/erlang.ear + $(INSTALL_DIR) $(RELSYSDIR)/bin +- $(INSTALL_PROGRAM) ecc elink escript ear esh $(RELSYSDIR)/bin ++ $(INSTALL_SCRIPT) ecc elink escript ear esh $(RELSYSDIR)/bin + endif + + bootstrap: ${BEAM} ${FAKES} elink diff --git a/lang/erlang/files/patch-erts_configure b/lang/erlang/files/patch-erts_configure new file mode 100644 index 000000000000..7ecc4f41d310 --- /dev/null +++ b/lang/erlang/files/patch-erts_configure @@ -0,0 +1,11 @@ +--- erts/configure.orig Wed Oct 16 10:41:01 2002 ++++ erts/configure Sat Nov 2 15:43:52 2002 +@@ -3960,7 +3960,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 diff --git a/lang/erlang/files/patch-erts_configure.in b/lang/erlang/files/patch-erts_configure.in new file mode 100644 index 000000000000..a81d2ede3fe4 --- /dev/null +++ b/lang/erlang/files/patch-erts_configure.in @@ -0,0 +1,11 @@ +--- erts/configure.in.orig Thu Oct 10 16:18:27 2002 ++++ erts/configure.in Sat Nov 2 15:43:51 2002 +@@ -546,7 +546,7 @@ + dnl ---------------------------------------------------------------------- + + AC_CHECK_FUNCS([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]) + AC_FUNC_SETVBUF_REVERSED + AC_FUNC_VFORK diff --git a/lang/erlang/files/patch-lib_erl__interface_src_configure.in b/lang/erlang/files/patch-lib_erl__interface_src_configure.in new file mode 100644 index 000000000000..feda49221378 --- /dev/null +++ b/lang/erlang/files/patch-lib_erl__interface_src_configure.in @@ -0,0 +1,10 @@ +--- lib/erl_interface/src/configure.in.orig Fri Sep 22 16:09:38 2000 ++++ lib/erl_interface/src/configure.in Sat Nov 2 15:43:51 2002 +@@ -28,7 +28,7 @@ + AC_FUNC_MEMCMP + AC_TYPE_SIGNAL + AC_FUNC_VPRINTF +-AC_CHECK_FUNCS(gethostname gettimeofday select socket strdup strerror strstr uname) ++AC_CHECK_FUNCS(gethostname gettimeofday select socket strdup strerror strerror_r strstr uname) + + AC_OUTPUT(GNUmakefile) diff --git a/lang/erlang/pkg-plist b/lang/erlang/pkg-plist index 26d6a1304b1d..67fc8852673b 100644 --- a/lang/erlang/pkg-plist +++ b/lang/erlang/pkg-plist @@ -1,6 +1,10 @@ +bin/ear +bin/ecc +bin/elink bin/erl bin/erl_call bin/erlc +bin/escript @comment Insert PLIST.lib-erlang here @comment -=[ begin PLIST.lib-erlang ]=- @comment -=[ end PLIST.lib-erlang ]=- |