[PC-BSD Commits] r8141 - in pbi/modules/java: . openjdk6 openjdk6/xdg-desktop openjdk6/xdg-menu openjdk7 openjdk7/xdg-desktop openjdk7/xdg-menu

[svn at pcbsd.org]

Author: kris
Date: 2010-12-04 06:59:43 -0800 (Sat, 04 Dec 2010)
New Revision: 8141

Added:
   pbi/modules/java/openjdk7/
Removed:
   pbi/modules/java/openjdk6/xdg-desktop/ControlPanel.desktop
   pbi/modules/java/openjdk6/xdg-menu/ControlPanel.desktop
   pbi/modules/java/openjdk7/xdg-desktop/ControlPanel.desktop
   pbi/modules/java/openjdk7/xdg-menu/ControlPanel.desktop
Modified:
   pbi/modules/java/openjdk6/external-links
   pbi/modules/java/openjdk6/pbi.conf
   pbi/modules/java/openjdk7/external-links
   pbi/modules/java/openjdk7/pbi.conf
Log:

ALso fix openjdk6/7 for 9



Modified: pbi/modules/java/openjdk6/external-links
===================================================================
--- pbi/modules/java/openjdk6/external-links	2010-12-04 14:58:38 UTC (rev 8140)
+++ pbi/modules/java/openjdk6/external-links	2010-12-04 14:59:43 UTC (rev 8141)
@@ -8,4 +8,3 @@
 #include/libfoo.h       include/libfoo.h        replace
 #bin/appfoo             bin/appfoo              binary,nocrash
 #bin/appfoo2            bin/appfoo-test         binary
-

Modified: pbi/modules/java/openjdk6/pbi.conf
===================================================================
--- pbi/modules/java/openjdk6/pbi.conf	2010-12-04 14:58:38 UTC (rev 8140)
+++ pbi/modules/java/openjdk6/pbi.conf	2010-12-04 14:59:43 UTC (rev 8141)
@@ -7,7 +7,7 @@
 ##############################################################################
 
 # Program Name
-PBI_PROGNAME="JavaJRE"
+PBI_PROGNAME="OpenJDK"
  
 # Program Website
 PBI_PROGWEB="http://www.java.com"

Modified: pbi/modules/java/openjdk7/external-links
===================================================================
--- pbi/modules/java/openjdk6/external-links	2010-10-27 23:27:13 UTC (rev 7928)
+++ pbi/modules/java/openjdk7/external-links	2010-12-04 14:59:43 UTC (rev 8141)
@@ -8,4 +8,3 @@
 #include/libfoo.h       include/libfoo.h        replace
 #bin/appfoo             bin/appfoo              binary,nocrash
 #bin/appfoo2            bin/appfoo-test         binary
-

Modified: pbi/modules/java/openjdk7/pbi.conf
===================================================================
--- pbi/modules/java/openjdk6/pbi.conf	2010-10-27 23:27:13 UTC (rev 7928)
+++ pbi/modules/java/openjdk7/pbi.conf	2010-12-04 14:59:43 UTC (rev 8141)
@@ -7,7 +7,7 @@
 ##############################################################################
 
 # Program Name
-PBI_PROGNAME="JavaJRE"
+PBI_PROGNAME="OpenJDK"
  
 # Program Website
 PBI_PROGWEB="http://www.java.com"
@@ -19,7 +19,7 @@
 PBI_PROGICON="logo.png"
  
 # The target port we are building
-PBI_MAKEPORT="java/openjdk6"
+PBI_MAKEPORT="java/openjdk7"
  
 # Additional options for make.conf
 PBI_MAKEOPTS="PACKAGE_BUILDING=YES