From owner-svn-ports-head@FreeBSD.ORG Tue Apr 1 10:28:09 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE40E3C8; Tue, 1 Apr 2014 10:28:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 81B65E44; Tue, 1 Apr 2014 10:28:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s31AS9QI016069; Tue, 1 Apr 2014 10:28:09 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s31AS9VP016068; Tue, 1 Apr 2014 10:28:09 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404011028.s31AS9VP016068@svn.freebsd.org> From: Pawel Pekala Date: Tue, 1 Apr 2014 10:28:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349833 - head/devel/maven2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Apr 2014 10:28:09 -0000 Author: pawel Date: Tue Apr 1 10:28:08 2014 New Revision: 349833 URL: http://svnweb.freebsd.org/changeset/ports/349833 QAT: https://qat.redports.org/buildarchive/r349833/ Log: - Add staging support - Use PORTDATA for plist generation Modified: head/devel/maven2/Makefile Modified: head/devel/maven2/Makefile ============================================================================== --- head/devel/maven2/Makefile Tue Apr 1 09:46:05 2014 (r349832) +++ head/devel/maven2/Makefile Tue Apr 1 10:28:08 2014 (r349833) @@ -24,24 +24,21 @@ WRKSRC= ${WRKDIR}/apache-maven-${DISTVE INSTANCE_FILE= 020201-${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/m2.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}/m2.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}/m2.sh ${STAGEDIR}${DATADIR}/bin/mvn + @${MKDIR} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR} + ${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} \ + ${STAGEDIR}${PREFIX}/${INSTANCES_DIR} .include