Update to the Wine 5.0.4 maintenance release which fixes some 67 bugs.

Remove conflicts with wine-staging-[0-9]* and i386-wine-staging-[0-9]*
which have not existed for years.

Remove dependency on libhal it is going to be removed from the ports tree

www.winehq.org now defaults to https; adjust all URLs.

Remove the GCC option. which has been the default all along, and simply
use GCC.

This avoids troubles for users disabling the option and then encountering
failures without knowing how to go about that. (And there is not much one
can even do given upstream focuses on GCC.)

PR:		242202

Back port r556564 | gerald | 2020-11-29 from emulators/wine-devel:

  Wine is now able to use mingw-w64 to build components. When mingw-w64
  is installed on FreeBSD, users might inadvertedly use that when we have
  not set up things properly yet (and it probably should be an option to
  choose, at least initially). For example, mingw-w64 produces .dll files
  instead of the current .dll.so files, breaking pkg-plist.

  So for now explicitly disable the use of mingw-w64. In a next step,
  once mingw-w64 is available, we probably should make this an option.

PR:		237213
Reported by:	Damjan Jovanovic <damjan.jov@gmail.com>
MFH:		2020Q4 (blanket: build issue)

Back port r551487 | gerald | 2020-10-05 from emulators/wine-devel:

  Add an option SDL that uses SDL 2, a cross-platform multimedia development
  API which can be useful particularly when it comes to supporting games.
  This is off by default for now in alignment with the status quo.

Submitted by:	Alex S <iwtcex@gmail.com>
PR:		249869

Update to the Wine 5.0.3 maintenance release which fixes some 44 bugs
and adds where.exe and whoami.exe.

Backport revision r550190 from emulators/wine-devel:

  No longer hack tools/wineapploader.in to account for wine64 vs wine.

  Since upstream commit
https://source.winehq.org/git/wine.git/commitdiff/57f9c33c08782399d6729bc58b
68d73812560638
  this hasn't been necessary any longer and it did actually break things
  afterwards by replacing wine64 with wine6464.

PR:		249868
Submitted by:	Alex S <iwtcex@gmail.com>

Update to the Wine 5.0.2 maintenance release which fixes some 46 bugs.

Backport r540756 | gerald | 2020-06-29 from emulators/wine-devel:

  Explicitly configure --without-usb. There does not appear to be a way
  for the configure test to pass on FreeBSD right now (even with extra
  ports available), so this simply makes this explicit and avoids a
  warning from configure.

MFH:		2020Q3 (blanket: missing dependency)

Update to the Wine 5.0.1 maintenance release.

This adds some timezones and fixes some 37 bugs.

Plus it facilitates compilation with GCC 10. [1]

PR:		246700 [1]

Backport r534205 | gerald | 2020-05-06 from emulators/wine-devel:

  Push USES=pkgconfig to the global level instead just contingent on the
  VKD3D option.

  This makes a real difference for the GNUTLS option (on by default) and
  others.  Accordingly bump PORTREVISION.

Reported by:	Benny Goemans <benny.goemans@belgacom.net>
MFH:		2020Q2 (blanket: missing dependency)

Explicitly configure --without-inotify so that the presence of the
devel/libinotify port does not pull in an implicit dependency that
is not tracked properly.

Reported by:	Andy Mender <andymenderunix@gmail.com>
PR:		245172
MFH:		2020Q2 (blanket: missing dependency)

Backport r530401 | gerald | 2020-04-02 from our wine-devel companion:

  Explicitly configure --without-unwind so that the presence of the
  devel/libunwind port does not pull in an implicit dependency that
  is not tracked properly.

Reported by:	Andy Mender <andymenderunix@gmail.com>
PR:		245172

emulators/wine: Change tested variable for master port detection

Forward r529132 from emulators/wine-devel.

Approved by:	gerald (maintainer, mentor)
Differential Revision:	https://reviews.freebsd.org/D24262

emulators/i386-wine: Use standard ports infrastructure for ARCH

This commit is the analogous for i386-wine of r528249 that concerns
emulators/i386-wine-devel.

Until now i386-wine defined its own ARCH variable and manually included
Makefile.i386 for i386 systems and Makefile.inc for amd64 systems. This
commit makes use of the standard ARCH variable and renames Makefile.inc to
Makefile.amd64 so that the proper Makefile.${ARCH} is automatically
included.
This requires conditional inclusion bsd.ports.pre.mk and bsd.ports.post.mk
by emulators/wine [1], master port for i386-wine: those files must be
included only if they have not already been included by i386-wine.

Approved by:	gerald (mentor, maintainer [1])

Update from Wine 4.0.3 and the Wine 4.0 release series to Wine 5.0.

This represents a year of development effort with over 7,400 individual
changes.  This port and the wine-devel port have been in sync as closely
as possible, and this update is mostly copying over from the -devel port
minus support for the Wine Staging patchset (and STAGING option).

Highlights of this new release include built-in modules in PE format,
multi-monitor support, Vulkan 1.1 support, and an XAudio2 reimplementation.

This also comes with updates of the emulators/wine-gecko and
emulators/wine-mono ports to match their -devel counterparts:
version 2.47.1 for wine-gecko and version 4.9.4 for wine-mono.

And we "lose" four local patches that got integrated or became obsolete

Update to the Wine 4.0.3 maintenance release with various bug fixes and
updates to the National Language Support files.

Sprinkle more USES=xorg

Explain why this patch currently only is part of emulators/wine and not
emulators/wine-devel (any longer) and should disappear from the former
with the next major version upgrade.

Update to the Wine 4.0.2 maintenance release.

This brings some 68 bug fixes.

Backport r506725 | gerald | 2019-07-16 from wine-devel:

  Fix packaging list (pkg-plist) when the MPG123 option is set.

PR:		239202
Submitted by:	arrowd, avos
MFH:		2019Q3 (packing list with non-default option)

Convert to UCL & cleanup pkg-message (categories e-g)

Add a note how to work around Wine issuing an error message of
    i386_set_ldt: Invalid argument
    Did you reconfigure your kernel with "options USER_LDT"?

PR:		224264
Submitted by:	rozhuk.im@gmail.com
Reviewed by:	arrowd
MFH:		2019Q3 (documentation to address crash)

Bump PORTREVISION for ports depending on the canonical version of GCC
as defined in Mk/bsd.default-versions.mk which has moved from GCC 8.3
to GCC 9.1 under most circumstances now after revision 507371.

This includes ports
 - with USE_GCC=yes or USE_GCC=any,
 - with USES=fortran,
 - using Mk/bsd.octave.mk which in turn features USES=fortran, and
 - with USES=compiler specifying openmp, nestedfct, c11, c++0x, c++11-lang,
   c++11-lib, c++14-lang, c++17-lang, or gcc-c++11-lib
plus, everything INDEX-11 shows with a dependency on lang/gcc9 now.

PR:		238330

Add a comment explaining that files/patch-libinotify is not necessary for
Wine 4.7 and later (and Wine 5.0) any longer and shall be removed then.

Update to the Wine 4.0.1 maintenance release.

This brings various bug fixes and Sinhala and Tamil translation updates.

Update from the Wine 3.0 release series to Wine 4.0.

This represents a year of development effort with over 6,000 individual
changes. Due to regular syncing between the wine-devel port and this
one changes mostly relate to pkg-plist; the biggest difference between
the two is wine-devel featuring a STAGING option to support the Wine
Staging patchset.

Highlights of this new release include Direct3D 12 and Vulkan support,
as well as support for game controllers.

It also goes along with a corresponding minor update of
emulators/wine-mono. [1]

The following is a more detailed list extracted from the full(er) release

Add gl to X11_USES since a naked USE_GL=, without also setting USES, as
we've had has been deprecated for a while.

Restore a simpler and more elegant version of r490816 which was reverted
in r490825. (r490827 addresses the breakage of INDEX which happened in
some scenarios that led to that revert.)

Add a new option, GCC, that controls the use of GCC instead of the
system compiler (usually clang these days) as we have been doing since
r334935 in 2013-11-26.  And make that the default, both since there've
been user reports about Wine not working properly with the toolchain
in FreeBSD 12 and since there may be other challenges given that
upstrea and in other distributions GCC is being used all along.

PR:		231010
Reviewed by:	mat
Tested by:	sbruno

Remove a hack (defining __builtin_ms_va_list and friends) for versions
of clang before 3.8 and hence versions of FreeBSD no longer maintained.

Revert r490816, it breaks INDEX

With hat:	portmgr

Add a new option, GCC, that controls the use of GCC instead of the
system compiler (usually clang these days) as we have been doing since
r334935 in 2013-11-26.  And make that the default, both since there've
been user reports about Wine not working properly with the toolchain
in FreeBSD 12 and there may be other challenges given that upstream
and in other distributions GCC is being used all along. [1]

Also backport part of r488645 | gerald | 2018-12-29 01:53:56 from
emulators/wine-devel:

  Create a proper USES block in Makefile, moving the existing USES
  statement there.

PR:		231010 [1]

Bump PORTREVISION for ports depending on the canonical version of GCC
defined via Mk/bsd.default-versions.mk which has moved from GCC 7.4 t
GCC 8.2 under most circumstances.

This includes ports
 - with USE_GCC=yes or USE_GCC=any,
 - with USES=fortran,
 - using Mk/bsd.octave.mk which in turn features USES=fortran, and
 - with USES=compiler specifying openmp, nestedfct, c11, c++0x, c++11-lang,
   c++11-lib, c++14-lang, c++17-lang, or gcc-c++11-lib
plus, as a double check, everything INDEX-11 showed depending on lang/gcc7.

PR:		231590

Update to the Wine 3.0.4 maintenance release which addresses 47 bug
reports and adds a lot of icons in Shell32.

Bump PORTREVISION to chase update of multimedia/v4l_compat and libv4l

Update to the Wine 3.0.3 maintenance release which addresses 52 bug
reports, mostly in actual applications.

Change x11/xorgproto to become a build dep

Change x11/xorgproto to become a build time dependency when added to
USE_XORG.  Change the dependency to be on the port, rather than a file the
port installs.
Fix fallout.
Bump portrevision on depending ports.

PR:		230909
Reviewed by:	eadler
Approved by:	portmgr (antoine)
Obtained
from:	https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/xorgproto
exp-run:	antoine
Differential Revision:	https://reviews.freebsd.org/D16906

Backport r464959 | gerald | 2018-03-18 22:24:42 from emulators/wine-devel:

Fully disable building Kerberos components.

We already had --without-krb5, alas when someone had krb5 installed
in their build environment, the build still failed.  This takes care
using a bigger hammer.

PR:		226396
Analyzed by:	John Hein <z7dr6ut7gs@snkmail.com>

Sync a comment re WoW64 plus the desktop file with revision r477548
of the emulators/wine-devel port to keep the two in sync.

Bump PORTREVISION for ports depending on the canonical version of GCC
in the ports tree (via Mk/bsd.default-versions.mk and lang/gcc) which
has now moved from GCC 6 to GCC 7 by default.

This includes ports
 - featuring USE_GCC=yes or USE_GCC=any,
 - featuring USES=fortran,
 - using Mk/bsd.octave.mk which in turn features USES=fortran, and those
 - with USES=compiler specifying one of openmp, nestedfct, c11, c++0x,
   c++11-lib, c++11-lang, c++14-lang, c++17-lang, or gcc-c++11-lib.

PR:		222542

Update to the Wine 3.0.2 maintenance release which "only" fixes a couple
of bugs.

Port revision 471203 from the wine-devel port to the main wine port:

Replace explicit settings of CFLAGS and LDFLAGS in favor of USES=localbase
(the former predating the latter by at least a decade alas with variation).

PR:		226396
Submitted by:	John Hein <z7dr6ut7gs@snkmail.com>

emulators/wine: fix desktop file on amd64

Reviewed by:	gerald
Approved by:	dbn
Differential Revision:	https://reviews.freebsd.org/D15489

Update to the Wine 3.0.1 maintenance release which fixes a number of bugs
and provides translation updates for Finnish, German, Lithuanian, Norwegian,
Polish, Russian, and Ukrainian.

For ports under `emulators', `games', `irc`, and `sysutils' categories:
remove redundant PKGMESSAGE assignment, which is set appropriately by
the b.p.m when `pkg-message' appears on the SUB_FILES list.

Remove the workaround for a clang 6.0.0 crash on FreeBSD version 1200056
(where we'd use GCC), now that version 1200057 which fixes that issue is
eight weeks old.

PR:		224863

Change dependencies from wine-gecko-devel to wine-gecko and wine-mono-devel
to wine-mono.

Technically this is not required at this point, since the -devel and
regular ports provide the same versions temporarily, but it sets us up
for when the -devel ports are going to diverge again later.

The issue of clang 6.0.0 crashing when building Wine was resolved with
__FreeBSD_version 1200057, so reduce the window of versions we need a
workaround for to just 1200056.

In the mid term I plan on removing this workaround, but let's keep it
in place for a bit longer for the sake of users on an affected snapshot.

PR:		224863
Thanks to:	dim

Fix the ibiblio.org MASTER_SITE URL which has changed.

Update from the Wine 2.0 release series to Wine 3.0.

This represents a year of development effort with over 6,000 individual
changes.  Due to regular syncing from the wine-devel port to this one
changes mostly relate to pkg-plist and the two ports mostly differ by
wine-devel featuring a STAGING option to support the Wine Staging
patchset.

Highlights of this new release include Direct3D 10 and 11 support,
Direct3D command stream, and improved DirectWrite and Direct2D support.
The following is a more detailed list:

== Direct3D

- A significant number of Direct3D 10 and 11 features are implemented

Limit the workaround for clang crashing to amd64.

PR:		224863
Reported by:	jbeich

Use GCC instead of the system compiler on FreeBSD 12.x with clang 6.0.0
since that compiler crashes.

(There may be a way to work around this in Wine, but that is unlikely
to be accepted for the stable release branch.)

PR:		224863

Backport r459628 | gerald | 2018-01-21 from emulators/wine-devel:

  Configure --without-krb5 aka Kerberos support.  This should not make a
  real difference (and definitely not for clean builds), but makes this
  explicit and also avoids a configure warning.

Backport two configure-related changes from emulators/wine-devel.  This
is partly to sync wine and wine-devel as closely as possible before the
pending new major release of Wine, partly to make builds more reproducible
outside of a strict build environment (there should be no change for "pure"
builds).

r454242 | gerald | 2017-11-15

  [G]enerally disable PulseAudio support, not just for the
  Wine Staging case (where this originally only existed). [1]

r458393 | gerald | 2018-01-08

  Configure --without-udev since FreeBSD does not feature udev support
  as such.  (This should not be a practical change, but makes this explicit
  and also avoids a configure warning.)

PR:		195765 [1]
Reported by:	dbn [1]

Update to the Wine 2.0.4 maintenance release which brings the following:
 - Various bug fixes
 - Updates to the National Language Support files
 - Documentation updates

On the way backport r454456 from emulators/wine-devel where it has sat
for seven weeks now:

 Explicitly add x11 and xext to USE_XORG (when the X11 option is set),
 both of which were pulled in implicitly so far. [1]

Reported by:    Mk/Scripts/qa.sh via dbn@ [1]

Update to the Wine 2.0.3 maintenance release.  This brings various bug
fixes and FreeType 2.8.1 compatibility fixes.

Move ONLY_FOR_ARCHS and USES to appropriate places in the Makefile. [1]

Reported by:	portlint [1]

Bump PORTREVISION for ports depending on the canonical version of GCC
(via Mk/bsd.default-versions.mk and lang/gcc) which has moved from
GCC 5.4 to GCC 6.4 under most circumstances.

This includes ports
 - with USE_GCC=yes or USE_GCC=any,
 - with USES=fortran,
 - using Mk/bsd.octave.mk which in turn features USES=fortran, and
 - with USES=compiler specifying openmp, nestedfct, c++11-lib, c++11-lang,
   c++14-lang, c++0x, c11, or gcc-c++11-lib.

PR:		219275

Update to the Wine 2.0.2 maintenance which mostly fixes bugs (62 as
filed in the upstream bug tracker).

Sort ONLY_FOR_ARCHS.

Pet portlint as far as files/patch-dlls_iphlpapi_ipstats.c goes.

Bump PORTREVISION for pkg-descr change.

Be more bold re games working.

Add a note on when to use this port and how it relates to i386-wine.

Discussed with:	dbn

Revision bump of all ports with USE_GL after consolidation of mesa-libs

Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D10845

Adjust PORTSCOUT to the new versioning scheme of Wine where current
releases carry versions of the form 2.0.x, whereas new development
snapshots are labeled 2.y.

Update to the Wine maintenance release 2.0.1, bringing various bug fixes
and deprecating tools/wineinstall.

Switch to .xz distribution files from .bz2 on the way.

Bump PORTREVISIONs for ports depending on the canonical version of GCC and
lang/gcc which have moved from GCC 4.9.4 to GCC 5.4 (at least under some
circumstances such as versions of FreeBSD or platforms).

This includes ports
 - with USE_GCC=yes or USE_GCC=any,
 - with USES=fortran,
 - using using Mk/bsd.octave.mk which in turn has USES=fortran, and
 - with USES=compiler specifying openmp, nestedfct, c++11-lib, c++14-lang,
   c++11-lang, c++0x, c11, or gcc-c++11-lib.

PR:		216707

Update emulators/wine-mono to version 4.6.4 and switch to new MASTER_SITES.

Switch emulators/wine to this (from emulators/wine-mono-devel) and bump
PORTREVISION accordingly.

Make it compilable on FreeBSD 12 after struct inpcb and struct tcpcb were
stopped being exported.

Update from the 1.8 release series to Wine 2.0.

This represents over a year of development effort and around 6600
individual changes.

Support for Microsoft Office 2013 is a major highlight, and it
contains improvements across the board, as well as support for
many new applications and games.

== Text and fonts

- More DirectWrite features are implemented, including:
  - Drawing of underlines.
  - Renderer sees drawing effect associated with text segment.
  - Support for color fonts in COLR/CPAL format.

Complete pkg-plist when OPENAL is set.

- Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL

Approved by:	portmgr blanket

Update to Wine 1.8.6 which is a conservative maintenance release:
 - Fix a regression introduced in 1.8.5 (#41627)
 - Various bug fixes.
 - A few more cards added to the GPU description table.

Bump PORTREVISIONS for ports depending on the canonical version of GCC and
lang/gcc which have moved from GCC 4.8.5 to GCC 4.9.4 (at least under some
circumstances such as versions of FreeBSD or platforms).

In particular that is ports with USE_GCC=yes, USE_GCC=any, or one of
gcc-c++11-lib, openmp, nestedfct, c++11-lib as well as c++14-lang,
c++11-lang, c++0x, c11 requested via USES=compiler.

Update to Wine 1.8.5 which mostly brings a number of bug fixes, and
a new include file include/wine/windows/wlanapi.h.

On the way, properly sort two existing files in pkg-plist.

Backport from wine-devel (r414806):

Include GNUTLS in the default options since apparently it does help
with Evernote and World of Warcraft.

And it also seems to help with Internet Explorer and Microsoft Office. [1]

Bump PORTREVISION.

PR:		208234
Reported by:	crees [1]

Configure without --without-xinerama which I missed from r420654 since
it was not part of the respective patch in wine-devel.

Backport from emulators/wine-devel:

Require/build with Xinerama support (which has been explicitly disabled
before to ensure reproducible builds).  Without this, some programs would
incorrectly show full screen as a wide window covering 2 monitors.

PR:		210039
Submitted by:	Henry Hu <henry.hu.sh@gmail.com>

Update to Wine 1.8.4 which brings
 - various bug fixes, and.
 - a few more cards added to the GPU description table.

Similar to 1.8.3 and a bit surprisingly a new include file
include/wine/windows/ddk/ndis.h.

Update to Wine 1.8.3 which brings
 - various bug fixes;
 - a lot of additional NVidia cards in the GPU description table; and
 - updates to the National Language Support files.

A bit surprisingly given the nature of this maintenance release, also
a handfull of changes to the packaging list (such as a new include file
include/wine/windows/fontsub.h).

Fix for old make on FreeBSD 9.x.  USE_GCC=yes instead of USE_GCC=any there.

PR:		206527

Force the use of GCC where it is the system compiler since
COMPILER_VERSION will be 42 (the GCC version) even if clang
is CHOSEN_COMPILER_TYPE in that case.

PR:		206527

Update to Wine 1.8.2 which brings
 - various bug fixes;
 - small translation updates.

Remove ${PORTSDIR}/ from dependencies, categories d, e, f, and g.

With hat:	portmgr
Sponsored by:	Absolight

- Update security/gnutls to 3.4.10.
- Rename the LIBDANE option DANE because that's the name of the protocol
  supported by libgnutls-dane and gnutls-cli.  Also clarify the option
  description.
- Add an IDN option.
- libgnutls-openssl has been removed in 3.4.  Some ports used this library
  in their LIB_DEPENDS but no port actually required it.
- Some old API functions have been removed.  Ports that used these have been
  updated or patched to use the new API.
- Add a patch to print/cups to prevent overlinking of libgnutls.so.
- Bump PORTREVISION on dependent ports.

net-im/jabber: This port used the old API to give users fine grained
control over which crypto algorithms were used via a configuration file.
It's not immediately obvious how to port this to the new API so the port
always uses the defaults now.

www/hydra: Mark BROKEN.  This uses more removed calls than the other ports,
is said to be alpha quality and not fully functional and has been abandoned
10 years ago.

PR:		207768
Exp-run by:	antoine
Approved by:	portmgr (antoine)

Combine print/cups-base, print/cups-client and print/cups-image into
print/cups and update it to 2.1.3.  Also remove print/cups-pstoraster,
improve print/cups-filters, print/foomatic-* and update print/hplip to
3.16.2.

Long description:

First some background.  When you hand a file to cups it sets up a chain of
filter programs that converts the file to something a printer understands.
Each filter has a cost associated with it and cups tries to find the
cheapest chain.  Costs used to be configured in such a way that files were
first converted to PostScript.  This could then be manipulated further (e.g.
putting multiple pages on one sheet) before finally being sent to a
PostScript printer or another filter like pstoraster which produces a raster
format understood by non-PostScript printer drivers.  Nowadays most filters

Update emulators/wine-mono from 0.0.8 to 4.5.6. [1]

Adjust emulators/wine to use this port instead of wine-mono-devel,
which we just upgraded a few hours ago.

Approved by:	dbn (maintainer, pre-approved) [1]

Fix the build with clang 3.8.0 or later which support "native" Windows
varargs builtins.

PR:		206527
Submitted by:	dim

Depend on emulators/wine-gecko instead of emulators/wine-gecko-devel
when option GECKO is set.

Bump PORTREVISION accordingly.

Pet overeager portlint (when it comes to patch format).

Update to Wine 1.8.1 which brings
 - various bug fixes;
 - small translation updates.

Update from the stable 1.6 releases series of Wine to Wine 1.8 and the
1.8 release series.  This represents 17 months of development and around
13,000 individual changes.

This port now also supports amd64.

It generally syncs with the emulators/wine-devel port (from where we
have been syncing various packaging changes over time), now configures
--without-gettext in addition to --without-gettextpo and still refers
to emulators/wine-gecko-devel and emulators/wine-mono-devel for the
time being, but remains without a dependency on sysutils/prelink.

At a more detailed level, changes include:

== Text and fonts

Convert to USES=jpeg

Rename emulators/wine-compholio to emulators/wine-staging and
accordingly emulators/i386-wine-compholio to emulators/i386-wine-staging.

Adjust CONFLICTS across all Wine related ports.

Reviewed by:	dbn, kmoore

emulators/i386-wine(-devel|-compholio): add BUNDLE_LIBS.

The i386-wine ports bundle their own (32-bit) libraries that cause pkg-1.5
issues.  Since these libraries are under lib32 it does not cause issues
with other software.

Bump PORTREVISION [1] for the 32-bit side of the ports.  The 64-bit side of
the ports will be bumped when new packages have been prepared.

Approved by:	gerald@ [1]
Reported by:	bapt@

Add optional support for V4L (off by default).

With this, the wine and wine-devel ports are in sync as much as
possible.

Backport changes from emulators/i386-wine-devel to emulators/i386-wine.

Changes:
 - Fix install conflicts [1] (for the "newly" added compholio port)
 - nvidia.sh: Gracefully handle a corrupt nVidia tarball
 - nvidia.sh: Provide checksum and size information for nVidia tarball
 - Reduce diff between i386-wine and i386-wine-devel:
   - Add support for sub-ports (unused by this port)
   - Properly detect linked (and dlopen) libraries
   - binbounce: Properly set LD_(32_)?LIBRARY_PATH_RPATH variables
   - nvidia.sh: Add detection for i386-wine-compholio
 - Bump master port [1] due to changes to binbounce, nvidia.sh and shared
   library handling.

Approved by:    gerald@ [1]

Replay revision r375594 (change libpng15.so to libpng.so in LIB_DEPENDS
to prepare the upgrade of graphics/png).

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]

Bump portrevision after png update

Change libpng15.so to libpng.so in LIB_DEPENDS to prepare the upgrade

Fix pkg-plist when the MPG123 option is set.
Add USES=desktop-file-utils as suggested by stage-qa.

PR:		195903
Submitted by:	amdmi3