define MODERL_{ERL,ERLC} as shortcuts to the versioned binaries

This commit is contained in:
jasper 2015-06-25 13:34:23 +00:00
parent 8034b7cabd
commit 27acaf9d38
3 changed files with 11 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2015/06/25 13:28:59 jasper Exp $
# $OpenBSD: Makefile,v 1.9 2015/06/25 13:34:23 jasper Exp $
COMMENT= multi-protocol distributed load testing tool
@ -25,8 +25,8 @@ RUN_DEPENDS= graphics/py-matplotlib \
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= HOME=/tmp \
ERL=${LOCALBASE}/bin/erl${MODERL_VERSION} \
ERLC=${LOCALBASE}/bin/erlc${MODERL_VERSION} \
ERL=${MODERL_ERL} \
ERLC=${MODERL_ERLC}
MODPY_ADJ_FILES= src/tsung-plotter/tsplot.py.in

View File

@ -1,4 +1,4 @@
# $OpenBSD: erlang.port.mk,v 1.16 2015/06/25 13:16:51 jasper Exp $
# $OpenBSD: erlang.port.mk,v 1.17 2015/06/25 13:34:23 jasper Exp $
#
# Module for Erlang-based ports or modules
@ -82,6 +82,10 @@ MODERL_LIBROOT ?= lib/erlang${MODERL_VERSION}/lib
# Standard directory into which a module/library gets installed.
ERL_LIBDIR ?= ${ERL_LIBROOT}/${DISTNAME}
# Common program shortcuts
MODERL_ERL = ${LOCALBASE}/bin/erl${MODERL_VERSION}
MODERL_ERLC = ${LOCALBASE}/bin/erlc${MODERL_VERSION}
# In order to prevent patching every single Erlang-using port (there's no
# pkg-config like system to retrieve binary names), symlink the binaries
# the build will use.

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.41 2015/06/25 13:20:44 jasper Exp $
# $OpenBSD: Makefile,v 1.42 2015/06/25 13:34:23 jasper Exp $
COMMENT= jabber server written in Erlang
@ -44,8 +44,8 @@ CONFIGURE_ARGS+= --disable-pam \
--disable-roster-gateway-workaround \
--disable-mssql
CONFIGURE_ENV= HOME=${WRKDIST} \
ERLC=${LOCALBASE}/bin/erlc${MODERL_VERSION} \
ERL=${LOCALBASE}/bin/erl${MODERL_VERSION} \
ERL=${MODERL_ERL} \
ERLC=${MODERL_ERLC} \
ac_cv_header_openssl_md2_h=no
JABBERDUSER= _ejabberd