From scheidell@secnap.net  Tue Dec 20 18:35:23 2011
Return-Path: <scheidell@secnap.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9DDAE106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 20 Dec 2011 18:35:23 +0000 (UTC)
	(envelope-from scheidell@secnap.net)
Received: from mx1.secnap.com.ionspam.net (mx1.secnap.com.ionspam.net [204.89.241.253])
	by mx1.freebsd.org (Postfix) with ESMTP id 58DC88FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 20 Dec 2011 18:35:23 +0000 (UTC)
Received: from mx1.secnap.com.ionspam.net (mx1.secnap.com.ionspam.net [10.70.1.253])
	by mx1.secnap.com.ionspam.net (Postfix) with ESMTP id BF841621C48
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 20 Dec 2011 13:35:22 -0500 (EST)
Received: from scanner.secnap.net (unknown [10.70.1.4])
	by mx1.secnap.com.ionspam.net (Postfix) with ESMTP id 45FD6621C0D
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 20 Dec 2011 13:35:21 -0500 (EST)
Received: by scanner.secnap.net (Postfix, from userid 1001)
	id 4230B1D3C5; Tue, 20 Dec 2011 13:35:21 -0500 (EST)
Message-Id: <20111220183521.4230B1D3C5@scanner.secnap.net>
Date: Tue, 20 Dec 2011 13:35:21 -0500 (EST)
From: Michael Scheidell <scheidell@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [UPDATE] java/linux-sun-jdk16 to 6u30
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         163486
>Category:       ports
>Synopsis:       [UPDATE] java/linux-sun-jdk16 to 6u30
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-java
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 20 18:40:13 UTC 2011
>Closed-Date:    Sat Dec 24 21:03:07 UTC 2011
>Last-Modified:  Sat Dec 24 21:10:10 UTC 2011
>Originator:     Michael Scheidell
>Release:        8.x, i386
>Organization:
SECNAP Network Security Corp
>Environment:
>Description:
	While trying to compile a java base program, and redirected to sun's web site, I noticed that 6u29 is not 
available (it is, but you need to know the url).  6u30 is available via link
	- Update to 6u30
	- pet portlint (Makefile, pkg-plist)
>How-To-Repeat:
	install something that needs java jdk. tro to find it.
>Fix:

this patch


Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/java/linux-sun-jdk16/Makefile,v
retrieving revision 1.45
diff -u -u -r1.45 Makefile
--- Makefile	30 Nov 2011 19:32:27 -0000	1.45
+++ Makefile	20 Dec 2011 18:29:42 -0000
@@ -31,7 +31,7 @@
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
 JDK_VERSION=	1.6.0
-JDK_REVISION=	29
+JDK_REVISION=	30
 DL_JDK_VERSION=	${JDK_VERSION}_${JDK_REVISION}
 ONLY_FOR_ARCHS=	i386 amd64
 DOWNLOAD_URL?=	http://www.oracle.com/technetwork/java/javase/downloads/index.html
@@ -60,7 +60,7 @@
 
 post-patch:
 	${REINPLACE_CMD} -i.orig -e 's:^#!/bin/bash:#!/bin/sh:' ${WRKSRC}/bin/jcontrol
-	@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
 # XXX: This is missing a "${BRANDELF} -t Linux <executables>".
 
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/java/linux-sun-jdk16/distinfo,v
retrieving revision 1.30
diff -u -u -r1.30 distinfo
--- distinfo	30 Nov 2011 19:32:27 -0000	1.30
+++ distinfo	20 Dec 2011 18:29:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (jdk-6u29-linux-i586.bin) = 1117f4dfc45632b68ec0f4d5e61e5cafc1d85dc655ee3df5fa6f50128b8c3faf
-SIZE (jdk-6u29-linux-i586.bin) = 85146345
+SHA256 (jdk-6u30-linux-i586.bin) = b551be83a690bc9fec0107d9aa4f828cd47e150fa54cbedbfa8f80c99e2f18b5
+SIZE (jdk-6u30-linux-i586.bin) = 85282052
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/java/linux-sun-jdk16/pkg-plist,v
retrieving revision 1.26
diff -u -u -r1.26 pkg-plist
--- pkg-plist	30 Nov 2011 19:32:27 -0000	1.26
+++ pkg-plist	20 Dec 2011 18:29:43 -0000
@@ -4686,7 +4686,7 @@
 %%T%%/sample/webservices/EbayServer/src/ebay/server/Main.java
 %%T%%/src.zip
 @exec	mkdir -p %D/share/doc/java
-@unexec	rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry %D/share/doc/java
 @exec	%%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Sun-JDK%%PORTVERSION%%"
 @dirrm %%T%%/sample/webservices/EbayServer/src/ebay/server
 @dirrm %%T%%/sample/webservices/EbayServer/src/ebay
______________________________________________________________________
This email has been scanned and certified safe by SpammerTrap(r). 
For Information please see http://www.spammertrap.com/
______________________________________________________________________  
  
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-java 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Dec 20 18:40:29 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163486 
State-Changed-From-To: open->closed 
State-Changed-By: glewis 
State-Changed-When: Sat Dec 24 21:03:06 UTC 2011 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163486 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/163486: commit references a PR
Date: Sat, 24 Dec 2011 21:03:00 +0000 (UTC)

 glewis      2011-12-24 21:02:46 UTC
 
   FreeBSD ports repository
 
   Modified files:
     java/linux-sun-jdk16 Makefile distinfo pkg-plist 
   Log:
   . Update to JDK6 Update 30.
   
   PR:             163486
   Submitted by:   scheidell@
   
   Revision  Changes    Path
   1.46      +2 -2      ports/java/linux-sun-jdk16/Makefile
   1.31      +2 -2      ports/java/linux-sun-jdk16/distinfo
   1.27      +28 -12    ports/java/linux-sun-jdk16/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
