kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

No longer always configure --with-xcomposite since this is now

Browse source 
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.
This commit is contained in:
Gerald Pfeifer 2015-01-08 13:06:35 +00:00
parent d44418571a
commit be1d64f780
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=376529
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
emulators/wine-devel/Makefile
View file

@ -37,7 +37,7 @@ CONFIGURE_ARGS+=--verbose --disable-tests \
--with-oss \ --with-oss \
--without-sane \ --without-sane \
--without-tiff \ --without-tiff \
--with-xcomposite --without-xinerama --without-xinerama
CONFIGURE_ENV= FLEX="${LOCALBASE}/bin/flex" CONFIGURE_ENV= FLEX="${LOCALBASE}/bin/flex"
WINELIBDIR?= ${PREFIX}/lib WINELIBDIR?= ${PREFIX}/lib
.if !defined(USE_LDCONFIG32) .if !defined(USE_LDCONFIG32)
@ -51,6 +51,8 @@ SHEBANG_FILES= tools/make_requests tools/winemaker \
SUB_FILES= pkg-message SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/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_DEFINE= COMPHOLIO CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO
OPTIONS_DEFAULT=X11 OPTIONS_DEFAULT=X11
OPTIONS_SUB= yes OPTIONS_SUB= yes
@ -94,7 +96,7 @@ V4L_LIB_DEPENDS= libv4l1.so:${PORTSDIR}/multimedia/libv4l
WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML 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_USE= GL=glu XORG=xcomposite,xcursor,xi,xrandr,xrender
X11_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ X11_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
libfreetype.so:${PORTSDIR}/print/freetype2 \ libfreetype.so:${PORTSDIR}/print/freetype2 \
@ -102,8 +104,6 @@ X11_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
liblcms2.so:${PORTSDIR}/graphics/lcms2 \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \
libpng.so:${PORTSDIR}/graphics/png libpng.so:${PORTSDIR}/graphics/png
PORTDATA= l_intl.nls wine.inf
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MCOMPHOLIO} .if ${PORT_OPTIONS:MCOMPHOLIO}