svn commit: r330750 - in head/java: jdk16-doc jdk7-doc

[Baptiste Daroussin]

Author: bapt
Date: Fri Oct 18 14:17:16 2013
New Revision: 330750
URL: http://svnweb.freebsd.org/changeset/ports/330750

Log:
  Fix pkgname collision

Modified:
  head/java/jdk16-doc/Makefile
  head/java/jdk7-doc/Makefile

Modified: head/java/jdk16-doc/Makefile
==============================================================================
--- head/java/jdk16-doc/Makefile	Fri Oct 18 14:14:25 2013	(r330749)
+++ head/java/jdk16-doc/Makefile	Fri Oct 18 14:17:16 2013	(r330750)
@@ -1,16 +1,16 @@
 # Created by: Greg Lewis <glewis at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	jdk-doc
+PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${JDK_UPDATE_VER}
 CATEGORIES=	java
 MASTER_SITES=	#
+PKGNAMESUFFIX=	${JDK_CONCAT_VER}-doc
 DISTNAME=	jdk-6u30-apidocs
 
 MAINTAINER=	java at FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_MAJOR_VER} Documentation
 
-LATEST_LINK=	jdk${JDK_CONCAT_VER}-doc
 DOCSDIR?=	${PREFIX}/share/doc/jdk${JDK_MAJOR_VER}
 NO_CDROM=	License does not allow distribution with fee.
 RESTRICTED=	This documentation is under license and export control.

Modified: head/java/jdk7-doc/Makefile
==============================================================================
--- head/java/jdk7-doc/Makefile	Fri Oct 18 14:14:25 2013	(r330749)
+++ head/java/jdk7-doc/Makefile	Fri Oct 18 14:17:16 2013	(r330750)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
-PORTNAME=	jdk-doc
+PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${JDK_UPDATE_VER}
 CATEGORIES=	java
 MASTER_SITES=	#
 DISTNAME=	jdk-${JDK_VERSION}u${JDK_UPDATE_VER}-apidocs
+PKGNAMESUFFIX=	${JDK_VERSION}-doc
 
 MAINTAINER=	java at FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_MAJOR_VER} Documentation
 
-LATEST_LINK=	jdk${JDK_VERSION}-doc
 DOCSDIR?=	${PREFIX}/share/doc/jdk${JDK_VERSION}
 NO_CDROM=	License does not allow distribution with fee.
 RESTRICTED=	This documentation is under license and export control.