From owner-svn-ports-head@FreeBSD.ORG  Sat Apr 12 23:44:18 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 3742A6CD;
 Sat, 12 Apr 2014 23:44:18 +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 0A6981BA3;
 Sat, 12 Apr 2014 23:44:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CNiHbN010628;
 Sat, 12 Apr 2014 23:44:17 GMT (envelope-from danilo@svn.freebsd.org)
Received: (from danilo@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3CNiH7h010627;
 Sat, 12 Apr 2014 23:44:17 GMT (envelope-from danilo@svn.freebsd.org)
Message-Id: <201404122344.s3CNiH7h010627@svn.freebsd.org>
From: Danilo Egea Gondolfo <danilo@FreeBSD.org>
Date: Sat, 12 Apr 2014 23:44:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351161 - head/science/dlpoly-classic
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: Sat, 12 Apr 2014 23:44:18 -0000

Author: danilo
Date: Sat Apr 12 23:44:17 2014
New Revision: 351161
URL: http://svnweb.freebsd.org/changeset/ports/351161
QAT: https://qat.redports.org/buildarchive/r351161/

Log:
  - Support staging
  - Use options helpers
  -
  
  Approved by:	portmgr (blanket)

Modified:
  head/science/dlpoly-classic/Makefile

Modified: head/science/dlpoly-classic/Makefile
==============================================================================
--- head/science/dlpoly-classic/Makefile	Sat Apr 12 23:43:51 2014	(r351160)
+++ head/science/dlpoly-classic/Makefile	Sat Apr 12 23:44:17 2014	(r351161)
@@ -27,15 +27,10 @@ BUILD_WRKSRC=	${WRKSRC}/source
 
 MPIF90=		${LOCALBASE}/mpi/openmpi/bin/mpif90
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGUI}
-USE_JAVA=	yes
-PLIST_FILES+=	bin/dlpoly-gui \
-		${DATADIR_REL}/GUI.jar
-PLIST_DIRS+=	${DATADIR_REL}
-.endif
+GUI_USE=		JAVA=yes
+GUI_PLIST_FILES=	bin/dlpoly-gui \
+			${DATADIR_REL}/GUI.jar
+GUI_PLIST_DIRS=		${DATADIR_REL}
 
 post-patch:
 	${CP} ${WRKSRC}/build/MakePAR ${WRKSRC}/build/MakeSEQ ${BUILD_WRKSRC}
@@ -55,25 +50,20 @@ do-build:
 		${CP} -f MakePAR Makefile && \
 		${MAKE} gfortran)
 
+.include <bsd.port.options.mk>
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/execute/dlpoly-classic ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/execute/dlpoly-classic-mpi ${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/manual/* ${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/execute ${EXAMPLESDIR}
-	${RM} ${EXAMPLESDIR}/execute/dlpoly*
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/execute/dlpoly-classic ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/execute/dlpoly-classic-mpi ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/manual/* ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${CP} -R ${WRKSRC}/execute ${STAGEDIR}${EXAMPLESDIR}
+	${RM} ${STAGEDIR}${EXAMPLESDIR}/execute/dlpoly*
 .if ${PORT_OPTIONS:MGUI}
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/java/GUI.jar ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/dlpoly-gui ${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/java/GUI.jar ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/dlpoly-gui ${STAGEDIR}${PREFIX}/bin
 .endif
 
-post-install:
-	@${CAT} pkg-message
-
 .include <bsd.port.mk>