pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/lang/openjdk7



Module Name:    pkgsrc
Committed By:   rillig
Date:           Tue Jan  2 00:15:08 UTC 2018

Modified Files:
        pkgsrc/lang/openjdk7: builtin.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/openjdk7/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk7/builtin.mk
diff -u pkgsrc/lang/openjdk7/builtin.mk:1.2 pkgsrc/lang/openjdk7/builtin.mk:1.3
--- pkgsrc/lang/openjdk7/builtin.mk:1.2 Mon Jan  1 18:16:37 2018
+++ pkgsrc/lang/openjdk7/builtin.mk     Tue Jan  2 00:15:08 2018
@@ -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 @@ MAKEVARS+=    IS_BUILTIN.openjdk7
 ###
 .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



Home | Main Index | Thread Index | Old Index