Date: Thu, 8 Jan 2015 13:06:36 +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: r376529 - head/emulators/wine-devel Message-ID: <201501081306.t08D6ahC065232@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Thu Jan 8 13:06:35 2015 New Revision: 376529 URL: https://svnweb.freebsd.org/changeset/ports/376529 QAT: https://qat.redports.org/buildarchive/r376529/ Log: No longer always configure --with-xcomposite since this is now handled as part of the X11 option. Sort X11_CONFIGURE_WITH alphabetically and add the previously missing xrender option. Adjust the position of PORTDATA to match the emulators/wine port. Modified: head/emulators/wine-devel/Makefile Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Thu Jan 8 13:03:15 2015 (r376528) +++ head/emulators/wine-devel/Makefile Thu Jan 8 13:06:35 2015 (r376529) @@ -37,7 +37,7 @@ CONFIGURE_ARGS+=--verbose --disable-test --with-oss \ --without-sane \ --without-tiff \ - --with-xcomposite --without-xinerama + --without-xinerama CONFIGURE_ENV= FLEX="${LOCALBASE}/bin/flex" WINELIBDIR?= ${PREFIX}/lib .if !defined(USE_LDCONFIG32) @@ -51,6 +51,8 @@ SHEBANG_FILES= tools/make_requests tools SUB_FILES= pkg-message 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_SUB= yes @@ -94,7 +96,7 @@ V4L_LIB_DEPENDS= libv4l1.so:${PORTSDIR}/ WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML -X11_CONFIGURE_WITH= x cms fontconfig glu jpeg opengl png xinput2 xrandr freetype +X11_CONFIGURE_WITH= x cms fontconfig freetype glu jpeg opengl png xinput2 xrandr xrender X11_USE= GL=glu XORG=xcomposite,xcursor,xi,xrandr,xrender X11_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ @@ -102,8 +104,6 @@ X11_LIB_DEPENDS= libfontconfig.so:${PORT liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libpng.so:${PORTSDIR}/graphics/png -PORTDATA= l_intl.nls wine.inf - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MCOMPHOLIO}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501081306.t08D6ahC065232>