Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Apr 2016 15:45:01 +0000 (UTC)
From:      Jimmy Olgeni <olgeni@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r413586 - head/lang/erlang
Message-ID:  <201604181545.u3IFj1MW012757@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
 
 .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/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604181545.u3IFj1MW012757>