diff options
author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2003-08-07 10:03:00 +0000 |
---|---|---|
committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2003-08-07 10:03:00 +0000 |
commit | 9673022b5c7dbd5ea75848016e82f3df32c6b51f (patch) | |
tree | 6c6516bfd29512554e24404265bc723967a0e3ce /lang/erlang | |
parent | Changes: (diff) |
Upgrade to release R9C-0, and start using OTP release numbers as
port versions.
Notes
Notes:
svn path=/head/; revision=86486
Diffstat (limited to 'lang/erlang')
-rw-r--r-- | lang/erlang/Makefile | 11 | ||||
-rw-r--r-- | lang/erlang/Makefile.lib | 53 | ||||
-rw-r--r-- | lang/erlang/Makefile.man | 10 | ||||
-rw-r--r-- | lang/erlang/distinfo | 6 | ||||
-rw-r--r-- | lang/erlang/files/patch-lib_crypto_c__src_Makefile.in | 35 | ||||
-rw-r--r-- | lang/erlang/files/patch-lib_crypto_c__src_crypto__drv.c | 26 | ||||
-rw-r--r-- | lang/erlang/files/patch-lib_observer_src_Makefile | 14 | ||||
-rw-r--r-- | lang/erlang/pkg-message | 2 |
8 files changed, 43 insertions, 114 deletions
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 9aa3885c0946..bc77fbea7069 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -6,14 +6,13 @@ # PORTNAME= erlang -PORTVERSION= 9.1 -PORTREVISION= 1 +PORTVERSION= r9c0 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_R9B-1 +DISTNAME= otp_src_R9C-0 DIST_SUBDIR= erlang DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -29,9 +28,9 @@ COMMENT= A functional programming language from Ericsson JAVABINDIR?= ${LOCALBASE}/jdk1.4.1/bin JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk14 -ERLANG_MAN= otp_man_R9B-1.tar.gz +ERLANG_MAN= otp_man_R9C-0.tar.gz .if !defined(NOPORTDOCS) -ERLANG_DOCS= otp_html_R9B-1.tar.gz +ERLANG_DOCS= otp_html_R9C-0.tar.gz .endif USE_GMAKE= yes @@ -115,8 +114,6 @@ post-install: .endif @${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 # All non-library files. diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib index bd0b54f6bd6c..670ba2d8e3a5 100644 --- a/lang/erlang/Makefile.lib +++ b/lang/erlang/Makefile.lib @@ -1,8 +1,8 @@ # $FreeBSD$ -OTP_LIBS= appmon-2.1.1 \ - asn1-1.4.1 \ - compiler-4.1.1 \ +OTP_LIBS= appmon-2.1.2 \ + asn1-1.4.2 \ + compiler-4.2 \ cosEvent-2.1 \ cosEventDomain-1.1 \ cosFileTransfer-1.1 \ @@ -10,33 +10,34 @@ OTP_LIBS= appmon-2.1.1 \ cosProperty-1.1 \ cosTime-1.1 \ cosTransactions-1.2 \ - crypto-1.1.2.1 \ - debugger-2.1 \ - erl_interface-3.3.2 \ + crypto-1.2 \ + debugger-2.2 \ + erl_interface-3.4 \ et-1.0 \ - eva-2.0.3 \ - gs-1.5.1 \ - hipe-2.0 \ - ic-4.2 \ - inets-3.0.3 \ + eva-2.0.4 \ + gs-1.5.2 \ + hipe-2.0.2 \ + ic-4.2.1 \ + inets-3.0.6 \ jinterface-1.2.1.1 \ - kernel-2.8.1.1 \ - megaco-1.1.2 \ + kernel-2.9 \ + megaco-1.2.3 \ mnemosyne-1.2.5 \ - mnesia-4.1.3 \ + mnesia-4.1.4 \ mnesia_session-1.1.5 \ - observer-0.9.3 \ - odbc-1.0.5 \ - orber-3.4 \ - os_mon-1.6.0.2 \ + observer-0.9.5 \ + odbc-1.0.8 \ + orber-3.4.2 \ + os_mon-1.6.1 \ + otp_mibs-1.0 \ parsetools-1.2 \ pman-2.4.1 \ - runtime_tools-1.3 \ - sasl-1.9.4 \ - snmp-3.3.8 \ - ssl-2.3.5 \ - stdlib-1.11.4.1 \ + runtime_tools-1.4 \ + sasl-1.10 \ + snmp-3.4 \ + ssl-3.0.1 \ + stdlib-1.12 \ toolbar-1.1.0 \ - tools-2.2 \ - tv-2.0.4 \ - webtool-0.7.1 + tools-2.3 \ + tv-2.0.5 \ + webtool-0.8.1 diff --git a/lang/erlang/Makefile.man b/lang/erlang/Makefile.man index 69e50e5f032c..9fcf28b33eba 100644 --- a/lang/erlang/Makefile.man +++ b/lang/erlang/Makefile.man @@ -10,6 +10,7 @@ MAN1= epmd.1 \ run_erl.1 \ start.1 \ start_erl.1 \ + start_webtool.1 \ werl.1 MAN3= CORBA_Environment_alloc.3 \ @@ -103,6 +104,7 @@ MAN3= CORBA_Environment_alloc.3 \ cover.3 \ cprof.3 \ cpu_sup.3 \ + crashdump.3 \ crypto.3 \ dbg.3 \ debugger.3 \ @@ -134,9 +136,12 @@ MAN3= CORBA_Environment_alloc.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 \ @@ -151,6 +156,7 @@ MAN3= CORBA_Environment_alloc.3 \ eva_sup.3 \ file.3 \ file_sorter.3 \ + filelib.3 \ filename.3 \ fixed.3 \ fprof.3 \ @@ -234,6 +240,7 @@ MAN3= CORBA_Environment_alloc.3 \ os.3 \ os_mon.3 \ os_sup.3 \ + otp_mib.3 \ overload.3 \ pg.3 \ pg2.3 \ @@ -252,7 +259,6 @@ MAN3= CORBA_Environment_alloc.3 \ sets.3 \ shell.3 \ shell_default.3 \ - sl_alloc.3 \ slave.3 \ snmp.3 \ snmp_community_mib.3 \ @@ -274,7 +280,7 @@ MAN3= CORBA_Environment_alloc.3 \ snmp_view_based_acm_mib.3 \ sofs.3 \ ssl.3 \ - ssl_socket.3 \ + ssl_pkix.3 \ string.3 \ supervisor.3 \ supervisor_bridge.3 \ diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo index c010cf527cde..08e67f682ec2 100644 --- a/lang/erlang/distinfo +++ b/lang/erlang/distinfo @@ -1,3 +1,3 @@ -MD5 (erlang/otp_src_R9B-1.tar.gz) = 37ac7d5e4e9fa7730775e590f4796bbf -MD5 (erlang/otp_man_R9B-1.tar.gz) = e616921266ed22c9eff6167dfcf6853e -MD5 (erlang/otp_html_R9B-1.tar.gz) = f29f9438dde6608c219280e8083aee9d +MD5 (erlang/otp_src_R9C-0.tar.gz) = d40842cf79ca65007de5ad54d3c50d18 +MD5 (erlang/otp_man_R9C-0.tar.gz) = f94bbaba800cc73e67704b92df5aab60 +MD5 (erlang/otp_html_R9C-0.tar.gz) = 6885f276d1501fd22a72ae421b4a94e6 diff --git a/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in deleted file mode 100644 index deb146433712..000000000000 --- a/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in +++ /dev/null @@ -1,35 +0,0 @@ - -$FreeBSD$ - ---- lib/crypto/c_src/Makefile.in.orig Sun Jun 1 17:57:42 2003 -+++ lib/crypto/c_src/Makefile.in Sun Jun 1 17:59:06 2003 -@@ -97,6 +97,21 @@ - -u _des_ncbc_encrypt \ - -u _des_ede3_cbc_encrypt - else -+ifeq ($(findstring freebsd,$(TARGET)),freebsd) -+ELIBCRYPTO_UNDEFS = \ -+ -u CRYPTO_set_mem_functions \ -+ -u MD5 \ -+ -u MD5_Init \ -+ -u MD5_Update \ -+ -u MD5_Final \ -+ -u SHA1 \ -+ -u SHA1_Init \ -+ -u SHA1_Update \ -+ -u SHA1_Final \ -+ -u _ossl_old_des_set_key \ -+ -u _ossl_old_des_ncbc_encrypt \ -+ -u _ossl_old_des_ede3_cbc_encrypt -+else - ELIBCRYPTO_UNDEFS = \ - -u CRYPTO_set_mem_functions \ - -u MD5 \ -@@ -110,6 +125,7 @@ - -u des_set_key \ - -u des_ncbc_encrypt \ - -u des_ede3_cbc_encrypt -+endif - endif - - # ---------------------------------------------------- diff --git a/lang/erlang/files/patch-lib_crypto_c__src_crypto__drv.c b/lang/erlang/files/patch-lib_crypto_c__src_crypto__drv.c deleted file mode 100644 index b79cd54b3d5a..000000000000 --- a/lang/erlang/files/patch-lib_crypto_c__src_crypto__drv.c +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- lib/crypto/c_src/crypto_drv.c.orig Sun Jun 1 18:15:54 2003 -+++ lib/crypto/c_src/crypto_drv.c Sun Jun 1 18:15:50 2003 -@@ -29,6 +29,7 @@ - #include <string.h> - #include "erl_driver.h" - -+#define OPENSSL_DES_LIBDES_COMPATIBILITY - #include "des.h" - #include "md5.h" - #include "sha.h" -@@ -207,9 +208,9 @@ - cfs.SHA1_Init = driver_dl_sym(lib_handle, "SHA1_Init"); - cfs.SHA1_Update = driver_dl_sym(lib_handle, "SHA1_Update"); - cfs.SHA1_Final = driver_dl_sym(lib_handle, "SHA1_Final"); -- cfs.des_set_key = driver_dl_sym(lib_handle, "des_set_key"); -- cfs.des_ncbc_encrypt = driver_dl_sym(lib_handle, "des_ncbc_encrypt"); -- cfs.des_ede3_cbc_encrypt = driver_dl_sym(lib_handle, "des_ede3_cbc_encrypt"); -+ cfs.des_set_key = driver_dl_sym(lib_handle, "_ossl_old_des_set_key"); -+ cfs.des_ncbc_encrypt = driver_dl_sym(lib_handle, "_ossl_old_des_ncbc_encrypt"); -+ cfs.des_ede3_cbc_encrypt = driver_dl_sym(lib_handle, "_ossl_old_des_ede3_cbc_encrypt"); - - /* Check that all pointer where initialized */ - for (i = 0; i < sizeof(crypto_funcs)/sizeof(void*); i++) { diff --git a/lang/erlang/files/patch-lib_observer_src_Makefile b/lang/erlang/files/patch-lib_observer_src_Makefile deleted file mode 100644 index dc51a15fee3c..000000000000 --- a/lang/erlang/files/patch-lib_observer_src_Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/observer/src/Makefile.orig Wed Mar 5 19:37:25 2003 -+++ lib/observer/src/Makefile Wed Mar 5 19:37:30 2003 -@@ -102,7 +102,7 @@ - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/priv/bin -- $(INSTALL_PROGRAM) $(EXECUTABLES) $(RELSYSDIR)/priv/bin -+ $(INSTALL_SCRIPT) $(EXECUTABLES) $(RELSYSDIR)/priv/bin - - release_docs_spec: - diff --git a/lang/erlang/pkg-message b/lang/erlang/pkg-message index 974700c26e7d..97bf3e663e09 100644 --- a/lang/erlang/pkg-message +++ b/lang/erlang/pkg-message @@ -3,7 +3,7 @@ Installation tips: You can find an emacs mode for Erlang here: - ${LOCALBASE}/lib/erlang/lib/tools-2.2/emacs + ${LOCALBASE}/lib/erlang/lib/tools-2.3/emacs You may wish to add the following line to /etc/manpath.config: |