diff options
| author | rillig <rillig@pkgsrc.org> | 2019-05-23 19:22:54 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-05-23 19:22:54 +0000 |
| commit | cabadf3d995dfdb93e43fa33e676fdfbb6f7d1f5 (patch) | |
| tree | dfd45506cac9c8adb60a55d809ab0dbc4d5a750e /lang/scala | |
| parent | afe0216c35d9e0e0b96fe80eb38badf368ef84a7 (diff) | |
| download | pkgsrc-cabadf3d995dfdb93e43fa33e676fdfbb6f7d1f5.tar.gz | |
all: replace SUBST_SED with the simpler SUBST_VARS
pkglint -Wall -r --only "substitution command" -F
With manual review and indentation fixes since pkglint doesn't get that
part correct in every case.
Diffstat (limited to 'lang/scala')
| -rw-r--r-- | lang/scala/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lang/scala/Makefile b/lang/scala/Makefile index 8bd06463e1f..19475b3255e 100644 --- a/lang/scala/Makefile +++ b/lang/scala/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2018/12/16 10:07:11 ryoon Exp $ +# $NetBSD: Makefile,v 1.14 2019/05/23 19:23:04 rillig Exp $ DISTNAME= scala-2.12.8 CATEGORIES= lang @@ -23,9 +23,9 @@ SCALA_HOME= ${PREFIX}/share/${DISTNAME} SUBST_CLASSES+= scala SUBST_FILES.scala= bin/fsc bin/scala bin/scalac bin/scaladoc bin/scalap SUBST_STAGE.scala= pre-configure -SUBST_SED.scala= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.scala= PREFIX SUBST_SED.scala+= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' -SUBST_SED.scala+= -e 's,@SCALA_HOME@,${SCALA_HOME},g' +SUBST_VARS.scala+= SCALA_HOME PLIST_SUBST+= DISTNAME=${DISTNAME} |