Update port to erlang 7.1.0.

Change maintainer (agreed to by previous maintainer).

PR:		ports/24456
Submitted by:	sam@inf.enst.fr
This commit is contained in:
Pierre Beyssac 2001-01-23 20:50:38 +00:00
parent e7e00cac2c
commit 2921f400fb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=37506
28 changed files with 10934 additions and 8332 deletions

View file

@ -6,40 +6,42 @@
#
PORTNAME= erlang
PORTVERSION= 6.1.0
PORTVERSION= 7.1.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_R6B-0
DISTNAME= otp_src_R7B-1
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PATCH_SITES= http://www.erlang.org/faq/ http://erlang.stacken.kth.se/faq/
PATCHFILES= tmp_patch_R6B0.2.txt tmp_patch_R6B0.3.txt \
tmp_patch_R6B0.4.txt tmp_patch_R6B0.5.txt \
tmp_patch_R6B0.7.txt tmp_patch_R6B0.8.txt
PATCH_SITES= http://www.erlang.org/download/patches/
PATCHFILES=
PATCH_DIST_STRIP= -p1
MAINTAINER= seb@bluetail.com
MAINTAINER= sam@inf.enst.fr
# Make sure jdk is available (see use below)
BUILD_DEPENDS= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk
BUILD_DEPENDS= ${JAVAPORT}
CONFIGURE_TARGET= # Empty
# Don't clutter up /usr/ports/distfiles with all distfiles (including patches)
DIST_SUBDIR= erlang
EXTRACT_ONLY= otp_src_R6B-0.tar.gz
ERLANG_MAN= otp_src_doc_man_R6B-0.tar.gz
ERLANG_DOCS= otp_src_doc_html_R6B-0.tar.gz
ERLANG_MAN= otp_doc_man_R7B.tar.gz
.if !defined(NOPORTDOCS)
ERLANG_DOCS= otp_doc_html_R7B.tar.gz
.endif
.if !defined(WITHOUT_X11)
USE_XLIB= yes
.endif
USE_GMAKE= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= # empty
STRIP=
.if !defined(WITHOUT_JAVA)
# 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
@ -49,12 +51,33 @@ STRIP=
# JAVABINDIR is added to the PATH, using the *_ENV macros.
# Set JAVABINDIR to where you have javac, if different from below
JAVABINDIR?= ${LOCALBASE}/jdk1.1.8/bin
JAVABINDIR?= ${LOCALBASE}/jdk1.2.2/bin
JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk12-beta
# Make sure javabindir is in the path
CONFIGURE_ENV+= PATH=${PATH}:${JAVABINDIR}
MAKE_ENV+= PATH=${PATH}:${JAVABINDIR}
SCRIPT_ENV+= PATH=${PATH}:${JAVABINDIR}
CONFIGURE_ENV+= PATH=${PATH}:${JAVABINDIR}
MAKE_ENV+= PATH=${PATH}:${JAVABINDIR}
SCRIPT_ENV+= PATH=${PATH}:${JAVABINDIR}
.endif
.if !defined(WITHOUT_X11)
PLIST_SUB+= WITHOUT_X11=""
.else
PLIST_SUB+= WITHOUT_X11="@comment "
.endif
.if !defined(WITHOUT_JAVA)
PLIST_SUB+= WITHOUT_JAVA=""
.else
PLIST_SUB+= WITHOUT_JAVA="@comment "
.endif
# If X11 is not used, skip gs and etk applications
pre-build:
.if defined(WITHOUT_X11)
${ECHO} "WITHOUT_X11 defined" > ${WRKSRC}/lib/gs/SKIP
${ECHO} "WITHOUT_X11 defined" > ${WRKSRC}/lib/etk/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
@ -66,6 +89,8 @@ post-install:
tar --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
-C ${PREFIX}/lib/erlang
.endif
sslapp=`ls -d ${PREFIX}/lib/erlang/lib/ssl-* | tail -1`; \
cd $$sslapp/priv/obj && ${MAKE} && strip ../bin/ssl_esock
# 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
@ -74,63 +99,65 @@ post-install:
# epmd.1 perhaps being the exception).
MAN1PREFIX= ${PREFIX}/lib/erlang
MAN1= erl_call.1 epmd.1 erl.1 erlc.1 werl.1 erlsrv.1 start_erl.1
MAN_MAN1= epmd.1 erl.1 erl_call.1 erlc.1 erlsrv.1 start_erl.1 werl.1
MAN3PREFIX= ${PREFIX}/lib/erlang
MAN3= appmon.3 asn1ct.3 asn1rt.3 compile.3 CosEventChannelAdmin.3 \
CosEventChannelAdmin_ConsumerAdmin.3 \
CosEventChannelAdmin_SupplierAdmin.3 \
CosEventChannelAdmin_EventChannel.3 \
CosEventChannelAdmin_ProxyPullConsumer.3 \
CosEventChannelAdmin_ProxyPullSupplier.3 \
CosEventChannelAdmin_ProxyPushConsumer.3 \
CosEventChannelAdmin_ProxyPushSupplier.3 OrberEventChannel.3 \
OrberEventChannel_EventChannelFactory.3 cosTransactions.3 \
CosTransactions_Control.3 CosTransactions_Coordinator.3 \
CosTransactions_RecoveryCoordinator.3 \
CosTransactions_Resource.3 \
CosTransactions_SubtransactionAwareResource.3 \
CosTransactions_Terminator.3 \
CosTransactions_TransactionFactory.3 crypto.3 i.3 int.3 \
erl_connect.3 erl_error.3 erl_eterm.3 registry.3 erl_format.3 \
erl_malloc.3 erl_marshal.3 erl_global.3 erl_set_memory_block.3 \
etk.3 tk.3 eva.3 eva_log.3 eva_log_snmp.3 eva_server.3 \
eva_snmp_adaptation.3 eva_sup.3 log.3 log_server.3 log_snmp.3 \
log_snmpea.3 gs.3 ic.3 CORBA_Environment_alloc.3 ig.3 ftp.3 \
httpd.3 jive.3 httpd_conf.3 httpd_core.3 httpd_socket.3 \
httpd_util.3 mod_actions.3 mod_alias.3 mod_auth.3 mod_cgi.3 \
mod_dir.3 mod_disk_log.3 mod_esi.3 mod_include.3 mod_log.3 \
mod_security.3 application.3 auth.3 code.3 disk_log.3 \
erl_boot_server.3 erl_ddll.3 erl_prim_loader.3 erlang.3 \
error_handler.3 error_logger.3 file.3 gen_tcp.3 gen_udp.3 \
global.3 global_group.3 heart.3 inet.3 init.3 net_adm.3 \
net_kernel.3 os.3 pg2.3 rpc.3 seq_trace.3 wrap_log_reader.3 \
user.3 mesh.3 mesh_snmp.3 mesh_lib.3 mnemosyne.3 mnesia.3 \
mnesia_registry.3 mnesia_session.3 odbc.3 any.3 corba.3 \
corba_object.3 orber.3 CosNaming.3 CosNaming_NamingContext.3 \
CosNaming_BindingIterator.3 lname.3 lname_component.3 \
orber_ifr.3 orber_tc.3 Module_Interface.3 cpu_sup.3 disksup.3 \
memsup.3 os_mon.3 os_sup.3 nteventlog.3 yecc.3 pman.3 dbg.3 \
alarm_handler.3 overload.3 rb.3 systools.3 release_handler.3 \
snmp.3 snmp_community_mib.3 snmp_error.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 socket.3 \
udp.3 ssl.3 ssl_socket.3 c.3 calendar.3 dets.3 dict.3 digraph.3 \
epp.3 erl_eval.3 erl_id_trans.3 erl_internal.3 erl_lint.3 \
erl_parse.3 erl_pp.3 erl_scan.3 ets.3 filename.3 gen_event.3 \
gen_fsm.3 gen_server.3 io.3 io_lib.3 lib.3 lists.3 log_mf_h.3 \
math.3 ordsets.3 pg.3 pool.3 proc_lib.3 queue.3 random.3 \
regexp.3 shell.3 shell_default.3 slave.3 string.3 supervisor.3 \
supervisor_bridge.3 sys.3 timer.3 unix.3 toolbar.3 coast.3 \
eprof.3 exref.3 instrument.3 tags.3 make.3 tv.3 xref.3 \
MAN_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 CosNaming.3 \
CosNaming_BindingIterator.3 CosNaming_NamingContext.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 \
OrberEventChannel.3 OrberEventChannel_EventChannelFactory.3 \
alarm_handler.3 any.3 application.3 appmon.3 asn1ct.3 \
asn1rt.3 auth.3 c.3 calendar.3 coast.3 code.3 compile.3 \
corba.3 corba_object.3 cosTransactions.3 cpu_sup.3 crypto.3 \
dbg.3 dets.3 dict.3 digraph.3 disk_log.3 disksup.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 etk.3 ets.3 eva.3 eva_log.3 eva_log_snmp.3 \
eva_server.3 eva_snmp_adaptation.3 eva_sup.3 exref.3 \
file.3 filename.3 ftp.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 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 memsup.3 \
mesh.3 mesh_lib.3 mesh_snmp.3 mnemosyne.3 mnesia.3 \
mnesia_registry.3 mnesia_session.3 mod_actions.3 mod_alias.3 \
mod_auth.3 mod_cgi.3 mod_dir.3 mod_disk_log.3 mod_esi.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 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 shell.3 shell_default.3 \
slave.3 snmp.3 snmp_community_mib.3 snmp_error.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 ssl.3 ssl_socket.3 string.3 \
supervisor.3 supervisor_bridge.3 sys.3 systools.3 tags.3 \
timer.3 tk.3 toolbar.3 tv.3 unix.3 user.3 wrap_log_reader.3 \
xref.3 yecc.3
MAN4PREFIX= ${PREFIX}/lib/erlang
MAN4= app.4 config.4 appup.4 rel.4 relup.4 script.4
MAN_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 mesh.6 runtime_tools.6 \
sasl.6 snmp.6 sockets.6 ssl.6
MAN_MAN6= crypto.6 eva.6 inets.6 kernel.6 mesh.6 runtime_tools.6 \
sasl.6 snmp.6 ssl.6
.include <bsd.port.mk>

View file

@ -1,9 +1,3 @@
MD5 (erlang/otp_src_R6B-0.tar.gz) = f0fa9199acf29f7d6fbfa9616948d03e
MD5 (erlang/otp_src_doc_man_R6B-0.tar.gz) = 54cb1b7e0e70e4cef9ec3b06f6095978
MD5 (erlang/otp_src_doc_html_R6B-0.tar.gz) = 5efa887ff6330a9d657454ffef479729
MD5 (erlang/tmp_patch_R6B0.2.txt) = 67e05c1a0f4e1f970f00f66fb687398a
MD5 (erlang/tmp_patch_R6B0.3.txt) = 367b0fe3b311b10ab03b5c0a4960d2bd
MD5 (erlang/tmp_patch_R6B0.4.txt) = 26f982909743c0e6a937ac947f2f0e6c
MD5 (erlang/tmp_patch_R6B0.5.txt) = e6b6bfae4845ed69a87a9c5fd5059a5e
MD5 (erlang/tmp_patch_R6B0.7.txt) = 15f8aa0d753fbd52c9f02e5f2ded5191
MD5 (erlang/tmp_patch_R6B0.8.txt) = fed0434bd9642f25378feed6d18be0b9
MD5 (erlang/otp_src_R7B-1.tar.gz) = eef99af31cadd45c144c8b941fd516a5
MD5 (erlang/otp_doc_man_R7B.tar.gz) = b7394481967190eb15b491a0fd75042f
MD5 (erlang/otp_doc_html_R7B.tar.gz) = 71406db3ade731af91372de2accbc8b5

View file

@ -1,26 +0,0 @@
*** erts/etc/unix/Install.src.ORIG Tue Nov 23 16:05:11 1999
--- erts/etc/unix/Install.src Thu Dec 30 16:39:15 1999
***************
*** 165,174 ****
# Fixing the man pages
#
! if [ -d $ERL_ROOT/man ]
! then
! cd $ERL_ROOT
! ./misc/format_man_pages $ERL_ROOT
! fi
!
--- 165,175 ----
# Fixing the man pages
#
! # This is not needed!
! # if [ -d $ERL_ROOT/man ]
! # then
! # cd $ERL_ROOT
! # ./misc/format_man_pages $ERL_ROOT
! # fi
+ exit 0

View file

@ -0,0 +1,12 @@
--- lib/inets/priv/Makefile.orig Tue Nov 28 20:38:31 2000
+++ lib/inets/priv/Makefile Tue Nov 28 20:38:38 2000
@@ -57,7 +57,7 @@
release_spec: opt
$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
- $(INSTALL_PROGRAM) $(EXECUTABLES) $(RELSYSDIR)/priv/bin
+ $(INSTALL_SCRIPT) $(EXECUTABLES) $(RELSYSDIR)/priv/bin
release_docs_spec:
# End

View file

@ -0,0 +1,27 @@
--- 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

View file

@ -0,0 +1,21 @@
--- lib/os_mon/src/disksup.erl.orig Sat Dec 2 22:19:26 2000
+++ lib/os_mon/src/disksup.erl Sat Dec 2 22:19:34 2000
@@ -81,6 +81,9 @@
check_disk_space(State) when State#state.os == {unix, solaris} ->
Result = os:cmd("/usr/bin/df -lk"),
check_disks_solaris(skip_to_eol(Result), State#state.threshold);
+check_disk_space(State) when State#state.os == {unix, freebsd} ->
+ Result = os:cmd("/bin/df -k -t ufs"),
+ check_disks_solaris(skip_to_eol(Result), State#state.threshold);
check_disk_space(State) when State#state.os == {unix, sunos4} ->
Result = os:cmd("df"),
check_disks_solaris(skip_to_eol(Result), State#state.threshold).
@@ -162,6 +165,8 @@
{4,_,_} -> {unix, sunos4};
V -> exit({{unknown_os_version, V}, {disk_sup, get_os, []}})
end;
+ {unix, freebsd} ->
+ {unix, freebsd};
{win32,W} ->
{win32,W};
Type ->

View file

@ -0,0 +1,18 @@
--- erts/autoconf/configure.in.orig Sat Dec 2 22:27:49 2000
+++ erts/autoconf/configure.in Sat Dec 2 22:34:30 2000
@@ -638,10 +638,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
# End

View file

@ -0,0 +1,19 @@
--- 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) $<

View file

@ -0,0 +1,33 @@
--- 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

View file

@ -0,0 +1,84 @@
--- 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) {

View file

@ -0,0 +1,12 @@
--- 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>

View file

@ -0,0 +1,18 @@
--- ./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
@@ -97,7 +97,8 @@
chmod 755 start_erl
fi
-if [ -d $ERL_ROOT/lib/sasl* ]
+set $ERL_ROOT/lib/sasl*
+if [ -d $1 ]
then
(cd $ERL_ROOT/releases
echo %I_VSN% %I_SYSTEM_VSN% > start_erl.data)
@@ -171,4 +172,4 @@
./misc/format_man_pages $ERL_ROOT
fi
-
+exit 0

View file

@ -0,0 +1,11 @@
--- lib/inets/examples/Makefile.orig Tue Nov 28 20:35:48 2000
+++ lib/inets/examples/Makefile Tue Nov 28 20:36:24 2000
@@ -176,7 +176,7 @@
$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/auth
$(INSTALL_DATA) $(AUTH_FILES) $(RELSYSDIR)/examples/server_root/auth
$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/cgi-bin
- $(INSTALL_PROGRAM) $(CGI_FILES) $(RELSYSDIR)/examples/server_root/cgi-bin
+ $(INSTALL_SCRIPT) $(CGI_FILES) $(RELSYSDIR)/examples/server_root/cgi-bin
$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/conf
$(INSTALL_DATA) $(CONF_FILES) $(RELSYSDIR)/examples/server_root/conf
$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/open

File diff suppressed because it is too large Load diff

View file

@ -6,40 +6,42 @@
#
PORTNAME= erlang
PORTVERSION= 6.1.0
PORTVERSION= 7.1.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_R6B-0
DISTNAME= otp_src_R7B-1
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PATCH_SITES= http://www.erlang.org/faq/ http://erlang.stacken.kth.se/faq/
PATCHFILES= tmp_patch_R6B0.2.txt tmp_patch_R6B0.3.txt \
tmp_patch_R6B0.4.txt tmp_patch_R6B0.5.txt \
tmp_patch_R6B0.7.txt tmp_patch_R6B0.8.txt
PATCH_SITES= http://www.erlang.org/download/patches/
PATCHFILES=
PATCH_DIST_STRIP= -p1
MAINTAINER= seb@bluetail.com
MAINTAINER= sam@inf.enst.fr
# Make sure jdk is available (see use below)
BUILD_DEPENDS= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk
BUILD_DEPENDS= ${JAVAPORT}
CONFIGURE_TARGET= # Empty
# Don't clutter up /usr/ports/distfiles with all distfiles (including patches)
DIST_SUBDIR= erlang
EXTRACT_ONLY= otp_src_R6B-0.tar.gz
ERLANG_MAN= otp_src_doc_man_R6B-0.tar.gz
ERLANG_DOCS= otp_src_doc_html_R6B-0.tar.gz
ERLANG_MAN= otp_doc_man_R7B.tar.gz
.if !defined(NOPORTDOCS)
ERLANG_DOCS= otp_doc_html_R7B.tar.gz
.endif
.if !defined(WITHOUT_X11)
USE_XLIB= yes
.endif
USE_GMAKE= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= # empty
STRIP=
.if !defined(WITHOUT_JAVA)
# 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
@ -49,12 +51,33 @@ STRIP=
# JAVABINDIR is added to the PATH, using the *_ENV macros.
# Set JAVABINDIR to where you have javac, if different from below
JAVABINDIR?= ${LOCALBASE}/jdk1.1.8/bin
JAVABINDIR?= ${LOCALBASE}/jdk1.2.2/bin
JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk12-beta
# Make sure javabindir is in the path
CONFIGURE_ENV+= PATH=${PATH}:${JAVABINDIR}
MAKE_ENV+= PATH=${PATH}:${JAVABINDIR}
SCRIPT_ENV+= PATH=${PATH}:${JAVABINDIR}
CONFIGURE_ENV+= PATH=${PATH}:${JAVABINDIR}
MAKE_ENV+= PATH=${PATH}:${JAVABINDIR}
SCRIPT_ENV+= PATH=${PATH}:${JAVABINDIR}
.endif
.if !defined(WITHOUT_X11)
PLIST_SUB+= WITHOUT_X11=""
.else
PLIST_SUB+= WITHOUT_X11="@comment "
.endif
.if !defined(WITHOUT_JAVA)
PLIST_SUB+= WITHOUT_JAVA=""
.else
PLIST_SUB+= WITHOUT_JAVA="@comment "
.endif
# If X11 is not used, skip gs and etk applications
pre-build:
.if defined(WITHOUT_X11)
${ECHO} "WITHOUT_X11 defined" > ${WRKSRC}/lib/gs/SKIP
${ECHO} "WITHOUT_X11 defined" > ${WRKSRC}/lib/etk/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
@ -66,6 +89,8 @@ post-install:
tar --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
-C ${PREFIX}/lib/erlang
.endif
sslapp=`ls -d ${PREFIX}/lib/erlang/lib/ssl-* | tail -1`; \
cd $$sslapp/priv/obj && ${MAKE} && strip ../bin/ssl_esock
# 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
@ -74,63 +99,65 @@ post-install:
# epmd.1 perhaps being the exception).
MAN1PREFIX= ${PREFIX}/lib/erlang
MAN1= erl_call.1 epmd.1 erl.1 erlc.1 werl.1 erlsrv.1 start_erl.1
MAN_MAN1= epmd.1 erl.1 erl_call.1 erlc.1 erlsrv.1 start_erl.1 werl.1
MAN3PREFIX= ${PREFIX}/lib/erlang
MAN3= appmon.3 asn1ct.3 asn1rt.3 compile.3 CosEventChannelAdmin.3 \
CosEventChannelAdmin_ConsumerAdmin.3 \
CosEventChannelAdmin_SupplierAdmin.3 \
CosEventChannelAdmin_EventChannel.3 \
CosEventChannelAdmin_ProxyPullConsumer.3 \
CosEventChannelAdmin_ProxyPullSupplier.3 \
CosEventChannelAdmin_ProxyPushConsumer.3 \
CosEventChannelAdmin_ProxyPushSupplier.3 OrberEventChannel.3 \
OrberEventChannel_EventChannelFactory.3 cosTransactions.3 \
CosTransactions_Control.3 CosTransactions_Coordinator.3 \
CosTransactions_RecoveryCoordinator.3 \
CosTransactions_Resource.3 \
CosTransactions_SubtransactionAwareResource.3 \
CosTransactions_Terminator.3 \
CosTransactions_TransactionFactory.3 crypto.3 i.3 int.3 \
erl_connect.3 erl_error.3 erl_eterm.3 registry.3 erl_format.3 \
erl_malloc.3 erl_marshal.3 erl_global.3 erl_set_memory_block.3 \
etk.3 tk.3 eva.3 eva_log.3 eva_log_snmp.3 eva_server.3 \
eva_snmp_adaptation.3 eva_sup.3 log.3 log_server.3 log_snmp.3 \
log_snmpea.3 gs.3 ic.3 CORBA_Environment_alloc.3 ig.3 ftp.3 \
httpd.3 jive.3 httpd_conf.3 httpd_core.3 httpd_socket.3 \
httpd_util.3 mod_actions.3 mod_alias.3 mod_auth.3 mod_cgi.3 \
mod_dir.3 mod_disk_log.3 mod_esi.3 mod_include.3 mod_log.3 \
mod_security.3 application.3 auth.3 code.3 disk_log.3 \
erl_boot_server.3 erl_ddll.3 erl_prim_loader.3 erlang.3 \
error_handler.3 error_logger.3 file.3 gen_tcp.3 gen_udp.3 \
global.3 global_group.3 heart.3 inet.3 init.3 net_adm.3 \
net_kernel.3 os.3 pg2.3 rpc.3 seq_trace.3 wrap_log_reader.3 \
user.3 mesh.3 mesh_snmp.3 mesh_lib.3 mnemosyne.3 mnesia.3 \
mnesia_registry.3 mnesia_session.3 odbc.3 any.3 corba.3 \
corba_object.3 orber.3 CosNaming.3 CosNaming_NamingContext.3 \
CosNaming_BindingIterator.3 lname.3 lname_component.3 \
orber_ifr.3 orber_tc.3 Module_Interface.3 cpu_sup.3 disksup.3 \
memsup.3 os_mon.3 os_sup.3 nteventlog.3 yecc.3 pman.3 dbg.3 \
alarm_handler.3 overload.3 rb.3 systools.3 release_handler.3 \
snmp.3 snmp_community_mib.3 snmp_error.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 socket.3 \
udp.3 ssl.3 ssl_socket.3 c.3 calendar.3 dets.3 dict.3 digraph.3 \
epp.3 erl_eval.3 erl_id_trans.3 erl_internal.3 erl_lint.3 \
erl_parse.3 erl_pp.3 erl_scan.3 ets.3 filename.3 gen_event.3 \
gen_fsm.3 gen_server.3 io.3 io_lib.3 lib.3 lists.3 log_mf_h.3 \
math.3 ordsets.3 pg.3 pool.3 proc_lib.3 queue.3 random.3 \
regexp.3 shell.3 shell_default.3 slave.3 string.3 supervisor.3 \
supervisor_bridge.3 sys.3 timer.3 unix.3 toolbar.3 coast.3 \
eprof.3 exref.3 instrument.3 tags.3 make.3 tv.3 xref.3 \
MAN_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 CosNaming.3 \
CosNaming_BindingIterator.3 CosNaming_NamingContext.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 \
OrberEventChannel.3 OrberEventChannel_EventChannelFactory.3 \
alarm_handler.3 any.3 application.3 appmon.3 asn1ct.3 \
asn1rt.3 auth.3 c.3 calendar.3 coast.3 code.3 compile.3 \
corba.3 corba_object.3 cosTransactions.3 cpu_sup.3 crypto.3 \
dbg.3 dets.3 dict.3 digraph.3 disk_log.3 disksup.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 etk.3 ets.3 eva.3 eva_log.3 eva_log_snmp.3 \
eva_server.3 eva_snmp_adaptation.3 eva_sup.3 exref.3 \
file.3 filename.3 ftp.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 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 memsup.3 \
mesh.3 mesh_lib.3 mesh_snmp.3 mnemosyne.3 mnesia.3 \
mnesia_registry.3 mnesia_session.3 mod_actions.3 mod_alias.3 \
mod_auth.3 mod_cgi.3 mod_dir.3 mod_disk_log.3 mod_esi.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 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 shell.3 shell_default.3 \
slave.3 snmp.3 snmp_community_mib.3 snmp_error.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 ssl.3 ssl_socket.3 string.3 \
supervisor.3 supervisor_bridge.3 sys.3 systools.3 tags.3 \
timer.3 tk.3 toolbar.3 tv.3 unix.3 user.3 wrap_log_reader.3 \
xref.3 yecc.3
MAN4PREFIX= ${PREFIX}/lib/erlang
MAN4= app.4 config.4 appup.4 rel.4 relup.4 script.4
MAN_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 mesh.6 runtime_tools.6 \
sasl.6 snmp.6 sockets.6 ssl.6
MAN_MAN6= crypto.6 eva.6 inets.6 kernel.6 mesh.6 runtime_tools.6 \
sasl.6 snmp.6 ssl.6
.include <bsd.port.mk>

View file

@ -1,9 +1,3 @@
MD5 (erlang/otp_src_R6B-0.tar.gz) = f0fa9199acf29f7d6fbfa9616948d03e
MD5 (erlang/otp_src_doc_man_R6B-0.tar.gz) = 54cb1b7e0e70e4cef9ec3b06f6095978
MD5 (erlang/otp_src_doc_html_R6B-0.tar.gz) = 5efa887ff6330a9d657454ffef479729
MD5 (erlang/tmp_patch_R6B0.2.txt) = 67e05c1a0f4e1f970f00f66fb687398a
MD5 (erlang/tmp_patch_R6B0.3.txt) = 367b0fe3b311b10ab03b5c0a4960d2bd
MD5 (erlang/tmp_patch_R6B0.4.txt) = 26f982909743c0e6a937ac947f2f0e6c
MD5 (erlang/tmp_patch_R6B0.5.txt) = e6b6bfae4845ed69a87a9c5fd5059a5e
MD5 (erlang/tmp_patch_R6B0.7.txt) = 15f8aa0d753fbd52c9f02e5f2ded5191
MD5 (erlang/tmp_patch_R6B0.8.txt) = fed0434bd9642f25378feed6d18be0b9
MD5 (erlang/otp_src_R7B-1.tar.gz) = eef99af31cadd45c144c8b941fd516a5
MD5 (erlang/otp_doc_man_R7B.tar.gz) = b7394481967190eb15b491a0fd75042f
MD5 (erlang/otp_doc_html_R7B.tar.gz) = 71406db3ade731af91372de2accbc8b5

View file

@ -1,26 +0,0 @@
*** erts/etc/unix/Install.src.ORIG Tue Nov 23 16:05:11 1999
--- erts/etc/unix/Install.src Thu Dec 30 16:39:15 1999
***************
*** 165,174 ****
# Fixing the man pages
#
! if [ -d $ERL_ROOT/man ]
! then
! cd $ERL_ROOT
! ./misc/format_man_pages $ERL_ROOT
! fi
!
--- 165,175 ----
# Fixing the man pages
#
! # This is not needed!
! # if [ -d $ERL_ROOT/man ]
! # then
! # cd $ERL_ROOT
! # ./misc/format_man_pages $ERL_ROOT
! # fi
+ exit 0

View file

@ -0,0 +1,12 @@
--- lib/inets/priv/Makefile.orig Tue Nov 28 20:38:31 2000
+++ lib/inets/priv/Makefile Tue Nov 28 20:38:38 2000
@@ -57,7 +57,7 @@
release_spec: opt
$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
- $(INSTALL_PROGRAM) $(EXECUTABLES) $(RELSYSDIR)/priv/bin
+ $(INSTALL_SCRIPT) $(EXECUTABLES) $(RELSYSDIR)/priv/bin
release_docs_spec:
# End

View file

@ -0,0 +1,27 @@
--- 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

View file

@ -0,0 +1,21 @@
--- lib/os_mon/src/disksup.erl.orig Sat Dec 2 22:19:26 2000
+++ lib/os_mon/src/disksup.erl Sat Dec 2 22:19:34 2000
@@ -81,6 +81,9 @@
check_disk_space(State) when State#state.os == {unix, solaris} ->
Result = os:cmd("/usr/bin/df -lk"),
check_disks_solaris(skip_to_eol(Result), State#state.threshold);
+check_disk_space(State) when State#state.os == {unix, freebsd} ->
+ Result = os:cmd("/bin/df -k -t ufs"),
+ check_disks_solaris(skip_to_eol(Result), State#state.threshold);
check_disk_space(State) when State#state.os == {unix, sunos4} ->
Result = os:cmd("df"),
check_disks_solaris(skip_to_eol(Result), State#state.threshold).
@@ -162,6 +165,8 @@
{4,_,_} -> {unix, sunos4};
V -> exit({{unknown_os_version, V}, {disk_sup, get_os, []}})
end;
+ {unix, freebsd} ->
+ {unix, freebsd};
{win32,W} ->
{win32,W};
Type ->

View file

@ -0,0 +1,18 @@
--- erts/autoconf/configure.in.orig Sat Dec 2 22:27:49 2000
+++ erts/autoconf/configure.in Sat Dec 2 22:34:30 2000
@@ -638,10 +638,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
# End

View file

@ -0,0 +1,19 @@
--- 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) $<

View file

@ -0,0 +1,33 @@
--- 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

View file

@ -0,0 +1,84 @@
--- 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) {

View file

@ -0,0 +1,12 @@
--- 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>

View file

@ -0,0 +1,18 @@
--- ./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
@@ -97,7 +97,8 @@
chmod 755 start_erl
fi
-if [ -d $ERL_ROOT/lib/sasl* ]
+set $ERL_ROOT/lib/sasl*
+if [ -d $1 ]
then
(cd $ERL_ROOT/releases
echo %I_VSN% %I_SYSTEM_VSN% > start_erl.data)
@@ -171,4 +172,4 @@
./misc/format_man_pages $ERL_ROOT
fi
-
+exit 0

View file

@ -0,0 +1,11 @@
--- lib/inets/examples/Makefile.orig Tue Nov 28 20:35:48 2000
+++ lib/inets/examples/Makefile Tue Nov 28 20:36:24 2000
@@ -176,7 +176,7 @@
$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/auth
$(INSTALL_DATA) $(AUTH_FILES) $(RELSYSDIR)/examples/server_root/auth
$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/cgi-bin
- $(INSTALL_PROGRAM) $(CGI_FILES) $(RELSYSDIR)/examples/server_root/cgi-bin
+ $(INSTALL_SCRIPT) $(CGI_FILES) $(RELSYSDIR)/examples/server_root/cgi-bin
$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/conf
$(INSTALL_DATA) $(CONF_FILES) $(RELSYSDIR)/examples/server_root/conf
$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/open

File diff suppressed because it is too large Load diff