14:23 brnrd 

Mk/Uses/apache.mk: Migrate Mk/bsd.apache.mk to Uses

 - Chase required changes in framework (bsd.sanity.mk, bsd.port.mk)
 - Chase required changes in ports (version checks)
 - Chase required changes in PHP ports (include bsd.apache.mk)
 - exp-run by antoine, brnrd, joneum

PR:             223691 (exp-run)
Reviewed by:    joneum (hat apache), mat (portmgr), antoine (portmgr)
Approved by:    joneum (hat apache)
Approved by:	portmgr
With hat:       apache

 

12:09 mat 

Always include bsd.default-versions.mk in bsd.port.mk.

The variable defined in it are now always available after including
bsd.port.pre.mk.

PR:		210666
Submitted by:	mat
Exp-run by:	antoine
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D6933

 

12:42 mat 

Remove DO_NADA targets.

No need to have make(1) compute a target order graph for targets that
are empty.

Sponsored by:	Absolight

 

13:34 mat 

Try to be more helpful to our users, and keep all the possible versions
close to their default value in Mk/bsd.default-versions.mk.

Sponsored by:	Absolight

 

01:23 bapt 

Remove the now unneeded ${PORTSDIR} from dependency definition in
The infrastructure Makefiles

PR:		206569
Exp run by:	antoine
Differential Revision:	D5047

 

11:39 ohauer 

- adopt new pkg keywords (CHANGES: 20150926)
   - s/exec/postexec/
   - s/unexec/postunexec/

with head apache@

 

22:34 pgollucci 

Fix static modules in www/apache24

--enable-foo=static
works in both 2.2/2.4 and is required in 2.4

PR:           200161
Submitted by: freebsd@magic.360xl.net
With Hat:     apache@

 

10:53 ohauer 

- fix documentation of user controlled parameters for usage in /etc/make.conf.
  APACHE_PORT should be used only in combination with
"DEFAULT_VERSIONS+=apache2.2"

- ripp AP_BUILDEXT, it is only used in bsd.apache.mk and not exported

 

22:10 ohauer 

- remove SLAVE_PORT_MODULES (no longer required since apache >= 20)

with hat apache@

 

20:18 ohauer 

- fix bad warning example, s/DEFAULT_VERSIONS=/DEFAULT_VERSIONS+=/

with hat apache@

 

15:47 ohauer 

- change check for httpd version s/-V/-v/

  -V also checks for config issues in httpd.conf, this can break a build
  in case there are config issues during rebuilds on a live system.
  -v prints the required info without check

with hat apache@

PR:		191471
Submitted by:	Todd <kovert_at_omniscient.com>

 

21:51 ohauer 

- fix DEFAULT_APACHE_VERSION,
  (patch based on fix from babt)
- white space cleanup

with hat apache@

 

22:09 ohauer 

- revert to r366839

 

15:58 ohauer 

- fix build for ports defining USE_APACHE=22, USE_APACHE_(BUILD|RUN)=22

spotted by adam@

 

05:43 bapt 

Remove support for NO_STAGE
Mark all current non staged ports as BROKEN

Reviewed by:	antoine
Exp-run:	antoine
Differential Revision:	https://reviews.freebsd.org/D693

 

18:06 antoine 

Add an option helper for PLIST_SUB
Rename a few variables to avoid confusion with this new helper

Requested by:	koobs
Reviewed by:	mat
With hat:	portmgr
Differential revision: https://reviews.freebsd.org/D665

 

18:21 ohauer 

- add some additional SUB_LIST hints

MFH:		2014Q3

 

15:58 ohauer 

- reflect new preferred apache version

 

07:20 bapt 

tabspace: 8

 

09:45 bapt 

Convert all :U to :tu and :L to :tl

Since FreeBSD 8.4 and FreeBSD 9.1 make(1) do support :tu and :tl as a
replacement for :U and :L (which has been marked as deprecated)

bmake which is the default on FreeBSD 10+ only support by default
:tu/:tl a hack has been added at the time to support :U and :L to ease
migration. This hack is now not necessary anymore

Note that this makes the ports tree incompatible with make(1) from
FreeBSD 8.3 or earlier

With hat:	portmgr

 

14:11 ohauer 

- automatically strip modules build with
  AP_FAST_BUILD, except if DEBUG is set

 

17:12 mat 

Use default-versions.mk for Apache, PHP, MySQL And PostgreSQL.

Submitted by:	Allan Jude
Reviewed by:	bdrewery, ohauer (apache), mat
With hat:	portmgr

 

23:05 ohauer 

- support STAGE for ports using AP_FAST_BUILD

 

20:45 ohauer 

- rewrite part of module enabling

 

21:31 ohauer 

- prepare for apache24

 

20:49 ohauer 

- fix semantic in the install target (swap -a -A)

with head apache@

 

19:46 ohauer 

- allow to install apache modules activated by defining
  AP_MODENABLE in make.conf

  Requested on the mailing lists

- fix patch location in help text

with head apache@

 

20:55 ohauer 

- USE_APACHE s/22+/22/

some additional cleanups/fixes
- adopt new Makefile header
- convert to optionsNG
- use BROKEN instead IGNORE in bsd.apache.mk

with hat apache@

 

18:25 ohauer 

- fix issue in case no module is specified

Noted by: Adam McDougall

 

16:35 ohauer 

- add a note about devel/apr1 and apache22 updates
- adjust DBD IGNORE message

 

14:31 ohauer 

devel/apr1 [1]
- update APR to 1.4.6
- update APR-util to 1.4.1
- remove PKGNAMESUFFIX'es

www/apache-(event|itk|peruser|worker)-mpm
- adopt new Makefile header, adjust
  PKGNAMESUFFIX in apache22 masterport
  PKGNAME match now LATEST_LINK

www/apache22 [2]-[6]
- rewrite for options NG
- PORTNAME s|apache|apache22|
- remove APR APR-util specific otions,
  will be checked now with help of apr/u-1-config

Mk/bsd.apache.mk
- rewrite for options NG
- remove no longer needet make targets
  (show-categories, make-options-list)

[1]
PR: 165143

[2]-[6]
PR: 130479
PR: 153406
PR: 158565
PR: 168769
PR: 167965

with hat apache@

 

04:49 ohauer 

- rewite apache port
 - remove all apr/apu related parts (leftovers from bundled apr)
 - remove invalid parts from Makefile.doc
 - move MODULES to Makefile.options

- remove apache20 parts
- remove category handling

with hat apache@

19:51 ohauer 

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

21:19 ohauer 

- remove old apache13 parts

with hat apache@

08:17 miwi 

- Remove emacs mode, -*- mode: ...; -*- [1]
- Comments for BUILD_ and RUN_DEPENDS fail to mention alternate means to specify
dependencie [2]
- Fix make reinstall [3]
- Trivial comment change for PORTDATA [4]

PR:             151954 [1]
                161314 [2]
                167085 [3]
                167465 [4]
Submitted by:   Anonymous <swell.k@gmail.com> [1]
                dougb@ and Chris Rees <utisoft@gmail.com> [2]
                Garrett Cooper <yanegomi@gmail.com> [3]
                "Bryan Drewery" <bryan@shatow.net> [4]
Tested via:     phw

20:09 ohauer 

- no need to strip `.' in APACHE_VERSION_CHECK because `.' is no longer valid in
APACHE_VERSION
- make apache2x module cleanup more strict so addon modules will not remove
LoadModule lines insert by apache2x.
  For example apache own proxy_scgi_module could be removed during deinstall of
mod_scgi
- remove apache13 module pkg-plist cleanup

with hat apache@

19:30 ohauer 

- remove apache13 and ports depending on apache13 from portstree
  ( EXPIRATION_DATE=2012-01-01 )

with hat apache@

22:47 ohauer 

- adjust Note to reflect enforcement of USE_APACHE values

21:55 ohauer 

- force usage of USE_APACHE values without '.'

 Examples:
  USE_APACHE= 22       # specify exact version
  USE_APACHE= 13+      # specify [min] version, no [max] version
  USE_APACHE= 13-22    # specify [min]-[max] range
  USE_APACHE= -22      # specify [max] version, no [min] version

with hat apache@

18:58 ohauer 

 - adjust USE_APACHE sample
   USE_APACHE value is preferred without "." since bsd.apache.mk
   has to rip out the "." for further processing.
   Support for "." in the value is taret for change.

17:21 ohauer 

- change default apache version to apache22
- make entry in UPDATING

with hat apache@

PR:             ports/147009

20:21 ohauer 

- document parameter APACHE_PORT

PR:             ports/153565
Submitted by:   dougb

15:37 ohauer 

  Mk/bsd.apache.mk was rewritten with a new logic and some new parameters
  to support future apache versions and the transition to apache22.

  Existing and new USE_APACHE* parameters:

  USE_APACHE         set apache and apxs as build and run dependency
  USE_APACHE_BUILD   set apache and apxs as build dependency
  USE_APACHE_RUN     set apache and apxs as run dependency

  The following example is representative of all three possible parameters to
use:

  USE_APACHE= 22     specify exact version
  USE_APACHE= 1.3+   specify [min] version, no [max] version
  USE_APACHE= 13-22  specify [min]-[max] range
  USE_APACHE= -2.2   specify [max] version, no [min] version

  Values can be specified with and without "." (dot) between major and minor
  version numbers. For example 22 is equal to 2.2

  For documentation and full changelist please take a look into
  Mk/bsd.apache.mk or http://wiki.freebsd.org/bsd.apache.mk

  Commit with hat apache@

PR:             ports/156533
Submitted by:   ohauer

14:23 ohauer 

 - add mod_substitute to apache22
 - adjust some .endif comments

With Hat:   apache@

14:38 pgollucci 

- Provide a knob to not check the APACHE_PORT value or the installed version of
httpd.
  Very useful for maintainers or for doing all the targets up to 'do-install'

With Hat:   apache@

20:59 pgollucci 

stray $

20:17 pgollucci 

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)

21:43 pgollucci 

- Enable,build, and install mod_reqtimeout.so which mitigates solaris attacks.
- Default on, so bump PORTREVISION

Reuested by:        Jonas Eckerman <jonas@fsdb.org> (via apache@)
With Hat:           apache@

23:01 pgollucci 

*****************************************************************************
            Implement PKGNAMEPREFIX=ap13|ap20|ap22
*****************************************************************************

- Create packages for USE_APACHE=x ports with PKGNAMEPREFIX [1]
- Rephrase IGNORE statement, kill EOL spaces, reformat in Mk/bsd.apache.mk [2]
- Remove USE_APACHE=yes, USE_APACHE=apr, and APR_DEPS=foo
- Remove APACHE_COMPAT=X
- Drop support for 21 [dev only release, not in tree for years now]

PR:             ports/115461 [1], ports/133197 [2], ports/141688
Submitted by:   myself (pgollucci@),
                Alexey Rubtsov <arubtsov@swsoft.com> [1],
                dafne [2]
Requested by:   Several [1]
Tested by:      2 -exp runs by pav
Approved by:    portmgr (pav)
With Hat:       apache@

22:26 pgollucci 

- Make the SLAVE_DESIGNED_FOR message more useful and say what versions
  didn't match.  Changes message text only.

With Hat:   apache@

00:16 pgollucci 

- Fix builds that enable PROXY support.
  This should have been part of the following previous commit to www/apache22

>- OPTIONS+= PROXY_SCGI
>
>PR:             ports/140137
>Submitted by:   olli hauer <ohauer@gmx.de>

21:03 clement 

- Avoid "OPTIONS blackhole" during 'make make-options-list'

20:01 clement 

- cosmetic changes
- s/OPTIONS=/OPTIONS+=/

14:36 clement 

- fix pre/post includes for USE_APACHE=common*
  We still perform a double inclusion for modules to ensure backward
  compatibility
- add "Apache servers"-wide support for OPTIONS.
  !! Warning !!
  If OPTIONS is defined, all other modes to select modules are disabled.
  Here's the logic behind:
    1) OPTIONS
    2) WITH_MODULES
    3) all others knobs.

  OPTIONS'ified list of modules can be obtained via:
  "make make-options-list"

12:43 clement 

- Fix index build: temporary remove pre/post stuff.

Pointy Hat to: clement

10:48 clement 

- fix long standing bugs
  * fix pre/post includes
  * fix local port overiding for apache > 2.1
  * Add a short notr about USE_APACHE=yes

15:50 pav 

- Fix leftover httpd.conf for AP_GEN_PLIST using ports.  The problem is that
  apxs does not remove module line from httpd.conf, it merely comments it out.
  Later, on Apache deinstall, the file differs from stock httpd.conf and is not
  deleted.

Tested by:      pointyhat exprun

09:11 clement 

- s/WITH_SUEXEC_UMASK/SUEXEC_UMASK/

Spotted by:             ksaveras.sakys@observer.lt

04:58 linimon 

Fix typo in IGNORE message.

15:21 clement 

- Add APACHEETCDIR to catch apache etc directory.
  It can't be used with USE_APACHE=yes

Requested by:   pav, tmclaugh

16:38 clement 

- We have to explicitely disable proxy modules to avoid auto activation of
  non desired proxy modules with WITH_CUSTOM_PROXY

PR:             ports/95728
Submitted by:   Tetsuya Uemura <t_uemura@macome.co.jp>

20:46 clement 

- Fix USE_APACHE=22

Approved by:    portmgr (self)

Spotted by:     Larry Rosenman <ler at lerctr dot org>

18:58 clement 

Cleanups and fixes
- remove useless options (and fix thread stuff) [1]
- move print-closest-mirror to bsd.apache.mk
- move threads configure options out of Makefile.modules
- Fix stupid logic to disable v4mapped address [2]
- and more...

Submitted/spotted by:   many, Hirohisa Yamaguchi <umq@ueo.co.jp> [1]
                        ume[2]
PR:                     ports/91813 [1]

13:42 clement 

- Fix some suexec CONFIGURE_ARGS for 1.3.x
- add show-categories and show-modules targets, for server ports.
  Remove these targets from www/apache22/Makefile

20:54 clement 

- Add forgotten mod_filter

Spotted by:             Cheese Lottery <cheeselottery@gmail.com>

17:13 clement 

- export APACHEMODDIR and APACHEINCLUDEDIR to Makefile-land
- remove duplicated "code"

14:08 clement 

- Fix a condition in bsd.apache.mk
- all apache 1.3 only modules maintained by apache@ are now bsd.apache.mk
  compliant

00:18 clement 

- prepare removal of www/apache2 in favor of www/apache20 for naming
  consistency
- add entries in UPDATING (for apache22 too)

PR:             ports/78119
Repocopied by:  marcus

21:28 clement 

- Add support for upcoming www/apache22 port

09:02 clement 

* Add bsd.database.mk [1]
  - move out from bsd.port.mk USE_MYSQL and USE_PGSQL.
  - add support for Berkley DB and SQLite (via USE_BDB and USE_SQLITE
    knobs).

* Espace '+' in make search [2]

* Add "makepatch" target to simplify creation of patches during porting [3]

* Replace deprecated MACHINE_ARCH with ARCH [4]

* Remove support of OpenLDAP 2.1 [5]

* Add bsd.tcl.mk [6]
  It introduces USE_TCL/USE_TCL_BUILD knobs to support various

(Only the first 15 lines of the commit message are shown above )