From owner-svn-ports-head@FreeBSD.ORG Mon Jul 28 18:34:13 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 DD74C939; Mon, 28 Jul 2014 18:34:13 +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 CB09B211D; Mon, 28 Jul 2014 18:34:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6SIYDnA017808; Mon, 28 Jul 2014 18:34:13 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6SIYD2i017807; Mon, 28 Jul 2014 18:34:13 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407281834.s6SIYD2i017807@svn.freebsd.org> From: Adam Weinberger Date: Mon, 28 Jul 2014 18:34:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363219 - head/emulators/darcnes 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.18 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: Mon, 28 Jul 2014 18:34:13 -0000 Author: adamw Date: Mon Jul 28 18:34:13 2014 New Revision: 363219 URL: http://svnweb.freebsd.org/changeset/ports/363219 QAT: https://qat.redports.org/buildarchive/r363219/ Log: Use OPTIONS instead of WITH_* and checking whether dependencies are already installed. Modified: head/emulators/darcnes/Makefile Modified: head/emulators/darcnes/Makefile ============================================================================== --- head/emulators/darcnes/Makefile Mon Jul 28 18:31:50 2014 (r363218) +++ head/emulators/darcnes/Makefile Mon Jul 28 18:34:13 2014 (r363219) @@ -9,7 +9,6 @@ MASTER_SITES= http://www.dridus.com/~nye ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= grembo DISTNAME= dn${PORTVERSION} -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= multi-system emulator @@ -19,11 +18,15 @@ NO_CDROM= Commercial use is restricted WRKSRC= ${WRKDIR}/${PORTNAME} WANT_GNOME= yes -USES= gmake +USES= gmake tar:tgz MAKE_ARGS= CC="${CC}" TARGET_CC="${CC}" CXX="${CXX}" TARGET_CXX="${CXX}" \ AS="${AS}" TARGET_AS="${CC}" LD="${LD}" TARGET_LD="${CC}" OPTIONS_DEFINE= DOCS +OPTIONS_SINGLE= BACKEND +OPTIONS_SINGLE_BACKEND= X11 GTK1 SVGALIB +OPTIONS_DEFAULT=X11 +BACKEND_DESC= GUI backend .include @@ -33,18 +36,20 @@ MAKE_ARGS+= C_ONLY=-DC_ONLY MAKE_ARGS+= MACH_TYPES=-DMACH_TYPES=\\\"types-i386.h\\\" .endif -.if ${HAVE_GNOME:Mgtk12}!="" +.if ${PORT_OPTIONS:MGTK1} USE_GNOME= gtk12 MAKE_ARGS+= TARGET=Linux_GTK PKGNAMESUFFIX= -gtk -.else -.if defined(WITH_SVGALIB) +.endif + +.if ${PORT_OPTIONS:MSVGALIB} LIB_DEPENDS+= libvga.so:${PORTSDIR}/graphics/svgalib MAKE_ARGS+= TARGET=Linux_svgalib PKGNAMESUFFIX= -svgalib -.else -USE_XORG= x11 xaw xext xmu xt .endif + +.if ${PORT_OPTIONS:MX11} +USE_XORG= x11 xaw xext xmu xt .endif post-patch: