From owner-svn-ports-all@freebsd.org  Mon Feb  1 06:10:22 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0751A9162E;
 Mon,  1 Feb 2016 06:10:22 +0000 (UTC) (envelope-from dbn@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 810311639;
 Mon,  1 Feb 2016 06:10:22 +0000 (UTC) (envelope-from dbn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u116ALjG057967;
 Mon, 1 Feb 2016 06:10:21 GMT (envelope-from dbn@FreeBSD.org)
Received: (from dbn@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u116ALb5057966;
 Mon, 1 Feb 2016 06:10:21 GMT (envelope-from dbn@FreeBSD.org)
Message-Id: <201602010610.u116ALb5057966@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dbn set sender to dbn@FreeBSD.org
 using -f
From: David Naylor <dbn@FreeBSD.org>
Date: Mon, 1 Feb 2016 06:10:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r407683 - head/emulators/i386-wine-staging
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2016 06:10:22 -0000

Author: dbn
Date: Mon Feb  1 06:10:21 2016
New Revision: 407683
URL: https://svnweb.freebsd.org/changeset/ports/407683

Log:
  emulators/i386-wine-staging: update Makefile.
  
  Update Makefile to be consistent with r407682:
   - Mark option STAGING as a slave option.
   - Simplify arch specific code by removing non-arch specific PKGNAMESUFFIX

Modified:
  head/emulators/i386-wine-staging/Makefile

Modified: head/emulators/i386-wine-staging/Makefile
==============================================================================
--- head/emulators/i386-wine-staging/Makefile	Mon Feb  1 06:04:06 2016	(r407682)
+++ head/emulators/i386-wine-staging/Makefile	Mon Feb  1 06:10:21 2016	(r407683)
@@ -7,7 +7,8 @@ SLAVE_PORT=	i386-wine-devel
 
 CONFLICTS_INSTALL=	i386-wine-[0-9]* wine-[0-9]* wine-staging-[0-9]* i386-wine-devel-[0-9]* wine-devel-[0-9]*
 
-OPTIONS_SET=	LIBXSLT HAL STAGING X11
+OPTIONS_SLAVE=	STAGING
+OPTIONS_SET=	LIBXSLT HAL X11
 
 SLAVEDIR=	${.CURDIR}/../i386-wine-devel
 PLIST=		${MASTERDIR}/pkg-plist
@@ -16,12 +17,11 @@ PLIST=		${MASTERDIR}/pkg-plist
 ARCH!=          uname -p
 .endif
 
+PKGNAMESUFFIX=	-staging
 .if ${ARCH} == i386
 .include "${SLAVEDIR}/Makefile.i386"
-PKGNAMESUFFIX=	-staging
 .else
 MASTERDIR=	${SLAVEDIR}
-PKGNAMESUFFIX=	-staging
 .include "${SLAVEDIR}/Makefile.inc"
 .endif