Hi Victor,

Thank you for review. I've come back from NY vacation and ready to continue integration of the NetBeans packages.
A diff file for the second revision of changes is attached.
The package developer/netbeans/library/libnb-webcommon is obsoleted according to your suggestions. I hope my assumption about a starting letter of the package name is correct, i.e. "d", but not "l", and placing the package definition in a list of the obsoleted/renamed packages is provided according to your expectation.

That looks fine. I'd like a second reviewer of these changes if possible.

Thanks.

Hi Victor,

I'm looking for a review of the fix for bug #13523 - Integrate NetBeans
6.8 as an unbundled package:
http://defect.opensolaris.org/bz/show_bug.cgi?id=13523

Changes needed for the new version of the NetBeans.
A diff file is attached.

Mostly looking good.

It looks like you are now obsoleting "developer/netbeans/library/libnb-webcommon" but you can't just remove the package definition lines for that package from the
NetBeans file:

 -package developer/netbeans/library/libnb-webcommon
 -version 6.7
 -classification "Development/Integrated Development Environments"
 -import libnb-webcommon
 -depend developer/netbeans/library/libnb-ide
 -depend developer/netbeans/library/libnb-platform
 -depend developer/netbeans/netbeans-ide
 -end package

You need to turn them into an obsoleted package definition. Something like:

 package developer/netbeans/library/libnb-webcommon
 add set name=pkg.obsolete value=true
 version 6.8
 end package

I suggest placing that package definition at the bottom of the file
in alphabetical order, with all the other obsoleted/renamed ones.

Thanks.





diff --git a/src/util/distro-import/unbundleds/NetBeans b/src/util/distro-import/unbundleds/NetBeans
--- a/src/util/distro-import/unbundleds/NetBeans
+++ b/src/util/distro-import/unbundleds/NetBeans
@@ -1,7 +1,7 @@
 package developer/netbeans
 classification "Development/Integrated Development Environments"
-summary "Open-source Integrated Development Environment for enterprise, web and mobile applications in Java, C/C++, and Ruby"
-version 6.7
+summary "Open-source Integrated Development Environment for enterprise, web and mobile applications in Java, JavaFX, C/C++, and Ruby"
+version 6.8
 import netbeans-full
 depend developer/netbeans/library/libnb-apisupport
 depend developer/netbeans/library/libnb-cnd
@@ -12,69 +12,71 @@
 depend developer/netbeans/library/libnb-ide
 depend developer/netbeans/library/libnb-identity
 depend developer/netbeans/library/libnb-java
+depend developer/netbeans/library/libnb-javafx
 depend developer/netbeans/library/libnb-php
 depend developer/netbeans/library/libnb-platform
 depend developer/netbeans/library/libnb-profiler
 depend developer/netbeans/library/libnb-ruby
-depend developer/netbeans/library/libnb-webcommon
 depend developer/netbeans/library/libnb-websvccommon
-depend developer/netbeans/[email protected]
+depend developer/netbeans/[email protected]
 depend SUNWj6dev
 depend SUNWj6rt
 end package
 
 package developer/netbeans/netbeans-incorporation
-version 6.7
+version 6.8
 summary "netbeans incorporation to insure all components are upgraded at once"
-add depend type=incorporate fmri=developer/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/library/[email protected]
-add depend type=incorporate fmri=developer/netbeans/[email protected]
-add depend type=incorporate fmri=developer/netbeans/[email protected]
-add depend type=incorporate fmri=developer/netbeans/[email protected]
-add depend type=incorporate fmri=developer/netbeans/[email protected]
-add depend type=incorporate fmri=developer/netbeans/[email protected]
-add depend type=incorporate fmri=developer/netbeans/[email protected]
-add depend type=incorporate fmri=developer/netbeans/[email protected]
-add depend type=incorporate fmri=developer/netbeans/[email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
-add depend type=incorporate [email protected]
+add depend type=incorporate fmri=developer/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/library/[email protected]
+add depend type=incorporate fmri=developer/netbeans/[email protected]
+add depend type=incorporate fmri=developer/netbeans/[email protected]
+add depend type=incorporate fmri=developer/netbeans/[email protected]
+add depend type=incorporate fmri=developer/netbeans/[email protected]
+add depend type=incorporate fmri=developer/netbeans/[email protected]
+add depend type=incorporate fmri=developer/netbeans/[email protected]
+add depend type=incorporate fmri=developer/netbeans/[email protected]
+add depend type=incorporate fmri=developer/netbeans/[email protected]
+add depend type=incorporate fmri=developer/netbeans/[email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
+add depend type=incorporate [email protected]
 end package
 
 package developer/netbeans/library/libnb-apisupport
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import libnb-apisupport
 depend developer/netbeans/library/libnb-ide
@@ -84,16 +86,17 @@
 end package
 
 package developer/netbeans/library/libnb-cnd
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import libnb-cnd
+depend developer/netbeans/library/libnb-dlight
 depend developer/netbeans/library/libnb-ide
 depend developer/netbeans/library/libnb-platform
 depend developer/netbeans/netbeans-ide
 end package
 
 package developer/netbeans/library/libnb-dlight
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import libnb-dlight
 depend developer/netbeans/library/libnb-ide
@@ -102,7 +105,7 @@
 end package
 
 package developer/netbeans/library/libnb-enterprise
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import libnb-enterprise
 depend developer/netbeans/library/libnb-ide
@@ -112,7 +115,7 @@
 end package
 
 package developer/netbeans/library/libnb-ergonomics
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import libnb-ergonomics
 depend developer/netbeans/library/libnb-ide
@@ -121,16 +124,20 @@
 end package
 
 package developer/netbeans/library/libnb-groovy
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import libnb-groovy
+depend developer/netbeans/library/libnb-apisupport
 depend developer/netbeans/library/libnb-ide
+depend developer/netbeans/library/libnb-java
 depend developer/netbeans/library/libnb-platform
+depend developer/netbeans/library/libnb-profiler
+depend developer/netbeans/library/libnb-websvccommon
 depend developer/netbeans/netbeans-ide
 end package
 
 package developer/netbeans/library/libnb-ide
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import libnb-ide
 depend developer/netbeans/library/libnb-platform
@@ -138,7 +145,7 @@
 end package
 
 package developer/netbeans/library/libnb-identity
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import libnb-identity
 depend developer/netbeans/library/libnb-enterprise
@@ -150,7 +157,7 @@
 end package
 
 package developer/netbeans/library/libnb-java
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import libnb-java
 depend developer/netbeans/library/libnb-ide
@@ -159,24 +166,35 @@
 depend developer/netbeans/netbeans-ide
 end package
 
-package developer/netbeans/library/libnb-php
-version 6.7
+package developer/netbeans/library/libnb-javafx
+version 6.8
 classification "Development/Integrated Development Environments"
-import libnb-php
+import libnb-javafx
+depend developer/netbeans/library/libnb-apisupport
 depend developer/netbeans/library/libnb-ide
 depend developer/netbeans/library/libnb-platform
 depend developer/netbeans/netbeans-ide
 end package
 
+package developer/netbeans/library/libnb-php
+version 6.8
+classification "Development/Integrated Development Environments"
+import libnb-php
+depend developer/netbeans/library/libnb-ide
+depend developer/netbeans/library/libnb-platform
+depend developer/netbeans/library/libnb-websvccommon
+depend developer/netbeans/netbeans-ide
+end package
+
 package developer/netbeans/library/libnb-platform
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import libnb-platform
 depend developer/netbeans/netbeans-ide
 end package
 
 package developer/netbeans/library/libnb-profiler
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import libnb-profiler
 depend developer/netbeans/library/libnb-ide
@@ -187,7 +205,7 @@
 end package
 
 package developer/netbeans/library/libnb-ruby
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import libnb-ruby
 depend developer/netbeans/library/libnb-ide
@@ -195,17 +213,8 @@
 depend developer/netbeans/netbeans-ide
 end package
 
-package developer/netbeans/library/libnb-webcommon
-version 6.7
-classification "Development/Integrated Development Environments"
-import libnb-webcommon
-depend developer/netbeans/library/libnb-ide
-depend developer/netbeans/library/libnb-platform
-depend developer/netbeans/netbeans-ide
-end package
-
 package developer/netbeans/library/libnb-websvccommon
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import libnb-websvccommon
 depend developer/netbeans/library/libnb-ide
@@ -214,42 +223,42 @@
 end package
 
 package developer/netbeans/netbeans-cpp
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import netbeans-cpp
 depend developer/netbeans/library/libnb-cnd
 depend developer/netbeans/library/libnb-ide
 depend developer/netbeans/library/libnb-platform
-depend developer/netbeans/[email protected]
+depend developer/netbeans/[email protected]
 depend developer/netbeans/plugin/nb-dtrace
 depend SUNWj6dev
 depend SUNWj6rt
 end package
 
 package developer/netbeans/netbeans-desktop
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import netbeans-desktop
 end package
 
 package developer/netbeans/netbeans-full
-version 6.7
+version 6.8
 depend developer/netbeans
 depend developer/netbeans/plugin/nb-dtrace
 end package
 
 package developer/netbeans/netbeans-ide
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import netbeans-ide
 depend developer/netbeans/netbeans-desktop
-depend developer/netbeans/[email protected]
+depend developer/netbeans/[email protected]
 depend SUNWj6dev
 depend SUNWj6rt
 end package
 
 package developer/netbeans/netbeans-java
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import netbeans-java
 depend developer/netbeans/library/libnb-apisupport
@@ -260,16 +269,32 @@
 depend developer/netbeans/library/libnb-java
 depend developer/netbeans/library/libnb-platform
 depend developer/netbeans/library/libnb-profiler
-depend developer/netbeans/library/libnb-webcommon
 depend developer/netbeans/library/libnb-websvccommon
-depend developer/netbeans/[email protected]
+depend developer/netbeans/[email protected]
+depend developer/netbeans/plugin/nb-dtrace
+depend SUNWj6dev
+depend SUNWj6rt
+end package
+
+package developer/netbeans/netbeans-javafx
+version 6.8
+classification "Development/Integrated Development Environments"
+import netbeans-javafx
+depend developer/netbeans/library/libnb-apisupport
+depend developer/netbeans/library/libnb-ide
+depend developer/netbeans/library/libnb-java
+depend developer/netbeans/library/libnb-javafx
+depend developer/netbeans/library/libnb-platform
+depend developer/netbeans/library/libnb-profiler
+depend developer/netbeans/library/libnb-websvccommon
+depend developer/netbeans/[email protected]
 depend developer/netbeans/plugin/nb-dtrace
 depend SUNWj6dev
 depend SUNWj6rt
 end package
 
 package developer/netbeans/netbeans-javase
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import netbeans-javase
 depend developer/netbeans/library/libnb-apisupport
@@ -278,292 +303,308 @@
 depend developer/netbeans/library/libnb-platform
 depend developer/netbeans/library/libnb-profiler
 depend developer/netbeans/library/libnb-websvccommon
-depend developer/netbeans/[email protected]
+depend developer/netbeans/[email protected]
 depend developer/netbeans/plugin/nb-dtrace
 depend SUNWj6dev
 depend SUNWj6rt
 end package
 
 package developer/netbeans/netbeans-php
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import netbeans-php
 depend developer/netbeans/library/libnb-ide
 depend developer/netbeans/library/libnb-php
 depend developer/netbeans/library/libnb-platform
 depend developer/netbeans/library/libnb-websvccommon
-depend developer/netbeans/[email protected]
+depend developer/netbeans/[email protected]
 depend developer/netbeans/plugin/nb-dtrace
 depend SUNWj6dev
 depend SUNWj6rt
 end package
 
 package developer/netbeans/netbeans-ruby
-version 6.7
+version 6.8
 classification "Development/Integrated Development Environments"
 import netbeans-ruby
 depend developer/netbeans/library/libnb-ide
 depend developer/netbeans/library/libnb-platform
 depend developer/netbeans/library/libnb-ruby
-depend developer/netbeans/[email protected]
+depend developer/netbeans/[email protected]
 depend developer/netbeans/plugin/nb-dtrace
 depend SUNWj6dev
 depend SUNWj6rt
 end package
 
+package developer/netbeans/library/libnb-webcommon
+add set name=pkg.obsolete value=true
+version 6.8
+end package
+
 package netbeans
 add set name=pkg.renamed value=true
 depend developer/netbeans
-version 6.7
+version 6.8
 end package
 
 package libnb-apisupport
 add set name=pkg.renamed value=true
 depend developer/netbeans/library/libnb-apisupport
-version 6.7
+version 6.8
 end package
 
 package libnb-cnd
 add set name=pkg.renamed value=true
 depend developer/netbeans/library/libnb-cnd
-version 6.7
+version 6.8
 end package
 
 package libnb-dlight
 add set name=pkg.renamed value=true
 depend developer/netbeans/library/libnb-dlight
-version 6.7
+version 6.8
 end package
 
 package libnb-enterprise
 add set name=pkg.renamed value=true
 depend developer/netbeans/library/libnb-enterprise
-version 6.7
+version 6.8
 end package
 
 package libnb-ergonomics
 add set name=pkg.renamed value=true
 depend developer/netbeans/library/libnb-ergonomics
-version 6.7
+version 6.8
 end package
 
 package libnb-groovy
 add set name=pkg.renamed value=true
 depend developer/netbeans/library/libnb-groovy
-version 6.7
+version 6.8
 end package
 
 package libnb-ide
 add set name=pkg.renamed value=true
 depend developer/netbeans/library/libnb-ide
-version 6.7
+version 6.8
 end package
 
 package libnb-identity
 add set name=pkg.renamed value=true
 depend developer/netbeans/library/libnb-identity
-version 6.7
+version 6.8
 end package
 
 package libnb-java
 add set name=pkg.renamed value=true
 depend developer/netbeans/library/libnb-java
-version 6.7
+version 6.8
+end package
+
+package libnb-javafx
+add set name=pkg.renamed value=true
+depend developer/netbeans/library/libnb-javafx
+version 6.8
 end package
 
 package libnb-php
 add set name=pkg.renamed value=true
 depend developer/netbeans/library/libnb-php
-version 6.7
+version 6.8
 end package
 
 package libnb-platform
 add set name=pkg.renamed value=true
 depend developer/netbeans/library/libnb-platform
-version 6.7
+version 6.8
 end package
 
 package libnb-profiler
 add set name=pkg.renamed value=true
 depend developer/netbeans/library/libnb-profiler
-version 6.7
+version 6.8
 end package
 
 package libnb-ruby
 add set name=pkg.renamed value=true
 depend developer/netbeans/library/libnb-ruby
-version 6.7
+version 6.8
 end package
 
 package libnb-webcommon
 add set name=pkg.renamed value=true
 depend developer/netbeans/library/libnb-webcommon
-version 6.7
+version 6.8
 end package
 
 package libnb-websvccommon
 add set name=pkg.renamed value=true
 depend developer/netbeans/library/libnb-websvccommon
-version 6.7
+version 6.8
 end package
 
 package netbeans-cpp
 add set name=pkg.renamed value=true
 depend developer/netbeans/netbeans-cpp
-version 6.7
+version 6.8
 end package
 
 package netbeans-desktop
 add set name=pkg.renamed value=true
 depend developer/netbeans/netbeans-desktop
-version 6.7
+version 6.8
 end package
 
 package netbeans-full
 add set name=pkg.renamed value=true
 depend developer/netbeans/netbeans-full
-version 6.7
+version 6.8
 end package
 
 package netbeans-ide
 add set name=pkg.renamed value=true
 depend developer/netbeans/netbeans-ide
-version 6.7
+version 6.8
 end package
 
 package netbeans-java
 add set name=pkg.renamed value=true
 depend developer/netbeans/netbeans-java
-version 6.7
+version 6.8
+end package
+
+package netbeans-javafx
+add set name=pkg.renamed value=true
+depend developer/netbeans/netbeans-javafx
+version 6.8
 end package
 
 package netbeans-javase
 add set name=pkg.renamed value=true
 depend developer/netbeans/netbeans-javase
-version 6.7
+version 6.8
 end package
 
 package netbeans-php
 add set name=pkg.renamed value=true
 depend developer/netbeans/netbeans-php
-version 6.7
+version 6.8
 end package
 
 package netbeans-ruby
 add set name=pkg.renamed value=true
 depend developer/netbeans/netbeans-ruby
-version 6.7
+version 6.8
 end package
 
-
 package libnb-gsf
 add set name=pkg.renamed value=true
 depend netbeans-ide
-version 6.7
+version 6.8
 end package
 
 package libnb-soa
 add set name=pkg.obsolete value=true
-version 6.7
+version 6.8
 end package
 
 package libnb-visualweb
 add set name=pkg.obsolete value=true
-version 6.7
+version 6.8
 end package
 
 package libnb-xml
 add set name=pkg.obsolete value=true
-version 6.7
+version 6.8
 end package
 
 package SUNWnetbeans-ide
 add set name=pkg.renamed value=true
 depend netbeans-ide
-version 6.7
+version 6.8
 end package
 
 package SUNWnetbeans-desktop
 add set name=pkg.renamed value=true
 depend netbeans-desktop
-version 6.7
+version 6.8
 end package
 
 package SUNWnetbeans-javaee
 add set name=pkg.renamed value=true
 depend netbeans-java
-version 6.7
+version 6.8
 end package
 
 package SUNWnetbeans-javase
 add set name=pkg.renamed value=true
 depend netbeans-javase
-version 6.7
+version 6.8
 end package
 
 package SUNWnetbeans-ruby
 add set name=pkg.renamed value=true
 depend netbeans-ruby
-version 6.7
+version 6.8
 end package
 
 package SUNWnetbeans-cpp
 add set name=pkg.renamed value=true
 depend netbeans-cpp
-version 6.7
+version 6.8
 end package
 
 package SUNWlibnb-apisupport1
 add set name=pkg.obsolete value=true
-version 6.7
+version 6.8
 end package
 
 package SUNWlibnb-cnd1
 add set name=pkg.obsolete value=true
-version 6.7
+version 6.8
 end package
 
 package SUNWlibnb-enterprise4
 add set name=pkg.obsolete value=true
-version 6.7
+version 6.8
 end package
 
 package SUNWlibnb-gsf1
 add set name=pkg.obsolete value=true
-version 6.7
+version 6.8
 end package
 
 package SUNWlibnb-ide8
 add set name=pkg.obsolete value=true
-version 6.7
+version 6.8
 end package
 
 package SUNWlibnb-java1
 add set name=pkg.obsolete value=true
-version 6.7
+version 6.8
 end package
 
 package SUNWlibnb-platform7
 add set name=pkg.obsolete value=true
-version 6.7
+version 6.8
 end package
 
 package SUNWlibnb-profiler2
 add set name=pkg.obsolete value=true
-version 6.7
+version 6.8
 end package
 
 package SUNWlibnb-ruby1
 add set name=pkg.obsolete value=true
-version 6.7
+version 6.8
 end package
 
 package SUNWlibnb-visualweb1
 add set name=pkg.obsolete value=true
-version 6.7
+version 6.8
 end package
 
 package SUNWlibnb-xml1
 add set name=pkg.obsolete value=true
-version 6.7
+version 6.8
 end package
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss

Reply via email to