From owner-svn-ports-all@FreeBSD.ORG Mon Aug 18 19:11:10 2014 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 ESMTPS id 19CB516B; Mon, 18 Aug 2014 19:11:10 +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 0479139EA; Mon, 18 Aug 2014 19:11:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7IJB9Lm042701; Mon, 18 Aug 2014 19:11:09 GMT (envelope-from dbn@FreeBSD.org) Received: (from dbn@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7IJB9if042696; Mon, 18 Aug 2014 19:11:09 GMT (envelope-from dbn@FreeBSD.org) Message-Id: <201408181911.s7IJB9if042696@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dbn set sender to dbn@FreeBSD.org using -f From: David Naylor Date: Mon, 18 Aug 2014 19:11:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365342 - in head/emulators: . i386-wine-compholio 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.18-1 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: Mon, 18 Aug 2014 19:11:10 -0000 Author: dbn Date: Mon Aug 18 19:11:08 2014 New Revision: 365342 URL: http://svnweb.freebsd.org/changeset/ports/365342 QAT: https://qat.redports.org/buildarchive/r365342/ Log: Introduce emulators/i386-wine-compholio. This is the companion port to wine-compholio: proving a means to compile, and binaries, for FreeBSD/amd64. Added: head/emulators/i386-wine-compholio/ - copied from r363069, head/emulators/wine-compholio/ Modified: head/emulators/Makefile head/emulators/i386-wine-compholio/Makefile head/emulators/i386-wine-devel/Makefile.i386 head/emulators/i386-wine-devel/Makefile.inc head/emulators/i386-wine-devel/distinfo Modified: head/emulators/Makefile ============================================================================== --- head/emulators/Makefile Mon Aug 18 19:07:11 2014 (r365341) +++ head/emulators/Makefile Mon Aug 18 19:11:08 2014 (r365342) @@ -54,6 +54,7 @@ SUBDIR += higan SUBDIR += hugo SUBDIR += i386-wine + SUBDIR += i386-wine-compholio SUBDIR += i386-wine-devel SUBDIR += ia64sim SUBDIR += ines Modified: head/emulators/i386-wine-compholio/Makefile ============================================================================== --- head/emulators/wine-compholio/Makefile Sun Jul 27 14:05:33 2014 (r363069) +++ head/emulators/i386-wine-compholio/Makefile Mon Aug 18 19:11:08 2014 (r365342) @@ -1,17 +1,27 @@ # Created by: Kris Moore # $FreeBSD$ -COMMENT= Wine built with the compholio patchset +COMMENT= 32bit Wine built with the compholio patchset for 64bit FreeBSD -SLAVE_PORT= wine-devel +SLAVE_PORT= i386-wine-devel -CONFLICTS= wine-[0-9]* wine-devel-[0-9]* +CONFLICTS= i386-wine-[0-9]* wine-[0-9]* wine-compholio-[0-9]* i386-wine-devel-[0-9]* wine-devel-[0-9]* OPTIONS_SET= COMPHOLIO LIBXSLT GNUTLS HAL X11 -MASTERDIR= ${.CURDIR}/../wine-devel -PLIST= ${.MASTERDIR}/pkg-plist +SLAVEDIR= ${.CURDIR}/../i386-wine-devel +PLIST= ${MASTERDIR}/pkg-plist -.include "${MASTERDIR}/Makefile" +.if !defined(ARCH) +ARCH!= uname -p +.endif +.if ${ARCH} == i386 +.include "${SLAVEDIR}/Makefile.i386" PKGNAMESUFFIX= -compholio +.else +MASTERDIR= ${SLAVEDIR} +PKGNAMESUFFIX= -compholio +.include "${SLAVEDIR}/Makefile.inc" +.endif + Modified: head/emulators/i386-wine-devel/Makefile.i386 ============================================================================== --- head/emulators/i386-wine-devel/Makefile.i386 Mon Aug 18 19:07:11 2014 (r365341) +++ head/emulators/i386-wine-devel/Makefile.i386 Mon Aug 18 19:11:08 2014 (r365342) @@ -4,7 +4,7 @@ PKGNAMEPREFIX= i386- MAINTAINER= dbn@FreeBSD.org -COMMENT= 32bit Microsoft Windows compatibility environment for 64bit FreeBSD +COMMENT?= 32bit Microsoft Windows compatibility environment for 64bit FreeBSD # Use the wine port to do most of the heavy lifting SLAVEDIR?= ${.CURDIR} @@ -14,7 +14,7 @@ PKGDEINSTALL= ${PKGINSTALL} RUN_DEPENDS= dri>0:${PORTSDIR}/graphics/dri -CONFLICTS_INSTALL= i386-wine-[0-9]* wine-[0-9]* wine-devel-[0-9]* +CONFLICTS_INSTALLi?= i386-wine-[0-9]* wine-[0-9]* wine-devel-[0-9]* ACTUAL-PACKAGE-DEPENDS= ${DO_NADA} WINELIBDIR= ${PREFIX}/lib32 Modified: head/emulators/i386-wine-devel/Makefile.inc ============================================================================== --- head/emulators/i386-wine-devel/Makefile.inc Mon Aug 18 19:07:11 2014 (r365341) +++ head/emulators/i386-wine-devel/Makefile.inc Mon Aug 18 19:11:08 2014 (r365342) @@ -7,13 +7,13 @@ PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION} PKGNAMEPREFIX= i386- -PKGNAMESUFFIX= -devel +PKGNAMESUFFIX?= -devel DISTNAME= ${PKGNAME} EXTRACT_SUFX= .txz DIST_SUBDIR= freebsd:${OSREL:C/\..*//}:x86:64 MAINTAINER= dbn@FreeBSD.org -COMMENT= 32bit Microsoft Windows compatibility environment for 64bit FreeBSD +COMMENT?= 32bit Microsoft Windows compatibility environment for 64bit FreeBSD LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual @@ -23,7 +23,7 @@ OPTIONS_DEFINE= GECKO MONO GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine -CONFLICTS_INSTALL= i386-wine-[0-9]* wine-[0-9]* wine-devel-[0-9]* +CONFLICTS_INSTALL?= i386-wine-[0-9]* wine-[0-9]* wine-devel-[0-9]* EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' \ Modified: head/emulators/i386-wine-devel/distinfo ============================================================================== --- head/emulators/i386-wine-devel/distinfo Mon Aug 18 19:07:11 2014 (r365341) +++ head/emulators/i386-wine-devel/distinfo Mon Aug 18 19:11:08 2014 (r365342) @@ -1,8 +1,16 @@ SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.24,1.txz) = 220b3758dfb27ce356bfad8afb393ce05d440b73b9c58da79a94943fefc94b79 SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.24,1.txz) = 26209408 +SHA256 (freebsd:8:x86:64/i386-wine-compholio-1.7.24,1.txz) = c87a6eb40c7cac391a43bd991dc2d6ff12a81d329d57a585b70e6950b6877cb0 +SIZE (freebsd:8:x86:64/i386-wine-compholio-1.7.24,1.txz) = 26292924 SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.24,1.txz) = 83f13a78e6a7d0d276b09ddc26a82a2f98c8ddcd007019283d8d31c87a5c40d7 SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.24,1.txz) = 26446048 +SHA256 (freebsd:9:x86:64/i386-wine-compholio-1.7.24,1.txz) = 9385a4a859838d8c79a0e40e4b47fed94bd475ca159ec6191c1fdb05f66e119d +SIZE (freebsd:9:x86:64/i386-wine-compholio-1.7.24,1.txz) = 26542932 SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.24,1.txz) = 97241082e1f2bb491047705c12c46a3cc1a1dbba8bc6bcbd3258e26bb25f1d10 SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.24,1.txz) = 26440916 +SHA256 (freebsd:10:x86:64/i386-wine-compholio-1.7.24,1.txz) = 63cf622d3065921201919b33c296b393b84a3107a91a6700fbc387609d3b8adf +SIZE (freebsd:10:x86:64/i386-wine-compholio-1.7.24,1.txz) = 26524940 SHA256 (freebsd:11:x86:64/i386-wine-devel-1.7.24,1.txz) = d3217fd4b8321ed9204c30a23530a598253d290bba28cd3660acbf272fb723da SIZE (freebsd:11:x86:64/i386-wine-devel-1.7.24,1.txz) = 46843344 +SHA256 (freebsd:11:x86:64/i386-wine-compholio-1.7.24,1.txz) = 0bdb7085d886876d03bdf76cc5ae7fe844c8a5e9907761591c9556c1e91f20a7 +SIZE (freebsd:11:x86:64/i386-wine-compholio-1.7.24,1.txz) = 46926196