- s/NOPORTDOCS/NO_INSTALL_MANPAGES/ where needed

- use MAN1 for man page anr remove it from plist
- fix plist for -DNOPORTDOCS
- bump PORTREVISION

Prompted by:	QA Tindy run

2 files changed, 6 insertions, 3 deletions

diff --git a/java/jboss2/Makefile b/java/jboss2/Makefile
index c1f9a377a91a..4ccf88f02858 100644
--- a/java/jboss2/Makefile
+++ b/java/jboss2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	${APP_TITLE:L}
 PORTVERSION=	2.4.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,6 +24,10 @@ NO_BUILD=	YES
 
 LATEST_LINK=	jboss2
 
+.if !defined(NO_INSTALL_MANPAGES)
+MAN1=	${CONTROL_SCRIPT_NAME}.1
+.endif
+
 WRKSRC=		${WRKDIR}/${DISTNAME}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/log
@@ -141,7 +145,7 @@ do-install:
 	@${CHMOD} 0544 ${STARTUP_SCRIPT}
 	@${ECHO_CMD} " [ DONE ]"
 
-.if !defined(NOPORTDOCS)
+.if !defined(NO_INSTALL_MANPAGES)
 	@${ECHO_CMD} -n ">> Installing man pages..."
 	@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
 	@${ECHO_CMD} " [ DONE ]"
diff --git a/java/jboss2/pkg-plist b/java/jboss2/pkg-plist
index d534eb05486e..e7fc00542ad9 100644
--- a/java/jboss2/pkg-plist
+++ b/java/jboss2/pkg-plist
@@ -1126,7 +1126,6 @@ etc/rc.d/020.jboss2.sh
 %%T%%/bin/run.sh
 %%T%%/bin/verifier.jar
 %%T%%/bin/run.jar
-man/man1/jboss2ctl.1
 @dirrm %%T%%/application-deployments
 @dirrm %%T%%/docs/images
 @dirrm %%T%%/docs/api/org/jboss/web