*/*: 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)

x11/xscreensaver: Add CPE information

Approved by:	portmgr (blanket)

graphics/mesa-libs: Bump reverse deps for libglvnd

Per discussion with bapt on helping pkg handle the changing of these
deps and avoiding impossible upgrade senarios.

PR:		246767
Reviewed by:	manu, bapt
Approved by:	x11
Differential Revision:	https://reviews.freebsd.org/D30824

Remove # $FreeBSD$ from Makefiles.

x11/xscreensaver: Update to 5.44

Update x11/xscreensaver to 5.44
Enable PAM by default [1]

Changelog:
https://www.jwz.org/xscreensaver/changelog.html

PR:		212830, 211424 [1]

x11/xscreensaver: Update dependencies, misc fixes

Update x11/xscreensaver dependencies, and remove the dependency on
Xxf86misc.
Add USES=xorg

x11/xscreensaver: Fix plist

Fix pkg-plist for x11/xscreensaver.  This was mixed with the 5.43 update,
when moving from git to svn.

x11/xscreensaver: Mark MAKE_JOBS_UNSAFE

Reported by:	Mark Millard

x11/xscreensaver: Update to 5.43

Update x11/xscreensaver to 5.43

Changelog:
https://www.jwz.org/xscreensaver/changelog.html

x11/xscreensaver: Update to 5.42

Update x11/xscreensaver to 5.42
Add missing gl and gnome to USES=

Changelog:
https://www.jwz.org/xscreensaver/changelog.html

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

x11/xscreensaver: Update to 5.40

Changelog: https://www.jwz.org/xscreensaver/changelog.html

PR:		230805
Submitted by:	Dmitri Goutnik

Fix build without the XFT option.

PR:		224731
Reported by:	ml@netfence.it

x11/xscreensaver: Fix NSFW option

Fix the NSFW option to actually work.  I don't know what I was thinking in
the previous commit.

Reported by:	tobik

x11/xscreensaver: Add NSFW option

Add NSFW option that, when enabled, enables some NSFW wording in the BSOD
screensaver, in the ransomware picture.

Submitted by:	jonathan
Differential Revision:	https://reviews.freebsd.org/D15762

- Switch to USES=localbase
- Update WWW

Approved by:	portmgr blanket

Update to 5.39

ChangeLog:
 * New hacks, 'razzledazzle', 'peepers', 'crumbler' and maze3d.
 * More heuristics for using RSS feeds as image sources.
 * Built-in image assets are now PNG instead of XPM or XBM.
 * X11: Better font-loading fallback heuristics on systems with a terrible
selection of installed fonts.

Sort this.

Update to 5.38

Update to 5.37

This adds a new hack called vigilance.
It also comes with a couple of new things for the BSOD hack.
There is also assorted bug fixes.

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

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

x11/xscreensaver: update 5.35 -> 5.36

- Add MIT License

PR:		213575
Changes:	https://www.jwz.org/xscreensaver/changelog.html
Submitted by:	Piotr Kubaj <pkubaj@anongoth.pl>
Approved by:	zeising (maintainer timeout)

Update to 5.35

Add missing dependencies as reported by poudriere.
Enable XFT by default.
Regenerate patches.

Changelog: https://www.jwz.org/xscreensaver/changelog.html

Remove ${PORTSDIR}/ from dependencies, categories v, w, x, y, and z.

With hat:	portmgr
Sponsored by:	Absolight

Remove some debugs and works in progress that snuck in with previous commit.

MFH:		2015Q4

Update to 5.34

This update fixes a lock bypass vulnerability, where the screen can be
unlocked without authorization.

MFH:		2015Q4
Security:	4b9393b8-7c0c-11e5-a010-080027ddead3

- Update to 5.33
- Resolves the obnoxious startup message issue [1]
- Add options NLS and XFT
- Convert to USES=autoreconf
- Don't install pam file when PAM option is disabled
- Regenerate patches

PR:		201254
Submitted by:	Will B. <will_brokenbourgh at yahoo.com>
Approved by:	Maintainer timeout
MFH:		2015Q4 [1]

- Fix plist for WITHOUT=PAM case
- Drop @dirrm* from plist

Approved by:	portmgr blanket

Convert to USES=jpeg

Fix packaging

Update the default version of GCC in the Ports Collection from GCC 4.7.4
to GCC 4.8.3.

Part II, Bump PORTREVISIONs.

PR:		192025
Tested by:	antoine (-exp runs)
Approved by:	portmgr (implicit)

- Fix shebangs by defining PERL in CONFIGURE_ENV
- Add some missing files to pkg-plist, don't try to remove mtree dirs, and
  get rid of ugly plist hack from Makefile (it is broken with staging
anyways, so add gdkpixbuf2 as dependency to make sure that
"bin/xscreensaver-hacks/webcollage-helper" is always installed)
- Deal with SETUID_HACK with @mode directive instead of with the configure
  option so that a regular user can build and then install as root
- Move some LIB_DEPENDS to USE_GNOME
- Use options helpers
- Remove PTHREADS option as there is no longer a configure knob for it
- Remove KERBEROS option since it is broken (needs ancient krb4 lib which we
  don't have anymore)
- Simplify post-patch commands.  The hacks for the PAM option don't need to
  be conditional.  Staging will handle whether the file is installed or not.
- Pet portlint(1)
- Bump PORTREVISION

PR:		192616
Submitted by:	jhale

- Switch graphics/gle to USES=libtool, drop .la files
- Bump dependent ports as .so version has changed

Approved by:	portmgr blanket

Update to 5.29

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

Update to 5.26

Stagify.

Thanks to bapt for the help with staging!

- Remove manual creation and removal of share/applications, as it's now in the
mtree (remaining categories)
- Add note on mtree change to CHANGES

Approved by:	portmgr (bdrewery)

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

A bunch of cleanups and fixes.

Fix build with compiler is gccXX (where xx is for instance 46, 47) by
running autoconf to generate a working configure.
Use ${REINPLACE_CMD} instead of hand-rolled sed.  Change regexp to work on
configure.in instead of configure, since we'll autoconf configure.in anyway.
Check for libutil.h alongside util.h, and make use of that if it is found.
Make detection and use of gettext work with all compilers.  Add locale
messages to plist.
Bump portrevision.

Noticed by:	avg (build issues)
Tested by:	avg

Add missing dependencies.

Bump portrevision (again).

PR:		ports/181726
Submitted by:	Pawel Pekala <pawel@FreeBSD.org>

Fix plist.
Bump portrevision.

noticed by:	QAT

Update to 5.22

While here, switch USE_GMAKE=yes to USES=gmake

- Remove MAKE_JOBS_SAFE variable

Approved by:	portmgr (bdrewery)

- Convert USE_GETTEXT to USES (part 4)

Approved by:	portmgr (bapt)

Finish converting the whole ports tree to USES=pkgconfig

Update to 5.21

Convert to optionsNG

Approved by:	kwm, miwi (mentors, implicit)

Update to 5.20
Change pkgconf dependency to use USE_PKCONFIG [1]

Suggested by:	kwm [1]
Approved by:	kwm, miwi (mentors, implicit)

Grab

Approved by:	miwi (mentor)

Throw my ports back in the pool, and make my intentions clear for the
various ports that I've created.

I bid fond fare well
A chapter closes for me
What opens for you?

Upgrade to 5.19 which contains some minor improvements

Add .desktop files for starting and stopping the daemon, and locking
and blanking the screen.

Add an explicit build dep for pkgconf, and add a sed pattern for configure
since pkgconf does not support the --list-all option

Do not install the new XML patch file

Fix installation of PAM conf file

PR:             ports/169724
Submitted by:   John Marshall <john.marshall@riverwillow.com.au>

Grrr, forced commit to note that this is the upgrade to 5.18, not 5.17

Upgrade to version 5.17:
  * Made `pipes' be ridiculously less efficient, but spin.
  * Added better mouse control to `rubik', `cube21', `crackberg', and `julia'.
  * Cosmetic improvements to `queens' and `endgame'.
  * `sonar' can now ping local subnet on DHCP.
  * Most savers now resize/rotate properly.
  * Various fixes.

For the port:
  * Remove a post-patch that was incorporated upstream
  * Add a patch to sonar.xml to ping freebsd.org instead of linux.org,
    and explain how to enable ping via the ports build option.

Forcing -O0 for amd64 no longer seems relevant

PR:             ports/169523
Submitted by:   Sayetsky Anton <vsjcfm@gmail.com>

s/spaces/tab/ for the CONFLICTS line added in the last commit

PR:             ports/169400
Submitted by:   "Anton Yuzhaninov" <ayuzhaninov@team.vega.ru>

Upgrade to version 5.17:
  * Enlarged the texture image for `lament'.
  * XInput devices now also ignore small mouse motions.
  * Various minor fixes.

For the port:
  * Add CONFLICTS with xscreensaver-gnome*
  * s/X11BASE/LOCALBASE/
  * Remove a pattern in pre-patch that was incorporated upstream
  * Add a pre-patch pattern to fix the image for `lament'

(Version 5.16 was quickly replaced by 5.17 due to compilation problems)

Fix Perl package name dependencies

- update png to 1.5.10

Convert to specifying the port name in _DEPENDS instead of
${SITE_PERL}/foo/bar/file.pm

http://wiki.freebsd.org/PortsLongtermTargets#Use_of_SITE_PERL_in_dependencies

Remove more tags from pkg-descr files fo the form:

- Name
em@i.l

or variations thereof. While I'm here also fix some whitespace and other
formatting errors, including moving WWW: to the last line in the file.

Now that we're installing the .desktop file we need to
@dirrmtry share/applications

Update to version 5.15  28-Sep-2011

New hacks, hilbert, companioncube and tronbit.
Image-manipulating hacks can now load from RSS or Atom feeds,
        imageDirectory may contain a URL.
Updated webcollage for recent search engine changes.
photopile sped up.
New molecule in molecule.

For port:

Add dependencies on www/p5-libwww and graphics/netpbm for
webcollage and vidwhacker. Add a tiny patch to vidwhacker.

Install the xscreensaver-properties.desktop file, it's useful
for more than gnome (e.g., XFCE).

Update to version 5.14:

* Fixed crash in Blank Only Mode when DPMS disabled.
* Added "Quick Power-off in Blank Only Mode" option.
* BSOD GLaDOS.

Miscellaneous cleanups and fixes, some of the windowmaker stuff
gracefully provided by danfe.

Upgrade to 5.13:

* Optionally enabled full-scene OpenGL antialiasing. Set the resource
  *multiSample to true if doing so doesn't kill performance with your
  video hardware.
* New version of glhanoi.
* Image-loading hacks that display the file name now also display the
  sub-directory (xscreensaver-getimage now returns relative paths under
  imageDirectory).
* Passwords that contain UTF-8 non-Latin1 chars are now typeable.
* Numerous minor stability fixes.

For the port, remove patch incorporated by the author, and now-obsolete
CONFIGURE_ENV

- Get Rid MD5 support

Patch a memory exhaustion error in hacks/glx/tube.c. Patch confirmed
with xscreensaver author.

PR:             ports/151788
Submitted by:   John Marshall <john.marshall@riverwillow.com.au>

Update to 5.12, very minor changes to 2 screensavers

Bounce PORTREVISION for gettext-related ports.  Have fun, ya'll.

Distfile was silently re-rolled to include the po/ directory, and
include it in SUBDIRS. This makes USE_GETTEXT required as well,
so bump PORTREVISION.

Update to version 5.11 which contains bug fixes to several screensavers

- update to 1.4.1
Reviewed by:    exp8 run on pointyhat
Supported by:   miwi

- update to jpeg-8

By now the distinction between various flavors of the xscreensaver
port is clear, so the pre-fetch message has lost its utility.

Update to version 2.10 which includes the following:

* Retired hypercube and hyperball, which are redundant with polytopes.
* New hack, rubikblocks.
* Fixed another potential RANDR crash.
* molecule now correctly displays PDB 3.2 files.
* Updates to mirrorblob, glhanoi, and sonar.
* Rewritten version of klein hack.
* New hack, surfaces, incorporating objects from old klein hack, plus new ones.
* Merged juggle and juggler3d hacks.
* Fixed compilation under gcc 4.4.0 (strict aliasing).
* Fixed intermittent failure in xscreensaver-command.

Fix a few common typos in pkg-descr ("separate", "compatible").

Remove support for electricsheep as a screensaver, the project has been
having "issues" for a long time now.

- update to jpeg7
Tested by:      pav on pointyhat

Where it matters, update regarding MAKE_JOBS_{UN}SAFE for my ports

Upgrade to version 5.08. One new screensaver (hack), tweaks to a few
others, and the removal of 18 of the "older, less interesting savers."

Users may wish to mv their ~/.xscreensaver file to a safe place and restart
the program to get a clean config file.

At one time pam was cut out unconditionally, but now it's only cut out
when the user does not have the OPTION ticked. So remove the part of this
patch that cuts it out unconditionally in favor of the already-existing
sed option in the Makefile.

pointy-hat-collection++

Submitted by:   John Marshall <john.marshall@riverwillow.com.au>

Update to version 5.07 which has several bug fixes and enhancements. It also
removes a couple screen savers, and support for 3rd party screen savers.
Support for the latter is added back to this port by permission.

Do something I should have done a long time ago, add OPTIONS to install the
various screen savers we have in ports that are supported by xscreensaver.

USE_DOS2UNIX is no longer needed.

In xscreensaver 5.07 the xml files for optional screen savers have been
removed. In order to continue supporting those screen savers that we have
in the ports tree I'm adding enhanced versions of the 5.06 xml files to
the port. (With permission)

Also add a patch to the default config file to:
1. Turn off display of screen savers that are not installed to avoid
confusion.
2. Add back support for those 3rd part screen savers we have in ports.
3. Remove a screen saver we're not building or installing.

Update to version 5.06, which contains one new hack, some new minor
features, and Xinerama/RANDR fixes.

- 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)

Update to version 5.05, with the usual assortment of 2 new screensavers,
and a few bug fixes.

Comment out the fix for the no-pam case, to match the others.

Configure'ing --without-pam is not enough to prevent the pam.d
file from being installed, so take matters into our own hands.

Update to version 5.04, which contains the usual combination of
a few new screesavers and miscellaneous bug fixes.

For the port:
1. Update the CONFIGURE_ARGS for the new xorg and other options
2. Add an OPTION to add --with-kerberos
3. Add an OPTION for PAM support, and delete stuff that was designed
to disable PAM.
4. Related to above, add a policy file for PAM that is relevant to
FreeBSD, and simply copy that over the distribution's and allow the
normal install method to work.

Remove patches no longer relevant in version 5.04.

- Set --mandir and --infodir in CONFIGURE_ARGS if the configure script
  supports them.  This is determined by running ``configure --help'' in
  do-configure target and set the shell variable _LATE_CONFIGURE_ARGS
  which is then passed to CONFIGURE_ARGS.
- Remove --mandir and --infodir in ports' Makefile where applicable
  Few ports use REINPLACE_CMD to achieve the same effect, remove them too.
- Correct some manual pages location from PREFIX/man to MANPREFIX/man
- Define INFO_PATH where necessary
- Document that .info files are installed in a subdirectory relative to
  PREFIX/INFO_PATH and slightly change add-plist-info to use INFO_PATH and
  subdirectory detection.

PR:             ports/111470
Approved by:    portmgr
Discussed with: stas (Mk/*), gerald (info related stuffs)
Tested by:      pointyhat exp run

Forced commit to note that the last commit included a switch to
@dirrmtry for the config directories since some other ports (most
notably x11/fireflies) also install config files there.

Update to 5.03, with a few bug fixes (bsod, PAM USB-dongle auth, track
recent Google Images and Flickr changes) and 4 new screensavers.

Argh. Forced commit to note that the previous commit also removed the
last vestiges of X11BASE in favor of LOCALBASE.

Upgrade to 5.02, with the usual assortment of minor bug fixes and
small updates to various hacks.

- Welcome X.org 7.2 \o/.
- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed.

Submitted by:   mezz, ahze, pav, and many others
Approved by:    portmgr (implicit, kris)

Upgrade to version 5.01, which contains various small bug fixes.