diff options
| author | antoine <antoine@FreeBSD.org> | 2016-04-19 13:35:01 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2016-04-19 13:35:01 +0800 |
| commit | 365eb15ec413c4a48bdbf99e5ceba610827187dd (patch) | |
| tree | f3ca774222600304456a80ba16ea292f29060e5d /lang | |
| parent | 37ef06cfda0ccd65c2725c931c309e5ead240e93 (diff) | |
| download | freebsd-ports-gnome-365eb15ec413c4a48bdbf99e5ceba610827187dd.tar.gz freebsd-ports-gnome-365eb15ec413c4a48bdbf99e5ceba610827187dd.tar.zst freebsd-ports-gnome-365eb15ec413c4a48bdbf99e5ceba610827187dd.zip | |
Revert r413586 and r413587, this breaks INDEX with fmake
Reported by: beefy1, beefy2
With hat: portmgr
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/erlang-runtime18/Makefile | 20 | ||||
| -rw-r--r-- | lang/erlang/Makefile | 20 |
2 files changed, 22 insertions, 18 deletions
diff --git a/lang/erlang-runtime18/Makefile b/lang/erlang-runtime18/Makefile index 49401956b08e..915ed4b67b00 100644 --- a/lang/erlang-runtime18/Makefile +++ b/lang/erlang-runtime18/Makefile @@ -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/ diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 432645b893dd..606b1981de85 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -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/ |