[PC-BSD Commits] r19975 - in pbi/modules/java/openjdk7: . scripts

svn at pcbsd.org svn at pcbsd.org
Fri Oct 26 07:56:42 PDT 2012


Author: kenmoore
Date: 2012-10-26 14:56:42 +0000 (Fri, 26 Oct 2012)
New Revision: 19975

Modified:
   pbi/modules/java/openjdk7/pbi.conf
   pbi/modules/java/openjdk7/scripts/pre-portmake.sh
Log:
Try to fix up the openJDK7 PBI, manually try to set the java/icedtea-web port's makfile before building to use openjdk7 instead of openjdk6.



Modified: pbi/modules/java/openjdk7/pbi.conf
===================================================================
--- pbi/modules/java/openjdk7/pbi.conf	2012-10-26 14:36:23 UTC (rev 19974)
+++ pbi/modules/java/openjdk7/pbi.conf	2012-10-26 14:56:42 UTC (rev 19975)
@@ -7,7 +7,7 @@
 ##############################################################################
 
 # Program Name
-PBI_PROGNAME="OpenJDK"
+PBI_PROGNAME="OpenJDK-7"
  
 # Program Website
 PBI_PROGWEB="http://www.java.com"
@@ -31,6 +31,6 @@
 
 PBI_REQUIRESROOT="YES"; export PBI_REQUIRESROOT
 
-PBI_BUILDKEY="04"; export PBI_BUILDKEY
+PBI_BUILDKEY="06"; export PBI_BUILDKEY
  
 export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MAKEPORT PBI_MAKEOPTS

Modified: pbi/modules/java/openjdk7/scripts/pre-portmake.sh
===================================================================
--- pbi/modules/java/openjdk7/scripts/pre-portmake.sh	2012-10-26 14:36:23 UTC (rev 19974)
+++ pbi/modules/java/openjdk7/scripts/pre-portmake.sh	2012-10-26 14:56:42 UTC (rev 19975)
@@ -5,3 +5,6 @@
 fetch ftp://ftp.pcbsd.org/pub/autobuildpkgs/javapack.tbz
 tar xvjf javapack.tbz
 
+echo "Modifying the java/icedtea-web Makefile to use OpenJDK7"
+sed -i.bak "s,JAVA_VERSION=	1.6+,JAVA_VERSION=	1.7+,g" /usr/ports/java/icedtea-web/Makefile
+echo "Done: now java version is: `cat /usr/ports/java/icedtea-web/Makefile | grep JAVA_VERSION` "



More information about the Commits mailing list