Convert my ports to new options helpers

java/jakarta-commons-collections/Makefile

@@ -24,17 +24,15 @@ OPTIONS_DEFINE=	DOCS
 
 DOCS_ALL_TARGET=	javadoc
 
-.include <bsd.port.options.mk>
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}-${PORTVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/build/docs && \
 		${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

java/jrosetta/Makefile

@@ -20,7 +20,7 @@ PLIST_FILES=	%%JAVAJARDIR%%/jrosetta-api.jar \
 		%%JAVAJARDIR%%/jrosetta-engine.jar
 
 OPTIONS_DEFINE=	COMPILE
-COMPILE_DESC=	Download and compile source instead of binaries
+COMPILE_DESC=	Download and compile source instead of using provided binaries
 
 .include <bsd.port.options.mk>
 
@@ -41,27 +41,24 @@ EXTRACT_ONLY=
 NO_BUILD=	yes
 .endif
 
-.if ${PORT_OPTIONS:MCOMPILE}
-post-patch:
+post-patch-COMPILE-on:
 	${MKDIR} ${WRKDIR}/m2
 	${CP} ${FILESDIR}/settings.xml ${WRKDIR}
 	${REINPLACE_CMD} -e "s|WORK|${WRKDIR}|" ${WRKDIR}/settings.xml
 
-do-build:
+do-build-COMPILE-on:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/mvn -gs "${WRKDIR}/settings.xml" clean install)
-.endif
 
-do-install:
-.if ${PORT_OPTIONS:MCOMPILE}
+do-install-COMPILE-on:
 	${INSTALL_DATA} ${OUTPUT}/jrosetta-api/${PORTVERSION}/jrosetta-api-${PORTVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}/jrosetta-api.jar
 	${INSTALL_DATA} ${OUTPUT}/jrosetta-engine/${PORTVERSION}/jrosetta-engine-${PORTVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}/jrosetta-engine.jar
-.else
+
+do-install-COMPILE-off:
 	${INSTALL_DATA} ${DISTDIR}/jrosetta-api-${PORTVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}/jrosetta-api.jar
 	${INSTALL_DATA} ${DISTDIR}/jrosetta-engine-${PORTVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}/jrosetta-engine.jar
-.endif
 
 .include <bsd.port.mk>