From owner-svn-ports-head@FreeBSD.ORG  Thu Jul 11 06:34:23 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id C759D821;
 Thu, 11 Jul 2013 06:34:23 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B91F01389;
 Thu, 11 Jul 2013 06:34:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6B6YNjS057450;
 Thu, 11 Jul 2013 06:34:23 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6B6YN2a057449;
 Thu, 11 Jul 2013 06:34:23 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201307110634.r6B6YN2a057449@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 11 Jul 2013 06:34:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322748 - head/math/scilab-toolbox-swt
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.14
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: Thu, 11 Jul 2013 06:34:23 -0000

Author: bapt
Date: Thu Jul 11 06:34:23 2013
New Revision: 322748
URL: http://svnweb.freebsd.org/changeset/ports/322748

Log:
  Use USES=display:build instead of custom implementation

Modified:
  head/math/scilab-toolbox-swt/Makefile

Modified: head/math/scilab-toolbox-swt/Makefile
==============================================================================
--- head/math/scilab-toolbox-swt/Makefile	Thu Jul 11 06:31:54 2013	(r322747)
+++ head/math/scilab-toolbox-swt/Makefile	Thu Jul 11 06:34:23 2013	(r322748)
@@ -1,9 +1,5 @@
-## New ports collection makefile for:	swt
-# Date created:				2006-03-28
-# Whom:					Max Brazhnikov makc@issp.ac.ru
-#
+# Created by: Max Brazhnikov makc@issp.ac.ru
 # $FreeBSD$
-#
 
 PORTNAME=	swt
 PORTVERSION=	0.1.11
@@ -43,7 +39,7 @@ SCILAB_ARGS=	-nogui
 PLIST_SUB+=	HELP="@comment "
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-etc__swt.start
 .else
-USE_DISPLAY=	yes
+USES=		display:build
 MAKE_ENV=	LC_ALL="C"
 PLIST_SUB+=	HELP=""
 TOOLBOX_SUBDIRS+=	jar
@@ -59,27 +55,12 @@ post-patch:
 
 pre-build:
 	${FIND} -d ${WRKSRC} \( -name '*.orig' -or -name '*.bak' \) -delete
-.if ${PORT_OPTIONS:MHELP} && !defined(DISPLAY)
-	@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
-		${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
-		${RM} -f ${WRKDIR}/.Xvfb.pid ; \
-	fi
-	${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 -fp ${LOCALBASE}/lib/X11/fonts/misc > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
 .endif
 
 do-build:
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${SCILAB_CMD} ${SCILAB_ARGS} -f builder.sce
 
-post-build:
-.if ${PORT_OPTIONS:MHELP} && !defined(DISPLAY)
-	@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
-		${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
-		${RM} -f ${WRKDIR}/.Xvfb.pid ; \
-	fi
-.endif
-
 do-install:
 	${MKDIR} ${TOOLBOXDIR}/sci_gateway/c
 	${INSTALL_DATA} ${WRKSRC}/loader.sce ${TOOLBOXDIR}