From owner-svn-ports-head@FreeBSD.ORG  Sat Sep  1 05:39:08 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 107E91065EF4;
	Sat,  1 Sep 2012 05:39:08 +0000 (UTC)
	(envelope-from glewis@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B6C458FC1A;
	Sat,  1 Sep 2012 05:39:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q815d7Gr056136;
	Sat, 1 Sep 2012 05:39:07 GMT (envelope-from glewis@svn.freebsd.org)
Received: (from glewis@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q815d7Qp056133;
	Sat, 1 Sep 2012 05:39:07 GMT (envelope-from glewis@svn.freebsd.org)
Message-Id: <201209010539.q815d7Qp056133@svn.freebsd.org>
From: Greg Lewis <glewis@FreeBSD.org>
Date: Sat, 1 Sep 2012 05:39:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303459 - head/java/linux-sun-jdk17
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Sep 2012 05:39:08 -0000

Author: glewis
Date: Sat Sep  1 05:39:07 2012
New Revision: 303459
URL: http://svn.freebsd.org/changeset/ports/303459

Log:
  . Update to 7u7.  This update is complicated by the demo package not having
    a u7 version released.

Modified:
  head/java/linux-sun-jdk17/Makefile
  head/java/linux-sun-jdk17/distinfo

Modified: head/java/linux-sun-jdk17/Makefile
==============================================================================
--- head/java/linux-sun-jdk17/Makefile	Sat Sep  1 03:01:35 2012	(r303458)
+++ head/java/linux-sun-jdk17/Makefile	Sat Sep  1 05:39:07 2012	(r303459)
@@ -34,7 +34,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 JDK_VERSION=		7
 JDK_INTERNAL_VERSION=	1.7.0
-JDK_UPDATE_VERSION=	6
+JDK_UPDATE_VERSION=	7
 DL_JDK_VERSION=		${JDK_INTERNAL_VERSION}_0${JDK_UPDATE_VERSION}
 DOWNLOAD_URL=		http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
@@ -49,10 +49,16 @@ IGNORE?=You must manually fetch the J2SE
 .endif
 
 .if defined(WITH_DEMO)
-.if !exists(${DISTDIR}/${DISTNAME}-demos${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
-IGNORE?=You must manually fetch the J2SE demos and samples for the Linux platform (${DISTNAME}-demos${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
+#DEMO_UPDATE_VERSION=	${JDK_UPDATE_VERSION}
+DEMO_UPDATE_VERSION=	6
+#DEMO_DISTNAME=	${DISTNAME}-demos
+DEMO_DISTNAME=	jdk-7u${DEMO_UPDATE_VERSION}-linux-i586-demos
+#DEMO_WRKSRC=	${WRKSRC}
+DEMO_WRKSRC=	${WRKDIR}/jdk${JDK_INTERNAL_VERSION}_0${DEMO_UPDATE_VERSION}
+.if !exists(${DISTDIR}/${DEMO_DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+IGNORE?=You must manually fetch the J2SE demos and samples for the Linux platform (${DEMO_DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-demos${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DEMO_DISTNAME}${EXTRACT_SUFX}
 PLIST_SUB+=	DEMO=""
 .else
 PLIST_SUB+=	DEMO="@comment "
@@ -61,6 +67,12 @@ PLIST_SUB+=	DEMO="@comment "
 pre-everything::
 	@${CAT} ${PKGMESSAGE}
 
+.if defined(WITH_DEMO) && ${DEMO_WRKSRC} != ${WRKSRC}
+post-extract:
+	@${MV} ${DEMO_WRKSRC}/demo ${WRKSRC}/
+	@${MV} ${DEMO_WRKSRC}/sample ${WRKSRC}/
+.endif
+
 post-patch:
 .for script in ${SCRIPT_FILES}
 	@${REINPLACE_CMD} -i.orig -e 's:^#!/bin/bash:#!/bin/sh:' ${WRKSRC}/${script}

Modified: head/java/linux-sun-jdk17/distinfo
==============================================================================
--- head/java/linux-sun-jdk17/distinfo	Sat Sep  1 03:01:35 2012	(r303458)
+++ head/java/linux-sun-jdk17/distinfo	Sat Sep  1 05:39:07 2012	(r303459)
@@ -1,4 +1,4 @@
-SHA256 (jdk-7u6-linux-i586.tar.gz) = 852cf2db507d1ff831dec01e757912023bb6219f32de83912ba52f04af6a8275
-SIZE (jdk-7u6-linux-i586.tar.gz) = 97360299
+SHA256 (jdk-7u7-linux-i586.tar.gz) = d54497580794091831cac86f93b066e0a4105b08acaf2c5d430dea87d2bf7ffe
+SIZE (jdk-7u7-linux-i586.tar.gz) = 97373835
 SHA256 (jdk-7u6-linux-i586-demos.tar.gz) = 15001be7615e92ffb21e805fdd17b56e2ac7cfa29eb7e429c8d2a81e9cff3dfc
 SIZE (jdk-7u6-linux-i586-demos.tar.gz) = 14741227