From owner-svn-ports-head@FreeBSD.ORG  Mon Mar 24 12:05:22 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8298978D;
 Mon, 24 Mar 2014 12:05:22 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5585DAD6;
 Mon, 24 Mar 2014 12:05:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2OC5M5X066431;
 Mon, 24 Mar 2014 12:05:22 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2OC5M6X066430;
 Mon, 24 Mar 2014 12:05:22 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201403241205.s2OC5M6X066430@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Mon, 24 Mar 2014 12:05:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r348947 - head/cad/impact
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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Mar 2014 12:05:22 -0000

Author: pawel
Date: Mon Mar 24 12:05:21 2014
New Revision: 348947
URL: http://svnweb.freebsd.org/changeset/ports/348947
QAT: https://qat.redports.org/buildarchive/r348947/

Log:
  - Add staging support
  - Use option helper
  - Switch to PORTDATA, add missing files to PLIST_FILES

Modified:
  head/cad/impact/Makefile

Modified: head/cad/impact/Makefile
==============================================================================
--- head/cad/impact/Makefile	Mon Mar 24 12:04:27 2014	(r348946)
+++ head/cad/impact/Makefile	Mon Mar 24 12:05:21 2014	(r348947)
@@ -33,36 +33,29 @@ SUB_FILES=	impact impactgui
 
 PLIST_FILES=	bin/impact \
 		bin/impactgui \
-		share/pixmaps/impact.png
-
-OPTIONS_DEFINE=	GMSH
-
-GMSH_DESC=	Enable automatic 3D finite element mesh generator
+		share/pixmaps/impact.png \
+		${DATADIR_REL}/.classpath \
+		${DATADIR_REL}/.project \
+		${DATADIR_REL}/.vcm_meta
+PORTDATA=	*
 
 DESKTOP_ENTRIES="Impact" "${COMMENT}" "${PORTNAME}" \
 		"${PORTNAME}gui" "Graphics;3DGraphics;Education;" false
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	GMSH
 
-.if ${PORT_OPTIONS:MGMSH}
-RUN_DEPENDS+=	gmsh:${PORTSDIR}/cad/gmsh
-.endif
+GMSH_DESC=		Automatic 3D finite element mesh generator
+GMSH_RUN_DEPENDS=	gmsh:${PORTSDIR}/cad/gmsh
 
 post-extract:
 	@${FIND} ${WRKSRC} -name CVS -type d -print0 -or -name .cvsignore -type f -print0 | \
 		${XARGS} -0 ${RM} -rf
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/impact ${WRKDIR}/impactgui ${PREFIX}/bin
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${DATADIR})
-
-post-install:
-	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps
-
-	@${FIND} ${DATADIR} ! -type d | \
-		${SED} 's|^${PREFIX}/||' >> ${TMPPLIST}
-	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
-		${SED} 's|^${PREFIX}/|@dirrm |' >> ${TMPPLIST}
+	(cd ${WRKDIR} && ${INSTALL_SCRIPT} impact impactgui \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>