Bug 146956 - Mk/bsd.apache.mk OPTIONSFILE fix
Mk/bsd.apache.mk OPTIONSFILE fix
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: Philip M. Gollucci
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2010-05-25 08:10 UTC by Philip M. Gollucci
Modified: 2010-05-25 21:20 UTC (History)
1 user (show)

See Also:


Attachments
options.diff (32.42 KB, patch)
2010-05-25 08:10 UTC, Philip M. Gollucci
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Philip M. Gollucci freebsd_committer 2010-05-25 08:10:04 UTC
As stated in prior e-mail:
141 ports are mod_ ports
80 of those use AP_FAST_BUILD and thus are auto hooked by this patch.
61 remaining are then patched to mirror the other $lang frameworks.
PKGNAMEPREFIX=    ${APACHE_PKGNAMEPREFIX}

This also changes PKGNAMEPREFIX=ap\d{2}- to need to be manually requested in the port Makefile instead of automagically by Mk/bsd.apache.mk. We're also dropping back to only doing this to ports where USE_APACHE is non-optional.  So i.e.: lang/php5 goes back from apXX-php5-5.3.2 -> php5-5.3.2

My TB should be done the 225 ports by the time I wake up tomorrow.
Comment 1 Edwin Groothuis freebsd_committer 2010-05-25 08:10:37 UTC
Responsible Changed
From-To: freebsd-ports-bugs->apache

bsd.apache.mk is apache territory (via the GNATS Auto Assign Tool)
Comment 2 Philip M. Gollucci freebsd_committer 2010-05-25 08:12:07 UTC
Responsible Changed
From-To: apache->portmgr

request for review
Comment 3 pav freebsd_committer 2010-05-25 08:17:09 UTC
Responsible Changed
From-To: portmgr->pgollucci

Approved!
Comment 4 Philip M. Gollucci freebsd_committer 2010-05-25 21:17:44 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 5 dfilter freebsd_committer 2010-05-25 21:18:56 UTC
pgollucci    2010-05-25 20:17:37 UTC

  FreeBSD ports repository

  Modified files:
    Mk                   bsd.apache.mk 
    www/mod_accounting   Makefile 
    www/mod_auth_form    Makefile 
    www/mod_auth_kerb    Makefile 
    www/mod_auth_kerb2   Makefile 
    www/mod_auth_mysql   Makefile 
    www/mod_auth_openid  Makefile 
    www/mod_auth_pam2    Makefile 
    www/mod_auth_pgsql   Makefile 
    www/mod_auth_pubtkt  Makefile 
    www/mod_auth_xradius Makefile 
    www/mod_backhand     Makefile 
    www/mod_bandwidth    Makefile 
    www/mod_cband        Makefile 
    www/mod_clamav       Makefile 
    www/mod_cplusplus    Makefile 
    www/mod_cvs2         Makefile 
    www/mod_dav          Makefile 
    www/mod_dnssd        Makefile 
    www/mod_dtcl         Makefile 
    www/mod_encoding     Makefile 
    www/mod_fcgid        Makefile 
    www/mod_fileiri      Makefile 
    www/mod_gzip         Makefile 
    www/mod_h264_streaming Makefile 
    www/mod_jk           Makefile 
    www/mod_layout       Makefile 
    www/mod_layout2      Makefile 
    www/mod_layout22     Makefile 
    www/mod_limitipconn  Makefile 
    www/mod_limitipconn2 Makefile 
    www/mod_line_edit    Makefile 
    www/mod_log_dbd      Makefile 
    www/mod_log_firstbyte Makefile 
    www/mod_log_sql      Makefile 
    www/mod_log_sql2     Makefile 
    www/mod_log_sql2-dtc Makefile 
    www/mod_memcache     Makefile 
    www/mod_mono         Makefile 
    www/mod_mp3          Makefile 
    www/mod_musicindex   Makefile 
    www/mod_ntlm         Makefile 
    www/mod_ntlm2        Makefile 
    www/mod_perl         Makefile 
    www/mod_perl2        Makefile 
    www/mod_proctitle    Makefile 
    www/mod_proxy_xml    Makefile 
    www/mod_pubcookie    Makefile 
    www/mod_python       Makefile 
    www/mod_python3      Makefile 
    www/mod_ruby         Makefile 
    www/mod_scgi         Makefile 
    www/mod_security     Makefile 
    www/mod_sed          Makefile 
    www/mod_transform    Makefile 
    www/mod_webapp       Makefile 
    www/mod_wsgi         Makefile 
    www/mod_wsgi3        Makefile 
    www/mod_xmlns        Makefile 
  Log:
  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)
  
  Revision  Changes    Path
  1.24      +5 -2      ports/Mk/bsd.apache.mk
  1.19      +1 -0      ports/www/mod_accounting/Makefile
  1.6       +1 -0      ports/www/mod_auth_form/Makefile
  1.26      +1 -0      ports/www/mod_auth_kerb/Makefile
  1.26      +1 -0      ports/www/mod_auth_kerb2/Makefile
  1.33      +1 -0      ports/www/mod_auth_mysql/Makefile
  1.6       +1 -0      ports/www/mod_auth_openid/Makefile
  1.9       +1 -0      ports/www/mod_auth_pam2/Makefile
  1.25      +1 -0      ports/www/mod_auth_pgsql/Makefile
  1.2       +1 -0      ports/www/mod_auth_pubtkt/Makefile
  1.3       +1 -0      ports/www/mod_auth_xradius/Makefile
  1.15      +1 -0      ports/www/mod_backhand/Makefile
  1.13      +1 -0      ports/www/mod_bandwidth/Makefile
  1.17      +1 -0      ports/www/mod_cband/Makefile
  1.25      +1 -0      ports/www/mod_clamav/Makefile
  1.13      +1 -0      ports/www/mod_cplusplus/Makefile
  1.5       +1 -0      ports/www/mod_cvs2/Makefile
  1.24      +1 -0      ports/www/mod_dav/Makefile
  1.10      +1 -0      ports/www/mod_dnssd/Makefile
  1.31      +1 -0      ports/www/mod_dtcl/Makefile
  1.8       +1 -0      ports/www/mod_encoding/Makefile
  1.20      +1 -0      ports/www/mod_fcgid/Makefile
  1.5       +1 -0      ports/www/mod_fileiri/Makefile
  1.18      +1 -0      ports/www/mod_gzip/Makefile
  1.5       +1 -0      ports/www/mod_h264_streaming/Makefile
  1.45      +1 -0      ports/www/mod_jk/Makefile
  1.22      +1 -0      ports/www/mod_layout/Makefile
  1.13      +1 -0      ports/www/mod_layout2/Makefile
  1.19      +1 -0      ports/www/mod_layout22/Makefile
  1.12      +1 -0      ports/www/mod_limitipconn/Makefile
  1.8       +1 -0      ports/www/mod_limitipconn2/Makefile
  1.6       +1 -0      ports/www/mod_line_edit/Makefile
  1.7       +1 -0      ports/www/mod_log_dbd/Makefile
  1.7       +1 -0      ports/www/mod_log_firstbyte/Makefile
  1.17      +1 -0      ports/www/mod_log_sql/Makefile
  1.14      +1 -0      ports/www/mod_log_sql2-dtc/Makefile
  1.13      +1 -0      ports/www/mod_log_sql2/Makefile
  1.6       +1 -0      ports/www/mod_memcache/Makefile
  1.9       +1 -0      ports/www/mod_mono/Makefile
  1.33      +1 -0      ports/www/mod_mp3/Makefile
  1.25      +1 -0      ports/www/mod_musicindex/Makefile
  1.8       +1 -0      ports/www/mod_ntlm/Makefile
  1.9       +1 -0      ports/www/mod_ntlm2/Makefile
  1.45      +1 -0      ports/www/mod_perl/Makefile
  1.72      +1 -0      ports/www/mod_perl2/Makefile
  1.6       +1 -0      ports/www/mod_proctitle/Makefile
  1.6       +1 -0      ports/www/mod_proxy_xml/Makefile
  1.5       +1 -1      ports/www/mod_pubcookie/Makefile
  1.32      +1 -0      ports/www/mod_python/Makefile
  1.45      +1 -0      ports/www/mod_python3/Makefile
  1.64      +1 -0      ports/www/mod_ruby/Makefile
  1.20      +1 -1      ports/www/mod_scgi/Makefile
  1.40      +1 -0      ports/www/mod_security/Makefile
  1.11      +1 -0      ports/www/mod_sed/Makefile
  1.8       +1 -0      ports/www/mod_transform/Makefile
  1.29      +1 -0      ports/www/mod_webapp/Makefile
  1.14      +1 -0      ports/www/mod_wsgi/Makefile
  1.15      +1 -0      ports/www/mod_wsgi3/Makefile
  1.6       +1 -0      ports/www/mod_xmlns/Makefile
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"