 @@ -1,58 +1,61 @@
-# $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}
+DISTNAME=		OTP-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH}
-PKGNAME=		${DISTNAME:S/otp_src_/erlang-/}
+PKGNAME=		${DISTNAME:S/OTP-/erlang-/}
 PKGREVISION=		1
 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/
 COMMENT=		Concurrent functional programming language
 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}
 PTHREAD_OPTS+=		require native
 CONFIGURE_ARGS+=	--enable-threads
 .include "../../mk/bsd.prefs.mk"
 # have gcc without the necessary atomic ops?
 .if !empty(MACHINE_PLATFORM:MNetBSD-[56].*)
 # a machine without native ethread implementation?
 .  if	empty(MACHINE_PLATFORM:M*i386)	&&\
 	empty(MACHINE_PLATFORM:M*sparc)	&&\
 	empty(MACHINE_PLATFORM:M*sparc64) &&\
 	empty(MACHINE_PLATFORM:M*powerpc) &&\
 	empty(MACHINE_PLATFORM:M*x86_64)
 CONFIGURE_ARGS+=	--disable-native-ethr-impls\
 			--disable-smp-require-native-atomics
 .  endif
 .endif
 MAKE_ENV+=		DESTDIR=${DESTDIR}
 do-configure-post-hook: replace-interpreter
 REPLACE_INTERPRETER+=	escript
 REPLACE.escript.old=	.*escript
 REPLACE.escript.new=	${PREFIX}/bin/escript
 REPLACE_FILES.escript=	\
 	lib/diameter/bin/diameterc \
 	lib/erl_docgen/priv/bin/codeline_preprocessing.escript \
 	lib/erl_docgen/priv/bin/xml_from_edoc.escript \
 	lib/reltool/examples/display_args \
 	lib/reltool/examples/mnesia_core_dump_viewer \
 	lib/snmp/bin/snmpc \
 	lib/snmp/src/compile/snmpc.src
 SUBST_CLASSES+=		target
 @@ -71,26 +74,29 @@ CONFIGURE_ARGS.DragonFly+=	--disable-sct
 ###
 ### XXX There may be others here.
 ###
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--enable-kernel-poll
 .endif
 CHECK_RELRO_SKIP+=	lib/erlang/lib/megaco-${VERSION.megaco}/priv/lib/megaco_flex_scanner_drv.so
 CHECK_RELRO_SKIP+=	lib/erlang/lib/megaco-${VERSION.megaco}/priv/lib/megaco_flex_scanner_drv_mt.so
 .include "options.mk"
 pre-configure:
 	cd ${WRKSRC} && ./otp_build autoconf
 ###
 ### Ensure this gets rebuilt.
 ###
 pre-build:
 	${RUN} ${RM} -f ${WRKSRC}/lib/stdlib/ebin/dets_v9.beam
 ###
 ### Generata list of module versions.
 ###
 .PHONY: versions
 versions: do-extract
 	@${ECHO} "# \$$NetBSD\$$" > ${.CURDIR}/versions.mk
 	@${ECHO} "# Do not edit, regenerate using 'make versions'" >> ${.CURDIR}/versions.mk

 @@ -1,19 +1,19 @@
-# $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"
 PLIST_SUBST+=	VERSION=${DIST_VERSION_MAJOR}
 .for name version in ${_VERSIONS}
 VERSION.${name}=${version}
 PLIST_SUBST+=	VERSION.${name}=${version}
 .endfor
 # Generate PLIST
 .for pkg version in ${_VERSIONS}
 PRINT_PLIST_AWK+=	{if ($$0 ~ /\/${pkg}-${version}\//) {sub(/\/${pkg}-${version}\//,"/${pkg}-$${VERSION.${pkg}}/", $$0);}}

 @@ -1,15 +1,15 @@
-$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
+SHA1 (erlang/OTP-21.0.9.tar.gz) = 84a58190149566e51ca552921b09f9ac77771599
-RMD160 (erlang/otp_src_21.0.tar.gz) = 6a13f1f49fddeb4bb0d5567ffe31ab232d80855b
+RMD160 (erlang/OTP-21.0.9.tar.gz) = 297898412640a17014f2bf019a4af2b95047c0cf
-SHA512 (erlang/otp_src_21.0.tar.gz) = 8bbc02ef74baf166dae6cac414ddbd1f5366d4aba0dc07adcceef6422e62fc83b585ee01d6a608282f9a7b63703a8bfb4e358bb5b924eca68209014997c0f6f8
+SHA512 (erlang/OTP-21.0.9.tar.gz) = 01bc5ce8d5c76823af1a17d389f326509c4ade5add0b0e66830e2c6aec2c7d93906cbbf9fb6b454178bddfa1c96355d632e4c557ab6da2bbdb8c6b0e05d87ee8
-Size (erlang/otp_src_21.0.tar.gz) = 84146631 bytes
+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
 SHA1 (patch-erts_lib__src_common_erl__printf.c) = 55decad8ca2266feddb310ab5d00394d717afca7
 SHA1 (patch-lib_crypto_c__src_Makefile.in) = 0ab1db36c03999524e933d60f913ff5608b0622e
 SHA1 (patch-make_output.mk.in) = d7b3da58bfb471d52c41242e2a03d1598ce24e62

 @@ -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