From owner-svn-ports-all@FreeBSD.ORG Sun Aug 11 08:19:19 2013 Return-Path: Delivered-To: svn-ports-all@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 ESMTP id 366B52BF; Sun, 11 Aug 2013 08:19:19 +0000 (UTC) (envelope-from dbn@FreeBSD.org) 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 14DDC2903; Sun, 11 Aug 2013 08:19:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7B8JIWF037029; Sun, 11 Aug 2013 08:19:18 GMT (envelope-from dbn@svn.freebsd.org) Received: (from dbn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7B8JIFJ037027; Sun, 11 Aug 2013 08:19:18 GMT (envelope-from dbn@svn.freebsd.org) Message-Id: <201308110819.r7B8JIFJ037027@svn.freebsd.org> From: David Naylor Date: Sun, 11 Aug 2013 08:19:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324577 - head/emulators/i386-wine-devel 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.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Aug 2013 08:19:19 -0000 Author: dbn Date: Sun Aug 11 08:19:18 2013 New Revision: 324577 URL: http://svnweb.freebsd.org/changeset/ports/324577 Log: Update emulators/i386-wine-devel options with GECKO and MONO. The binary package for amd64 systems does not bundle GECKO or MONO however it is useful (for some) to have those files installed, so allow the package to have a run-time dependency on the ports that provide Gecko and Mono support. PORTREVISION is not bumped since nothing changes in the default (BATCH) case. Modified: head/emulators/i386-wine-devel/Makefile.i386 head/emulators/i386-wine-devel/Makefile.inc Modified: head/emulators/i386-wine-devel/Makefile.i386 ============================================================================== --- head/emulators/i386-wine-devel/Makefile.i386 Sun Aug 11 07:33:16 2013 (r324576) +++ head/emulators/i386-wine-devel/Makefile.i386 Sun Aug 11 08:19:18 2013 (r324577) @@ -5,7 +5,6 @@ PKGNAMEPREFIX= i386- MAINTAINER= dbn@FreeBSD.org COMMENT= 32bit Microsoft Windows compatibility environment for 64bit FreeBSD -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}-devel # Use the wine port to do most of the heavy lifting MASTERDIR= ${.CURDIR}/../wine-devel @@ -14,10 +13,12 @@ PKGDEINSTALL= ${PKGINSTALL} RUN_DEPENDS= dri>0:${PORTSDIR}/graphics/dri +CONFLICTS_INSTALL= i386-wine-1.6* wine-[0-9]* +LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}-devel + ACTUAL-PACKAGE-DEPENDS= ${DO_NADA} WINELIBDIR= ${PREFIX}/lib32 CONFIGURE_ARGS+= --bindir=${PREFIX}/bin32 --libdir=${WINELIBDIR} -CONFLICTS_INSTALL= wine-[0-9]* PLIST_REINPLACE+= winelib PLIST_REINPLACE_WINELIB= s!lib/!lib32/!g WINE_SLAVE_BUILD= yes Modified: head/emulators/i386-wine-devel/Makefile.inc ============================================================================== --- head/emulators/i386-wine-devel/Makefile.inc Sun Aug 11 07:33:16 2013 (r324576) +++ head/emulators/i386-wine-devel/Makefile.inc Sun Aug 11 08:19:18 2013 (r324577) @@ -18,10 +18,15 @@ LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual LICENSE_FILE= ${WRKDIR}/LICENSE +OPTIONS_DEFINE= GECKO MONO +GECKO_DESC= Bundle Gecko MSI package for Wine +MONO_DESC= Bundle Mono MSI package for Wine + EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' -CONFLICTS_INSTALL= wine-[0-9]* +CONFLICTS_INSTALL= i386-wine-1.6* wine-[0-9]* LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}-devel + NO_BUILD= yes ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= wine only runs on x86 architecture @@ -38,6 +43,14 @@ USE_XZ= yes IGNORE= binaries compiled for FreeBSD 8.3+ and 9.1+ .endif +.if ${PORT_OPTIONS:MGECKO} +RUN_DEPENDS+= ${DATADIR}/gecko/wine_gecko-2.21-x86.msi:${PORTSDIR}/emulators/wine-gecko-devel +.endif + +.if ${PORT_OPTIONS:MMONO} +RUN_DEPENDS+= ${DATADIR}/mono/wine-mono-0.0.8.msi:${PORTSDIR}/emulators/wine-mono +.endif + .if ${PREFIX} != /usr/local EXTRACT_AFTER_ARGS+= -s '|/usr/local|${PREFIX}|gs' .endif