Mon Jul 24 12:26:35 2017 UTC ()
Add RCS Id. Fix pkglint warning.


(wiz)
diff -r1.1 -r1.2 pkgsrc/lang/openjdk8/builtin.mk
cvs diff -r1.1 -r1.2 pkgsrc/lang/openjdk8/builtin.mk (expand / switch to unified diff)

--- pkgsrc/lang/openjdk8/builtin.mk 2016/12/16 16:27:23 1.1
+++ pkgsrc/lang/openjdk8/builtin.mk 2017/07/24 12:26:35 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
 1# $NetBSD: builtin.mk,v 1.2 2017/07/24 12:26:35 wiz Exp $
 2
1BUILTIN_PKG:= openjdk8 3BUILTIN_PKG:= openjdk8
2 4
3BUILTIN_FIND_FILES_VAR:= OJDK8 5BUILTIN_FIND_FILES_VAR:= OJDK8
4BUILTIN_FIND_FILES.OJDK8= \ 6BUILTIN_FIND_FILES.OJDK8= \
5 /usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/bin/javac 7 /usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/bin/javac
6 8
7.include "../../mk/buildlink3/bsd.builtin.mk" 9.include "../../mk/buildlink3/bsd.builtin.mk"
8 10
9### 11###
10### Determine if there is a built-in implementation of the package and 12### Determine if there is a built-in implementation of the package and
11### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 13### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
12### 14###
13.if !defined(IS_BUILTIN.openjdk8) 15.if !defined(IS_BUILTIN.openjdk8)
@@ -16,27 +18,27 @@ IS_BUILTIN.openjdk8= yes @@ -16,27 +18,27 @@ IS_BUILTIN.openjdk8= yes
16. else 18. else
17IS_BUILTIN.openjdk8= no 19IS_BUILTIN.openjdk8= no
18. endif 20. endif
19.endif 21.endif
20MAKEVARS+= IS_BUILTIN.openjdk8 22MAKEVARS+= IS_BUILTIN.openjdk8
21 23
22### 24###
23### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to 25### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
24### a package name to represent the built-in package. 26### a package name to represent the built-in package.
25### 27###
26.if !defined(BUILTIN_PKG.openjdk8) && \ 28.if !defined(BUILTIN_PKG.openjdk8) && \
27 !empty(IS_BUILTIN.openjdk8:M[yY][eE][sS]) 29 !empty(IS_BUILTIN.openjdk8:M[yY][eE][sS])
28BUILTIN_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/' 30BUILTIN_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/'
29BUILTIN_PKG.openjdk8= openjdk8-$(BUILTIN_VERSION.openjdk8) 31BUILTIN_PKG.openjdk8= openjdk8-${BUILTIN_VERSION.openjdk8}
30.endif 32.endif
31MAKEVARS+= BUILTIN_PKG.openjdk8 33MAKEVARS+= BUILTIN_PKG.openjdk8
32 34
33### 35###
34### Determine whether we should use the built-in implementation if it 36### Determine whether we should use the built-in implementation if it
35### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). 37### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
36### 38###
37.if !defined(USE_BUILTIN.openjdk8) 39.if !defined(USE_BUILTIN.openjdk8)
38. if ${PREFER.openjdk8} == "pkgsrc" 40. if ${PREFER.openjdk8} == "pkgsrc"
39USE_BUILTIN.openjdk8= no 41USE_BUILTIN.openjdk8= no
40. else 42. else
41USE_BUILTIN.openjdk8= ${IS_BUILTIN.openjdk8} 43USE_BUILTIN.openjdk8= ${IS_BUILTIN.openjdk8}
42. if defined(BUILTIN_PKG.openjdk8) && \ 44. if defined(BUILTIN_PKG.openjdk8) && \