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

*: re-assign kuriyama@s ports to the pool, commit bit safekept

With hat:	portmgr-secretary

One more small cleanup, forgotten yesterday.
Reported by:	lwhsu

Remove # $FreeBSD$ from Makefiles.

Clean up after java/openjdk6 and java/openjdk6-jre removal

java/openjdk6 support was removed from Mk/bsd.java.mk (r512662) and
java/openjdk6 and java/openjdk6-jre were removed from the ports tree
(r512663).  Now this patch completely removes remaining stuff from the
ports tree.

PR:			241953 (exp-run)
Reviewed by:		glewis
Approved by:		portmgr (antoine)
Differential Revision:	https://reviews.freebsd.org/D22342

Unbreak things broken by my previous incomplete commits

Pointy hat:	tobik

devel/*: Use NO_WRKSUBDIR

Cleanup no longer needed CHMOD usage after r424898.

PR:		213743
Submitted by:	mat
Exp-run by:	antoine
Sponsored by:	Absolight

- Don't install garbage files
- Add NO_ARCH
- Add empty directories to plist

PR:		203194
Submitted by:	amdmi3
Approved by:	maintainer timeout (kuriyama, 2 weeks)

Remove explicit dependency on javavmwrapper for ports that USE_JAVA

Cleanup plist

Stageify.

Approved by:	portmgr@

Convert d* to USES=zip

Fixup pkgnames.

PR:		ports/184440, ports/184441, ports/184442, ports/184443, ports/184444,
ports/184445, ports/184446, ports/184447, ports/184448, ports/184449,
ports/184450
Submitted by:	mat
Approved by:	portmgr (bapt)

Add NO_STAGE all over the place in preparation for the staging support (cat:
devel part 2)

Decommissioning java 1.5 (EOLed since October 2009):
suppress any reference to USE_JAVA=	1.5+ (part1)

- Upgrade to 4.6.0.23201.

PR:             ports/167356
Submitted by:   dumbbell

Now that the Java 1.3 and Java 1.4 ports are deprecated and will expire soon,
remove support for them from bsd.java.mk.  As Jikes is not available in Java 1.5
or higher, remove it from bsd.java.mk too (suggested by hq@) and from the ports
which used it (only occurences were USE_JIKES=no).  Support for the Blackdown VM
is also removed, as it is not available in Java 1.5 and higher.

Also remove the mapping from Java 1.1-1.4 to Java 1.5+ in bsd.java.mk to detect
old, broken ports; therefore bump the minimal value of JAVA_VERSION to 1.5.
While here, replace static values of JAVA_VERSION in files/*.in by
%%JAVA_VERSION%% .

PR:             ports/158969
Submitted by:   rene
Tested on:      pointyhat-west -exp

Upgrade to 4.1.0 after repocopy to flex-sdk35.

- Upgrade to 3.5.0.12683.

PR:             149514
Submitted by:   Jui-Nan Lin <jnlin@csie.nctu.edu.tw>

Upgrade to 3.1.0.2701.  Old version (2.0.1) was repocopied as
devel/flex-sdk2.

This is MPL version (not including Flash Player binaries etc).

Upgrade to 2.0.1.194515.

# This port will be renamed flex-sdk2, and will become flex-sdk 3.1.

PR:             ports/126202
Submitted by:   Nicola Vitale <nivit@FreeBSD.org>

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)

The free Adobe Flex 2 SDK includes the technologies developers need to
start building effective Flex applications today.

WWW: http://www.adobe.com/products/flex/sdk/