- 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)

3 files changed, 15 insertions, 42 deletions

diff --git a/java/java-tutorial/Makefile b/java/java-tutorial/Makefile
index 873de44..6db5836 100644
--- a/java/java-tutorial/Makefile
+++ b/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>
diff --git a/java/java-tutorial/distinfo b/java/java-tutorial/distinfo
index 98005e2..f76cbb5 100644
--- a/java/java-tutorial/distinfo
+++ b/java/java-tutorial/distinfo
@@ -1,12 +1,12 @@
-MD5 (tutorial.zip) = 05ae29cf78749f7b48e8a5293fc4aba1
-SHA256 (tutorial.zip) = 20fe0428100cd0855c7515a88bb7186854e7d41d6de1b0296b72bfbe2ddbe121
-SIZE (tutorial.zip) = 15213206
-MD5 (tut-examples.zip) = f173fdb7d0d19d92734d3059641e8c9c
-SHA256 (tut-examples.zip) = ef4a4adbdd823d553dad1b11cb2fb9bffd139222050cbf37472debc30547916b
-SIZE (tut-examples.zip) = 6207716
-MD5 (tut-swing.zip) = 9298738ab50cd11036675bbecd3cf8e0
-SHA256 (tut-swing.zip) = c2a231bc2ccb473bbde7ed0fd93671b2028f5529c6e961b62a4b1525fc9d9525
-SIZE (tut-swing.zip) = 7594674
+MD5 (tutorial.zip) = ac7ed7a7e935dce8d757b6a4c5080efc
+SHA256 (tutorial.zip) = d56499f81e4b67535a4640b54bf6bfcefb16eb24adb1425b6575d42ec294f7c2
+SIZE (tutorial.zip) = 18485877
+MD5 (tut-examples.zip) = 14a9151b1a24614721729510081ea90f
+SHA256 (tut-examples.zip) = 7ded82d98c2075ca9038451c26a1f9a22ecbe06ca45c867126471306ec2f6912
+SIZE (tut-examples.zip) = 4844111
+MD5 (tut-swing.zip) = 6dba5dfd29ca2293599780af5889e4db
+SHA256 (tut-swing.zip) = a20f7d8c1c8c62863496d171d55be0d809d55d499073ee94884a334190552a54
+SIZE (tut-swing.zip) = 3318178
 MD5 (tut-bookstore-21.zip) = cfd834d8a03dde7e34860f62f05e5f89
 SHA256 (tut-bookstore-21.zip) = bbcef280b21b8443bc87ff6abeaf4a4f4c42818499a77af76be2fc3e3dba58ad
 SIZE (tut-bookstore-21.zip) = 18252
diff --git a/java/java-tutorial/files/pkg-message.in b/java/java-tutorial/files/pkg-message.in
index 2a3cb3c..1c6048b 100644
--- a/java/java-tutorial/files/pkg-message.in
+++ b/java/java-tutorial/files/pkg-message.in
@@ -1,6 +1,3 @@
 *
-* Set your browser to %%DOCSDIR%%/index.html and enjoy!"
-*
-* Michael C. Shultz (port maintainer)"
-* ringworm01@gmail.com
+* Set your browser to %%DOCSDIR%%/index.html and enjoy!
 *