1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-18 08:02:48 +00:00
Commit Graph

63 Commits

Author SHA1 Message Date
Olli Hauer
a6fda1e7ec - 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
2014-10-04 10:53:21 +00:00
Olli Hauer
0a56314ec4 - remove SLAVE_PORT_MODULES (no longer required since apache >= 20)
with hat apache@
2014-09-23 22:10:26 +00:00
Olli Hauer
1a469623b4 - fix bad warning example, s/DEFAULT_VERSIONS=/DEFAULT_VERSIONS+=/
with hat apache@
2014-09-23 20:18:01 +00:00
Olli Hauer
de6bc5227e - 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>
2014-09-21 15:47:08 +00:00
Olli Hauer
20a1167bf1 - fix DEFAULT_APACHE_VERSION,
(patch based on fix from babt)
- white space cleanup

with hat apache@
2014-09-10 21:51:25 +00:00
Olli Hauer
71d24d5697 - revert to r366839 2014-09-08 22:09:15 +00:00
Olli Hauer
bd6f9906a6 - fix build for ports defining USE_APACHE=22, USE_APACHE_(BUILD|RUN)=22
spotted by adam@
2014-09-07 15:58:05 +00:00
Baptiste Daroussin
8527bc1d3a 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
2014-09-01 05:43:02 +00:00
Antoine Brodin
b154a5521f 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
2014-08-21 18:06:58 +00:00
Olli Hauer
ef8909b7d9 - add some additional SUB_LIST hints
MFH:		2014Q3
2014-08-09 18:21:59 +00:00
Olli Hauer
c667d5ea1f - reflect new preferred apache version 2014-07-13 15:58:45 +00:00
Baptiste Daroussin
e48106740b tabspace: 8 2014-06-18 07:20:29 +00:00
Baptiste Daroussin
4a4ec28d37 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
2014-05-05 09:45:36 +00:00
Olli Hauer
edfcd95e30 - automatically strip modules build with
AP_FAST_BUILD, except if DEBUG is set
2014-04-27 14:11:30 +00:00
Mathieu Arnold
86f9c3213f Use default-versions.mk for Apache, PHP, MySQL And PostgreSQL.
Submitted by:	Allan Jude
Reviewed by:	bdrewery, ohauer (apache), mat
With hat:	portmgr
2014-02-11 17:12:28 +00:00
Olli Hauer
c0763e48fc - support STAGE for ports using AP_FAST_BUILD 2013-11-10 23:05:35 +00:00
Olli Hauer
5ecf027efa - rewrite part of module enabling 2013-11-10 20:45:09 +00:00
Olli Hauer
c1aa7d938b - prepare for apache24 2013-03-26 21:31:27 +00:00
Olli Hauer
b2c3ea48d8 - fix semantic in the install target (swap -a -A)
with head apache@
2013-03-02 20:49:03 +00:00
Olli Hauer
8a4e4e6266 - 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@
2013-03-02 19:46:37 +00:00
Olli Hauer
1d6232b246 - 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@
2012-09-24 20:55:01 +00:00
Olli Hauer
6637fa56fe - fix issue in case no module is specified
Noted by: Adam McDougall
2012-09-20 18:25:52 +00:00
Olli Hauer
0578f91ad7 - add a note about devel/apr1 and apache22 updates
- adjust DBD IGNORE message
2012-09-08 16:35:31 +00:00
Olli Hauer
2a91c25f5f 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@
2012-09-02 14:31:58 +00:00
Olli Hauer
fea05a23b6 - 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@
2012-08-23 04:49:36 +00:00
Olli Hauer
7ea5219979 - 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@
2012-08-13 19:51:11 +00:00
Olli Hauer
7c02e61dd0 - remove old apache13 parts
with hat apache@
2012-07-23 21:19:52 +00:00
Martin Wilke
61d8acdb49 - 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
2012-05-23 08:17:49 +00:00
Olli Hauer
44276a4895 - 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@
2012-01-11 20:09:27 +00:00
Olli Hauer
2c96f26a12 - remove apache13 and ports depending on apache13 from portstree
( EXPIRATION_DATE=2012-01-01 )

with hat apache@
2012-01-01 19:30:58 +00:00
Olli Hauer
91d95a621d - adjust Note to reflect enforcement of USE_APACHE values 2011-11-06 22:47:28 +00:00
Olli Hauer
542ab98854 - 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@
2011-11-06 21:55:53 +00:00
Olli Hauer
eb60c758ae - 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.
2011-08-20 18:58:52 +00:00
Olli Hauer
59d207f8bb - change default apache version to apache22
- make entry in UPDATING

with hat apache@

PR:		ports/147009
2011-08-20 17:21:38 +00:00
Olli Hauer
aa101333f9 - document parameter APACHE_PORT
PR:		ports/153565
Submitted by:	dougb
2011-05-15 20:21:30 +00:00
Olli Hauer
aaa59c1b11 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
2011-04-24 15:37:53 +00:00
Olli Hauer
b10577b78b - add mod_substitute to apache22
- adjust some .endif comments

With Hat:   apache@
2011-03-31 14:23:32 +00:00
Philip M. Gollucci
3d557e2bfc - 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@
2010-06-07 14:38:44 +00:00
Philip M. Gollucci
fb2e8372fe stray $ 2010-05-25 20:59:42 +00:00
Philip M. Gollucci
335f8cb35d 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)
2010-05-25 20:17:37 +00:00
Philip M. Gollucci
99d3f4c2b0 - 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@
2010-05-20 21:43:47 +00:00
Philip M. Gollucci
c4aff1ca1f *****************************************************************************
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@
2010-05-19 23:01:04 +00:00
Philip M. Gollucci
605d4bae06 - Make the SLAVE_DESIGNED_FOR message more useful and say what versions
didn't match.  Changes message text only.

With Hat:   apache@
2010-05-05 22:26:30 +00:00
Philip M. Gollucci
e353c85f90 - 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>
2009-12-14 00:16:25 +00:00
Clement Laforet
ab8293d70e - Avoid "OPTIONS blackhole" during 'make make-options-list' 2007-09-19 21:03:59 +00:00
Clement Laforet
4d35566575 - cosmetic changes
- s/OPTIONS=/OPTIONS+=/
2007-09-18 20:01:17 +00:00
Clement Laforet
fc5126bc4c - 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"
2007-09-09 14:36:42 +00:00
Clement Laforet
a1bae9f6e3 - Fix index build: temporary remove pre/post stuff.
Pointy Hat to: clement
2007-07-22 12:43:00 +00:00
Clement Laforet
9173d040e4 - fix long standing bugs
* fix pre/post includes
  * fix local port overiding for apache > 2.1
  * Add a short notr about USE_APACHE=yes
2007-07-22 10:48:42 +00:00
Pav Lucistnik
ac049a67f3 - 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
2007-06-28 15:50:53 +00:00