svn commit: r361464 - head/emulators/wine-devel

[Gerald Pfeifer]

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 at 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 <bsd.port.options.mk>
 
+.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