Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 10 Apr 2015 13:25:01 +0000 (UTC)
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r383725 - head/emulators/wine-devel
Message-ID:  <201504101325.t3ADP17J097942@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gerald
Date: Fri Apr 10 13:25:00 2015
New Revision: 383725
URL: https://svnweb.freebsd.org/changeset/ports/383725

Log:
  Fix package list in case option COMPHOLIO is set (lib/wine/fltmgr.sys.so).
  
  No PORTREVISION bump since the build with COMPHOLIO is broken right now.

Modified:
  head/emulators/wine-devel/Makefile
  head/emulators/wine-devel/pkg-plist

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Fri Apr 10 13:16:43 2015	(r383724)
+++ head/emulators/wine-devel/Makefile	Fri Apr 10 13:25:00 2015	(r383725)
@@ -53,7 +53,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 PORTDATA=	l_intl.nls wine.inf
 
 OPTIONS_DEFINE=	COMPHOLIO CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO
-OPTIONS_DEFAULT=X11
+OPTIONS_DEFAULT=X11 COMPHOLIO
 OPTIONS_SUB=	yes
 
 COMPHOLIO_DESC=	Include the Compholio patchset, needed for Pipelight support
@@ -146,7 +146,7 @@ BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/
 CONFIGURE_ARGS+=--without-pulse
 USE_AUTOTOOLS=	autoconf
 
-pre-configure:
+post-extract:
 	cd ${WRKSRC} && ${TAR} xf ${DISTDIR}/${COMP_DIST} --strip-components 1
 	cd ${WRKSRC} && bash ./patches/patchinstall.sh --backend=patch DESTDIR=${WRKSRC} --all
 .endif

Modified: head/emulators/wine-devel/pkg-plist
==============================================================================
--- head/emulators/wine-devel/pkg-plist	Fri Apr 10 13:16:43 2015	(r383724)
+++ head/emulators/wine-devel/pkg-plist	Fri Apr 10 13:25:00 2015	(r383725)
@@ -1269,6 +1269,7 @@ lib/wine/fakedlls/extrac32.exe
 lib/wine/fakedlls/faultrep.dll
 lib/wine/fakedlls/findstr.exe
 lib/wine/fakedlls/fltlib.dll
+%%COMPHOLIO%%lib/wine/fakedlls/fltmgr.sys
 lib/wine/fakedlls/fntcache.dll
 lib/wine/fakedlls/fontsub.dll
 lib/wine/fakedlls/fusion.dll
@@ -1683,6 +1684,7 @@ lib/wine/fakedlls/xpssvcs.dll
 lib/wine/faultrep.dll.so
 lib/wine/findstr.exe.so
 lib/wine/fltlib.dll.so
+%%COMPHOLIO%%lib/wine/fltmgr.sys.so
 lib/wine/fntcache.dll.so
 lib/wine/fontsub.dll.so
 lib/wine/fusion.dll.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504101325.t3ADP17J097942>