sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert r413586 and r413587, this breaks INDEX with fmake

Browse source 
Reported by:	beefy1, beefy2
With hat:	portmgr
This commit is contained in:
Antoine Brodin 2016-04-19 05:35:01 +00:00
parent 90f75ba664
commit 6d76b512f4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=413624
2 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lang/erlang-runtime18/Makefile
View file

@ -53,10 +53,6 @@ USE_PERL5= build
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib 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> .include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS} .if ${PORT_OPTIONS:MDOCS}
@ -205,11 +201,17 @@ post-install:
${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} -C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
.for app v1 v2 in ${APP_UPGRADE} ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-7.3/* \
${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-7.3.1
${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v2} ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-7.3
${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}
.endfor ${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 \ ${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/

20
lang/erlang/Makefile
View file

@ -63,10 +63,6 @@ EI_VSN= 3.8.2
SNMP_VSN= 5.2.2 SNMP_VSN= 5.2.2
TOOLS_VSN= 2.8.3 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> .include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS} .if ${PORT_OPTIONS:MDOCS}
@ -227,11 +223,17 @@ post-install:
${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} -C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
.for app v1 v2 in ${APP_UPGRADE} ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-7.3/* \
${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-7.3.1
${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v2} ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-7.3
${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}
.endfor ${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 \ ${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/