- update distinfo and un-(break|expire)

- drop WITH_EXTRAS, fetch and install all docs and examples
- bump PORTREVISION
- use my @FreeBSD.org address

Submitted by:	Stefan Pauly <stefan@fh-mainz.de> (the important part)
Approved by:	portmgr (marcus)

java/java-tutorial/Makefile

@@ -5,24 +5,17 @@
 # $FreeBSD$
 #
 
-PORTNAME=	jdk-tutorial
-PORTVERSION=	2006.03.06
+PORTNAME=	tutorial
+PORTVERSION=	2006.08.04
 CATEGORIES=	java devel
 MASTER_SITES=	http://java.sun.com/docs/books/tutorialNB/download/
-.if defined(WITH_EXTRAS)
+PKGNAMEPREFIX=	jdk-
 DISTNAME=	tutorial.zip tut-examples.zip tut-swing.zip tut-bookstore-21.zip \
 		tut-bookstore-tomcat.zip tut-bingo
-.else
-DISTNAME=	tutorial
-.endif
 
-MAINTAINER=	itetcu@people.tecnik93.com
+MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Official Java 2 SDK tutorial
 
-BROKEN=		Size mismatch
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
 NO_WRKSUBDIR=	yes
 RESTRICTED=	This software is under license and export control.
 NO_BUILD=	yes
@@ -31,23 +24,6 @@ PORTDOCS=	*
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-pre-extract:
-.if !defined(WITH_EXTRAS)
-	@${ECHO_MSG}	"*"
-	@${ECHO_MSG}	"* make install WITH_EXTRAS=yes will add to the installation:"
-	@${ECHO_MSG}	"*"
-	@${ECHO_MSG}	"* 1) source files for all the tutorial examples"
-	@${ECHO_MSG}	"*"
-	@${ECHO_MSG}	"* 2) Some examples such as the BINGO and Servlets Bookstore examples"
-	@${ECHO_MSG}	"* include many source files in a rather complex directory structure,"
-	@${ECHO_MSG}	"* so these examples are separate files."
-	@${ECHO_MSG}	"*"
-	@${ECHO_MSG}	"* 3) The JFC/Swing trail"
-	@${ECHO_MSG}	"*"
-.endif
-
-.include <bsd.port.pre.mk>
-
 do-install:
 	@${ECHO_MSG} -n ">> Creating directory ${DOCSDIR}..."
 	@${MKDIR} ${DOCSDIR}
@@ -61,4 +37,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>