From owner-svn-ports-head@freebsd.org Mon Apr 18 15:45: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 A40C3B12491; Mon, 18 Apr 2016 15:45:02 +0000 (UTC) (envelope-from olgeni@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 5A8031250; Mon, 18 Apr 2016 15:45:02 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3IFj14r012758; Mon, 18 Apr 2016 15:45:01 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3IFj1MW012757; Mon, 18 Apr 2016 15:45:01 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201604181545.u3IFj1MW012757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Mon, 18 Apr 2016 15:45:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413586 - head/lang/erlang 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: Mon, 18 Apr 2016 15:45:02 -0000 Author: olgeni Date: Mon Apr 18 15:45:01 2016 New Revision: 413586 URL: https://svnweb.freebsd.org/changeset/ports/413586 Log: Simplify handling of documentation when patching minor releases. For example, if APP_UPGRADE contains "erts 7.3 7.3.1 [...]" then the documentation for erts-7.3 will be moved to erts-7.3.1, which resulted from patching a minor release. More than one module can be specified. Modified: head/lang/erlang/Makefile Modified: head/lang/erlang/Makefile ============================================================================== --- head/lang/erlang/Makefile Mon Apr 18 15:21:29 2016 (r413585) +++ head/lang/erlang/Makefile Mon Apr 18 15:45:01 2016 (r413586) @@ -63,6 +63,10 @@ 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} @@ -223,17 +227,11 @@ post-install: ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ -C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} - ${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 +.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 ${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/