diff options
| -rw-r--r-- | lang/erlang/Makefile | 18 | ||||
| -rw-r--r-- | lang/erlang/Makefile.versions | 4 | ||||
| -rw-r--r-- | lang/erlang/distinfo | 12 | ||||
| -rw-r--r-- | lang/erlang/patches/patch-erts_configure | 15 | ||||
| -rw-r--r-- | lang/erlang/patches/patch-erts_configure.in | 13 | ||||
| -rw-r--r-- | lang/erlang/versions.mk | 4 |
6 files changed, 35 insertions, 31 deletions
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index bbb71775d24..02f7af9c65e 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.87 2018/08/22 09:45:19 wiz Exp $ +# $NetBSD: Makefile,v 1.88 2018/09/12 20:01:12 schmonz Exp $ -DISTNAME= otp_src_${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH} -PKGNAME= ${DISTNAME:S/otp_src_/erlang-/} -PKGREVISION= 1 +DISTNAME= OTP-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH} +PKGNAME= ${DISTNAME:S/OTP-/erlang-/} CATEGORIES= lang -MASTER_SITES= http://www.erlang.org/download/ +MASTER_SITES= https://github.com/erlang/otp/archive/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.erlang.org/ @@ -13,10 +12,12 @@ LICENSE= apache-2.0 DIST_SUBDIR= erlang +WRKSRC= ${WRKDIR}/otp-${DISTNAME} + GNU_CONFIGURE= yes USE_GNU_CONFIGURE_HOST= ${USE_CROSS_COMPILE} OVERRIDE_DIRDEPTH= 4 -USE_TOOLS+= awk gmake perl:run flex +USE_TOOLS+= autoconf awk gmake perl:run flex CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} @@ -43,6 +44,8 @@ CONFIGURE_ARGS+= --disable-native-ethr-impls\ MAKE_ENV+= DESTDIR=${DESTDIR} +do-configure-post-hook: replace-interpreter + REPLACE_INTERPRETER+= escript REPLACE.escript.old= .*escript REPLACE.escript.new= ${PREFIX}/bin/escript @@ -81,6 +84,9 @@ CHECK_RELRO_SKIP+= lib/erlang/lib/megaco-${VERSION.megaco}/priv/lib/megaco_flex_ .include "options.mk" +pre-configure: + cd ${WRKSRC} && ./otp_build autoconf + ### ### Ensure this gets rebuilt. ### diff --git a/lang/erlang/Makefile.versions b/lang/erlang/Makefile.versions index e966593c9bb..a06115dbe7e 100644 --- a/lang/erlang/Makefile.versions +++ b/lang/erlang/Makefile.versions @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.versions,v 1.32 2018/07/03 11:01:21 fhajny Exp $ +# $NetBSD: Makefile.versions,v 1.33 2018/09/12 20:01:12 schmonz Exp $ DIST_VERSION_MAJOR= 21 DIST_VERSION_MINOR= 0 # Only set when sources for patch level releases are published on erlang.org -DIST_VERSION_PATCH= # +DIST_VERSION_PATCH= 9 .include "versions.mk" diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo index c9ce8e61508..72ac0a32bfe 100644 --- a/lang/erlang/distinfo +++ b/lang/erlang/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.60 2018/08/14 18:40:42 nia Exp $ +$NetBSD: distinfo,v 1.61 2018/09/12 20:01:12 schmonz Exp $ -SHA1 (erlang/otp_src_21.0.tar.gz) = b9ba0909aef16f038b8c75e4d7fd0993ae4e3beb -RMD160 (erlang/otp_src_21.0.tar.gz) = 6a13f1f49fddeb4bb0d5567ffe31ab232d80855b -SHA512 (erlang/otp_src_21.0.tar.gz) = 8bbc02ef74baf166dae6cac414ddbd1f5366d4aba0dc07adcceef6422e62fc83b585ee01d6a608282f9a7b63703a8bfb4e358bb5b924eca68209014997c0f6f8 -Size (erlang/otp_src_21.0.tar.gz) = 84146631 bytes +SHA1 (erlang/OTP-21.0.9.tar.gz) = 84a58190149566e51ca552921b09f9ac77771599 +RMD160 (erlang/OTP-21.0.9.tar.gz) = 297898412640a17014f2bf019a4af2b95047c0cf +SHA512 (erlang/OTP-21.0.9.tar.gz) = 01bc5ce8d5c76823af1a17d389f326509c4ade5add0b0e66830e2c6aec2c7d93906cbbf9fb6b454178bddfa1c96355d632e4c557ab6da2bbdb8c6b0e05d87ee8 +Size (erlang/OTP-21.0.9.tar.gz) = 52842736 bytes SHA1 (patch-ab) = 5f1602f3a49c05fd4c45884a7cd6be8d3f287ac3 SHA1 (patch-ay) = f5f1accdb11e404ba4779b056228431e3080e4cd -SHA1 (patch-erts_configure) = dba8d72974e8c493cf2bb90e6b149a84dd9073da +SHA1 (patch-erts_configure.in) = 2154871858bab389509e908b38ae479a55709b97 SHA1 (patch-erts_emulator_drivers_common_inet__drv.c) = 854ae8d60f3f114da11306db425519a0063cacda SHA1 (patch-erts_emulator_sys_unix_sys__uds.c) = a165f977221acc8aba2ef30ca23d149a10af060a SHA1 (patch-erts_etc_unix_run__erl.c) = 9e2377ceba5021eaa2f0c729600df499954d134e diff --git a/lang/erlang/patches/patch-erts_configure b/lang/erlang/patches/patch-erts_configure deleted file mode 100644 index 7d37565e2e8..00000000000 --- a/lang/erlang/patches/patch-erts_configure +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-erts_configure,v 1.3 2016/09/05 16:03:38 jperkin Exp $ - -Use GCC -shared. - ---- erts/configure.orig 2016-06-21 18:55:58.000000000 +0000 -+++ erts/configure -@@ -44746,7 +44746,7 @@ case $host_os in - DED_LD_FLAG_RUNTIME_LIBRARY_PATH= - ;; - solaris2*|sysv4*) -- DED_LDFLAGS="-G" -+ DED_LDFLAGS="-shared" - if test X${enable_m64_build} = Xyes; then - DED_LDFLAGS="-64 $DED_LDFLAGS" - fi diff --git a/lang/erlang/patches/patch-erts_configure.in b/lang/erlang/patches/patch-erts_configure.in new file mode 100644 index 00000000000..1c577ff022a --- /dev/null +++ b/lang/erlang/patches/patch-erts_configure.in @@ -0,0 +1,13 @@ +$NetBSD: patch-erts_configure.in,v 1.1 2018/09/12 20:01:12 schmonz Exp $ + +--- erts/configure.in.orig 2018-09-11 14:57:05.000000000 +0000 ++++ erts/configure.in +@@ -3031,7 +3031,7 @@ case $host_os in + DED_LD_FLAG_RUNTIME_LIBRARY_PATH= + ;; + solaris2*|sysv4*) +- DED_LDFLAGS="-G" ++ DED_LDFLAGS="-shared" + if test X${enable_m64_build} = Xyes; then + DED_LDFLAGS="-64 $DED_LDFLAGS" + fi diff --git a/lang/erlang/versions.mk b/lang/erlang/versions.mk index b800ab40c70..d2eabcd9043 100644 --- a/lang/erlang/versions.mk +++ b/lang/erlang/versions.mk @@ -1,4 +1,4 @@ -# $NetBSD: versions.mk,v 1.1 2018/07/03 11:01:21 fhajny Exp $ +# $NetBSD: versions.mk,v 1.2 2018/09/12 20:01:12 schmonz Exp $ # Do not edit, regenerate using 'make versions' _VERSIONS= \ - asn1 5.0.6 common_test 1.16 compiler 7.2 crypto 4.3 debugger 4.2.5 dialyzer 3.3 diameter 2.1.5 edoc 0.9.3 eldap 1.2.4 erl_docgen 0.8 erl_interface 3.10.3 erts 10.0 et 1.6.2 eunit 2.3.6 ftp 1.0 hipe 3.18 inets 7.0 jinterface 1.9 kernel 6.0 mnesia 4.15.4 observer 2.8 os_mon 2.4.5 otp_mibs 1.2 parsetools 2.1.7 public_key 1.6 reltool 0.7.6 runtime_tools 1.13 sasl 3.2 ssh 4.7 ssl 9.0 stdlib 3.5 syntax_tools 2.1.5 tftp 1.0 tools 3.0 wx 1.8.4 xmerl 1.3.17 megaco 3.18.3 odbc 2.12.1 snmp 5.2.11 + compiler 7.2.4 erts 10.0.8 asn1 5.0.6 common_test 1.16 crypto 4.3.2 debugger 4.2.5 dialyzer 3.3 diameter 2.1.5 edoc 0.9.3 eldap 1.2.4 erl_docgen 0.8 erl_interface 3.10.3 et 1.6.2 eunit 2.3.6 ftp 1.0 hipe 3.18 inets 7.0.1 jinterface 1.9 kernel 6.0.1 megaco 3.18.3 mnesia 4.15.4 observer 2.8 odbc 2.12.1 os_mon 2.4.5 otp_mibs 1.2 parsetools 2.1.7 public_key 1.6.1 reltool 0.7.6 runtime_tools 1.13 sasl 3.2 snmp 5.2.11 ssh 4.7 ssl 9.0.1 stdlib 3.5.1 syntax_tools 2.1.5 tftp 1.0 tools 3.0 wx 1.8.4 xmerl 1.3.17 |