From owner-svn-ports-head@freebsd.org Tue Apr 19 05:35:02 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D8C92B0298A; Tue, 19 Apr 2016 05:35:02 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B354E1EA2; Tue, 19 Apr 2016 05:35:02 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3J5Z1bp065699; Tue, 19 Apr 2016 05:35:01 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3J5Z1uH065697; Tue, 19 Apr 2016 05:35:01 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201604190535.u3J5Z1uH065697@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Tue, 19 Apr 2016 05:35:01 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Apr 2016 05:35:03 -0000 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 .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 .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/