pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang Fixed dollar anchor in sed(1) expression.
details: https://anonhg.NetBSD.org/pkgsrc/rev/ed140f279fee
branches: trunk
changeset: 373435:ed140f279fee
user: rillig <rillig%pkgsrc.org@localhost>
date: Tue Jan 02 00:15:08 2018 +0000
description:
Fixed dollar anchor in sed(1) expression.
The single dollar was discarded by make(1). This was probably not intended
and confused the pkglint parser.
diffstat:
lang/openjdk7/builtin.mk | 4 ++--
lang/openjdk8/builtin.mk | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diffs (36 lines):
diff -r c8d01aafd80d -r ed140f279fee lang/openjdk7/builtin.mk
--- a/lang/openjdk7/builtin.mk Tue Jan 02 00:08:42 2018 +0000
+++ b/lang/openjdk7/builtin.mk Tue Jan 02 00:15:08 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2018/01/01 18:16:37 rillig Exp $
+# $NetBSD: builtin.mk,v 1.3 2018/01/02 00:15:08 rillig Exp $
BUILTIN_PKG:= openjdk7
@@ -27,7 +27,7 @@
###
.if !defined(BUILTIN_PKG.openjdk7) && \
!empty(IS_BUILTIN.openjdk7:M[yY][eE][sS])
-BUILTIN_VERSION.openjdk7!= ${OJDK7} -version 2>&1 | ${SED} -Ee 's:^[^0-9]*([0-9._]+)$:\1:' -e 's/_/./g' -e 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\4/'
+BUILTIN_VERSION.openjdk7!= ${OJDK7} -version 2>&1 | ${SED} -Ee 's:^[^0-9]*([0-9._]+)$$:\1:' -e 's/_/./g' -e 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\4/'
BUILTIN_PKG.openjdk7= openjdk7-${BUILTIN_VERSION.openjdk7}
.endif
MAKEVARS+= BUILTIN_PKG.openjdk7
diff -r c8d01aafd80d -r ed140f279fee lang/openjdk8/builtin.mk
--- a/lang/openjdk8/builtin.mk Tue Jan 02 00:08:42 2018 +0000
+++ b/lang/openjdk8/builtin.mk Tue Jan 02 00:15:08 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2017/07/24 12:26:35 wiz Exp $
+# $NetBSD: builtin.mk,v 1.3 2018/01/02 00:17:35 rillig Exp $
BUILTIN_PKG:= openjdk8
@@ -27,7 +27,7 @@
###
.if !defined(BUILTIN_PKG.openjdk8) && \
!empty(IS_BUILTIN.openjdk8:M[yY][eE][sS])
-BUILTIN_VERSION.openjdk8!= ${OJDK8} -version 2>&1 | ${SED} -Ee 's:^[^0-9]*([0-9._]+)$:\1:' -e 's/_/./g' -e 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\4/'
+BUILTIN_VERSION.openjdk8!= ${OJDK8} -version 2>&1 | ${SED} -Ee 's:^[^0-9]*([0-9._]+)$$:\1:' -e 's/_/./g' -e 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\4/'
BUILTIN_PKG.openjdk8= openjdk8-${BUILTIN_VERSION.openjdk8}
.endif
MAKEVARS+= BUILTIN_PKG.openjdk8
Home |
Main Index |
Thread Index |
Old Index