Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Jun 2015 01:21:44 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r388817 - head/net/seda
Message-ID:  <201506080121.t581LiRD036809@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Jun  8 01:21:43 2015
New Revision: 388817
URL: https://svnweb.freebsd.org/changeset/ports/388817

Log:
  - Simplify docs installation, do not try to install nonexisting javadoc
  - Add NO_ARCH

Modified:
  head/net/seda/Makefile

Modified: head/net/seda/Makefile
==============================================================================
--- head/net/seda/Makefile	Mon Jun  8 01:21:31 2015	(r388816)
+++ head/net/seda/Makefile	Mon Jun  8 01:21:43 2015	(r388817)
@@ -15,6 +15,7 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	dist
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
@@ -23,18 +24,9 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAM
 
 VERSION_DATE=	20020712
 
-DOC_FILES=	\
-		gnutella-graph.gif \
-		index.html \
-		nbio.html \
-		profile.gif \
-		sandstorm.html \
-		sandstorm.jpg
-PORTDOCS=	${DOC_FILES} \
-		javadoc
+PORTDOCS=	*
 
-PLIST_FILES=	\
-		%%JAVAJARDIR%%/${PORTNAME:tl}.jar
+PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME:tl}.jar
 
 .include <bsd.port.options.mk>
 
@@ -52,16 +44,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/dist/lib/${PORTNAME:tl}.jar \
 		${STAGEDIR}${JAVAJARDIR}/
 # docs
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-. for doc in ${DOC_FILES}
+.for doc in gnutella-graph.gif index.html nbio.html profile.gif sandstorm.html sandstorm.jpg
 	${INSTALL_DATA} ${WRKSRC}/docs/${doc} ${STAGEDIR}${DOCSDIR}
-. endfor
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/javadoc
-# line taken from textproc/xerces-j maintained by hq@FreeBSD.org
-	cd ${JAVADOC_WRKSRC} && \
-		${FIND} . -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/javadoc/{}" \; && \
-		${FIND} . -not -type d -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DOCSDIR}/javadoc/{}" \;
-.endif
+.endfor
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506080121.t581LiRD036809>