Cleaned things up here and there.

Switched to USE_JAVA. This fixes PR 35079.
Improved download URL. Changed do-install target a
little. Installing a link to activation.jar in
${PREFIX}/share/java/classes. The real activation.jar
is now in ${PREFIX}/share/java/${PKGNAME}.
Bumped PORTREVISION.

The maintainer has not responded in months, so I took the
freedom to commit this without his approval.

PR:	35079

2 files changed, 104 insertions, 104 deletions

diff --git a/java/jaf/Makefile b/java/jaf/Makefile
index f42751517f6d..4ace2351353a 100644
--- a/java/jaf/Makefile
+++ b/java/jaf/Makefile
@@ -7,33 +7,32 @@
 
 PORTNAME=	jaf
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	java
-DISTNAME=	jaf1_0_1
-EXTRACT_SUFX=	.zip
+MASTER_SITES=	#
+DISTNAME=	${PORTNAME}1_0_1
 
 MAINTAINER=	noway@nohow.demon.co.uk
 
-RUN_DEPENDS=	${PREFIX}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk
-
 USE_ZIP=	YES
+USE_JAVA=	1.1+
 
-WRKSRC=		${WRKDIR}/jaf-1.0.1
-JDK_VERSION=	1.1.8
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 NO_CDROM=	"See the license"
+TARGET_DIR=	${PREFIX}/share/java/${PKGNAME}
+PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///}
+DOWNLOAD_URL=	"http://java.sun.com/cgi-bin/download3.cgi?config-file=jaf1_0_1.config&platform=zip&button=continue"
 
 .include <bsd.port.pre.mk>
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=	"You must manually fetch the distribution from http://java.sun.com/beans/glasgow/jaf.html and place it in ${DISTDIR} then run make again"
+IGNORE=	"You must manually fetch the distribution from ${DOWNLOAD_URL} and place it in ${DISTDIR} then run make again"
 .endif
 
 do-install:
-	@cd ${WRKSRC}; \
-		${MKDIR} ${PREFIX}/share/java/classes/; \
-		${CP} ${WRKSRC}/activation.jar ${PREFIX}/share/java/classes/; \
-		${MKDIR} ${PREFIX}/share/java/${PKGNAME}/; \
-		${CP} LICENSE.txt README.txt RELNOTES.txt ${PREFIX}/share/java/${PKGNAME}/; \
-		${CP} -R demo ${PREFIX}/share/java/${PKGNAME}/; \
-		${CP} -R docs ${PREFIX}/share/java/${PKGNAME}/
+	${MKDIR} ${PREFIX}/share/java/classes
+	${MKDIR} ${TARGET_DIR}
+	${CP} -R ${WRKSRC}/* ${TARGET_DIR}
+	${LN} -sf ${TARGET_DIR}/activation.jar ${PREFIX}/share/java/classes/activation.jar
 
 .include <bsd.port.post.mk>
diff --git a/java/jaf/pkg-plist b/java/jaf/pkg-plist
index e054b8f2f43e..c841b62b35b5 100644
--- a/java/jaf/pkg-plist
+++ b/java/jaf/pkg-plist
@@ -1,91 +1,92 @@
 share/java/classes/activation.jar
-share/java/jaf-1.0.1/RELNOTES.txt
-share/java/jaf-1.0.1/README.txt
-share/java/jaf-1.0.1/LICENSE.txt
-share/java/jaf-1.0.1/demo/TextInternalizer.java
-share/java/jaf-1.0.1/demo/DCHTest.java
-share/java/jaf-1.0.1/demo/DCHTest2.java
-share/java/jaf-1.0.1/demo/DHURL.java
-share/java/jaf-1.0.1/demo/FileView.java
-share/java/jaf-1.0.1/demo/JAFApp.java
-share/java/jaf-1.0.1/demo/MCTest.java
-share/java/jaf-1.0.1/demo/ODCHTest.java
-share/java/jaf-1.0.1/demo/PlainDCH.java
-share/java/jaf-1.0.1/demo/PrefTest.java
-share/java/jaf-1.0.1/demo/SimpleDCF.java
-share/java/jaf-1.0.1/demo/CompViewer.java
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-16.html
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-2.html
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-3.html
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-4.html
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-5.html
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-6.html
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-7.html
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-8.html
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-9.html
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-10.html
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-11.html
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-12.html
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-13.html
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-14.html
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-15.html
-share/java/jaf-1.0.1/docs/javadocs/index-files/index-1.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/CommandObject.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/DataContentHandler.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/ActivationDataFlavor.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/FileDataSource.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/UnsupportedDataTypeException.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/CommandMap.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/MailcapCommandMap.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/MimeTypeParameterList.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/DataSource.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/FileTypeMap.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/DataHandler.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/MimeType.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/MimetypesFileTypeMap.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/DataContentHandlerFactory.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/URLDataSource.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/CommandInfo.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use/MimeTypeParseException.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/package-use.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/package-summary.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/package-tree.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/package-frame.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/CommandObject.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/DataContentHandler.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/DataContentHandlerFactory.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/DataSource.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/ActivationDataFlavor.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/CommandInfo.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/CommandMap.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/DataHandler.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/FileDataSource.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/FileTypeMap.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/MailcapCommandMap.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/MimeType.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/MimeTypeParameterList.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/MimetypesFileTypeMap.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/URLDataSource.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/MimeTypeParseException.html
-share/java/jaf-1.0.1/docs/javadocs/javax/activation/UnsupportedDataTypeException.html
-share/java/jaf-1.0.1/docs/javadocs/deprecated-list.html
-share/java/jaf-1.0.1/docs/javadocs/allclasses-frame.html
-share/java/jaf-1.0.1/docs/javadocs/index.html
-share/java/jaf-1.0.1/docs/javadocs/packages.html
-share/java/jaf-1.0.1/docs/javadocs/serialized-form.html
-share/java/jaf-1.0.1/docs/javadocs/package-list
-share/java/jaf-1.0.1/docs/javadocs/help-doc.html
-share/java/jaf-1.0.1/docs/javadocs/stylesheet.css
-share/java/jaf-1.0.1/docs/javadocs/overview-tree.html
-share/java/jaf-1.0.1/docs/JAF-1.0.pdf
-share/java/jaf-1.0.1/docs/JAF-1.0.ps
-@dirrm share/java/jaf-1.0.1/demo
-@dirrm share/java/jaf-1.0.1/docs/javadocs/index-files
-@dirrm share/java/jaf-1.0.1/docs/javadocs/javax/activation/class-use
-@dirrm share/java/jaf-1.0.1/docs/javadocs/javax/activation
-@dirrm share/java/jaf-1.0.1/docs/javadocs/javax
-@dirrm share/java/jaf-1.0.1/docs/javadocs
-@dirrm share/java/jaf-1.0.1/docs
-@dirrm share/java/jaf-1.0.1/
-@unexec rmdir %D/share/java/classes || true
-@unexec rmdir %D/share/java || true
+%%T%%/activation.jar
+%%T%%/RELNOTES.txt
+%%T%%/README.txt
+%%T%%/LICENSE.txt
+%%T%%/demo/TextInternalizer.java
+%%T%%/demo/DCHTest.java
+%%T%%/demo/DCHTest2.java
+%%T%%/demo/DHURL.java
+%%T%%/demo/FileView.java
+%%T%%/demo/JAFApp.java
+%%T%%/demo/MCTest.java
+%%T%%/demo/ODCHTest.java
+%%T%%/demo/PlainDCH.java
+%%T%%/demo/PrefTest.java
+%%T%%/demo/SimpleDCF.java
+%%T%%/demo/CompViewer.java
+%%T%%/docs/javadocs/index-files/index-16.html
+%%T%%/docs/javadocs/index-files/index-2.html
+%%T%%/docs/javadocs/index-files/index-3.html
+%%T%%/docs/javadocs/index-files/index-4.html
+%%T%%/docs/javadocs/index-files/index-5.html
+%%T%%/docs/javadocs/index-files/index-6.html
+%%T%%/docs/javadocs/index-files/index-7.html
+%%T%%/docs/javadocs/index-files/index-8.html
+%%T%%/docs/javadocs/index-files/index-9.html
+%%T%%/docs/javadocs/index-files/index-10.html
+%%T%%/docs/javadocs/index-files/index-11.html
+%%T%%/docs/javadocs/index-files/index-12.html
+%%T%%/docs/javadocs/index-files/index-13.html
+%%T%%/docs/javadocs/index-files/index-14.html
+%%T%%/docs/javadocs/index-files/index-15.html
+%%T%%/docs/javadocs/index-files/index-1.html
+%%T%%/docs/javadocs/javax/activation/class-use/CommandObject.html
+%%T%%/docs/javadocs/javax/activation/class-use/DataContentHandler.html
+%%T%%/docs/javadocs/javax/activation/class-use/ActivationDataFlavor.html
+%%T%%/docs/javadocs/javax/activation/class-use/FileDataSource.html
+%%T%%/docs/javadocs/javax/activation/class-use/UnsupportedDataTypeException.html
+%%T%%/docs/javadocs/javax/activation/class-use/CommandMap.html
+%%T%%/docs/javadocs/javax/activation/class-use/MailcapCommandMap.html
+%%T%%/docs/javadocs/javax/activation/class-use/MimeTypeParameterList.html
+%%T%%/docs/javadocs/javax/activation/class-use/DataSource.html
+%%T%%/docs/javadocs/javax/activation/class-use/FileTypeMap.html
+%%T%%/docs/javadocs/javax/activation/class-use/DataHandler.html
+%%T%%/docs/javadocs/javax/activation/class-use/MimeType.html
+%%T%%/docs/javadocs/javax/activation/class-use/MimetypesFileTypeMap.html
+%%T%%/docs/javadocs/javax/activation/class-use/DataContentHandlerFactory.html
+%%T%%/docs/javadocs/javax/activation/class-use/URLDataSource.html
+%%T%%/docs/javadocs/javax/activation/class-use/CommandInfo.html
+%%T%%/docs/javadocs/javax/activation/class-use/MimeTypeParseException.html
+%%T%%/docs/javadocs/javax/activation/package-use.html
+%%T%%/docs/javadocs/javax/activation/package-summary.html
+%%T%%/docs/javadocs/javax/activation/package-tree.html
+%%T%%/docs/javadocs/javax/activation/package-frame.html
+%%T%%/docs/javadocs/javax/activation/CommandObject.html
+%%T%%/docs/javadocs/javax/activation/DataContentHandler.html
+%%T%%/docs/javadocs/javax/activation/DataContentHandlerFactory.html
+%%T%%/docs/javadocs/javax/activation/DataSource.html
+%%T%%/docs/javadocs/javax/activation/ActivationDataFlavor.html
+%%T%%/docs/javadocs/javax/activation/CommandInfo.html
+%%T%%/docs/javadocs/javax/activation/CommandMap.html
+%%T%%/docs/javadocs/javax/activation/DataHandler.html
+%%T%%/docs/javadocs/javax/activation/FileDataSource.html
+%%T%%/docs/javadocs/javax/activation/FileTypeMap.html
+%%T%%/docs/javadocs/javax/activation/MailcapCommandMap.html
+%%T%%/docs/javadocs/javax/activation/MimeType.html
+%%T%%/docs/javadocs/javax/activation/MimeTypeParameterList.html
+%%T%%/docs/javadocs/javax/activation/MimetypesFileTypeMap.html
+%%T%%/docs/javadocs/javax/activation/URLDataSource.html
+%%T%%/docs/javadocs/javax/activation/MimeTypeParseException.html
+%%T%%/docs/javadocs/javax/activation/UnsupportedDataTypeException.html
+%%T%%/docs/javadocs/deprecated-list.html
+%%T%%/docs/javadocs/allclasses-frame.html
+%%T%%/docs/javadocs/index.html
+%%T%%/docs/javadocs/packages.html
+%%T%%/docs/javadocs/serialized-form.html
+%%T%%/docs/javadocs/package-list
+%%T%%/docs/javadocs/help-doc.html
+%%T%%/docs/javadocs/stylesheet.css
+%%T%%/docs/javadocs/overview-tree.html
+%%T%%/docs/JAF-1.0.pdf
+%%T%%/docs/JAF-1.0.ps
+@dirrm %%T%%/demo
+@dirrm %%T%%/docs/javadocs/index-files
+@dirrm %%T%%/docs/javadocs/javax/activation/class-use
+@dirrm %%T%%/docs/javadocs/javax/activation
+@dirrm %%T%%/docs/javadocs/javax
+@dirrm %%T%%/docs/javadocs
+@dirrm %%T%%/docs
+@dirrm %%T%%/
+@unexec rmdir %D/share/java/classes 2>/dev/null || true
+@unexec rmdir %D/share/java 2>/dev/null || true