[csw-devel] SF.net SVN: gar:[2575] csw/mgar/pkg/jdk5/trunk

[dmichelsen at users.sourceforge.net]

Revision: 2575
          http://gar.svn.sourceforge.net/gar/?rev=2575&view=rev
Author:   dmichelsen
Date:     2008-12-13 22:06:46 +0000 (Sat, 13 Dec 2008)

Log Message:
-----------
jdk5: Update to 1.5.0_17 and mGAR v2 and analogous to jdk6

Modified Paths:
--------------
    csw/mgar/pkg/jdk5/trunk/Makefile
    csw/mgar/pkg/jdk5/trunk/checksums
    csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec

Added Paths:
-----------
    csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec

Property Changed:
----------------
    csw/mgar/pkg/jdk5/trunk/


Property changes on: csw/mgar/pkg/jdk5/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/jdk5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/jdk5/trunk/Makefile	2008-12-13 21:51:31 UTC (rev 2574)
+++ csw/mgar/pkg/jdk5/trunk/Makefile	2008-12-13 22:06:46 UTC (rev 2575)
@@ -1,5 +1,5 @@
 GARNAME = jdk5
-SPKG_VERSION = 1.5.0_16
+SPKG_VERSION = 1.5.0_17
 GARVERSION = $(shell echo $(SPKG_VERSION) | sed -e 's/\./_/g')
 CATEGORIES = lang
 
@@ -19,14 +19,30 @@
 DISTFILES  = $(foreach S,$(SUFFIXES),jdk-$(GARVERSION)-solaris-$S.sh)
 NOEXTRACT  = $(foreach S,$(filter-out $(SUFFIXES_$(GARCH)),$(SUFFIXES)),jdk-$(GARVERSION)-solaris-$S.sh)
 DISTFILES += $(call admfiles,CSWjdk5)
+DISTFILES += $(call admfiles,CSWjre5)
 
-SPKG_SOURCEURL = http://java.sun.com/products/archive/
+SPKG_SOURCEURL = http://java.sun.com/javase/downloads/index_jdk5.jsp
 
+SPKG_DESC_CSWjdk5 = Java Development Kit 6
+SPKG_DESC_CSWjre5 = Java Runtime Environment 6
+
+REQUIRED_PKGS_CSWjdk6 = CSWjre6
+
+MANPAGES_JRE  = java.1 javaws.1 keytool.1 orbd.1 pack200.1 policytool.1 rmid.1 rmiregistry.1
+MANPAGES_JRE += servertool.1 tnameserv.1 unpack200.1
+
+MANPAGE_REGEX = ($(shell echo $(MANPAGES_JRE) | perl -lne 's/\./\\./g;print join("|",split)'))
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+PKGFILES_CSWjre5  = $(prefix)/java/jdk/$(DISTNAME)/jre/.*
+PKGFILES_CSWjre5 += $(prefix)/java/jdk/$(DISTNAME)/man/.*/$(MANPAGE_REGEX)
+PKGFILES_CSWjre5 += $(prefix)/java/jre/jre$(SPKG_VERSION)
+PKGFILES_CSWjre5 += $(prefix)/java/jre/jre5
+
 # Tell the user to download the file manually
 manual//%:
 	@echo
@@ -41,7 +57,7 @@
 # rule to extract files with shell
 shell-extract-%:
 	@echo " ==> Extracting $(DOWNLOADDIR)/$*"
-	@echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); MORE="-10000" sh $$D)
+	@echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); DISPLAY= MORE="-10000" sh $$D -noregister)
 	@$(MAKECOOKIE)
 
 extract-%.sh: shell-extract-%.sh
@@ -51,9 +67,18 @@
 
 install-custom:
 	@echo " ==> Installing $(GARNAME)"
-	@rm -rf $(DESTDIR)$(prefix)/$(DISTNAME)
-	@ginstall -d $(DESTDIR)$(prefix)
-	@(cd $(WORKDIR); pax -r -w -v $(DISTNAME) $(DESTDIR)$(prefix))
-	@rm -f $(DESTDIR)$(prefix)/$(GARNAME)
-	@gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/$(GARNAME)
+
+	rm -rf $(DESTDIR)$(prefix)/java
+	ginstall -d $(DESTDIR)$(prefix)/java/jdk
+	(cd $(WORKDIR); pax -r -w $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk)
+	rm -f $(DESTDIR)$(prefix)/java/jdk/jdk5
+	gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk/jdk5
+	
+	ginstall -d $(DESTDIR)$(prefix)/java/jre
+	rm -f $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION)
+	gln -sf ../jdk/$(DISTNAME)/jre $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION)
+	rm -f $(DESTDIR)$(prefix)/java/jre/jre5
+	gln -sf jre$(SPKG_VERSION) $(DESTDIR)$(prefix)/java/jre/jre5
+	
+	gln -s ../man $(DESTDIR)$(prefix)/java/jdk/$(DISTNAME)/jre/man
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/jdk5/trunk/checksums
===================================================================
--- csw/mgar/pkg/jdk5/trunk/checksums	2008-12-13 21:51:31 UTC (rev 2574)
+++ csw/mgar/pkg/jdk5/trunk/checksums	2008-12-13 22:06:46 UTC (rev 2575)
@@ -1,5 +1,6 @@
-07cd02212259ed4b421c07b140873e88  download/jdk-1_5_0_16-solaris-sparc.sh
-4216693ca5d27fa3a2242a2932149a38  download/jdk-1_5_0_16-solaris-sparcv9.sh
-8f96c0535287b32d4ef26e35a5307957  download/jdk-1_5_0_16-solaris-i586.sh
-cdb42f091f5ace5b5fb23b70d0a23520  download/jdk-1_5_0_16-solaris-amd64.sh
-7fc8cfa2f14f146a0546d6b69dcc0aae  download/CSWjdk5.gspec
+7d8b35d7eb7664d36ff2387e73baa15b  download/jdk-1_5_0_17-solaris-sparc.sh
+7e0ccd19d636bc3fdf1781c07a99cb8d  download/jdk-1_5_0_17-solaris-sparcv9.sh
+f000bd7d44c2964dd811f3f526572106  download/jdk-1_5_0_17-solaris-i586.sh
+419310f32f7f2bfff715bc6f1d1258c4  download/jdk-1_5_0_17-solaris-amd64.sh
+43194293b08b51d47ebc1c78af346942  download/CSWjdk5.gspec
+68ebd77b4f7648109eb11c58f8959b5b  download/CSWjre5.gspec

Modified: csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec
===================================================================
--- csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec	2008-12-13 21:51:31 UTC (rev 2574)
+++ csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec	2008-12-13 22:06:46 UTC (rev 2575)
@@ -1,4 +1,4 @@
 %var            bitname jdk5
 %var            pkgname CSWjdk5
 %include        url file://%{PKGLIB}/csw_standard.gspec
-%copyright      url file://%{WORKSRC}/LICENSE
+%copyright      url file://%{WORKSRC_FIRSTMOD}/LICENSE

Added: csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec
===================================================================
--- csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec	                        (rev 0)
+++ csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec	2008-12-13 22:06:46 UTC (rev 2575)
@@ -0,0 +1,4 @@
+%var            bitname jre5
+%var            pkgname CSWjre5
+%include        url file://%{PKGLIB}/csw_standard.gspec
+%copyright      url file://%{WORKSRC_FIRSTMOD}/LICENSE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.