Fix CONFLICTS entries of multiple ports

There have been lots of missing CONFLICTS_INSTALL entries, either
because conflicting ports were added without updating existing ports,
due to name changes of generated packages, due to mis-understanding
the format and semantics of the conflicts entries, or just due to
typoes in package names.

This patch is the result of a comparison of all files contained in
the official packages with each other. This comparison was based on
packages built with default options and may therefore have missed
further conflicts with optionally installed files.

Where possible, version numbers in conflicts entries have been
generalized, some times taking advantage of the fact that a port

*: fix tab vs. space issues, and comments according to the guide.

x11/aterm: Add CPE information

Approved by:	portmgr (blanket)

Remove # $FreeBSD$ from Makefiles.

Add USES=xorg USES=gl, ports categories x

Add USES=xorg and USES=gl to ports in categories starting with 'x'
While here, try to sprinkle other USES (mostly gnome and sdl) as needed.

With the power of USES=dos2unix, get rid of most patches and files
with CRLF.

While there, run make makepatch, rename patches to use the new scheme,
and various fixes.

With hat:	portmgr
Sponsored by:	Absolight

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

With hat:	portmgr
Sponsored by:	Absolight

- Drop 8.x support

Approved by:	portmgr blanket

Convert to USES=jpeg

Bump portrevision after png update

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

Support stage
Use options helpers
Use modern lib_depends

Mark seven unmaintained ports as jobs unsafe.

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

Style: tab -> space.

Most contributors copy an existing port when writing their own so reduce the
number of bad examples in the tree.

- Convert to optionsNG
- Strip library versions

Feature safe:	yes

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?

- update png to 1.5.10

- remove maintainer tags from pkg-descr

Approved by:    portmgr
Approved by:    bapt (mentor)

- 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

- Get Rid MD5 support

Revamp this port:
1. There are no slave ports, so remove the mechanism for that
2. Update CONFIGURE_ARGS
3. Add OPTIONS support
4. Remove knobs for some things that were not actually used by configure
5. Add knobs for other things
6. Default transparency support, mouse support, and bsd-style del/bksp
   support to on, as previously; but default background image support to
   off. With modern window managers it's problematic, and needlessly bloats
   the binary.
7. Switch to PLIST_FILES for the one file installed, the chmod doesn't seem
   to have any effect one way or the other.
8. Add a bunch of patches from the debian repo which slightly improve
   support for modern WMs.

Bump PORTREVISION

Approved by:    maintainer timeout

Quick and dirty hack to un-BROKEN on -current.

Approved by:    maintainer timeout

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

- Mark BROKEN on HEAD: fails to build with new utmpx

Reported by:    pointyhat

- update to jpeg-8

- update to jpeg7
Tested by:      pav on pointyhat

Bump portrevision due to upgrade of devel/gettext.

The affected ports are the ones with gettext as a run-dependency
according to ports/INDEX-7 (5007 of them) and the ones with USE_GETTEXT
in Makefile (29 of them).

PR:             ports/124340
Submitted by:   edwin@
Approved by:    portmgr (pav)

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

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

Approved by:    portmgr (xorg cleanup)

- update to -> 1.0.1

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

SHA256ify

Approved by: krion@

o fix annoying "window size" bug
o bump PORTREVISION

PR:             ports/85770
Submitted by:   Daniel Roethlisberger <daniel@roe.ch>

o add WITHOUT_BACKGROUND_IMAGE knob [1]
        - so you can decide if you want another dep. or not
o add without-afterstep-config to configure args [2]
        - workaround for x11-wm/afterstep-stable weirdness

Submitted by:   glewis[2], Paulius Bulotas <paulius@devnull.lt>[1]

Update to -> 1.0.0

PR:             ports/84989
Submitted by:   arundel[at]h3c.de

o include Xlocale.h

Submitted by:           Francois Briere <fbriere@peperes.info>

- Add two knobs:
        - WITHOUT_JPEG
        - WITHOUT_PNG

- Tell configure where to look for libs

Submitted by:           Grigori Goronzy <greg@chown.ath.cx>

o Move backspace/delete specific configure options to a knob. (WITH_BSDEL) [1]
o Add SIZE field to distinfo.
o Fix some whitespace issues, to make portlint happy.

[1] Suggested by:               Daniel Roethlisberger <daniel@roe.ch>

I'm an aterm fan, so I'd be happy so adopt this orphan..

Jim Mock (jim) returned his commit bit, so set his ports free.

Thank for all your work, Jim!

Clear moonlight beckons.
Requiem mors pacem pkg-comment,
And be calm ports tree.

E Nomini Patri, E Fili, E Spiritu Sancti.

use MASTER_SITE_SOURCEFORGE

PR:             40440 (zh-aterm)
Submitted by:   Kang-min Liu <gugod@gugod.org> (zh-aterm)

Update to version 0.4.2.    

Bump png major    

Prepare for the forthcoming slave port.    

Add support for Russian characters.    

Style fixes for ports/x11.    

Teach aterm about ptys above f.    

Convert category x11 to new layout.  

(1) Add new variable, XFREE86_VERSION, to specify which version of       XFree86
(3 or 4) to depend to when USE_XLIB is set.       XFREE86_VERSION defaults to 3
for now, but adventurous users can       override it in /etc/make.conf.  When
XFREE86_VERSION=3, USE_XLIB       will add a dependency to x11/XFree86; when it
is set to 4, the       dependency will be to x11/XFree86-4-libraries.  When     
 XFREE86_VERSION=4, the PKG_IGNORE_DEPENDS and ALWAYS_BUILD_DEPENDS       hacks
to avoid messing with XFree86 are turned off.    

Bump png shared library version.    

Update to version 0.4.0.  Also add WITH_MENUBAR and WITH_NEXTSCROLL hooks   for
those who prefer to use those features.