svn commit: r352108 - in head: java/javahelp java/jrosetta math/jlatexmath

Max Brazhnikov makc at FreeBSD.org
Fri Apr 25 11:51:06 UTC 2014 

Author: makc
Date: Fri Apr 25 11:51:05 2014
New Revision: 352108
URL: http://svnweb.freebsd.org/changeset/ports/352108
QAT: https://qat.redports.org/buildarchive/r352108/

Log:
  java/javahelp:
  - Remove dead entry from MASTER_SITES
  - Add stage support
  - Drop unneeded JAVA_VERSION
  - Convert NOPORTDOCS to option
  - Amend COMMENT, update WWW
  
  java/jrosetta:
  - Add stage support
  - Drop JAVA_VERSION
  
  math/jlatexmath:
  - Remove dead entry from MASTER_SITES
  - Add stage support
  - Drop JAVA_VERSION
  - Use options helpers

Modified:
  head/java/javahelp/Makefile
  head/java/javahelp/pkg-descr
  head/java/jrosetta/Makefile
  head/math/jlatexmath/Makefile

Modified: head/java/javahelp/Makefile
==============================================================================
--- head/java/javahelp/Makefile	Fri Apr 25 11:49:42 2014	(r352107)
+++ head/java/javahelp/Makefile	Fri Apr 25 11:51:05 2014	(r352108)
@@ -5,49 +5,46 @@ PORTNAME=	javahelp
 PORTVERSION=	2.0.05
 PORTREVISION=	1
 CATEGORIES=	java devel
-MASTER_SITES=	http://download.java.net/javadesktop/javahelp/ \
-		http://www.predatorlabs.net/dl/
+MASTER_SITES=	http://download.java.net/javadesktop/javahelp/
 DISTNAME=	${PORTNAME}2_0_05
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A system to add online help to Java applications
+COMMENT=	Online help support for Java applications
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/jh2.0
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-patch:
 	${REINPLACE_CMD} -e 's|$$JAVAHELP_HOME/javahelp/bin/|${JAVAJARDIR}/|' ${WRKSRC}/javahelp/bin/jhindexer
 	${REINPLACE_CMD} -e 's|$$JAVAHELP_HOME/javahelp/bin/|${JAVAJARDIR}/|' ${WRKSRC}/javahelp/bin/jhsearch
 	(cd ${WRKSRC} && ${RM} -rf `${FIND} . -type d -name .svn`)
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/LICENSE.html ${JAVAJARDIR}/LICENSE.${PORTNAME}.html
-	${INSTALL_SCRIPT} ${WRKSRC}/javahelp/bin/jhindexer ${PREFIX}/bin/jhindexer
-	${INSTALL_SCRIPT} ${WRKSRC}/javahelp/bin/jhsearch ${PREFIX}/bin/jhsearch
-	${INSTALL_DATA} ${WRKSRC}/javahelp/bin/jhindexer.jar ${JAVAJARDIR}/jhindexer.jar
-	${INSTALL_DATA} ${WRKSRC}/javahelp/bin/jhsearch.jar ${JAVAJARDIR}/jhsearch.jar
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jh.jar ${JAVAJARDIR}/jh.jar
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jhall.jar ${JAVAJARDIR}/jhall.jar
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jhbasic.jar ${JAVAJARDIR}/jhbasic.jar
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jsearch.jar ${JAVAJARDIR}/jsearch.jar
-	${MKDIR} ${JAVAJARDIR}/dtd
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/favorites_2_0.dtd ${JAVAJARDIR}/dtd/favorites_2_0.dtd
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/helpset_2_0.dtd ${JAVAJARDIR}/dtd/helpset_2_0.dtd
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/index_2_0.dtd ${JAVAJARDIR}/dtd/index_2_0.dtd
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/map_2_0.dtd ${JAVAJARDIR}/dtd/map_2_0.dtd
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/toc_2_0.dtd ${JAVAJARDIR}/dtd/toc_2_0.dtd
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.html ${DOCSDIR}
-	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
-	(cd ${WRKSRC}/demos/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
-.endif
+	${INSTALL_DATA} ${WRKSRC}/LICENSE.html ${STAGEDIR}${JAVAJARDIR}/LICENSE.${PORTNAME}.html
+	${INSTALL_SCRIPT} ${WRKSRC}/javahelp/bin/jhindexer ${STAGEDIR}${PREFIX}/bin/jhindexer
+	${INSTALL_SCRIPT} ${WRKSRC}/javahelp/bin/jhsearch ${STAGEDIR}${PREFIX}/bin/jhsearch
+	${INSTALL_DATA} ${WRKSRC}/javahelp/bin/jhindexer.jar ${STAGEDIR}${JAVAJARDIR}/jhindexer.jar
+	${INSTALL_DATA} ${WRKSRC}/javahelp/bin/jhsearch.jar ${STAGEDIR}${JAVAJARDIR}/jhsearch.jar
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jh.jar ${STAGEDIR}${JAVAJARDIR}/jh.jar
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jhall.jar ${STAGEDIR}${JAVAJARDIR}/jhall.jar
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jhbasic.jar ${STAGEDIR}${JAVAJARDIR}/jhbasic.jar
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jsearch.jar ${STAGEDIR}${JAVAJARDIR}/jsearch.jar
+	${MKDIR} ${STAGEDIR}${JAVAJARDIR}/dtd
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/favorites_2_0.dtd ${STAGEDIR}${JAVAJARDIR}/dtd/favorites_2_0.dtd
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/helpset_2_0.dtd ${STAGEDIR}${JAVAJARDIR}/dtd/helpset_2_0.dtd
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/index_2_0.dtd ${STAGEDIR}${JAVAJARDIR}/dtd/index_2_0.dtd
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/map_2_0.dtd ${STAGEDIR}${JAVAJARDIR}/dtd/map_2_0.dtd
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/toc_2_0.dtd ${STAGEDIR}${JAVAJARDIR}/dtd/toc_2_0.dtd
+	${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.html ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC}/demos/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>

Modified: head/java/javahelp/pkg-descr
==============================================================================
--- head/java/javahelp/pkg-descr	Fri Apr 25 11:49:42 2014	(r352107)
+++ head/java/javahelp/pkg-descr	Fri Apr 25 11:51:05 2014	(r352108)
@@ -4,4 +4,4 @@ is both a JCP specification (JSR 97) and
 that specification. The JavaHelp system open source project includes the
 source to the reference implementation.
 
-WWW: https://javahelp.dev.java.net/
+WWW: https://javahelp.java.net/

Modified: head/java/jrosetta/Makefile
==============================================================================
--- head/java/jrosetta/Makefile	Fri Apr 25 11:49:42 2014	(r352107)
+++ head/java/jrosetta/Makefile	Fri Apr 25 11:51:05 2014	(r352108)
@@ -14,7 +14,6 @@ COMMENT=	API for building a graphical co
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/jrosetta-api.jar \
@@ -23,7 +22,6 @@ PLIST_FILES=	%%JAVAJARDIR%%/jrosetta-api
 OPTIONS_DEFINE=	COMPILE
 COMPILE_DESC=	Download and compile source instead of binaries
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCOMPILE}
@@ -56,14 +54,14 @@ do-build:
 do-install:
 .if ${PORT_OPTIONS:MCOMPILE}
 	${INSTALL_DATA} ${OUTPUT}/jrosetta-api/${PORTVERSION}/jrosetta-api-${PORTVERSION}.jar \
-		${JAVAJARDIR}/jrosetta-api.jar
+		${STAGEDIR}${JAVAJARDIR}/jrosetta-api.jar
 	${INSTALL_DATA} ${OUTPUT}/jrosetta-engine/${PORTVERSION}/jrosetta-engine-${PORTVERSION}.jar \
-		${JAVAJARDIR}/jrosetta-engine.jar
+		${STAGEDIR}${JAVAJARDIR}/jrosetta-engine.jar
 .else
 	${INSTALL_DATA} ${DISTDIR}/jrosetta-api-${PORTVERSION}.jar \
-		${JAVAJARDIR}/jrosetta-api.jar
+		${STAGEDIR}${JAVAJARDIR}/jrosetta-api.jar
 	${INSTALL_DATA} ${DISTDIR}/jrosetta-engine-${PORTVERSION}.jar \
-		${JAVAJARDIR}/jrosetta-engine.jar
+		${STAGEDIR}${JAVAJARDIR}/jrosetta-engine.jar
 .endif
 
 .include <bsd.port.mk>

Modified: head/math/jlatexmath/Makefile
==============================================================================
--- head/math/jlatexmath/Makefile	Fri Apr 25 11:49:42 2014	(r352107)
+++ head/math/jlatexmath/Makefile	Fri Apr 25 11:51:05 2014	(r352108)
@@ -4,8 +4,7 @@
 PORTNAME=	jlatexmath
 PORTVERSION=	0.9.7
 CATEGORIES=	math java
-MASTER_SITES=	http://forge.scilab.org/upload/jlatexmath/files/ \
-		http://www.predatorlabs.net/dl/
+MASTER_SITES=	http://forge.scilab.org/upload/jlatexmath/files/
 DISTNAME=	${PORTNAME}-src-all-${PORTVERSION}
 
 MAINTAINER=	ports at FreeBSD.org
@@ -15,7 +14,6 @@ LICENSE=	GPLv2
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 USE_ANT=	yes
@@ -24,28 +22,18 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 
 OPTIONS_DEFINE=	FOP EXAMPLES
 OPTIONS_DEFAULT=	FOP
-FOP_DESC=	textproc/fop plugin (required for math/scilab)
+OPTIONS_SUB=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MFOP}
-BUILD_DEPENDS=	fop:${PORTSDIR}/textproc/fop \
-		${JAVALIBDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons \
-		${JAVASHAREDIR}/batik/batik.jar:${PORTSDIR}/graphics/batik \
-		${JAVALIBDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework \
-		${JAVALIBDIR}/commons-io.jar:${PORTSDIR}/devel/jakarta-commons-io \
-		${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
-		${JAVALIBDIR}/xml-apis-ext.jar:${PORTSDIR}/textproc/xml-commons
-
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-ALL_TARGET+=	fop
-
-PLIST_SUB+=	FOP=""
-.else
-PLIST_SUB+=	FOP="@comment "
-.endif
+FOP_DESC=		textproc/fop plugin (required for math/scilab)
+FOP_BUILD_DEPENDS=	fop:${PORTSDIR}/textproc/fop \
+			${JAVALIBDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons \
+			${JAVASHAREDIR}/batik/batik.jar:${PORTSDIR}/graphics/batik \
+			${JAVALIBDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework \
+			${JAVALIBDIR}/commons-io.jar:${PORTSDIR}/devel/jakarta-commons-io \
+			${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
+			${JAVALIBDIR}/xml-apis-ext.jar:${PORTSDIR}/textproc/xml-commons
+FOP_RUN_DEPENDS:=	${FOP_BUILD_DEPENDS}
+FOP_ALL_TARGET=		fop
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/share/java/fop.jar|${LOCALBASE}/share/java/fop/build/fop.jar|' ${WRKSRC}/fop.properties
@@ -53,10 +41,8 @@ post-patch:
 	${REINPLACE_CMD} -e 's|/usr/share/java/|${JAVALIBDIR}/|' ${WRKSRC}/fop.properties
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-${PORTVERSION}.jar ${JAVAJARDIR}/jlatexmath.jar
-	${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-fop-${PORTVERSION}.jar ${JAVAJARDIR}/jlatexmath-fop.jar
-.if ${PORT_OPTIONS:MEXAMPLES}
-	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
-.endif
+	${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jlatexmath.jar
+	${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-fop-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jlatexmath-fop.jar
+	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>

More information about the svn-ports-all mailing list