Bug 50092 - Update port: java/jdk13 (fix plist)
Summary: Update port: java/jdk13 (fix plist)
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Greg Lewis
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-03-18 07:30 UTC by Kimura Fuyuki
Modified: 2003-04-07 19:24 UTC (History)
0 users

See Also:

Attachments
file.diff (20.05 KB, patch)
2003-03-18 07:30 UTC, Kimura Fuyuki 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Kimura Fuyuki 2003-03-18 07:30:11 UTC 
Fix plist
Comment 1 Norikatsu Shigemura freebsd_committer freebsd_triage 2003-03-18 07:36:01 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->glewis

Over to maintainer.
Comment 2 Munehiro Matsuda 2003-03-19 09:35:57 UTC 
Hello Kimura-san and Greg,

I think this patch is basically Good. :-)
Anyhow, I have a comment and additions to this PR.

1) SwingSet2/resources/ issue

::--- pkg-plist	28 Feb 2003 17:54:40 -0000	1.13
::+++ pkg-plist	18 Mar 2003 07:23:33 -0000
::@@ -566,6 +566,193 @@
:: jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/SwingSet2.html
:: jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/SwingSet2.jar
:: jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/SwingSet2Plugin.html
::+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/ant.html
::+jdk%%JDK_VERSION%%/demo/jfc/SwingSet2/resources/bug.html

I don't think we need to add this "SwingSet2/resources/*" stuff into
the pkg-list, because it's included in the SwingSet2/SwingSet2.jar file.
Also, between lines 129-131 in j2sdk1.3.1/make/common/DemoSwing.gmk file, 
"resources" directory gets deleted explicitly for the SwingSet2 case afer
creating the SwingSet2.jar file.


2) jre/lib/ext directory handling
  The "${PREFIX}/jdk${JDK_VERSION}/jre/lib/ext" directorly is being created
  in the java/jdk13/Makefile on do-install case, but there is no mention of
  creating this in the pkg-plist file.

3) share/doc/java directory handling
  There is an entry of "%D/share/doc/java" in the pkg-plist file, but there
  is no reference to it in the java/jdk13/Makefile.

Here is updated patch, that merges all three cases:
---8<------8<------8<------8<--- Cut Here ---8<------8<------8<------8<---
--- pkg-plist.org	Sat Mar  1 07:47:00 2003
+++ pkg-plist	Wed Mar 19 17:40:18 2003
@@ -923,6 +923,8 @@
 jdk%%JDK_VERSION%%/man/man1/serialver.1
 jdk%%JDK_VERSION%%/man/man1/tnameserv.1
 jdk%%JDK_VERSION%%/src.jar
+@exec   mkdir -p %D/jdk%%JDK_VERSION%%/jre/lib/ext/
+@unexec rmdir %D/jdk%%JDK_VERSION%%/jre/lib/ext 2>/dev/null || true
 @exec   mkdir -p %D/share/doc/java
 @unexec rmdir %D/share/doc/java 2>/dev/null || true
 @exec   %D/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # FREEBSD-JDK%%JDK_VERSION%%"
@@ -934,33 +936,33 @@
 %%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns600
 %%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386/ns4
 %%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin/i386
-@dirrm jdk%%JDK_VERSION%%/jre/plugin
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/plugin
 @dirrm jdk%%JDK_VERSION%%/jre/lib/security
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de
-@dirrm jdk%%JDK_VERSION%%/jre/lib/locale
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW/LC_MESSAGES
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW.BIG5
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh_TW
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh/LC_MESSAGES
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK/LC_MESSAGES
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh.GBK
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/zh
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv/LC_MESSAGES
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/sv
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko/LC_MESSAGES
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8/LC_MESSAGES
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko.UTF-8
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ko
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja/LC_MESSAGES
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/ja
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it/LC_MESSAGES
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/it
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr/LC_MESSAGES
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/fr
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es/LC_MESSAGES
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/es
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de/LC_MESSAGES
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale/de
+%%PLUGIN:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/locale
 @dirrm jdk%%JDK_VERSION%%/jre/lib/images/cursors
 @dirrm jdk%%JDK_VERSION%%/jre/lib/images
 %%HOTSPOT:%%@dirrm jdk%%JDK_VERSION%%/jre/lib/i386/server
@@ -970,11 +972,10 @@
 @dirrm jdk%%JDK_VERSION%%/jre/lib/i386/classic
 @dirrm jdk%%JDK_VERSION%%/jre/lib/i386
 @dirrm jdk%%JDK_VERSION%%/jre/lib/fonts
-@dirrm jdk%%JDK_VERSION%%/jre/lib/ext
 @dirrm jdk%%JDK_VERSION%%/jre/lib/cmm
 @dirrm jdk%%JDK_VERSION%%/jre/lib/audio
 @dirrm jdk%%JDK_VERSION%%/jre/lib
-@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/native_threads
+%%NATIVE:%%@dirrm jdk%%JDK_VERSION%%/jre/bin/i386/native_threads
 @dirrm jdk%%JDK_VERSION%%/jre/bin/i386/green_threads
 @dirrm jdk%%JDK_VERSION%%/jre/bin/i386
 @dirrm jdk%%JDK_VERSION%%/jre/bin
@@ -1078,7 +1079,7 @@
 @dirrm jdk%%JDK_VERSION%%/demo/applets/Animator
 @dirrm jdk%%JDK_VERSION%%/demo/applets
 @dirrm jdk%%JDK_VERSION%%/demo
-@dirrm jdk%%JDK_VERSION%%/bin/i386/native_threads
+%%NATIVE:%%@dirrm jdk%%JDK_VERSION%%/bin/i386/native_threads
 @dirrm jdk%%JDK_VERSION%%/bin/i386/green_threads
 @dirrm jdk%%JDK_VERSION%%/bin/i386
 @dirrm jdk%%JDK_VERSION%%/bin
--- Makefile.org	Wed Mar  5 00:55:00 2003
+++ Makefile	Wed Mar 19 17:38:52 2003
@@ -276,6 +276,7 @@
 	  | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 .endif
 	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}/jre/lib/ext
+	${MKDIR} ${PREFIX}/share/doc/java
 
 post-install:
 	@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
---8<------8<------8<------8<--- Cut Here ---8<------8<------8<------8<---

Hope this helps,
  Haro
Comment 3 Kimura Fuyuki 2003-03-20 02:02:28 UTC 
At Wed, 19 Mar 2003 18:35:57 +0900 (JST),
Munehiro Matsuda <haro@kgt.co.jp> wrote:
> 
> I don't think we need to add this "SwingSet2/resources/*" stuff into
> the pkg-list, because it's included in the SwingSet2/SwingSet2.jar file.
> Also, between lines 129-131 in j2sdk1.3.1/make/common/DemoSwing.gmk file, 
> "resources" directory gets deleted explicitly for the SwingSet2 case afer
> creating the SwingSet2.jar file.

You're right. I reinstalled java/jdk13 and confirmed
SwingSet2/resources wasn't installed. I don't know why but suspects
some timing issue...
Comment 4 Greg Lewis 2003-03-20 03:31:57 UTC 
On Thu, Mar 20, 2003 at 11:02:28AM +0900, Kimura Fuyuki wrote:
> At Wed, 19 Mar 2003 18:35:57 +0900 (JST),
> Munehiro Matsuda <haro@kgt.co.jp> wrote:
> > 
> > I don't think we need to add this "SwingSet2/resources/*" stuff into
> > the pkg-list, because it's included in the SwingSet2/SwingSet2.jar file.
> > Also, between lines 129-131 in j2sdk1.3.1/make/common/DemoSwing.gmk file, 
> > "resources" directory gets deleted explicitly for the SwingSet2 case afer
> > creating the SwingSet2.jar file.
> 
> You're right. I reinstalled java/jdk13 and confirmed
> SwingSet2/resources wasn't installed. I don't know why but suspects
> some timing issue...

There was a recent commit to java/jdk14 to address just this.  I intend
to commit the same fix to java/jdk13 once the port freeze is over (which
addresses part of the PR).

-- 
Greg Lewis                          Email   : glewis@eyesbeyond.com
Eyes Beyond                         Web     : http://www.eyesbeyond.com
Information Technology              FreeBSD : glewis@FreeBSD.org
Comment 5 Greg Lewis freebsd_committer freebsd_triage 2003-04-07 19:23:56 UTC 
State Changed
From-To: open->closed

Committed, thanks!