Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Feb 2014 18:18:12 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r344808 - head/java/xdoclet
Message-ID:  <201402171818.s1HIICUQ083077@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Mon Feb 17 18:18:12 2014
New Revision: 344808
URL: http://svnweb.freebsd.org/changeset/ports/344808
QAT: https://qat.redports.org/buildarchive/r344808/

Log:
  - Stage support
  - Remove infozip dependency

Modified:
  head/java/xdoclet/Makefile

Modified: head/java/xdoclet/Makefile
==============================================================================
--- head/java/xdoclet/Makefile	Mon Feb 17 18:09:55 2014	(r344807)
+++ head/java/xdoclet/Makefile	Mon Feb 17 18:18:12 2014	(r344808)
@@ -8,6 +8,7 @@ PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-bin-${PORTVERSION}
+EXTRACT_SUFX=	.zip
 DISTFILES=	${DISTNAME}.zip xjavadoc-${XJAVADOC_VER}.zip
 
 MAINTAINER=	lxv@omut.org
@@ -17,7 +18,6 @@ RUN_DEPENDS=	${LOCALBASE}/bin/ant:${PORT
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
@@ -25,26 +25,16 @@ XJAVADOC_VER=	1.1
 
 PLIST_SUB+=	XJAVADOC_VER="${XJAVADOC_VER}"
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	*
-.endif
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 do-install:
-	cd ${WRKSRC}/xdoclet-${PORTVERSION} && ${FIND} lib -name '*xdoclet*' -exec \
-	    ${INSTALL_DATA} \{} ${JAVAJARDIR} \;
-	cd ${WRKSRC}/xdoclet-${PORTVERSION}/samples && ${FIND} . -type d -exec \
-	    ${MKDIR} ${EXAMPLESDIR}/\{} \;
-	cd ${WRKSRC}/xdoclet-${PORTVERSION}/samples && ${FIND} . -type f -exec \
-	    ${INSTALL_DATA} \{} ${EXAMPLESDIR}/\{} \;
+	${INSTALL_DATA} ${WRKSRC}/xdoclet-${PORTVERSION}/lib/*xdoclet* ${STAGEDIR}${JAVAJARDIR}
+	cd ${WRKSRC}/xdoclet-${PORTVERSION}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} \
 	    ${WRKSRC}/xjavadoc-${XJAVADOC_VER}/xjavadoc-${XJAVADOC_VER}.jar \
-	    ${JAVAJARDIR}
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC}/xdoclet-${PORTVERSION}/docs && ${FIND} . -type d -exec \
-	    ${MKDIR} ${DOCSDIR}/\{} \;
-	cd ${WRKSRC}/xdoclet-${PORTVERSION}/docs && ${FIND} . -type f -exec \
-	    ${INSTALL_DATA} \{} ${DOCSDIR}/\{} \;
-.endif
+	    ${STAGEDIR}${JAVAJARDIR}
+	cd ${WRKSRC}/xdoclet-${PORTVERSION}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



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