Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Apr 2014 10:29:44 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r349834 - head/devel/maven3
Message-ID:  <201404011029.s31ATim5016315@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Tue Apr  1 10:29:43 2014
New Revision: 349834
URL: http://svnweb.freebsd.org/changeset/ports/349834
QAT: https://qat.redports.org/buildarchive/r349834/

Log:
  - Add staging support
  - Use PORTDATA for plist generation
  - Fix WWW line in pkg-descr

Modified:
  head/devel/maven3/Makefile
  head/devel/maven3/pkg-descr

Modified: head/devel/maven3/Makefile
==============================================================================
--- head/devel/maven3/Makefile	Tue Apr  1 10:28:08 2014	(r349833)
+++ head/devel/maven3/Makefile	Tue Apr  1 10:29:43 2014	(r349834)
@@ -25,24 +25,21 @@ SUB_LIST=	CLASSWORLDS_JAR=plexus-classwo
 INSTANCE_FILE=	030004-${PORTNAME}-${PORTVERSION}
 INSTANCES_DIR=	etc/maven-wrapper/instances.d/
 PLIST_FILES=	${INSTANCES_DIR}/${INSTANCE_FILE}
+PORTDATA=	*
 
-NO_STAGE=	yes
 post-extract:
 	${RM} -f ${WRKSRC}/bin/*.bat
 	${ECHO_CMD} "${DATADIR}" > ${WRKSRC}/${INSTANCE_FILE}
 
 do-install:
-	cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} ${DATADIR}/{} \;
-	cd ${WRKSRC} && ${FIND} . -type f -not -path "\./bin/" -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
-	${INSTALL_DATA} ${WRKSRC}/bin/m2.conf ${DATADIR}/bin/
-	${INSTALL_SCRIPT} ${WRKDIR}/mvn.sh ${DATADIR}/bin/mvn
-	${MKDIR} ${PREFIX}/${INSTANCES_DIR}
-	${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} ${PREFIX}/${INSTANCES_DIR}
-
-post-install:
-	@${FIND} -s ${WRKSRC} -not -type d 2>/dev/null | \
-		${SED} -ne 's,^${WRKSRC},${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${FIND} -s -d ${WRKSRC} -type d 2>/dev/null | \
-		${SED} -ne 's,^${WRKSRC},@dirrm ${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
+	cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} \
+		${STAGEDIR}${DATADIR}/{} \;
+	cd ${WRKSRC} && ${FIND} . -type f -not -path "\./bin/" \
+		-exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \;
+	${INSTALL_DATA} ${WRKSRC}/bin/m2.conf ${STAGEDIR}${DATADIR}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/mvn.sh ${STAGEDIR}${DATADIR}/bin/mvn
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
+	${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} \
+		${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
 
 .include <bsd.port.mk>

Modified: head/devel/maven3/pkg-descr
==============================================================================
--- head/devel/maven3/pkg-descr	Tue Apr  1 10:28:08 2014	(r349833)
+++ head/devel/maven3/pkg-descr	Tue Apr  1 10:29:43 2014	(r349834)
@@ -2,4 +2,4 @@ Apache Maven is a software project manag
 the concept of a project object model (POM), Maven can manage a project's
 build, reporting and documentation from a central piece of information. 
 
-WWW:	http://maven.apache.org/
+WWW: http://maven.apache.org/



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