Mk/Uses/apache.mk: Refactor after removal of older versions

apache22 and apache25 had been removed a long time ago however the
apache.mk file has never been refactored and is out of sync from the
file Mk/bsd.default-versions.mk. These changes refactors the removals of
the older versions. In addition:

- Move some keywords like USE_APACHE, USE_APACHE_BUILD, USE_APACHE_RUN
  from SANITY_DEPRECATED to SANITY_UNSUPPORTED
- Remove apache versions from ports Makefiles as currently there is only
  one available version in the tree. However the version checks are
  still valid and should work flawlessly whenever a new version is
  added. For example USES=apache:2.2+ are simply replaced with
  USES=apache. As currently there are no other versions available for
  test this could not be checked on it's own ground.
- Update FOO_USE=APACHE=yes to FOO_USES=apache
- Remove trailing whitespaces

Approved by:    portmgr
Differential Revision: https://reviews.freebsd.org/D38113

www/mod_security: Update to 2.9.6

ChangeLog: https://github.com/SpiderLabs/ModSecurity/releases/tag/v2.9.6

New features and security impacting issues

    Adjust parser activation rules in modsecurity.conf-recommended
    Multipart parsing fixes and new MULTIPART_PART_HEADERS collection

Bug fixes

 * Limit rsub null termination to where necessary
 * IIS: Update dependencies for next planned release
 * XML parser cleanup: NULL duplicate pointer
 * Properly cleanup XML parser contexts upon completion

Remove WWW entries moved into port Makefiles

Commit b7f05445c00f has added WWW entries to port Makefiles based on
WWW: lines in pkg-descr files.

This commit removes the WWW: lines of moved-over URLs from these
pkg-descr files.

Approved by:		portmgr (tcberner)

Add WWW entries to port Makefiles

It has been common practice to have one or more URLs at the end of the
ports' pkg-descr files, one per line and prefixed with "WWW:". These
URLs should point at a project website or other relevant resources.

Access to these URLs required processing of the pkg-descr files, and
they have often become stale over time. If more than one such URL was
present in a pkg-descr file, only the first one was tarnsfered into
the port INDEX, but for many ports only the last line did contain the
port specific URL to further information.

There have been several proposals to make a project URL available as
a macro in the ports' Makefiles, over time.

textproc/libxml2: bump all LIB_DEPENDS consumers

This is a separate commit to facilitate easier cherry-picking for
quarterly.

PR: 262853, 262940, 262877, 263126
Approved by: fluffy (mentor)

textproc/libxml2: bump all dependencies

This should make sure that all dependent ports will pick
up the new version commited with a13ec21cd733f67a9fc0dc00ab45268bdc236246

www/mod_security: Update to 2.9.5

Changelog: https://github.com/SpiderLabs/ModSecurity/releases/

PR:	261527
Sponsored by:	Netzkommune GmbH

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

all: Remove all other $FreeBSD keywords.

Remove # $FreeBSD$ from Makefiles.

www: Add missing USES=gnome

Convert to UCL & cleanup pkg-message (categories w)

Update to 2.9.3

Changelog: https://github.com/SpiderLabs/ModSecurity/releases/tag/v2.9.3

PR:		235054
Sponsored by:	Netzkommune GmbH

Take Maintainership

Approved by:	WH (walter@lifeforms.nl - maintainer via private eMail)
Sponsored by:	Netzkommune GmbH
differential revision:
--this line, and those below, will be ignored--
> description of fields to fill in above:                     76 columns --|
> pr:                       if and which problem report is related.
> submitted by:             if someone else sent in the change.
> reported by:              if someone else reported the issue.
> reviewed by:              if someone else reviewed your modification.
> approved by:              if you needed approval for this commit.
> Obtained from:            If the change is from a third party.
> MFC after:                N [day[s]|week[s]|month[s]].  Request a reminder
email.
> MFH:                      Ports tree branch name.  Request approval for merge.
> Relnotes:                 Set to 'yes' for mention in release notes.
> Security:                 Vulnerability reference (one per line) or
description.
> Sponsored by:             If the change was sponsored by an organization (each
collaborator).
> Differential Revision:    https://reviews.freebsd.org/D### (*full* phabric URL
needed).
> Empty fields above will be automatically removed.

M    mod_security/Makefile

Update `databases/gdbm' to version 1.18.1, an important bugfix release
which restores compatibility with old databases (version 1.8) and some
later versions which were built without mmap(2) support.  Due to shlib
version change, bump port revisions of the consumer ports.

PR:		233059
Exp-run by:	antoine
Approved by:	maintainer (johans, numerous timeouts)

devel/apr1: Bump portrevision

 - Repair my rookie mistake of earlier today
 - Bump revision of dependent ports (again)

Reported by:	antoine

devel/apr1: Fix runtime issues of dependent port

 - iconv is in base in all supported FreeBSD versions
 - Fix build with MariaDB 10.2 [2]
 - Bump portrevision in dependencies

PR:		226705 [1], 226026 [2]
With hat:	apache
Approved by:	joneum (apache)

Migrate USE_APACHE to USES= apache (category www)

 - Following migration of Mk/bsd.apache.mk to Mk/Uses/apache.mk

With hat:	apache

www/mod_security: update to 2.9.2

PR:		222838
Submitted by:	walter@lifeforms.nl (maintainer)
Approved by:	olivier (mentor)
Differential Revision:	https://reviews.freebsd.org/D12623

- Fix trailing whitespace in pkg-messages

Approved by:	portmgr blanket

- Fix trailing whitespace in pkg-descrs, categories [p-x]*

Approved by:	portmgr blanket

- update to 2.9.1
- install etc/apache2x/modules.d/280_mod_security.conf.sample
- adjust README and pkg-message to reflect new module activation
- adjust and sort pkg-plist

Changes:
- ModSecurity: update to 2.9.1
- Add support for Lua 5.1 or higher (was 5.1 only)
- pkg-plist: bring back mod_unique_id activation, fix deprecated @exec
- README: point user to configuration files

PR:		208144
Submitted by:	Walter Hop (maintainer)
MFH:		2016Q2

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

With hat:	portmgr
Sponsored by:	Absolight

Remove UNIQUENAME and LATEST_LINK.

UNIQUENAME was never unique, it was only used by USE_LDCONFIG and now,
we won't have conflicts there.

Use PKGBASE instead of LATEST_LINK in PKGLATESTFILE, the *only* consumer
is pkg-devel, and it works just fine without LATEST_LINK as pkg-devel
has the correct PKGNAME anyway.

Now that UNIQUENAME is gone, OPTIONSFILE is too. (it's been called
OPTIONS_FILE now.)

Reviewed by:	antoine, bapt
Exp-run by:	antoine
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3336

Update to 2.9.0.

Changes:
- update ModSecurity to 2.9.0 (released Feb 12, 2015)
- add JSON parsing support via devel/yajl
- add support for loading remote configuration, which depends on ftp/curl
- add optional support for fuzzy hashes via security/ssdeep
- fix: use lua51 only, ModSecurity does not support lua 5.2 yet
- add FreeBSD specific README with installation and configuration hints
- pkg-message: refer uses to README
- install recommended modsecurity.conf using .sample config file convention
- port skeleton cleanups

PR:		197833
Submitted by:	maintainer (Walter Hop)

Bump PORTREVISION on everything that depends on devel/apr1 due to the
library version change.

Approved by:	portmgr (implicit)

Prefer lua 5.2 over lua 5.1

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 version 2.7.7 [1]

- Makefile cleanup
 - remove unused variables
 - use explicit OPTIONSFILE
 - mlogc is build and installed unless explicit disabled,
   remove useless Makefile instructions

- pass MAINTAINER to submitter [1]

Changelog:
https://raw.github.com/SpiderLabs/ModSecurity/master/CHANGES

PR:		ports/186524 [1]
Submitted by:	Walter Hop <walter@lifeforms.nl> (new port maintainer)

- Fix build when LUA=on [1]
- Remove leading article from COMMENT
- Convert to LIB_DEPENDS format
- Use option helpers
- Support stage

PR:		ports/182894 [1]
Submitted by:	Matthew X. Economou <xenophon+fbsdports@irtnog.org>

- rename AL2 to APACHE20 in Mk/bsd.licenses.db.mk
- svn move Templates/Licenses/AL2 Templates/Licenses/APACHE20
- add APACHE10 and APACHE11 to Mk/bsd.licenses.db.mk
- add entry in UPDATING
- bulk change all ports AL2 => APACHE20

- math/openfst/pkg-plist: remove share/licenses/openfst-1.3.4

PR:		ports/184785
Submitted by:	ohauer
Reviewed by:	tabthorpe
Approved by:	portmgr (tabthorpe@)

- Return almost all of my ports back to the pool. I have no time to make any
  necessary fixes on them for the past months.

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

- Remove MAKE_JOBS_SAFE variable

Approved by:	portmgr (bdrewery)

- 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

-  bump PORTREVISION on ports with LIB_DEPENDS+= devel/apr1

while I'm here
- convert to USES=gmake
- trim Makefile header and respect nice_people

- Update to 2.7.4.

More info:
https://github.com/SpiderLabs/ModSecurity/blob/master/CHANGES

PR:		ports/179167
Submitted by:	ohauer@
Security:	9dfb63b8-8f36-11e2-b34d-000c2957946c

- Update to 2.7.3 due a vulnerability that affect all versions 2.x. [1]
- Update MASTER_SITES.
- Convert to optionsNG.
- Trim header.

More info:
https://github.com/SpiderLabs/ModSecurity/blob/master/CHANGES

Reported by:    olli hauer <ohauer@gmx.de> [1]
Approved by:    portmgr (bdrewery)
Security:       2070c79a-8e1e-11e2-b34d-000c2957946c

- Fix mlogc source path.

PR:		ports/174784
Submitted by:	Dewayne <dewayne@amdg.etowns.org>

Update PCRE to 8.32
Introduces the UTF-32 library pcre32
Bump PORTREVISION in dependent ports

- remove www/apache20 and devel/apr0
- s/USE_APACHE= 20+/USE_APACHE= 22+/
- unify s/YES/yes/
- cleanup APACHE_VERSION <= 22 usage
- add entry to MOVED

with hat apache@

- Update to 2.6.6.

- Fix plist.
- Bump PORTREVISION.

Reported by:    pav

- Use lua-5.1.1 instead lua-5.1 that was a typo.
- Remove pkg-message.rules forgotten on previous commit.

- Update to 2.6.5.
- Define LICENSE.

Bump pcre library dependency due to 8.30 update

 - bump PORTREVISION from ports if USE_APACHE=13+ or 20+ is defined

- Update to 2.5.13.

PR:             ports/153985
Submitted by:   Jin-Sih Lin <linpct@gmail.com>

- Remove previously stray entry

- Update to 2.5.12
- sort PLIST_FILES and PLIST_DIRS

PR:             ports/147099
Submitted by:   pgollucci@ (myself), several
Approved by:    maintainer (araujo; implicit)
With Hat:       apache@

Mk/bsd.apache.mk can not sufficiently alter things before Mk/bsd.options.mk
in Mk/bsd.ports.mk due to ordering in Mk/bsd.port.mk.  This causes OPTIONSFILE
to be incorrectly set during some make phases as a result of the recent
PKGNAMEPREFIX for apache ports.

'Revert' some of the PKGNAMEPREFIX changes for apXX-.
   - Must be manually requested in tbe port Makefile either by
     a) AP_FAST_BUILD=yes
     b) PKGNAMEPREFIX=${APACHE_PKGNAMEPREFIX}
   - Going forward, we will only do this for ports where WITH_APACHE
       is NOT optional, but required.  mod_* ports are a good fit.

141 ports are mod_ ports
  80 of those use AP_FAST_BUILD and thus are auto hooked by this patch [a].
  61 remaining are then patched to mirror the other $lang frameworks [b].

PR:             ports/146956
Reported by:    Hans F. Nordhaug <Hans.F.Nordhaug@hiMolde.no>, several
Discussed with: pav, itectu on #bsdports
Tested by:      P6 TB run
Approved by:    portmgr (pav)

- Chase devel/apr -> devel/apr1 shuffling

PR:             ports/146553
Submitted by:   myself (pgollucci@)
With Hat:       apache@

- Convert ports/ to devel/apr1

PR:             ports/146553
Submitted by:   myself (pgollucci@)
With Hat:       apache@

4/5: Chase devel/apr shlib bump

PR:             ports/146130
Approved by:    portmgr (pav)
Tested by:      -exp run (pav)
With Hat:       apache@

3/5: Fix apr-1.3 libnames to be apr-1
     PORTREVISION bumps comming next

PR:             ports/146130
Approved by:    portmgr (pav)
Tested by:      -exp run (pav)
With Hat:       apache@

Chase the ftp/curl shlib version bump.

- Update to 2.5.11

PR:             ports/140463
Submitted by:   Chris Petrik <chris@officialunix.com>
Approved by:    maintainer timeout (araujo; 1 month)

- Switch SourceForge ports to the new File Release System: categories starting
with W

- Fix a linker error when you use mlogc with pthread in osversion
  less than 700000.

Submitted by:   Mel Flynn <mel.flynn+fbsd.questions@mailing.thruhere.net>
                (private mail)

- Support updated to latest lang/lua library version.
- Fixed a wrong prefix when use WITH_MLOGC=yes.

PR:             ports/137214, ports/137215
Submitted by:   Oleg Ginzburg <oleg.ginzburg@nevosoft.ru>

- Fix the issue when you set a custom PREFIX or LOCALBASE.

Reported by:    itetcu (QAT)
Thanks to:      pgollucci

- Mark remaining mod_* ports MAKE_JOBS_SAFE=yes

PR:             ports/134611
Approved by:    pav (#bsdports)

- Update to 2.5.9.
- Update MASTER_SITES.

Bump the version of the curl shared library after the ftp/curl update
to 7.19.2.
Bump PORTREVISION, even on the ports that do not have a versioned
dependency, since the binaries will most probably still stop working.

- Add WITH_MLOGC knob. [0]
- Update to 2.5.7.

PR:             ports/126559 [0]
Submitted by:   Tomoyuki Sakurai <cherry@trombik.org>

- Add support a LUA scripts.
- Bump PORTREVISION.

PR:             ports/125789
Submitted by:   Tomoyuki Sakurai <cherry@trombik.org>

- Chase apr shlib bump

- The branch 1.9 not is more supported, from now on mod_security receive a new
series called 2.5.
x.
- Take maintainership.

Thanks to Alex Dupre which maintained this port by a long time.

PR:             ports/124828, ports/124830
Submitted by:   araujo (myself)
Approved by:    Alex Dupre <ale@FreeBSD.org> (maintainer)
Thanks to:      WIKTORZAK Cedric <cedric@synapse-interactive.fr>

Update to 1.9.4 release.

PR:             ports/100079
Submitted by:   Yi-Huan Chan <yhchan@csie.nctu.edu.tw>

Update to 1.9.2 release.

PR:             ports/92168
Submitted by:   Gary Palmer <freebsd-bugs@in-addr.com>

Update to 1.9.1 release.

Update to 1.8.7 release.

PR:             ports/79171
Submitted by:   Toni Viemero <toni.viemero@iki.fi>

Update to 1.8.6 release.

Update to 1.8.4 release.

Update to 1.8.2 release.

Update to 1.8 release.

Update to 1.7.6 release.

Update to 1.7.5 release.

Switch to my @FreeBSD.org email address.

Approved by:    nork (mentor)

Update to 1.7.4 release.

PR:             ports/61017
Submitted by:   ale (maintainer)

Update to 1.7.3.
Add a newline after COMMENT section, change DISTNAME.

Submitted by:   Alex Dupre <sysadmin@alexdupre.com> (maintainer)
PR:             59193

Use the new Apache bits from bsd.port.mk.

Submitted by:   dinoex

Security update to 1.7.2.
This release fixes several bugs, one of which is
a potentially exploitable local vulnerability
(Apache 2.x users only).

Submitted by:   Alex Dupre <sysadmin@alexdupre.com> (maintainer)
PR:             58681

Fix installation procedure: modsecurity Inc. released a bug-fix,
but forgot to bump version number of pdf doc.
Do not bump PORTREVISION.

Notify from:    bento via kris
No cookie for:  maintainer

Update to latest bugfix release: 1.7.1

Submitted by:   Alex Dupre <sysamin@alexdupre.com> (maintainer)
PR:             58374

Update to 1.7.

Submitted by:   Alex Dupre <sysadmin@alexdupre.com> (maintainer)
PR:             58307

Update to 1.5.1 release.

PR:             54344
Submitted by:   Alex Dupre <sysadmin@alexdupre.com>

> the installed file is *always* mod_security.so, even with
> apache2...only the filename passed to apxs is different.

You learn everyday something new about Apache, even if it means you
have to admit you were too enthousiastic about getting things udpated.

Submitted by:   Alex Dupre <sysadmin@alexdupre.com>

Apache2 has .la, apache13 has .so
Noticed by: Alex Dupre <sysadmin@alexdupre.com>

[New Port] www/mod_security

        ModSecurity is an open source intrustion detection and
        prevention engine for web applications. It operates embedded
        into the web server, acting as a powerful umbrella - shielding
        web applications from attacks.

        WWW: http://www.modsecurity.org/

        It supports both Apache 1.3 and Apache 2.0.

PR:             ports/52937
Submitted by:   Alex Dupre <sysadmin@alexdupre.com>