3 files changed, 48 insertions, 70 deletions
diff --git a/java/castor/Makefile b/java/castor/Makefile
index 61f61aa9e08c..14e300ef3dfd 100644
--- a/java/castor/Makefile
+++ b/java/castor/Makefile
@@ -27,18 +27,13 @@ PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}-anttasks.jar \
 PORTDOCS=	*.html *.txt *.css *.dtd *.xsd *.pdf \
 		ora-mar-2k images rss
 
-NO_STAGE=	yes
 do-install:
 .for f in ${PLIST_FILES:T:R}
-	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${f}.jar..."
-	@${INSTALL_DATA} \
+	${INSTALL_DATA} \
 		${WRKSRC}/${f:S/tor/tor-${PORTVERSION}/}.jar \
-		${JAVAJARDIR}/${f}.jar
-	@${ECHO_MSG} " [ DONE ]"
+		${STAGEDIR}${JAVAJARDIR}/${f}.jar
 .endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/java/jgraph/Makefile b/java/jgraph/Makefile
index fa58ea7b77df..186a5b2bf9f9 100644
--- a/java/jgraph/Makefile
+++ b/java/jgraph/Makefile
@@ -12,62 +12,56 @@ EXTRACT_SUFX=	.jar
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Java Graph Diagram Component
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+OPTIONS_DEFINE=	COMPILE DOCS
+
+COMPILE_DESC=	Compile from source instead of using prebuilt binaries
+
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 
-.if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	${ANT_CMD}:${PORTSDIR}/devel/apache-ant
-ANT_CMD?=	${LOCALBASE}/bin/ant
-ANT=		${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD}
-.endif
-
-.if !defined(WITHOUT_COMPILE)
-JAVA_BUILD=	yes
-ANT_TARGETS=	jar
-.endif
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS)
-ANT_TARGETS+=	doc
-PORTDOCS=	*
+.if ${PORT_OPTIONS:MCOMPILE} || ${PORT_OPTIONS:MDOCS}
+BUILD_DEPENDS+=>${ANT_CMD}:${PORTSDIR}/devel/apache-ant
+ANT_CMD?=>      ${LOCALBASE}/bin/ant
+ANT=>   >       ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD}
+.  if ${PORT_OPTIONS:MCOMPILE}
+JAVA_BUILD=>    yes
+ANT_TARGETS=>   jar
+.  endif
+.  if ${PORT_OPTIONS:MDOCS}
+ANT_TARGETS+=>  doc
+PORTDOCS=>      *
+.  endif
 .endif
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
 
-NO_STAGE=	yes
-pre-fetch:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following build options:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "    WITHOUT_COMPILE=yes    Install the pre-compiled .jar file"
-	@${ECHO_MSG} ""
-
 do-build:
-.if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MCOMPILE} || ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKSRC} && ${ANT} ${ANT_TARGETS}
 	@${MV} -f ${WRKSRC}/build/lib/${PORTNAME}.jar ${WRKSRC}/lib
-	@${RM} -fr ${WRKSRC}/doc && ${MV} -f ${WRKSRC}/build/doc/api ${WRKSRC}/doc
+	@${RM} -fr ${WRKSRC}/doc && \
+		${MV} -f ${WRKSRC}/build/doc/api ${WRKSRC}/doc
 .endif
 
 do-install: do-install-jar do-install-javadoc
 
 do-install-jar:
-	@${ECHO_CMD} -n  ">> Installing .jar file..."
-	@${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}.jar ${JAVAJARDIR}/${PORTNAME}.jar
-	@${ECHO_CMD} " [DONE]"
+	${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}.jar \
+		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 
 do-install-javadoc:
-.if !defined(NOPORTDOCS)
-	@${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}/doc && ${FIND} . \
-	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-	@${ECHO_CMD} " [DONE]"
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc && ${FIND} . \
+	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/java/jgraphx/Makefile b/java/jgraphx/Makefile
index 19373ffc0972..368eb79b2503 100644
--- a/java/jgraphx/Makefile
+++ b/java/jgraphx/Makefile
@@ -1,4 +1,3 @@
-# Created by: Chris Rees
 # $FreeBSD$
 
 PORTNAME=	jgraphx
@@ -19,53 +18,43 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	jgraph
 GH_COMMIT=	b445bde
 
+OPTIONS_DEFINE=	COMPILE DOCS
+
+COMPILE_DESC=	Compile from source instead of using provided binary
+
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 
-.if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MCOMPILE} || ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	${ANT_CMD}:${PORTSDIR}/devel/apache-ant
 ANT_CMD?=	${LOCALBASE}/bin/ant
 ANT=		${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD}
-.endif
-
-.if !defined(WITHOUT_COMPILE)
+.  if ${PORT_OPTIONS:MCOMPILE}
 JAVA_BUILD=	yes
-.endif
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
+.  endif
 .endif
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
-
-NO_STAGE=	yes
-pre-fetch:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following build options:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "    WITHOUT_COMPILE=yes    Install the pre-compiled .jar file"
-	@${ECHO_MSG} ""
+PORTDOCS=	*
 
 do-build:
-.if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS)
-	@cd ${WRKSRC} && ${ANT} ${ANT_TARGETS}
+.if ${PORT_OPTIONS:MCOMPILE} || ${PORT_OPTIONS:MDOCS}
+	cd ${WRKSRC} && ${ANT} ${ANT_TARGETS}
 .endif
 
 do-install: do-install-jar do-install-javadoc
 
 do-install-jar:
-	@${ECHO_CMD} -n  ">> Installing .jar file..."
-	@${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}.jar \
-		${JAVAJARDIR}/${PORTNAME}.jar
-	@${ECHO_CMD} " [DONE]"
+	${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}.jar \
+		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 
 do-install-javadoc:
-.if !defined(NOPORTDOCS)
-	@${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR}
-	@${ECHO_CMD} " [DONE]"
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>