Date: Tue, 19 Apr 2016 05:35:01 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413624 - in head/lang: erlang erlang-runtime18 Message-ID: <201604190535.u3J5Z1uH065697@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Tue Apr 19 05:35:01 2016 New Revision: 413624 URL: https://svnweb.freebsd.org/changeset/ports/413624 Log: Revert r413586 and r413587, this breaks INDEX with fmake Reported by: beefy1, beefy2 With hat: portmgr Modified: head/lang/erlang-runtime18/Makefile head/lang/erlang/Makefile Modified: head/lang/erlang-runtime18/Makefile ============================================================================== --- head/lang/erlang-runtime18/Makefile Tue Apr 19 04:28:47 2016 (r413623) +++ head/lang/erlang-runtime18/Makefile Tue Apr 19 05:35:01 2016 (r413624) @@ -53,10 +53,6 @@ USE_PERL5= build GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib -APP_UPGRADE= erts 7.3 7.3.1 \ - lib/inets 6.2 6.2.1 \ - lib/mnesia 4.13.3 4.13.4 - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} @@ -205,11 +201,17 @@ post-install: ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ -C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} -.for app v1 v2 in ${APP_UPGRADE} - ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}/* \ - ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v2} - ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1} -.endfor + ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-7.3/* \ + ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-7.3.1 + ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-7.3 + + ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.2/* \ + ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.2.1 + ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.2 + + ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/mnesia-4.13.3/* \ + ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/mnesia-4.13.4 + ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/mnesia-4.13.3 ${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/ Modified: head/lang/erlang/Makefile ============================================================================== --- head/lang/erlang/Makefile Tue Apr 19 04:28:47 2016 (r413623) +++ head/lang/erlang/Makefile Tue Apr 19 05:35:01 2016 (r413624) @@ -63,10 +63,6 @@ EI_VSN= 3.8.2 SNMP_VSN= 5.2.2 TOOLS_VSN= 2.8.3 -APP_UPGRADE= erts 7.3 7.3.1 \ - lib/inets 6.2 6.2.1 \ - lib/mnesia 4.13.3 4.13.4 - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} @@ -227,11 +223,17 @@ post-install: ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ -C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} -.for app v1 v2 in ${APP_UPGRADE} - ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}/* \ - ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v2} - ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1} -.endfor + ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-7.3/* \ + ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-7.3.1 + ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-7.3 + + ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.2/* \ + ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.2.1 + ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.2 + + ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/mnesia-4.13.3/* \ + ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/mnesia-4.13.4 + ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/mnesia-4.13.3 ${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604190535.u3J5Z1uH065697>