tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Adding REPLACE_R+=
I'd like to add
REPLACE_R+=
function (* 1)
but the attached patch is not enough, ${R} is empty for now, say,
make show-var VARNAME=R
returns empty.
Please let me know or just commit the correct changes
There may be discussion whether r/R should be lower or upper case in this patch,
anyway thank you,
(* 1)
textproc/R-vroom 1.5.4
wants this function, it is the new package, by the way,
(Is it good that wip version to be placed on wip/ ?)
--
Makoto Fujiwara
mef%NetBSD.org@localhost
makoto%if.t.u-tokyo.ac.jp@localhost
Key fingerprint = 0BFA FAEB EAD1 90BA 7498 8F85 6809 9E0B B7EF A12E
----
pkgsrc freshness:
http://www.ki.nu/~makoto/pkgsrc/check-update/00_Summary.html
http://www.ki.nu/~makoto/pkgsrc/check-update/HEAD/00_Summary.html
Index: mk/configure/replace-interpreter.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/configure/replace-interpreter.mk,v
retrieving revision 1.21
diff -u -r1.21 replace-interpreter.mk
--- mk/configure/replace-interpreter.mk 7 Jun 2020 06:10:36 -0000 1.21
+++ mk/configure/replace-interpreter.mk 9 Sep 2021 12:15:26 -0000
@@ -12,6 +12,7 @@
# REPLACE_PERL
# REPLACE_PERL6
# REPLACE_SH
+# REPLACE_R
# Lists of filename patterns relative to WRKSRC in which the #!
# interpreter should be replaced by the pkgsrc one. Any directories
# that appear in the lists are silenty skipped, assuming that
@@ -49,6 +50,7 @@
REPLACE_KSH?= # none
REPLACE_PERL?= # none
REPLACE_SH?= # none
+REPLACE_R?= # none
.if !empty(REPLACE_AWK:M*)
REPLACE_INTERPRETER+= sys-AWK
@@ -100,6 +102,13 @@
REPLACE_FILES.sys-sh= ${REPLACE_SH}
.endif
+.if !empty(REPLACE_R:M*)
+REPLACE_INTERPRETER+= sys-R
+REPLACE.sys-R.old= [^[:space:]]*R
+REPLACE.sys-R.new= ${R}
+REPLACE_FILES.sys-R= ${REPLACE_R}
+.endif
+
# sed regexp to match optional "/usr/bin/env" followed by one or more spaces
REPLACE.optional-env-space= \(/usr/bin/env[[:space:]][[:space:]]*\)\{0,1\}
@@ -136,7 +145,7 @@
_VARGROUPS+= interp
_PKG_VARS.interp= REPLACE_AWK REPLACE_BASH REPLACE_CSH REPLACE_KSH
-_PKG_VARS.interp+= REPLACE_PERL REPLACE_PERL6 REPLACE_SH
+_PKG_VARS.interp+= REPLACE_PERL REPLACE_PERL6 REPLACE_SH REPLACE_R
_PKG_VARS.interp+= REPLACE_INTERPRETER
.for interp in ${REPLACE_INTERPRETER}
_DEF_VARS.interp+= REPLACE.${interp}.old REPLACE.${interp}.new REPLACE_FILES.${interp}
Index: mk/tools/defaults.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/tools/defaults.mk,v
retrieving revision 1.62
diff -u -r1.62 defaults.mk
--- mk/tools/defaults.mk 22 Aug 2018 20:48:37 -0000 1.62
+++ mk/tools/defaults.mk 9 Sep 2021 12:15:26 -0000
@@ -113,6 +113,7 @@
_TOOLS_VARNAME.pod2man= POD2MAN
_TOOLS_VARNAME.printf= PRINTF
_TOOLS_VARNAME.pwd= PWD_CMD
+_TOOLS_VARNAME.r= R
_TOOLS_VARNAME.rm= RM
_TOOLS_VARNAME.rmdir= RMDIR
_TOOLS_VARNAME.rpm2pkg= RPM2PKG
Home |
Main Index |
Thread Index |
Old Index