- CONFLICTS extended

o Bump $LIB_DEPENDS line to chase expat's shlib version.
o Bump $PORTREVISION.

Whoa there, boy, that's a mighty big commit y'all have there...

Begin autotools sanitization sequence by requiring ports to explicitly
specify which version of {libtool,autoconf,automake} they need, erasing
the concept of a "system default".

For ports-in-waiting:

        USE_LIBTOOL=YES         ->      USE_LIBTOOL_VER=13
        USE_AUTOCONF=YES        ->      USE_AUTOCONF_VER=213
        USE_AUTOMAKE=YES        ->      USE_AUTOMAKE_VER=14

Ports attempting to use the old style system after June 1st 2004 will be
sorely disappointed.

Fix configure.

Replace all known incantations of WANT_{AUTOMAKE,AUTOCONF,LIBTOOL}* with
the USE_<x> equivalents.  In the current scheme of things, the WANT_
variables in this case are synonymous with the USE_ ones, and thus need
to be exterminated.

First in a series of major autotools cleanups.

Fix a mod_ssl denial-of-service.

http://www.vuxml.org/freebsd/492f8896-70fa-11d8-873f-0020ed76ef5a.html

Reported by:        nectar
Obtained from:      Apache CVS vis nectar

- Add windowsupdate.com mod_proxy fix. [1]
  you must define WITH_WINDOWSUPDATEFIX
- Fix typo/reword Makefile.doc [2]

PR:             62610 [1], 62757 [2]
Submitted by:   leafy <leafy@leafy.idv.tw> [1],
                Linh Pham <question+freebsdpr@closedsrc.org> [2]

- Improve apr from ports support.
  Thanks a lot to kuriyama.

Submitted by:   kuriyama

- Fix typo in SLAVE_DESIGNED_FOR check [1]
- Make ldap fix optional, since it may break LDAP auth [2]
  Please use WITH_LDAPFIX if you need the fix.
- Improve pthreads support
- SIZEify distinfo

Submitted by:           mharo [1]
Discussed with:         Robin P. Blanchard <robin.blanchard@gactr.uga.edu> [2]

o Use appropriate comment for WITH_IPV6_V6ONLY knob.
o Fix apu-config command name in WITH_APR_FROM_PORTS condition.

Add WITH_PTHREAD_LIBS and WITH_EXPERIMENTAL_THREADS.
These options are for people who want to directly link
apache against libkse and libthr.

Usage:
    WITH_EXPERIMENTAL_THREADS=YES
            Overrides default pthread detection behaviour.
    WITH_PTHREAD_LIBS={kse;thr}
            Lets you choose your pthread lib.
            Don't even try to use "c_r"...

*** These options are unsupported ***
But all gdb backtraces are welcome :-)
AFAIK, apache works well, but mod_php4 (worker MPM) behavior
is quite funny.
All modules which use apr mutexes may crash with KSE.
Since I'm working on it, if you have coredumps, feel free
to send me the backtrace (you must compile libkse, apache
and modules with debugging symbols).
Don't forget to set kern.sugid_coredump to 1.
(using CoreDumpDirectory in httpd.conf can help too)

- Fix compilation for threaded MPM.
  This is due to partial revert of apr improvment.
  setting LIBS=${PTHREAD_LIBS} conflicts with libtool.
  All should be OK now...
  If someone can explain me why libtool impose using
  -pthread (ltshmain), I'm all ears...
  Note:
  You CAN NOT override -lc_r (i.e. setting -lkse) at compile time.
  I must fix it...
- Move patchset to MASTER_SITE_LOCAL

Noticed by:         Martin Nilsson <martin@gneto.com>
Approved by:        erwin (mentor) (implicitly)

- Remove thread support in apr. The code prevents apache from running
  on > 4.8-STABLE (from september 2003) system because apache2 used
  libc_r instead of libc.
  Compiling with -lkse (on -CURRENT) was broken too.

- bump PORTREVISION to force users to upgrade.

NOTE: on -STABLE DO NOT DEFINE WITH_THREADS.
      (unless you use a threaded MPM)

Thanks to Fritz Heinrichmeyer <fritz.heinrichmeyer@fernuni-hagen.de>
who helped me to track the problem.

Noticed by:         Fritz Heinrichmeyer <fritz.heinrichmeyer@fernuni-hagen.de>
                    HAYASHI, "Lef" Tatsuya <lef@st.rim.or.jp> [1]
PR:                 61317 [1]
Approved by:        erwin (mentor) (implicitly)

- Per popular request, add "you can you use make show-modules"-like
  message option in pre-everything:: target.
- Change OpenSSL fix. (specially when WITH_BERKELEYDB=FreeBSD is defined)
  There are too many cases of failure (at leat 3), so I can't force -STABLE
  users to use SSL_EXPERIMENT_ENGINE [1]
- Add WITH_SSL_EXPERIMENTAL_ENGINE knob [2]
- Better db42 apr-util detection [3]
- Add fastest mirror to PATCH_SITES
- Add db42 to "make show-options"

Note to users:
    Unless you have a *really* good request, no more features will be added.
    Please send me with your bug reports:
            - uname -a output
            - all config.log files
            - pkg_info output
            - your make command line

Noticed by:     apache2-test-ng.sh script [1]
                Barry Pederson <bp@barryp.org> [3]
Requested by:   jb@perso-web.com [2]

Uncomment db42-related lines, since db42 is in the
ports tree now.

Reminded by:    lev
Approved by:    erwin (mentor) (implicitly)

s/APACHE_USER/WWWOWN/.
I don't use APACHE_USER, so SUEXEC_CALLER is set to "".
Since apache only produce error at run time, I didn't catch it.
BTW, SUEXEC_CALLER is now correctly set.

Noticed by:     Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
Pointy hat to:  me
Approved by:    erwin (mentor) (implicity)

Mark apache2 as broken when devel/apr is installed and WITH_APR_FROM_PORTS
is not defined.
This workaround should avoid weird apache behaviours when apache is
linked against the wrong apr* libraries.
Time to add CONFLICTS_BUILD option to bsd.port.mk ?

Approved by:    erwin (mentor) (implicity)

- fix SSL detection problem on stable with base OpenSSL [1]
  Force the use of SSL_EXPERIMENTAL_ENGINE *only* if the user uses
  -STABLE and base OpenSSL.
  This is an *apache* problem. It's not the port.
  I strongly encourage users to use OpenSSL from ports.
   From httpd-2.0 Status:
   * mod_ssl: fix a link failure when the openssl-engine libraries are
     present but the engine headers are missing.
- fix a typo in WITH_DBM, should be bdb and not db [1]
  I keep db for backward compatibility
- Add WITH_APR_FROM_PORTS to use devel/apr with apache2.
  !!! WARNING !!! apache-2.0.48 is designed to work with apr 0.9.5.

Noticed by:     Fritz Heinrichmeyer <Fritz.Heinrichmeyer@Fernuni-Hagen.de> [1]
Approved by:    erwin (mentor)

Apache2 PORTREVISION 2:
- Move docs-related stuff to Makefile.doc
- Better MPM handling (for slave ports)
- Fix HTTP_PORT behaviour
- Make suExec more configurable [1]
- Now config script are regenerated by buildconfig, to improve slave
  ports support and minimize apr/apache2 ports conflict [2]
- Fix typo in AUTH_MODULES routine [3] [4]
- apr threaded support [5]
- Fix Segmentation fault with LDAP [6]
- Add db42 support. [7] (just uncomment related lines
  if you installed it from shar)
- add SLAVE_DESIGNED_FOR variable for slave ports to
  automaticaly mark them as BROKEN, if they are out of sync with
  apache2

Remove duplicated WITH_EXPERIMENTAL comment.

Reviewed by:    maintainer

- fix LDAP deps (typo) [1]
- fix nasty typo in DBM code (missing + in LIB_DEPENDS=)
- remove NO_{ERROR;WWWDATE;CGI;ICONS;WWW} and utilize WITHOUT_WWW and
  WITH_CUSTOM_WWW [2]
- HTTP_PORT => WITH_HTTP_PORT and IPV6_ONLY => WITH_IPV6_ONLY [3]
- add support for FreeBSD libc db [4]
- add db41 support [5]
- more typos and a few things...

Notified by:    Oliver Eikemeier <eikemeier@fillmore-labs.com> [1]
Discussed with: Oliver Eikemeier <eikemeier@fillmore-labs.com> [2] [3]
Requested by:   Fritz Heinrichmeyer <fritz.heinrichmeyer@fernuni-hagen.de> [4]
Submitted by:   <swp@uni-altai.ru> [5]

PR:             58739
Submitted by:   Clement Laforet <sheepkiller@cultdeadsheep.org>

Fix build.

PR:             58711
Submitted by:   Yusuke Matsuoka <yusmat@iris.dti.ne.jp>
Approved by:    maintainer

Update to 2.0.48, which has corrections for two security bugs:
- CAN-2003-0789:  information leak in mod_cgid
<URL:http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0789>
- CAN-2003-0542:  buffer overflow in mod_alias and mod_rewrite
<URL:http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0542>

Use a DIST_SUBDIR.  Use the DOCSDIR macro.

Add options: HTTP_PORT, IPV6_V6ONLY, NO_CGI, NO_ERROR, NO_ICONS,
NO_WWW, NO_WWWDATA, WITHOUT_AUTH, WITHOUT_DAV, WITHOUT_MODULES,
WITHOUT_MODULES, WITHOUT_PROXY, WITH_ALL_STATIC_APACHE, WITH_BERKELEYDB,
WITH_CUSTOM_AUTH, WITH_CUSTOM_PROXY, WITH_DBM, WITH_EXTRA_MODULES,
WITH_MODULES, WITH_MPM, WITH_STATIC_APACHE, WITH_STATIC_MODULES and
WITH_STATIC_SUPPORT

PR:             58654
Submitted by:   Clement Laforet (maintainer)

- fix spelling in CONFLICTS

Add forgotten file to plist.

PR:             58211
Submitted by:   Dimitry Andric <dimitry@andric.com>
Approved by:    maintainer

- add CONFLICTS
Submitted by:   eikemeier@fillmore-labs.com
Approved by:    kris

Cease FreeBSD port maintainerships

        I don't have the time to give to many of the ports I maintain at
        the moment. I wasn't expecting to be so busy this summer ...

        Please set all my ports back to ports@freebsd.org.

PR:             ports/56935
Submitted by:   Dominic Marks <dom@wirespeed.org.uk>,Clement Laforet
<sheepkiller@cultdeadsheep.org>,Oliver Eikemeier <eikemeier@fillmore-labs.com>

Fix non-default dependency on openldap2[012] which is broken by splitting.

# I'm not bumped port revision of them because this should not affect
# packages built on bento...

Update 2.0.46 --> 2.0.47

Approved by:    MAINTAINER (dominic.marks@btinternet.com)
Notified by:    striker@apache.org on announce@apache.org

Set GNU_CONFIGURE instead of HAS_CONFIGURE.

Reviewed by:    maintainer

Hand maintainership to submitter

PR:             54053
Submitted by:   Dominic Marks <dom@cus.org.uk>

Set maintainer to ports@FreeBSD.org

Add a new knob WITH_LDAP that brings mod_auth_ldap and mod_ldap.

Submitted by:   Jean-Baptiste Quenot <jb.quenot@caraldi.com>
Requested by:   Moti Levy <moti@flncs.com>,
                Milan Andric <mandric@eecs.berkeley.edu>,

Change to use ${PKGINSTALL} instead of `pkg-install' to unbreak the build
when WRKDIRPREFIX is defined.

PR:             52973
Submitted by:   Morten Rodal <morten@rodal.no>

[SECURITY FIX]
Update to 2.0.46

See vulnerability details at:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0245
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0189

PR:             52768 [1]
Submitted by:   Xin Li <delphij@freebsdchina.org> [1],
                Miguel Mendez <flynn@energyhq.es.eu.org>,
                Trevor Johnson <trevor@FreeBSD.org>,
                Mark Gooderum <mark@verniernetworks.com>,
                John Walsh <zed@maths.tcd.ie>

- Utilize MASTER_SITE_APACHE_HTTPD [1]
- Allow to override SUEXEC_SAFEPATH [2]

Submitted by:   naddy [1],
                Eugene M. Kim <ab@astralblue.net> [2]

Add missed files on the previous commit.

Update to 2.0.45. This update fixes a DDOS vulnerability.

PR:             50564 [1]
Submitted by:   Cy Schubert <cy@FreeBSD.org>, delphij@hotmail.com [1]
Requested by:   many

De-pkg-comment for my ports.

Remove buggy SSL warning which isn't working correctly for openssl's
version scheme change.

Submitted by:   Jos Backus <jos@catnook.com>,
                Tiller Beauchamp <tiller@cs.uoregon.edu>

Update to 2.0.44

New knob IPV6_V6ONLY=yes disables accepting v4 connection via v4-mapped
v6 socket.

Move bin/ap[ru]-config to lib/apache2/ to coexist with devel/apr-devel
Bumped PORTREVISION accordingly.

PR:             ports/39091
Submitted by:   Marc Recht <marc@informatik.uni-bremen.de>

o Change installbuilddir to $PREFIX/share/apache2/build to make porting
  3rd party modules easy. [1]
o Include <limits.h> before <sys/syslimits.h> to reduce warnings on -CURRENT

PR:             44104 [1]
Submitted by:   Clement Laforet <sheepkiller@cultdeadsheep.org> [1]

Add MASTER_SITE_RINGSERVER to MASTER_SITES.

Update to apache 1.3.27 and 2.0.43.  This fixes a security vulnerability.
Mark apache13-ssl FORBIDDEN because the new version does not yet exist.

Partially based on patches submitted by below authors.

Submitted by:   "Sergey A. Osokin" <osa@freebsd.org.ru>,
                Udo Schweigert <udo.schweigert@siemens.com>,
                Lev A. Serebryakov <lev@serebryakov.spb.ru>
PR:             ports/43682, ports/43688, ports/43666, ports/43681

Update to 2.0.42

Approved by:    will (portmgr)

Bump PORTREVISION and expat shlib.

Update to 2.0.40

Fixed my stupid MAKE_ENV mistake on NOPORTDOCS=true

PR:             41292 [1]
Submitted by:   Clemens Oertel <oertel@uni-tuebingen.de>
                Oliver Eikemeier <eikemeier@fillmore-labs.com> [1]

- Add a small hack for worker MPM [1]
  (worker MPM with this hack seems to work without visible problems.
   and still requires -DFORCE_THREADING_MPM to build for worker MPM.)
- Fix plist for worker MPM
- Comment out fancy modules from default httpd.conf

Tested on:      ref5.freebsd.org, several 4-stable machines [1]

Bump portrevision (textproc/expat2 shlib bump).

o Install mod_deflate by default
o Add mod_bucketeer and mod_optional_* modules to WITH_EXPERIMENTAL modules
o Bump port revision

PR:             40529
Submitted by:   Lawrence Ho <lawrenceho@fastmail.fm>

Correct envvars path on apachectl(1)

Submitted by:   Franco Venturi <fventuri@attbi.com>

- Add a patch for a bug on infinite loop in HTTP_IN
  filter that allows DoS attack.
- Bump PORTREVISION
- Change maintainer address

Obtained from: Apache Group CVS (rev 1.150-1.151)

Fix more fatal bugs on htpasswd(1)

Requested by:   "Jon Noack" <noackjr@compgeek.com>
Obtained from:  Apache Group CVS (rev 1.49-1.51)

Use ${INSTALL_DATA} instead of ${CP} to set others readable on 077 umasks

PR:             38389
Submitted by:   abatko@cs.mcgill.ca

o Fix the htpasswd logic bug around -c and -n options
o Take away WITH_BUNDLED_EXPAT option (use textproc/expat2)
o Bump PORTREVISION

Prompted by:    Jon Noack <noackjr@rice.edu> (htpasswd)
Obtained from:  Apache Project's CVS (htpasswd)

- Sync www/apache13's change (.default -> -dist)
- Change default to WITH_BULDLED_EXPAT
- Reorder .if .endif blocks (.if WITH_MPM must appear earlier than .if
WITHOUT_CACHE)
- Some minor style fixes
- Bump PORTREVISION

PR:             ports/39635
Submitted by:   maintainer

* Always use /bin/sh for configure and build.
* Fix EXPAT_PATHS substitution on 4.4.

Submitted by:   maintainer Hye-Shik Chang <perky@fallin.lv>

Add USE_REINPLACE where appropriate.

- Update to 2.0.39, the emergency security update.
- Unmark FORBIDDEN

PR:             ports/39477
Submitted by:   maintainer

Mark FORBIDDEN until an update is available.
See <URL:http://httpd.apache.org/info/security_bulletin_20020617.txt>.

- Better WITH_SUEXEC support
- Build with textproc/expat2 unless defined(WITH_BUNDLED_EXPAT)

PR:             38552
Submitted by:   maintainer

Fix ports for building with -current without perl

PR:             38359
Submitted by:   maintainer

1.  Upgrade 2.0.35 --> 2.0.36

2.  Port printed message to "pw userdel www" if port removed permanently.
    However master.passwd 1.25.2.5 has user www by default, so this is no
    longer correct advice.  Removed pkg-deinstall to correct this.

PR:             37849 and 36907
Approved by:    MAINTAINER:  Hye-Shik Chang <perky@fallin.lv>

Respect $DESTDIR for all paths

PR:             37211
Submitted by:   maintainer

Remove this patch since perl patch in port Makefile is used to
accomplish this.

PR:             37046
Submitted by:   Helge Oldach <send-pr@oldach.net>
Approved by:    maintainer

- Disable THREADS by default (many ports people reported problems around
  threads)
- Bump port revision
- Added two more "POSIX expr" patch target for 5-CURRENT

PR:             36981
Submitted by:   maintainer

Fix 'expr' usage and allow to compile with GCC 3.1.

Submitted by:   Hye-Shik Chang <perky@fallin.lv> (maintainer)

Fix typo in the optional WITH_SUEXEC section.

PR:             ports/36872
Submitted by:   Hye-Shik Chang <perky@fallin.lv> (MAINTAINER)

Update to 2.0.35 (first GA release!)

PR:             36834
Submitted by:   maintainer

Don't try to fetch the "-beta" file.  `make fetch' returns "Multiple files".

Update to 2.0.32

PR:             36040
Submitted by:   maintainer

Fix problem where installation would overwrite existing config files   Bump
PORTREVISION    

Fix invalid path problem on building extension module with apxs.    

Suggest a command to delete user instead of actually deleting it    

Fix to define correct $PATCHFILES which is introduced in previous commit.    

PLIST cleanup.    

Fix a problem that apache release can't detach from launcher's   terminal    

Update to 2.0.28    

Set LATEST_LINK to apache2 in favor of www/apache13.    

Oops, CVS not change access bits on removing/adding, so use ${SH} trick    

Second part to fix missing x-bit on pkg*install    

First part to fix missing x-bit on pkg*install    

Sync with main Apache    

Fix problems with configure bug that doesn't evaluate variables for  
support/*.in.    

Add ipv6 to CATEGORIES, since Apache supports IPv6 by default.    

Bring in Apache 2.0.16-beta.  Just in time for the release...