View | Details | Raw Unified | Return to bug 244942 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/bsd.default-versions.mk (+2 lines)
Lines 51-56 Link Here
51 
.endif
 51 
.endif
52 
# Possible values: 7, 8, 9, agpl
 52 
# Possible values: 7, 8, 9, agpl
53 
GHOSTSCRIPT_DEFAULT?=	agpl
 53 
GHOSTSCRIPT_DEFAULT?=	agpl
54 
# Allowed values: 7 8 11 12 13
55 
JAVA_DEFAULT?=8
54 
# Possible values: 0.6, 0.7, 1.0, 1.1
 56 
# Possible values: 0.6, 0.7, 1.0, 1.1
55 
JULIA_DEFAULT?=		1.0
 57 
JULIA_DEFAULT?=		1.0
56 
# Possible values: 2.0.6
 58 
# Possible values: 2.0.6
(-)Mk/bsd.java.mk (+2 lines)
Lines 199-204 Link Here
199 
					JAVA_PORT_NATIVE_OPENJDK_JDK_7  \
 199 
					JAVA_PORT_NATIVE_OPENJDK_JDK_7  \
200 
					JAVA_PORT_LINUX_ORACLE_JDK_8
 200 
					JAVA_PORT_LINUX_ORACLE_JDK_8
201 
_JAVA_PORTS_ALL=	${JAVA_PREFERRED_PORTS} \
 201 
_JAVA_PORTS_ALL=	${JAVA_PREFERRED_PORTS} \
202 
			JAVA_PORT_NATIVE_OPENJDK_JDK_${JAVA_DEFAULT} \
202 
					${__JAVA_PORTS_ALL}
 203 
					${__JAVA_PORTS_ALL}
203 

          204
          

        

        

          204
          
# Set the name of the file that indicates that a JDK is indeed installed, as a

          205
          
# Set the name of the file that indicates that a JDK is indeed installed, as a

        

  

    
      
            Lines 452-457
          
      
      
        Link Here
      
    
  

        

          452
          
	@${ECHO_CMD} "JAVA_BUILD=                     ${JAVA_BUILD}"

          453
          
	@${ECHO_CMD} "JAVA_BUILD=                     ${JAVA_BUILD}"

        

        

          453
          
	@${ECHO_CMD} "JAVA_RUN=                       ${JAVA_RUN}"

          454
          
	@${ECHO_CMD} "JAVA_RUN=                       ${JAVA_RUN}"

        

        

          454
          
	@${ECHO_CMD} "JAVA_EXTRACT=                   ${JAVA_EXTRACT}"

          455
          
	@${ECHO_CMD} "JAVA_EXTRACT=                   ${JAVA_EXTRACT}"

        

            

              
              
              456
              
	@${ECHO_CMD} "JAVA_DEFAULT=                   ${JAVA_DEFAULT}"

            

        

          455
          
	@${ECHO_CMD}

          457
          
	@${ECHO_CMD}

        

        

          456
          
	@${ECHO_CMD} "# JDK port dependency selection process:"

          458
          
	@${ECHO_CMD} "# JDK port dependency selection process:"

        

        

          457
          
	@${ECHO_CMD} "_JAVA_PORTS_POSSIBLE=           ${_JAVA_PORTS_POSSIBLE}"

          459
          
	@${ECHO_CMD} "_JAVA_PORTS_POSSIBLE=           ${_JAVA_PORTS_POSSIBLE}"

        






  

  Return to bug 244942