From owner-svn-ports-all@FreeBSD.ORG Thu Jul 10 15:40:55 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F63F77C; Thu, 10 Jul 2014 15:40:55 +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 4C3342786; Thu, 10 Jul 2014 15:40:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6AFetW5053259; Thu, 10 Jul 2014 15:40:55 GMT (envelope-from gerald@svn.freebsd.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6AFes0E053254; Thu, 10 Jul 2014 15:40:54 GMT (envelope-from gerald@svn.freebsd.org) Message-Id: <201407101540.s6AFes0E053254@svn.freebsd.org> From: Gerald Pfeifer Date: Thu, 10 Jul 2014 15:40:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361464 - head/emulators/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 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: Thu, 10 Jul 2014 15:40:55 -0000 Author: gerald Date: Thu Jul 10 15:40:54 2014 New Revision: 361464 URL: http://svnweb.freebsd.org/changeset/ports/361464 QAT: https://qat.redports.org/buildarchive/r361464/ Log: Add a new OPTION named COMPHOLIO to include the Compholio patchset. This is off by default for now and nicely moving towards increasing upstream integration. It will be needed for Pipelight support. Submitted by: kmoore Tested by: gerald, kmoore Modified: head/emulators/wine-devel/Makefile head/emulators/wine-devel/distinfo head/emulators/wine-devel/pkg-plist Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Thu Jul 10 15:21:55 2014 (r361463) +++ head/emulators/wine-devel/Makefile Thu Jul 10 15:40:54 2014 (r361464) @@ -8,6 +8,7 @@ CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ http://ibiblio.org/pub/linux/system/emulators/wine/ PKGNAMESUFFIX= -devel +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= gerald@FreeBSD.org COMMENT?= Microsoft Windows compatibility environment @@ -42,10 +43,11 @@ SHEBANG_FILES= tools/winemaker tools/win SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT OPENAL WINEMAKER GECKO MONO X11 +OPTIONS_DEFINE= COMPHOLIO CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT OPENAL WINEMAKER GECKO MONO X11 OPTIONS_DEFAULT=X11 OPTIONS_SUB= yes +COMPHOLIO_DESC= Include the Compholio patchset, needed for Pipelight support DOSBOX_DESC= Use DOSBox to run MS-DOS programs LIBXSLT_DESC= Use libxslt (only used by msxml3.dll) WINEMAKER_DESC= Fully support winemaker (requires Perl) @@ -91,6 +93,19 @@ PORTDATA= l_intl.nls wine.inf .include +.if ${PORT_OPTIONS:MCOMPHOLIO} +MASTER_SITES+= https://github.com/compholio/wine-compholio-daily/archive/:cho +COMP_DIST= v${DISTVERSION}.tar.gz +DISTFILES+= ${COMP_DIST}:cho +USE_AUTOTOOLS= autoconf +BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash \ + git:${PORTSDIR}/devel/git + +pre-configure: + cd ${WRKSRC} && ${TAR} xf ${DISTDIR}/${COMP_DIST} --strip-components 1 + cd ${WRKSRC} && ${MAKE_CMD} -C ./patches DESTDIR=${WRKSRC} install +.endif + pre-build: cd ${WRKSRC} && ${MAKE_CMD} depend Modified: head/emulators/wine-devel/distinfo ============================================================================== --- head/emulators/wine-devel/distinfo Thu Jul 10 15:21:55 2014 (r361463) +++ head/emulators/wine-devel/distinfo Thu Jul 10 15:40:54 2014 (r361464) @@ -1,2 +1,4 @@ SHA256 (wine-1.7.21.tar.bz2) = a14723104135c21414c61e146144a2c527430057255f8c35a3a7d354e68b9401 SIZE (wine-1.7.21.tar.bz2) = 21635330 +SHA256 (v1.7.21.tar.gz) = 19b619599e1d00829ab7782e069551dede0feacfd918b168f0843bd4ab0cd0d2 +SIZE (v1.7.21.tar.gz) = 883807 Modified: head/emulators/wine-devel/pkg-plist ============================================================================== --- head/emulators/wine-devel/pkg-plist Thu Jul 10 15:21:55 2014 (r361463) +++ head/emulators/wine-devel/pkg-plist Thu Jul 10 15:40:54 2014 (r361464) @@ -2179,6 +2179,7 @@ share/applications/wine.desktop %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.winedbg %%PORTDOCS%%%%DOCSDIR%%/README.winedump +%%COMPHOLIO%%%%X11%%%%DATADIR%%/fonts/arial.ttf %%X11%%%%DATADIR%%/fonts/coue1255.fon %%X11%%%%DATADIR%%/fonts/coue1256.fon %%X11%%%%DATADIR%%/fonts/coue1257.fon