Date: Sat, 31 Jan 2015 18:46:26 +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: r378225 - in head/lang: erlang-runtime15 erlang-runtime16 erlang-runtime17 Message-ID: <201501311846.t0VIkQL0029388@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olgeni Date: Sat Jan 31 18:46:25 2015 New Revision: 378225 URL: https://svnweb.freebsd.org/changeset/ports/378225 QAT: https://qat.redports.org/buildarchive/r378225/ Log: Sort OPTIONS_DEFINE and OPTIONS_DEFAULT. Create SKIP files for applications disabled by port options. Remove disabled applications from ${STAGEDIR}. Modified: head/lang/erlang-runtime15/Makefile head/lang/erlang-runtime16/Makefile head/lang/erlang-runtime17/Makefile Modified: head/lang/erlang-runtime15/Makefile ============================================================================== --- head/lang/erlang-runtime15/Makefile Sat Jan 31 18:08:53 2015 (r378224) +++ head/lang/erlang-runtime15/Makefile Sat Jan 31 18:46:25 2015 (r378225) @@ -3,7 +3,7 @@ PORTNAME= erlang PORTVERSION= 15.b.03.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ @@ -29,7 +29,7 @@ SUB_LIST= ERLANG_LIB=${ERLANG_LIB} MAKE_JOBS_UNSAFE=yes -OPTIONS_DEFINE= GCC DOCS GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DTRACE +OPTIONS_DEFINE= DOCS DTRACE GCC GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX GCC_DESC= Use current GCC HIPE_DESC= Build native HiPE compiler @@ -40,7 +40,7 @@ WX_DESC= Enable WX application GS_DESC= Enable GS application (deprecated) DTRACE_DESC= Enable DTrace support -OPTIONS_DEFAULT=SMP OPENSSL THREADS SCTP KQUEUE +OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS ERL_RELEASE= R${PORTVERSION:S/.//g:tu:S/1$/-1/} @@ -163,6 +163,14 @@ MAKE_ARGS+= ARCH=x86 # rest, not in share/doc/erlang as it should, because of relative # links in the documentation. +pre-configure: +.if ! ${PORT_OPTIONS:MHIPE} + echo "disabled by port options" > ${WRKSRC}/lib/hipe/SKIP +.endif +.if ! ${PORT_OPTIONS:MWX} + echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP +.endif + post-install: for SECTION in 1 3 4 6; do \ ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \ @@ -178,6 +186,24 @@ post-install: ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/ .endif +.if ! ${PORT_OPTIONS:MGS} + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-* +.endif +.if ! ${PORT_OPTIONS:MJAVA} + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-* +.endif +.if ! ${PORT_OPTIONS:MODBC} + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-* +.endif +.if ! ${PORT_OPTIONS:MOPENSSL} + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-* + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-* + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-* +.endif +.if ! ${PORT_OPTIONS:MWX} + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* +.endif + @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type d -empty \ | ${SORT} \ | ${SED} -e 's#^#@dir #g' \ Modified: head/lang/erlang-runtime16/Makefile ============================================================================== --- head/lang/erlang-runtime16/Makefile Sat Jan 31 18:08:53 2015 (r378224) +++ head/lang/erlang-runtime16/Makefile Sat Jan 31 18:46:25 2015 (r378225) @@ -3,7 +3,7 @@ PORTNAME= erlang PORTVERSION= 16.b.03.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ @@ -29,7 +29,7 @@ SUB_LIST= ERLANG_LIB=${ERLANG_LIB} MAKE_JOBS_UNSAFE=yes -OPTIONS_DEFINE= GCC DOCS GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DTRACE +OPTIONS_DEFINE= DOCS DTRACE GCC GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX GCC_DESC= Use current GCC HIPE_DESC= Build native HiPE compiler @@ -40,7 +40,7 @@ WX_DESC= Enable WX application GS_DESC= Enable GS application (deprecated) DTRACE_DESC= Enable DTrace support -OPTIONS_DEFAULT=SMP OPENSSL THREADS SCTP KQUEUE +OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS ERL_RELEASE= R${PORTVERSION:S/.//g:tu:S/1$/-1/} @@ -163,6 +163,14 @@ MAKE_ARGS+= ARCH=x86 # rest, not in share/doc/erlang as it should, because of relative # links in the documentation. +pre-configure: +.if ! ${PORT_OPTIONS:MHIPE} + echo "disabled by port options" > ${WRKSRC}/lib/hipe/SKIP +.endif +.if ! ${PORT_OPTIONS:MWX} + echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP +.endif + post-install: for SECTION in 1 3 4 6 7; do \ ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \ @@ -178,6 +186,24 @@ post-install: ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/ .endif +.if ! ${PORT_OPTIONS:MGS} + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-* +.endif +.if ! ${PORT_OPTIONS:MJAVA} + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-* +.endif +.if ! ${PORT_OPTIONS:MODBC} + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-* +.endif +.if ! ${PORT_OPTIONS:MOPENSSL} + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-* + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-* + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-* +.endif +.if ! ${PORT_OPTIONS:MWX} + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* +.endif + @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type d -empty \ | ${SORT} \ | ${SED} -e 's#^#@dir #g' \ Modified: head/lang/erlang-runtime17/Makefile ============================================================================== --- head/lang/erlang-runtime17/Makefile Sat Jan 31 18:08:53 2015 (r378224) +++ head/lang/erlang-runtime17/Makefile Sat Jan 31 18:46:25 2015 (r378225) @@ -3,6 +3,7 @@ PORTNAME= erlang PORTVERSION= 17.4 +PORTREVISION= 1 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ @@ -28,7 +29,7 @@ SUB_LIST= ERLANG_LIB=${ERLANG_LIB} MAKE_JOBS_UNSAFE=yes -OPTIONS_DEFINE= GCC DOCS GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DTRACE +OPTIONS_DEFINE= DOCS DTRACE GCC GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX GCC_DESC= Use current GCC HIPE_DESC= Build native HiPE compiler @@ -39,7 +40,7 @@ WX_DESC= Enable WX application GS_DESC= Enable GS application (deprecated) DTRACE_DESC= Enable DTrace support -OPTIONS_DEFAULT=SMP OPENSSL THREADS SCTP KQUEUE +OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS ERL_RELEASE= ${PORTVERSION} @@ -162,6 +163,14 @@ MAKE_ARGS+= ARCH=x86 # rest, not in share/doc/erlang as it should, because of relative # links in the documentation. +pre-configure: +.if ! ${PORT_OPTIONS:MHIPE} + echo "disabled by port options" > ${WRKSRC}/lib/hipe/SKIP +.endif +.if ! ${PORT_OPTIONS:MWX} + echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP +.endif + post-install: for SECTION in 1 3 4 6 7; do \ ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \ @@ -177,6 +186,24 @@ post-install: ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/ .endif +.if ! ${PORT_OPTIONS:MGS} + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-* +.endif +.if ! ${PORT_OPTIONS:MJAVA} + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-* +.endif +.if ! ${PORT_OPTIONS:MODBC} + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-* +.endif +.if ! ${PORT_OPTIONS:MOPENSSL} + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-* + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-* + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-* +.endif +.if ! ${PORT_OPTIONS:MWX} + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* +.endif + @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type d -empty \ | ${SORT} \ | ${SED} -e 's#^#@dir #g' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501311846.t0VIkQL0029388>