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

- rewrite bsd.apache.mk  (prepare for options NG support)
   keep full backward support until apache20 is removed from the tree
   comment code to remove with MFC TODO:

- adjust apache20 and apache22 ports
   changes are transparent for users (no PORTREVISION bump)

 Users who are using special build instructions in make.conf, such as
  - WITH_STATIC_MODULES= alias dir log_config mime rewrite setenvif vhost_alias

 should convert the values to UPPERCASE
  - WITH_STATIC_MODULES= ALIAS DIR LOG_CONFIG MIME REWRITE SETENVIF VHOST_ALIAS

 At the moment code to support old lowercase style is in place, but
 target to remove in favor for options NG.

with hat apache@

new devel/pkgconf added to replace devel/pkg-config. new version of pkg-config
are no more self hosting so we are stuck with 0.25 version while pkgconf provide
the same set of features as 0.27 and a compatible frontend. A symlink to
pkg-config has been added for convenience and compatibility

This also introduces a new macro to use pkgconf in your ports:
USE_PKGCONFIG

it can take the following arguments:
 - yes (meaning build only dep)
 - build (meaning build only dep)
 - run (meaning run only dep)
 - both (meaning run and build dep)

From now USE_GNOME= pkgconfig is deprecated in favour of USE_PKGCONFIG
The old gnome macro has been modified to use pkgconf but still the sameway: run
and build dep to avoid large breakage.

While here fix some ports relying on pkg-config but not specifying it, fix some
ports broken because testing wrong .pc files, and fix ports using pkg-config
--version to determine pkg-config version instead of
pkg-config --modversion pkg-config like recommanded by pkg-config

With Hat:	portmgr
Exp-runs by:	bapt (pointhat-west), beat (pointyhat)

- apache20 has no SLAVE_PORTS so cleanup and simplify Makefile.modules
- use port framework instead pkg-install to check for www user
- no REVISION bump, logic / functionality has not changed

with hat apache@

- cleanup conflicts (remove no longer existent ports)
- remove explicit ABI version number from LIB_DEPENDS

Bump pcre library dependency due to 8.30 update
Add (vendor) patch for deprecated pcre_info()

- Fix WITH_LDAP support by adding =shared

PR:         ports/147806
With Hat:   apache@

In the rc.d scripts, change assignments to rcvar to use the
literal name_enable wherever possible, and ${name}_enable
when it's not, to prepare for the demise of set_rcvar().

In cases where I had to hand-edit unusual instances also
modify formatting slightly to be more uniform (and in
some cases, correct). This includes adding some $FreeBSD$
tags, and most importantly moving rcvar= to right after
name= so it's clear that one is derived from the other.

- Fix a typo (sync with the rest of them)

With Hat:       apache@

- bump PORTREVISION (devel/apr0 update)
- set EXPIRATION date to 2012-02-01

Feature safe:   yes

- 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

- Track dependencies after databases/gdbm update

- Track dependencies after databases/gdbm update

- Get Rid MD5 support

- Close a race condition that sometimes resulted in configure.in patches being
  ignored

- DEPRECATE and set EXPIRATION_DATE
  apache 2.3.10 will be release next week, 2.3.11 will be 1st beta shortly
  after that.  2.4.0 GA will follow not long after.  Once 2.4.0 is released
  2.0.x will be EOL upstream at httpd ASF.
  Get this in before 7.4/8.2 to help raise awareness and start migration plans.

- Work is already well in to move the default apache to www/apache22
  http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147009, help is appreciated
there
  with the goal to have this be true before 9.0.

- www/apache13* are on track to be deprecated after 9.0.  apache1.3.x support
has
  been EOL upstream at ASF almost 1 year already.

With Hat:       apache@
Discussed with: httpd@dev.a.o, private@dev.a.o, #bsdports

Sync to new bsd.autotools.mk

- forced commit, no changes, try to help QAT

- missed one

- Update to 2.0.64
- normalize patch-pcre.diff into makepatch format
- All 4 CVE patches are included upstream and part of 2.0.64
- part of the local apxs.in changes are upstream now too
- some patches were regenerated for offset updates

  ** There is NO security update here.  **

Changes:    http://www.apache.org/dist/httpd/CHANGES_2.0
With Hat:   apache@

<ChangeLog>
  *) SECURITY: CVE-2010-1452 (cve.mitre.org)
     mod_dav: Fix Handling of requests without a path segment.
     PR: 49246 [Mark Drayton, Jeff Trawick]

Punt autoconf267->autoconf268

Autotools update.   Read ports/UPDATING 20100915 for details.

Approved by:    portmgr (for Mk/bsd.port.mk part)
Tested by:      Multiple -exp runs

- conflicts with www/apache22*

- Fix the exactly one s/REG_EXTENDED/AP_REG_EXTENDED/ I missed.
- This is a non default option in the compile so no PORTREVISION bump

Reported by:    henrik@iaeste.dk
With Hat:       apache@

- force a retry for QAT, no changes

- I was so busy run-time testing this I didn't notice the new file.
  fix the pkg-plist

Reported by:    QAT

- Partial httpd SVN MFC of r15338
  [http://svn.apache.org/viewvc?view=revision&revision=153384]
  Essentially this internalizes the pcre POSIX API in the ap_ namespace.
  Thus fixing the use of an external pcre library and hence mod_redirect
  and other consumers.

- This includes an MMN bump which means you will need to recompile all your
  modules.  With ports this will happen when you upgrade via portmaster or
  portupgrade.  If you have any modules outside of ports they will need to
  be recompiled too.

- There is a small chance you will need to change some of your custom modules
  to adapt to the ap_regex_t and ap_regmatch_t api changes.

- For security, speed, maintenance, and simplification in the ports/ framework
  this route was chosen instead of reverting the devel/pcre change in 2.0.63_4.

PR:             ports/146604
Reported by:    Stefan Bethke <stb@lassitu.de>, serveral on ports@, apache@
With Hat:       apache@

- Fix 5 seen in 3rd party module failures due to converting from bundled apr to
ports apr.

Reported by:    pav via pointyhat
With Hat:       apache@

- lib/apache2 is empty and doesn't exist
- Bump PORTREVISION

Reported by:    Geraint Edwards <gedge@yadn.org> via apache@

- whitespace only

- Bump PORTREVISION

With Hat:   apache@

- Whitespace

With Hat:   apache@

- Force devel/apr0.  Bundled srclib/apr is never used now.

With Hat:   apache@

- Whitespace only

With hat:   apache@

- drop KQUEUE_SUPPORT, patch doesn't apply cleaning to devel/apr0

Patches to devel/apr0 are welcome, send-pr.

With Hat:   apache@

By default suexec doesn't enforces different resource limitations configured in
login.conf(5). This is probably because resource limitations are handled
differently on various different platforms.

This modifies suexec behaviour to set resource limits for CGI's
from /etc/login.conf before execing the customers CGI script.

Doesn't affect default package, so no PORTREVISION bumps.

I will follow up at dev@httpd.apache.org to see about adding this
with #ifdefs.

PR:             ports/136928
Submitted by:   Alexey V.Degtyarev <alexey@renatasystems.org>
With Hat:       apache@

- Fix some runtime devel/pcre conversion fallout
  the bundled pcre defined REG_NOSUB as 0 b/c its not used
  the devel/pcre port (8.0.0) defines it as 0x0020 which is causing havoc
  The REG_NOSUB was never used by pcre in www/apache20
  So, replace it with 0 in the www/apache20 code forcibly
- Bump PORTERVISION

PR:             ports/146399
Reported by:    ervin valentin <ervin23@gmail.com>
With Hat:       apache@

- Carry the bundled apr patch through current freebsd versions.
  clement@ added this patch in 1.201 of Makefile for fbsd 6.x
  This only adds -funsigned-char to CFLAGS and I haven't seen
  it break anything or anyone report any issues with not having the update.
  It was also only neccessary in apr 0.9.x not apr 1.x+
  This was remove entirely in
http://svn.apache.org/viewvc?view=revision&revision=65257

- Bump PORTREVISION

With Hat:   apache@

- Dupliate $] fix in apxs in www/apache22
- Rename rc.d script apache2.sh -> apache2
- Bump PORTREVISION

With Hat:   apache@

- Fix openssl rengotiation patch [1]
- Fix the openssl from ports flag
- Bump PORTREVISION
- Also patch 2 more CVEs

 *) SECURITY: CVE-2010-0434 (cve.mitre.org)
     Ensure each subrequest has a shallow copy of headers_in so that the
     parent request headers are not corrupted.  Elimiates a problematic
     optimization in the case of no request body.  PR 48359
     [Jake Scott, William Rowe, Ruediger Pluem]

  *) SECURITY: CVE-2008-2364 (cve.mitre.org)
     mod_proxy_http: Better handling of excessive interim responses
     from origin server to prevent potential denial of service and high
     memory usage. Reported by Ryujiro Shibuya. [Ruediger Pluem,
     Joe Orton, Jim Jagielski]

PR:             ports/146389 [1]
Submitted by:   several [1]
With Hat:       apache@

- Back out the OPTIONS framework for now.  Makefile.modules MODULES options
  also be in OPTIONS or they aren't passed to make.
  Thats one huge subtlety.  I'll fix this later, but don't have time now.

Reported by:    kevin brintnall <kbrint@qwest.net> via e-mail
Pointy hat:     myself
With Hat:       apache@

- That was the wrong patch file, too much git/cvs for me

- Fix -A and -a options for apxs to correctly ignore whitespace.
  This will fix about 100 pkg-plist left overs for httpd.conf
  apxs -A comments out the LoadModule line
  This adds custom FreeBSD mod to 'DELETE' the line so that it works with
  our pkg-plists in packages.
- Remove -s form the cmp httpd.conf in pkg-plist to be blatant about why
  it didn't get removed
- Bump PORTREVISION
- This will be in 2.0.64

PR:             ports/133704
Obtained from:  http://svn.apache.org/viewvc?rev=942211&view=rev
Reported by:    olli hauer <ohauer@gmx.de> (and very good pr!)
With Hat:       apache@

- This file is never included.

$ grep -R Makefile.modules.3rd ${PORTSDIR}/
UPDATING:  - Makefile.modules.3rd contains modules selection for apache 2.x and
1.3.x
www/apache20/CVS/Entries:/Makefile.modules.3rd/1.23/Sun Aug  2 19:35:56 2009//

With Hat:   apache@

- Add DBM=ndbm support

PR:             ports/83644
Submitted by:   Oliver Brandmueller <ob@gruft.de>
With Hat:       apache@

- fix ldap support
  --with-ldap switches on LDAP library linking in apr-util
  --enable-ldap option switches on the LDAP caching module
  --enable-auth-ldap option switches on the LDAP authentication module
  also apply a custom patch to fix the linking
- add a missing quote to OPTIONS desc
- ldap is not in the default package, so no PORTREVISION bump

PR:             ports/128079
Reported by:    koitsu, skreuzer
With Hat:       apache@

- duplicate www/apache22 re-fix for /etc/ftpusers in www/apache20

PR:             ports/144422
Reported by:    several
With hat:       apache@

- Apply  SECURITY: CVE-2009-3555 (cve.mitre.org)
  to www/apache20 as well.

PR:             ports/140357
Submitted by:   Eygene Ryabinkin <rea-fbsd@codelabs.ru>
With Hat:       apache@

- Take stab at adding OPTIONS framework in limited capacity.
  Some options were intentionally omitted.
- Remove a legacy option kludge

PR:             ports/146199
Requested by:   Nick Hibma <nick@anywi.com>
With Hat:       apache@

- Force devel/pcre and abandon the bundled pcre:
  0) its like 7yrs old
  0) the new version have speed,bug,&security fixes
  0) www/apache22 already does this
  0) www/apache23+ no longer bundle pcre [or apr* for that matter]
- Bump PORTREVISION

With Hat:   apache@

- Set the ITK version.

With Hat:   apache@

- Sync with the www/apache22 layout for mpm itk and *only* conditionally
  apply this patch. [Note, they are different revisions]

With Hat:   apache@

- Regenerate patch files with make makepatch for they have
  piled up and additional patches conflict.
  This also will help when we try to syncronize www/apache20&www/apache22

With Hat:   apache@

- Fix build for !root users
  duplicated from www/apache22 and devel/apr
  Originally:

PR:             ports/13876 [based on]
Submitted by:   Mel Flynn <mel@rachie.is-a-geek.net>
With Hat:       apache@

- Fix compile with security/openssl
- No PORTREVISION bump [security/openssl is not the default]

PR:             ports/146218
Submitted by:   Kazuo Dohzono <dohzono@axion-software.com>
Obtained from: 
http://mail-index.netbsd.org/pkgsrc-users/2009/08/25/msg010537.html
With Hat:       apache@

[I will contemplate sending this back to dev@httpd for branches/2.0.x for
2.0.64]

- openssl patch is unconditionally applied

With Hat:   apache@

- Fix another IGNORE message

- Fix some whitespace
- Silence portlitn for IGNORE message

- CFLAGS is already in CONFIGURE_ENV

With Hat:   apache@

- add caudium14 conflict
- fix caudium12 conflict

With Hat:   apache@

- Fix typo preventing install/deinstall when /etc/ftpusers was present

Note if you already have www/apache20 or www/apache22 installed this is
not worth updating for; however, you should verify your  [if you use it]
${PREFIX}/etc/apacheXX/extra/httpd-userdir.conf:
  DisableUser dir setting correct lists the users you don't want
  to have the ~/dir visible via http requests.

PR:             ports/144422
Reported by:    several
With hat:       apache@

Cleanse uneeded RC_SUBR variables

Approved by:    pgolluci

Begin the process of deprecating sysutils/rc_subr by
s#. %%RC_SUBR%%#. /etc/rc.subr#

-Repocopy devel/libtool15 -> libtool22 and libltdl15 -> libltdl22.
-Update libtool and libltdl to 2.2.6a.
-Remove devel/libtool15 and devel/libltdl15.
-Fix ports build with libtool22/libltdl22.
-Bump ports that depend on libltdl22 due to shared library version change.
-Explain what to do update in the UPDATING.

It has been tested with GNOME2, XFCE4, KDE3, KDE4 and other many wm/desktop
and applications in the runtime.

With help:      marcus and kwm
Pointyhat-exp:  a few times by pav
Tested by:      pgollucci, "Romain Tartière" <romain@blogreen.org>, and
                a few MarcusCom CVS users. Also, I might have missed a few.
Repocopy by:    marcus
Approved by:    portmgr

Fix a few "bad example" problems in the rc.d scripts that have been
propogated by copy and paste.

1. Primarily the "empty variable" default assignment, which is mostly
${name}_flags="", but fix a few others as well.
2. Where they are not already documented, add the existence of the _flags
(or other deleted empties) option to the comments, and in some cases add
comments from scratch.
3. Replace things that look like:
prefix=%%PREFIX%%
command=${prefix}/sbin/foo
to just use %%PREFIX%%. In many cases the $prefix variable is only used
once, and in some cases it is not used at all.
4. In a few cases remove ${name}_flags from command_args
5. Remove a long-stale comment about putting the port's rc.d script in
/etc/rc.d (which is no longer necessary).

No PORTREVISION bumps because all of these changes are noops.

- Backport apr-util security fixes pending the 2.2.12 release (forthcomming)

Security:      
http://www.vuxml.org/freebsd/eb9212f7-526b-11de-bbf2-001b77d09812
PR:             ports/135310
Submitted by:   Eygene Ryabinkin <rea-fbsd@codelabs.ru>
With Hat:       apache

- Mark SAFE apache@ ports MAKE_JOBS_SAFE=yes

Add note tp pkg-message informing users of FAQ:
  your hostname must be resolvable via at least
  1 mechanism configured in /etc/nsswitch.conf
  or depending on the modules you hae loaded
  apache might not be able to start.

PRs:            ports/131563, ports/131564, ports/131565
Submitted by:   Glen Barber <glen.j.barber@gmail.com>
Discussed with: me

- Re-assign www/apache* ports to apache@
- Previous MATAINERs please welcome yourself to the apache@ team.

Approved by: portmgr (pav, flz), secteam (simon), clement

- Remove conditional checks for FreeBSD 5.x and older

Approved by:    pav

- apache 2.0.x doesn't support BDB 4.7

- Revert previous patch to "fix" missing rc.d scripts. It
  actually breaks profiles.
- Fix CVE-2008-2939 for mod_proxy_ftp
  (XSS attacks when using wildcards in the path of the FTP URL)
- Bump PORTREVISION

- Fix grammatical error

Reported and fixed by: glarkin@

- Fix plist when NOPORTDOCS is defined [1]
- Sometimes, rc scripts aren't included in package
  Try to fix this. [2]
- Bump PORTREVISION

PR:          ports/124671 [2]
Reported by: QA Tindy [1],
             George Donnelly [2]
Special thanks to: pgollucci@

Update CONFIGURE_ARGS for how we pass CONFIGURE_TARGET to configure script.
Specifically, newer autoconf (> 2.13) has different semantic of the
configure target. In short, one should use --build=CONFIGURE_TARGET
instead of CONFIGURE_TARGET directly. Otherwise, you will get a warning
and the old semantic may be removed in later autoconf releases.

To workaround this issue, many ports hack the CONFIGURE_TARGET variable
so that it contains the ``--build='' prefix.

To solve this issue, under the fact that some ports still have
configure script generated by the old autoconf, we use runtime detection
in the do-configure target so that the proper argument can be used.

Changes to Mk/*:
 - Add runtime detection magic in bsd.port.mk

Conversion from (now defunct) autoconf-2.61 to autoconf-2.62

Tested by:      exp build run (erwin)

- Workaround a sh segfault on 6-STABLE

Reported by:    many

- Fix recursive use of WITH_BDB_VER when WITH_BERKELEYDB and WITH_BDB_VER
  are both defined.

Reported by:    Vivek Khera <VIVEK@KHERA.ORG>

- Update to 2.0.63
- Use BDB from bsd.database.mk instead of homebrew [1]

PR:             ports/119712 [1]
Submitted by:   mm [1]

Switch autoconf dependencies from 2.53 or 2.59 to 2.61.

PR:             ports/116639
Submitted by:   aDe

- Fix profiles support in startup script [1]
- move envvars support to the beginning of apache2_checkconfig() to be
  sure we're using envvars during configtest [2]

PR:             ports/116401 [1],
                ports/116329 [2]
Submitted by:   kevin brintnall <kbrint@rufus.net> [1],
                Ruud Althuizen <ruud@il.fontys.nl>

- Re-add apache2ssl_enable support

Noticed by:      Oliver Brandmueller <ob at e-Gitt dot NET>

- Update to 2.0.61
- sync' startup script with www/apache22

- Remove the DESTDIR modifications from individual ports as we have a new,
  fully chrooted DESTDIR, which does not need such any more.

Sponsored by:   Google Summer of Code 2007
Approved by:    portmgr (pav)

Remove thttpd from conflicts list, it has a different name for its
passwd program now.

Approved by:    maintainers/erwin

- Add mod_dumpio to EXPERIMENTAL_MODULES

Requested by:   pav

- Fix typo

- Add itk MPM
  mpm-itk allows you to run each of your vhost under a separate UID and GID
  WWW: http://home.samfundet.no/~sesse/mpm-itk/
- use LD_CONFIG

Add support for setting WITH_BERKELEYDB to db44

- Update to 2.0.59

- Fix security issue in mod_rewrite.
All people using mod_rewrite are strongly encouraged to update.

An off-by-one flaw exists in the Rewrite module, mod_rewrite.
Depending on the manner in which Apache httpd was compiled, this
software defect may result in a vulnerability which, in combination
with certain types of Rewrite rules in the web server configuration
files, could be triggered remotely.  For vulnerable builds, the nature
of the vulnerability can be denial of service (crashing of web server
processes) or potentially allow arbitrary code execution.
This issue has been rated as having important security impact
by the Apache HTTP Server Security Team

Updates to latest versions will follow soon.

Notified by:    so@ (simon)
Obtained from:  Apache Security Team
Security:       CVE-2006-3747

Remove USE_REINPLACE from categories starting with W

- Remove obsolete patch which add support to Windows Update Service when
  apache acts as a proxy.

Reported by:    Bjoern Voigt <bjoern@cs.tu-berlin.de>

- Fix build with WITH_KQUEUE_SUPPORT

Pointed out by: Marian Cerny <cerny@icomvision.com>

- Fix plist

Spotted by:     mnag
Pointy hat to:  clement

 Oops I forgot to "cvs rm" a secfix

Spotted by:     krion

- Update to 2.0.58

Conversion to a single libtool environment.

Approved by:    portmgr (kris)

Remove the FreeBSD KEYWORD from all rc.d scripts where it appears.
We have not checked for this KEYWORD for a long time now, so this
is a complete noop, and thus no PORTREVISION bump. Removing it at
this point is mostly for pedantic reasons, and partly to avoid
perpetuating this anachronism by copy and paste to future scripts.

Chase shlib bump of libexpat.