- Trim Makefile header per new bylaws

- Drop indefinite article from COMMENT
- Define LICENSE (GPLv2), install couple of extra docs
- Convert NOPORTDOCS -> PORT_OPTIONS:MDOCS
- Remove pretty obvious pkg-message, sort some knobs
- Reformat port description

Approved by:	maintainer (maho)

3 files changed, 22 insertions, 27 deletions

diff --git a/archivers/fastjar/Makefile b/archivers/fastjar/Makefile
index 328b0ca3c603..85ddd403d9e8 100644
--- a/archivers/fastjar/Makefile
+++ b/archivers/fastjar/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fastjar
-# Date created:		18 March 2000
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
+# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
-#
 
 PORTNAME=	fastjar
 PORTVERSION=	0.93.20060808
@@ -12,26 +8,30 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	maho/fastjar
 
 MAINTAINER=	maho@FreeBSD.org
-COMMENT=	A version of JDK's `jar' command written entirely in C
+COMMENT=	Version of JDK's `jar' command written entirely in C
+
+LICENSE=	GPLv2
 
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_PERL5_BUILD=	yes
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
-GNU_CONFIGURE=	yes
-PORTDOCS=	CHANGES README
+PORTDOCS=	CHANGES ChangeLog NEWS README
 PLIST_FILES=	bin/fastjar bin/grepjar
-SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-USE_PERL5_BUILD=	yes
 
 INFO=		fastjar
 MAN1=		fastjar.1 grepjar.1
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
-	@${CAT} ${PKGMESSAGE}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/archivers/fastjar/files/pkg-message.in b/archivers/fastjar/files/pkg-message.in
deleted file mode 100644
index 6116e4ec26ac..000000000000
--- a/archivers/fastjar/files/pkg-message.in
+++ /dev/null
@@ -1,4 +0,0 @@
-************************************************************
-Please refer to the documents held in:
-	%%PREFIX%%/share/doc/fastjar/
-************************************************************
diff --git a/archivers/fastjar/pkg-descr b/archivers/fastjar/pkg-descr
index a5f6db3c2c3b..1052a9347ca6 100644
--- a/archivers/fastjar/pkg-descr
+++ b/archivers/fastjar/pkg-descr
@@ -1,17 +1,16 @@
-Fastjar is a version of Sun's `jar' utility, written entirely in C,
-and therefore quite a bit faster.  Fastjar can be up to 100x faster
-than the stock `jar' program running without a JIT.  Currently,
-the author is working on adding all the features present in the Sun
-utility.  At the moment, implemented features are:
+Fastjar is a version of Sun's `jar' utility, written entirely in C, and
+therefore quite a bit faster.  Fastjar can be up to 100x faster than the
+stock `jar' program running without a JIT.  Currently, the author is
+working on adding all the features present in the Sun utility.  At the
+moment, implemented features are:
 
   * Archive creation
   * Verbose/quiet output
   * stdout vs. file output
   * Manifest file support
   * Deflation or storage
-  * Changing to a dir and adding files (-C)
+  * Changing to directory and adding files (-C)
   * Archive content listing (-t)
   * Archive extraction (-x)
 
-WWW: http://savannah.nongnu.org/projects/fastjar
-     http://fastjar.sourceforge.net/     
+WWW: http://fastjar.sourceforge.net/