*/*: Remove redundant '-[0-9]*' from CONFLICTS

The conflict checks compare the patterns first against the package
names without version (as reported by "pkg query "%n"), then - if
there was no match - agsinst the full package names including the
version (as reported by "pkg query "%n-%v").

Many CONFLICTS definitions used patterns like "bash-[0-9]*" to filter
for the bash package in any version. But that pattern is functionally
identical with just "bash".

Approved by:	portmgr (blanket)

sysutils/conky: update to 1.12.2

sysutils/conky: Force linking against correct LUA

When multiple LUA versions are present conky could link against
version 5.3 but register dependency against version 5.2.

Try to force conky build system to actually link against the desired
version of the library.

Reported by:	Joachim Moskalewski <moskalewski@jmos.net>

sysutils/conky: Allow lua 5.3 too, it's supported.

Reported by:	Joachim Moskalewski <moskalewski@jmos.net>

Remove # $FreeBSD$ from Makefiles.

Update conky to 1.12.1

Fix conky build on head after commit a21def4d568f which removed the
wi driver.

The code actually depending on this include is already disabled by
#if 0, so there is no functional change.

Prefer graphics/ligvrsvg2-rust over graphics/librsvg2

- switch to the more modern version of librsvg2 on architectures
  supporting rust
- this will fix some graphical issues on these architectures

PR:		250276
Exp-run by:	antoine
Submitted by:	tobik
Differential Revision:	https://reviews.freebsd.org/D18878

- Update conky to 1.11.6
- Remove patch now included upstream

Multiple ports: improve regex compliance

These changes largely fall into just two categories:

1. Need textproc/gsed for GNU extensions
2. Extraneous escapes that can go away

For #1, there's a further subdivision into those that require autoconf magic
and those that can get away with BINARY_ALIAS=sed=${LOCALBASE}/bin/gsed.
-CURRENT will soon gain GNU extensions, but these will take longer to get to
all supported releases; we must switch them to gsed to ensure we're actually
properly building them as intended.

For #2, I've fixed these as I can and we should upstream these fixes.

Fix if_mounted and if_running variables

PR:		243088
Submitted by:	Helge Oldach <freebsd@oldach.net>
Obtained from:	https://github.com/brndnmtthws/conky/pull/924

Sprinkle more USES=xorg

Add USES=xorg and USES=gl

Add USES=xorg and USES=gl to a few remaining ports.

Fix document generation.

PR:		240244
Submitted by:	James Stark <james.e.stark@gmail.com>
MFH:		2019Q3

Update conky to 1.11.5

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

Update conky to 1.11.4

- Allow building with lua 5.2
- Make LUA_CAIRO option default to on

Suggested by: lme

Fix build on non-x86 archs by disabling apm.

Approved by:	portmgr (tier-2 blanket)

- Upgrade conky to 1.11.3
- Remove patches included upstream

Import upstream patch in conky.

Obtained
from:	https://github.com/brndnmtthws/conky/commit/298eb76434cc2a62c76df706ff01ccd9c77a4681
		https://github.com/brndnmtthws/conky/commit/1fc2b17eb5c93ea7d0c00e6e7448fc9bc69aa276

Update conky to 1.11.2

New version uses an embedded version of toloa++ and drops support
for lua 5.1

- Update conky to 1.11.1
- Silence some portlint warnings

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

Fix build with GCC-based architectures.

Fix changes the name of a variable to avoid clash with a function
name defined in an include file used by GCC.

PR:		233616
Submitted by:	Piotr Kubaj <pkubaj@anongoth.pl>

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

Import upstream patch to fix OSS (sound mixer) support.

While here, fix malformed line in patch causing build time warning.

Reported by:	pong (via IRC)
Obtained
from:	https://github.com/brndnmtthws/conky/commit/6b386589c0822bdaf5ed38d5f388cf902e0e749e

- Update conky to 1.10.8
- Remove local patch included upstream

Import upstream patch to fix runtime crash.

PR:		225523
Submitted by:	Hatronmorus <ebirth@b0ss.net>
Obtained
from:	https://github.com/brndnmtthws/conky/commit/562c7375883445acb58388ff16d9eb126b7e12a1

Update conky to 1.10.7

Fix whitespace issues (mixed tab/spaces, alignment) in a few ports.

This round is @FreeBSD.org residents except teams.

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

Make ninja opt-out in cmake.mk

Using ninja instead of make (1) can lead to significant speed ups while
building.
Therefore switch from having the ninja generator opt-in to having it opt-out.

Previously cmake-ports that wanted to use ninja could set
    CMAKE_NINJA=yes
now, ports that do not work with ninja can set
    cmake:<existing args>,noninja
Note, that needing this should be an exception and most often points to a broken
cmake of the port.

The ports using cmake were modified
* removed USES=gmake, if ninja is used
* removed MAKE_ARGS, if ninja is used
* added the cmake-argument noninja if necessary

PR:		219629
PR:		213331
Exp-run by:	antoine
Reviewed by:	rakuco
Differential Revision:	https://reviews.freebsd.org/D10748

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

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

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

Attempt to fix build on tier-2 archs.

Tested on:	armv6
Submitted by:	madpilot (maintainer)

- Update conky to 1.10.6
- Remove patch submitted upstream

Make conky try to get CPU temperature from more than just one sysctl.

PR:		210235
Submitted by:	walter@pelissero.de

- Update to 1.10.5
- Remove patches which have been accepted upstream

Fix build by enforcing METAR option when XOAP option is enabled.

Reported by:	pilot513 at gmail.com (via email)
MFH:		2016Q4

Fix ${top name} configuration variable output.

Reported by:	Szabolcs Grof <grof.szabolcs at gmail.com>
		(via email, with patch)

Add dependency on libinotify and fix build when it is present.

Reported by:    Walter Schwarzenfeld <w.schwarzenfeld at utanet.at>
		(via email)

- Update conky and conky-awesome to 1.10.4
- Take maintainership [1]
- Options adapted to new version
- Removed LUA option since it's a mandatoory requirement now
- Use project own install target
- Fix installation of lua helper libraries
- Project moved to github
- in conky-awesome, properly use OPTIONS_EXCLUDE

PR:		212629
Submitted by:	me
Approved by:	ntarmos@ceid.upatras.gr (former maintainer) [1]

Fix typo

- Add explicit IMPLIES between dependencies and simplify option handling [1]
- Convert to USES=localbase
- Switch some options helpers from LIB_DEPENDS to USE=xorg and USE=gnome

PR:		210414 [1] (based on)
Submitted by:	elferdo@gmail.com
Approved by:	maintainer timeout

When there is a do-install target, do not use a post-install target, do
everything at once.  Sometime, rename post-install into a options helper
target.

I did not fix ports that were such a mess that I could not figure out
what they really wanted to do.  I also did not change ports that had
some version of an auto-plist code in post-install, for the same reason.

With hat:	portmgr
Sponsored by:	Absolight

- Fix battery percentage calculation and add support for ${battery_short} and
${battery_bar} [1]
- Remove a bogus __FreeBSD_kernel__ check in freebsd.c
- Re-gen patches with "make makepatch"
- Bump PORTREVISION

PR:		208651 [1]
Submitted by:	Helge Oldach <freebsd@oldach.net>
Approved by:	maintainer timeout (17 days)
MFH:		2016Q2

Remove ${PORTSDIR}/ from dependencies, categories r, s, t, and u.

With hat:	portmgr
Sponsored by:	Absolight

- Fix build with LUA_CAIRO or LUA_IMLIB2 enabled

PR:		204778
Submitted by:	walkerd@pamandduncan.co.uk
Approved by:	portmgr blanket
MFH:		2015Q4 (blanket)

- Add CPE info

Approved by:	portmgr blanket

Bump PORTREVISION following the last commit

Enable XFT option by default

PR:		192866
Submitted by:	Jean-Sebastien Pedron
Approved by:	Nikos Ntarmos (maintainer)

Convert to USES=lua

The FreeBSD x11@ and graphics team proudly presents
a zeising, kwm production, with help from dumbbell, bdrewery:

NEW XORG ON FREEBSD 9-STABLE AND 10-STABLE

This update switches over to use the new xorg stack by default on FreeBSD 9
and 10 stable, on osversions where vt(9) is available.
It is still possible to use the old stack by specifying WITHOUT_NEW_XORG in
/etc/make.conf .
FreeBSD 8-STABLE and released versions of FreeBSD still use
the old version.
A package repository with binary packages for new xorg will
be available soon.

This patch also contains updates of libxcb and related ports, pixman, as well

- Add patch to fix diskio memory leak
- Bump PORTREVISION

While here:
- Convert USE_BZIP2 -> USES

PR:		ports/181040
Submitted by:	Ken DEGUCHI <kdeguchi@sz.tokoha-u.ac.jp>
Approved by:	maintainer timeout (~8 months)

Allow slave port to set it's own COMMENT

- Add staging support and use option helpers [1]
- Remove leading article from COMMENT
- Convert USE_GMAKE to USES=gmake
- Convert to new LIB_DEPENDS format
- Remove tab character from WWW: line

PR:		ports/185302 [1] (based on)
Submitted by:	Zsolt Udvari <udvzsolt@gmail.com>
Approved by:	maintainer timeout

Add NO_STAGE all over the place in preparation for the staging support (cat:
sysutils)

- Update to 7.31.0
- Bump PORTREVISION for ftp/curl shlib change
- Add TEST_DEPENDS
- Convert to new options framework
- Adjust options:
  - Add COOKIES
  - Add CYASSL, NSS, POLARSSL, THREADED_RESOLVER, TLS_SRP [1]
  - Add GSSAPI and SPNEGO [2]
  - Remove KERBEROS4
  - Rename LIBIDN to IDN
  - Remove TRACKMEMORY [1]
- Sort option handler
- Add SLAVEDIRS: ftp/curl-hiphop
- Cosmetic change
- Cleanup Makefile header
- While I'm here, fix typo (PORTREVSION) in x11-wm/ede/Makefile

Changes:	http://curl.haxx.se/changes.html
PR:		ports/172325 (-exp run), ports/177369 (based on) [1]
Submitted by:	Hirohisa Yamaguchi <umq@ueo.co.jp> [1], hrs (via email) [2]
Exp run by:	miwi

- Convert USE_ICONV=yes to USES=iconv
- Change USE_GNOME=pkgconfig|gnomehack to USES=pathfix|pkgconfig and
  USE_GETTEXT=yes to USES=gettext while here

Finish converting the whole ports tree to USES=pkgconfig

- Convert to new options framework [1]
- Use USE_PKGCONFIG instead of USE_GNOME=pkgconfig [1]
- Remove ABI version numbers from LIB_DEPENDS [1]
- Trim Makefile headers on sysutils/conky-awesome [1]
- Update maintainer address [2]
- Add new options [2]
- Bump PORTREVISION [2]

PR:		ports/176038 [1]
Submitted by:	myself
Reviewed by:	bapt [1]
Approved by:	Nikos Ntarmos <ntarmos@ceid.upatras.gr> (maintainer) [2]

- Add missing patch to fix the build on i386

Reported in:	175979

- Remove some empty patches.

- Update to 1.9.0

PR:		168161
Submitted by:	lbartoletti <coder@tuxfamily.org>
		Lars Engels <lars.engels@0x20.net>
Approved by:	maintainer

- Fix build with llvm/clang and other miscellanous compile issues
- Bump PORTREVISION

PR:             ports/164893
Submitted by:   Brandon Gooch <jamesbrandongooch@gmail.com> &
                Nikos Ntarmos <ntarmos@ceid.upatras.gr> (maintainer)

- Add LDFLAGS to CONFIGURE_ENV and MAKE_ENV (as it was done with LDFLAGS)
- Fix all ports that add {CPP,LD}FLAGS to *_ENV to modify flags instead

PR:             157936
Submitted by:   myself
Exp-runs by:    pav
Approved by:    pav

- BMPx has gone, remove the option from BMPx [1]
- while here remove CPPFLAGS from CONFIGURE_ENV
- default package unchange: no portrevision bump

Approved by:    Nikos Ntarmos <ntarmos@cs.uoi.gr> (maintainer) [1]

update audacious to 2.5.4
Bump PORTREVISION of affected ports

update audacious to 2.4.4

- Update to 0.7.DrNo.
- Update WWW
- chase xmms2 shlib bump

PR:             144821
Submitted by:   Guido Falsi <mad@madpilot.net>

Explicitly disable ALSA support.

PR:             ports/153186
Approved by:    Nikos Ntarmos (maintainer)

Fix crash
Remove md5 sum

PR:             ports/151668
Submitted by:   Nikos Ntarmos (maintainer)

- Update to 1.8.1

PR:                             ports/151351
Submitted by:   Nikos Ntarmos <ntarmos@cs.uoi.gr>

- Update to 1.8.0

PR:             147795
Submitted by:   Nikos Ntarmos <ntarmos@cs.uoi.gr> (maintainer)

update audacious to 2.3
bump PORTREVISION on the affected ports

Chase the ftp/curl shlib version bump.

- Add support for Weather reports and apcupsd status

PR:             ports/143457
Submitted by:   Nikos Ntarmos <ntarmos@cs.uoi.gr> (maintainer)

- Support reporting per-core CPU load statistics

PR:             142577
Submitted by:   Ivan Klymenko <fidaj@ukr.net>
Approved by:    maintainer timeout

- Add RSS, LUA_CAIRO and LUA_IMLIB2 options

PR:             ports/141176
Submitted by:   Nikos Ntarmos <ntarmos@cs.uoi.gr> (maintainer)

update audacious to 2.2
bump portrevisions on dependent ports
mark audacious-crossfade BROKEN since it is no longer compatible with audacious

- Fix build with BMPX

PR:             139057
Submitted by:   Nikos Ntarmos <ntarmos@cs.uoi.gr> (maintainer)

- Chase audio/xmms2 shlib bump

PR:             138936
Submitted by:   "Herbert J. Skuhra" <h.skuhra@gmail.com>
Feature safe: yes

- Update to 1.7.2

PR:             138215 (based on)
Submitted by:   Sylvio Cesar <scjamorim@bsd.com.br>
Approved by:    maintainer
Feature safe:   yes

- Switch SourceForge ports to the new File Release System: categories starting
with P,R,S

update audacious to 2.1
bump portrevision on dependant ports

- Hide irrelevant options from awesome slave, and fix his install

Submitted by:   Nikos Ntarmos <ntarmos@cs.uoi.gr> (maintainer)

- Update to 1.7.1.1

PR:             135368
Submitted by:   Nikos Ntarmos <ntarmos@cs.uoi.gr> (maintainer)

update audacious to 2.0.1
bump portrevision on dependant ports

Update to 1.7.0

PR:             134184
Submitted by:   Nikos Ntarmos (maintainer)

Pass maintainership to Nikos Ntarmos who kindly agreed to look for this port.

Fix audacious support.

PR:             126003
Submitted by:   "Andrew J. Caines" <A.J.Caines@halplant.com>

Update to 1.6.1.

- Chase xmmsclient shlib bump

Pointy hat to:  alexbl

- Update to 1.5.1

Submitted by:   adamw
Approved by:    maintainer (novel)

Add sysutils/conky-awesome after a repocopy from sysutils/conky.
Conky-awesome is the conky X-based system monitor ported to the awesome
window manager.

Submitted by:   adamw
Conky diffs approved by:        novel

Chase audio/xmms2 shlib version bump.

PR:             123024
Submitted by:   Amaury Gauthier <amauryamaury@gmail.com>

- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+

Thanks to all Helpers:
        Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
        ehaupt, nox, itetcu, flz, pav

PR:             116263
Tested on:      pointyhat
Approved by:    portmgr (pav)

Comment out WITHOUT_OWN_WINDOW knob since it's broken in this version. It's
expected to be fixed in future versions though.

Reported by:    Keith Gaughan <keith.gaughan@gmail.com>

- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Bump PORTREVISION

Approved by:    portmgr (xorg cleanup)