Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Jun 2013 06:27:10 +0000 (UTC)
From:      Jason Helfman <jgh@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r321446 - head/databases/jasperserver
Message-ID:  <201306210627.r5L6RAQh058007@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jgh
Date: Fri Jun 21 06:27:10 2013
New Revision: 321446
URL: http://svnweb.freebsd.org/changeset/ports/321446

Log:
  - add validated support for headless systems to use openjdk7
  - default remains with openjdk6
  
  Reported by:	mfournier@openstudent.ca

Modified:
  head/databases/jasperserver/Makefile

Modified: head/databases/jasperserver/Makefile
==============================================================================
--- head/databases/jasperserver/Makefile	Fri Jun 21 06:19:34 2013	(r321445)
+++ head/databases/jasperserver/Makefile	Fri Jun 21 06:27:10 2013	(r321446)
@@ -34,12 +34,13 @@ JSUPDATE=	5.0.0-${PORTVERSION}
 
 NO_WRKSUBDIR=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6
 USE_ZIP=	yes
 
 # use own DOS2UNIX in pre-patch, not the one from bsd.port.mk!
 DOS2UNIX_REGEX=	.*(css|dtd|java|js|txt|wsdd|xml|xsl)$$
 
+OPTIONS_DEFINE=	HEADLESS
+HEADLESS_DESC=	Optimize for Headless Systems
 OPTIONS_SINGLE=	AS DB
 OPTIONS_SINGLE_AS=	TOMCAT6 TOMCAT7
 OPTIONS_SINGLE_DB=	MYSQL PGSQL
@@ -69,6 +70,12 @@ PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MHEADLESS}
+JAVA_VERSION=	1.7
+.else
+JAVA_VERSION=	1.6
+.endif
+
 .if ${PORT_OPTIONS:MMYSQL}
 WANT_MYSQL_VER=	55
 DBUSER?=	root



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306210627.r5L6RAQh058007>