Sync a number of changes from emulators/wine-devel:

Introduce a new option X11, on by default.  On the way add --with-x,
--with-cms, --with-freetype, --with-jpeg, --with-png and --with-xrender
to CONFIGURE_ARGS that had been missing before.

Always configure --without-gettextpo and --without-osmesa. [1]

No long configure with bogus --without-xcomposite (since we have
had USE_XORG=xcomposite for a while).

Add tools/make_requests to SHEBANG_FILES. [1]

No longer use XORG=xpm.  This has been removed with upstream commit
18e4b5e293cdbb83197fd1427cdd4e42314c831b eons ago. [1]

Sort DOCS alphabetically in OPTIONS_DEFINE.

PR:		195765 [1]
Submitted by:	Andriy Voskoboinyk <s3erios@gmail.com> [1]

2 files changed, 82 insertions, 22 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 2f0de6580fb1..c48835d726f1 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wine
 DISTVERSION=	1.6.2
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -17,12 +17,7 @@ LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
 
 CONFLICTS_INSTALL=	i386-wine-[0-9]* i386-wine-devel-[0-9]* wine-devel-[0-9]*
 
@@ -31,12 +26,14 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--verbose --disable-tests \
 		--without-alsa --without-capi --without-dbus \
-		--with-fontconfig --with-glu \
+		--without-gettextpo \
 		--without-gphoto --without-gsm --without-gstreamer \
-		--with-opengl \
-		--without-opencl --with-oss --without-sane --without-tiff \
-		--without-v4l --with-xcomposite --without-xinerama \
-		--with-xinput2 --with-xrandr
+		--without-opencl \
+		--without-osmesa \
+		--with-oss \
+		--without-sane \
+		--without-tiff \
+		--without-v4l --without-xinerama
 CONFIGURE_ENV=	FLEX="${LOCALBASE}/bin/flex"
 WINELIBDIR?=	${PREFIX}/lib
 .if !defined(USE_LDCONFIG32)
@@ -44,14 +41,16 @@ USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
 .endif
 ONLY_FOR_ARCHS=	i386
 USES=		bison compiler:c11 desktop-file-utils gmake shebangfix tar:bzip2
-SHEBANG_FILES=	tools/winemaker tools/winedump/function_grep.pl
-USE_GL=		glu
-USE_XORG=	xcomposite xcursor xi xpm xrandr xrender
+SHEBANG_FILES=	tools/make_requests tools/winemaker \
+		tools/winedump/function_grep.pl
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-OPTIONS_DEFINE=	CUPS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL WINEMAKER GECKO MONO DOCS
+PORTDATA=	generic.ppd l_intl.nls wine.inf
+
+OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL WINEMAKER X11 GECKO MONO
+OPTIONS_DEFAULT=X11
 OPTIONS_SUB=	yes
 
 DOSBOX_DESC=	Use DOSBox to run MS-DOS programs
@@ -60,8 +59,6 @@ WINEMAKER_DESC=	Fully support winemaker (requires Perl)
 GECKO_DESC=	Bundle Gecko MSI package for Wine
 MONO_DESC=	Bundle Mono MSI package for Wine
 
-PORTDATA=	fonts/ generic.ppd l_intl.nls wine.inf
-
 PORTSCOUT=	limitw:1,even
 
 CUPS_CONFIGURE_WITH=	cups
@@ -93,6 +90,14 @@ OPENAL_USES=		openal
 
 WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML
 
+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 \
+			libjpeg.so:${PORTSDIR}/graphics/jpeg \
+			liblcms2.so:${PORTSDIR}/graphics/lcms2 \
+			libpng15.so:${PORTSDIR}/graphics/png
+
 pre-build:
 	cd ${WRKSRC} && ${MAKE_CMD} depend
 
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 250b96d30a41..b0e0ff9493de 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -1071,7 +1071,7 @@ lib/wine/fakedlls/gameux.dll
 lib/wine/fakedlls/gdi.exe16
 lib/wine/fakedlls/gdi32.dll
 lib/wine/fakedlls/gdiplus.dll
-lib/wine/fakedlls/glu32.dll
+%%X11%%lib/wine/fakedlls/glu32.dll
 lib/wine/fakedlls/gphoto2.ds
 lib/wine/fakedlls/gpkcsp.dll
 lib/wine/fakedlls/hal.dll
@@ -1381,7 +1381,7 @@ lib/wine/fakedlls/winepath.exe
 lib/wine/fakedlls/wineps.drv
 lib/wine/fakedlls/wineps16.drv16
 lib/wine/fakedlls/winevdm.exe
-lib/wine/fakedlls/winex11.drv
+%%X11%%lib/wine/fakedlls/winex11.drv
 lib/wine/fakedlls/wing.dll16
 lib/wine/fakedlls/wing32.dll
 lib/wine/fakedlls/winhelp.exe16
@@ -1438,7 +1438,7 @@ lib/wine/gameux.dll.so
 lib/wine/gdi.exe16.so
 lib/wine/gdi32.dll.so
 lib/wine/gdiplus.dll.so
-lib/wine/glu32.dll.so
+%%X11%%lib/wine/glu32.dll.so
 lib/wine/gphoto2.ds.so
 lib/wine/gpkcsp.dll.so
 lib/wine/hal.dll.so
@@ -1915,7 +1915,7 @@ lib/wine/winepath.exe.so
 lib/wine/wineps.drv.so
 lib/wine/wineps16.drv16.so
 lib/wine/winevdm.exe.so
-lib/wine/winex11.drv.so
+%%X11%%lib/wine/winex11.drv.so
 lib/wine/wing.dll16.so
 lib/wine/wing32.dll.so
 lib/wine/winhelp.exe16.so
@@ -1998,3 +1998,58 @@ share/applications/wine.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.winedbg
 %%PORTDOCS%%%%DOCSDIR%%/README.winedump
+%%X11%%%%DATADIR%%/fonts/coue1255.fon
+%%X11%%%%DATADIR%%/fonts/coue1256.fon
+%%X11%%%%DATADIR%%/fonts/coue1257.fon
+%%X11%%%%DATADIR%%/fonts/coure.fon
+%%X11%%%%DATADIR%%/fonts/couree.fon
+%%X11%%%%DATADIR%%/fonts/coureg.fon
+%%X11%%%%DATADIR%%/fonts/courer.fon
+%%X11%%%%DATADIR%%/fonts/couret.fon
+%%X11%%%%DATADIR%%/fonts/cvgasys.fon
+%%X11%%%%DATADIR%%/fonts/hvgasys.fon
+%%X11%%%%DATADIR%%/fonts/jsmalle.fon
+%%X11%%%%DATADIR%%/fonts/jvgafix.fon
+%%X11%%%%DATADIR%%/fonts/jvgasys.fon
+%%X11%%%%DATADIR%%/fonts/marlett.ttf
+%%X11%%%%DATADIR%%/fonts/smae1255.fon
+%%X11%%%%DATADIR%%/fonts/smae1256.fon
+%%X11%%%%DATADIR%%/fonts/smae1257.fon
+%%X11%%%%DATADIR%%/fonts/smalle.fon
+%%X11%%%%DATADIR%%/fonts/smallee.fon
+%%X11%%%%DATADIR%%/fonts/smalleg.fon
+%%X11%%%%DATADIR%%/fonts/smaller.fon
+%%X11%%%%DATADIR%%/fonts/smallet.fon
+%%X11%%%%DATADIR%%/fonts/ssee1255.fon
+%%X11%%%%DATADIR%%/fonts/ssee1256.fon
+%%X11%%%%DATADIR%%/fonts/ssee1257.fon
+%%X11%%%%DATADIR%%/fonts/ssee874.fon
+%%X11%%%%DATADIR%%/fonts/ssef1255.fon
+%%X11%%%%DATADIR%%/fonts/ssef1256.fon
+%%X11%%%%DATADIR%%/fonts/ssef1257.fon
+%%X11%%%%DATADIR%%/fonts/ssef874.fon
+%%X11%%%%DATADIR%%/fonts/sserife.fon
+%%X11%%%%DATADIR%%/fonts/sserifee.fon
+%%X11%%%%DATADIR%%/fonts/sserifeg.fon
+%%X11%%%%DATADIR%%/fonts/sserifer.fon
+%%X11%%%%DATADIR%%/fonts/sserifet.fon
+%%X11%%%%DATADIR%%/fonts/sseriff.fon
+%%X11%%%%DATADIR%%/fonts/sseriffe.fon
+%%X11%%%%DATADIR%%/fonts/sseriffg.fon
+%%X11%%%%DATADIR%%/fonts/sseriffr.fon
+%%X11%%%%DATADIR%%/fonts/sserifft.fon
+%%X11%%%%DATADIR%%/fonts/svgasys.fon
+%%X11%%%%DATADIR%%/fonts/symbol.ttf
+%%X11%%%%DATADIR%%/fonts/tahoma.ttf
+%%X11%%%%DATADIR%%/fonts/tahomabd.ttf
+%%X11%%%%DATADIR%%/fonts/vgafix.fon
+%%X11%%%%DATADIR%%/fonts/vgas1255.fon
+%%X11%%%%DATADIR%%/fonts/vgas1256.fon
+%%X11%%%%DATADIR%%/fonts/vgas1257.fon
+%%X11%%%%DATADIR%%/fonts/vgas874.fon
+%%X11%%%%DATADIR%%/fonts/vgasys.fon
+%%X11%%%%DATADIR%%/fonts/vgasyse.fon
+%%X11%%%%DATADIR%%/fonts/vgasysg.fon
+%%X11%%%%DATADIR%%/fonts/vgasysr.fon
+%%X11%%%%DATADIR%%/fonts/vgasyst.fon
+%%X11%%%%DATADIR%%/fonts/wingding.ttf