Index: head/java/jdk16-doc/Makefile
===================================================================
--- head/java/jdk16-doc/Makefile	(revision 433809)
+++ head/java/jdk16-doc/Makefile	(revision 433810)
@@ -1,41 +1,44 @@
 # Created by: Greg Lewis <glewis@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${JDK_UPDATE_VER}
 PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMESUFFIX=	${JDK_CONCAT_VER}-doc
 DISTNAME=	jdk-6u30-apidocs
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_MAJOR_VER} Documentation
 
+DEPRECATED=	Should have been removed with linux-sun-jdk16 (2014-05-11)
+EXPIRATION_DATE=	2017-02-28 
+
 DOCSDIR?=	${PREFIX}/share/doc/jdk${JDK_MAJOR_VER}
 RESTRICTED=	This documentation is under license and export control.
 
 WRKSRC=		${WRKDIR}/docs
 JDK_VERSION=	1.6.0
 JDK_MAJOR_VER=	${JDK_VERSION:R}
 JDK_CONCAT_VER=	${JDK_MAJOR_VER:S/.//g}
 JDK_UPDATE_VER=	30
 DOWNLOAD_URL=	http://www.oracle.com/technetwork/java/javase/downloads/jdk-6u25-doc-download-355137.html
 
 NO_BUILD=	yes
 USES=		zip
 PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=	you must manually fetch ${DISTNAME}${EXTRACT_SUFX} from ${DOWNLOAD_URL} by selecting the "Download" link for the "Java SE 6 Documentation", place it in ${DISTDIR} and then run make again
 .endif
 
 do-install:
 	@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/)
 	@${ECHO} " [ DONE ]"
 
 .include <bsd.port.post.mk>
Index: head/java/jdk7-doc/Makefile
===================================================================
--- head/java/jdk7-doc/Makefile	(revision 433809)
+++ head/java/jdk7-doc/Makefile	(revision 433810)
@@ -1,37 +1,40 @@
 # $FreeBSD$
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${JDK_UPDATE_VER}
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMESUFFIX=	${JDK_VERSION}-doc
 DISTNAME=	jdk-${JDK_VERSION}u${JDK_UPDATE_VER}-docs-all
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_MAJOR_VER} Documentation
 
+DEPRECATED=	Should have been removed with linux-sun-jdk17 (2016-04-24)
+EXPIRATION_DATE=	2017-02-28 
+
 DOCSDIR?=	${PREFIX}/share/doc/jdk${JDK_VERSION}
 RESTRICTED=	This documentation is under license and export control.
 
 WRKSRC=		${WRKDIR}/docs
 JDK_VERSION=	7
 JDK_UPDATE_VER=	76
 DOWNLOAD_URL=	http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
 NO_BUILD=	yes
 USES=		zip
 PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=You must manually fetch ${DISTNAME}${EXTRACT_SUFX} from ${DOWNLOAD_URL} by selecting the "Download" link for the "Java SE 7 Documentation", place it in ${DISTDIR} and then run make again
 .endif
 
 do-install:
 	@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/)
 	@${ECHO} " [ DONE ]"
 
 .include <bsd.port.post.mk>