head	1.233;
access;
symbols
	RELEASE_6_0_0:1.226
	RELEASE_5_4_0:1.220
	RELEASE_4_11_0:1.216
	RELEASE_5_3_0:1.200
	RELEASE_4_10_0:1.175
	RELEASE_5_2_1:1.156
	RELEASE_5_2_0:1.156
	RELEASE_4_9_0:1.149
	RELEASE_5_1_0:1.142
	RELEASE_4_8_0:1.139
	RELEASE_5_0_0:1.135
	RELEASE_4_7_0:1.133
	RELEASE_4_6_2:1.126
	RELEASE_4_6_1:1.126
	RELEASE_4_6_0:1.115
	RELEASE_5_0_DP1:1.108
	RELEASE_4_5_0:1.107
	RELEASE_4_4_0:1.96
	RELEASE_4_3_0:1.96
	RELEASE_4_2_0:1.84
	RELEASE_4_1_1:1.82
	RELEASE_4_1_0:1.81
	RELEASE_3_5_0:1.80
	RELEASE_4_0_0:1.78
	RELEASE_3_4_0:1.75
	RELEASE_3_3_0:1.75
	RELEASE_3_2_0:1.70
	RELEASE_3_1_0:1.65
	RELEASE_2_2_8:1.63
	RELEASE_3_0_0:1.62
	RELEASE_2_2_7:1.58
	RELEASE_2_2_6:1.46
	RELEASE_2_2_5:1.39
	RELEASE_2_2_1:1.28
	RELEASE_2_2_2:1.30
	apache_0_8_11:1.1.1.1
	APACHE:1.1.1;
locks; strict;
comment	@# @;


1.233
date	2005.12.04.00.27.19;	author clement;	state dead;
branches;
next	1.232;

1.232
date	2005.11.15.06.51.28;	author ade;	state Exp;
branches;
next	1.231;

1.231
date	2005.10.25.18.58.53;	author fenner;	state Exp;
branches;
next	1.230;

1.230
date	2005.10.14.13.54.07;	author clement;	state Exp;
branches;
next	1.229;

1.229
date	2005.09.20.08.39.50;	author clement;	state Exp;
branches;
next	1.228;

1.228
date	2005.09.10.14.46.13;	author clement;	state Exp;
branches;
next	1.227;

1.227
date	2005.09.10.14.26.48;	author clement;	state Exp;
branches;
next	1.226;

1.226
date	2005.09.07.20.31.11;	author clement;	state Exp;
branches;
next	1.225;

1.225
date	2005.08.25.20.24.52;	author clement;	state Exp;
branches;
next	1.224;

1.224
date	2005.08.01.10.04.18;	author clement;	state Exp;
branches;
next	1.223;

1.223
date	2005.07.26.10.10.34;	author clement;	state Exp;
branches;
next	1.222;

1.222
date	2005.07.26.08.25.12;	author clement;	state Exp;
branches;
next	1.221;

1.221
date	2005.04.17.20.38.54;	author clement;	state Exp;
branches;
next	1.220;

1.220
date	2005.03.15.22.18.54;	author clement;	state Exp;
branches;
next	1.219;

1.219
date	2005.03.01.13.36.30;	author clement;	state Exp;
branches;
next	1.218;

1.218
date	2005.02.08.15.17.06;	author clement;	state Exp;
branches;
next	1.217;

1.217
date	2005.01.11.13.45.05;	author clement;	state Exp;
branches;
next	1.216;

1.216
date	2004.12.19.19.52.44;	author clement;	state Exp;
branches;
next	1.215;

1.215
date	2004.12.17.17.52.20;	author clement;	state Exp;
branches;
next	1.214;

1.214
date	2004.12.13.10.18.47;	author clement;	state Exp;
branches;
next	1.213;

1.213
date	2004.12.12.11.48.55;	author clement;	state Exp;
branches;
next	1.212;

1.212
date	2004.11.13.18.23.33;	author clement;	state Exp;
branches;
next	1.211;

1.211
date	2004.11.10.18.24.44;	author clement;	state Exp;
branches;
next	1.210;

1.210
date	2004.11.08.20.50.48;	author clement;	state Exp;
branches;
next	1.209;

1.209
date	2004.10.31.09.22.21;	author clement;	state Exp;
branches;
next	1.208;

1.208
date	2004.10.30.19.44.41;	author clement;	state Exp;
branches;
next	1.207;

1.207
date	2004.10.30.15.32.53;	author clement;	state Exp;
branches;
next	1.206;

1.206
date	2004.10.16.14.45.40;	author clement;	state Exp;
branches;
next	1.205;

1.205
date	2004.10.16.09.15.52;	author clement;	state Exp;
branches;
next	1.204;

1.204
date	2004.10.16.05.03.07;	author kuriyama;	state Exp;
branches;
next	1.203;

1.203
date	2004.10.13.14.03.06;	author clement;	state Exp;
branches;
next	1.202;

1.202
date	2004.10.13.09.17.38;	author clement;	state Exp;
branches;
next	1.201;

1.201
date	2004.10.12.08.27.39;	author clement;	state Exp;
branches;
next	1.200;

1.200
date	2004.10.10.08.17.59;	author clement;	state Exp;
branches;
next	1.199;

1.199
date	2004.09.15.16.54.37;	author clement;	state Exp;
branches;
next	1.198;

1.198
date	2004.08.19.14.38.36;	author clement;	state Exp;
branches;
next	1.197;

1.197
date	2004.08.18.19.40.07;	author clement;	state Exp;
branches;
next	1.196;

1.196
date	2004.08.17.12.41.25;	author clement;	state Exp;
branches;
next	1.195;

1.195
date	2004.08.07.20.25.02;	author clement;	state Exp;
branches;
next	1.194;

1.194
date	2004.08.05.21.46.16;	author clement;	state Exp;
branches;
next	1.193;

1.193
date	2004.08.02.08.40.05;	author clement;	state Exp;
branches;
next	1.192;

1.192
date	2004.07.30.17.04.46;	author clement;	state Exp;
branches;
next	1.191;

1.191
date	2004.07.13.09.32.44;	author clement;	state Exp;
branches;
next	1.190;

1.190
date	2004.07.09.16.41.38;	author clement;	state Exp;
branches;
next	1.189;

1.189
date	2004.07.02.13.47.40;	author clement;	state Exp;
branches;
next	1.188;

1.188
date	2004.07.01.18.06.35;	author clement;	state Exp;
branches;
next	1.187;

1.187
date	2004.07.01.17.06.41;	author ade;	state Exp;
branches;
next	1.186;

1.186
date	2004.07.01.05.54.56;	author clement;	state Exp;
branches;
next	1.185;

1.185
date	2004.06.29.08.06.19;	author clement;	state Exp;
branches;
next	1.184;

1.184
date	2004.06.07.14.56.53;	author clement;	state Exp;
branches;
next	1.183;

1.183
date	2004.06.05.11.14.17;	author clement;	state Exp;
branches;
next	1.182;

1.182
date	2004.06.02.08.15.58;	author clement;	state Exp;
branches;
next	1.181;

1.181
date	2004.05.29.22.17.16;	author clement;	state Exp;
branches;
next	1.180;

1.180
date	2004.05.29.22.07.37;	author clement;	state Exp;
branches;
next	1.179;

1.179
date	2004.05.29.21.37.38;	author clement;	state Exp;
branches;
next	1.178;

1.178
date	2004.05.28.15.27.01;	author clement;	state Exp;
branches;
next	1.177;

1.177
date	2004.05.18.11.58.56;	author clement;	state Exp;
branches;
next	1.176;

1.176
date	2004.05.18.11.35.54;	author clement;	state Exp;
branches;
next	1.175;

1.175
date	2004.03.20.12.27.45;	author clement;	state Exp;
branches;
next	1.174;

1.174
date	2004.03.18.20.50.09;	author dinoex;	state Exp;
branches;
next	1.173;

1.173
date	2004.03.14.07.58.25;	author kuriyama;	state Exp;
branches;
next	1.172;

1.172
date	2004.03.14.06.17.31;	author ade;	state Exp;
branches;
next	1.171;

1.171
date	2004.03.13.10.37.39;	author clement;	state Exp;
branches;
next	1.170;

1.170
date	2004.03.12.02.48.24;	author ade;	state Exp;
branches;
next	1.169;

1.169
date	2004.03.08.12.51.54;	author clement;	state Exp;
branches;
next	1.168;

1.168
date	2004.02.16.14.07.48;	author clement;	state Exp;
branches;
next	1.167;

1.167
date	2004.02.08.15.40.41;	author clement;	state Exp;
branches;
next	1.166;

1.166
date	2004.02.08.11.53.55;	author clement;	state Exp;
branches;
next	1.165;

1.165
date	2004.02.08.10.01.40;	author kuriyama;	state Exp;
branches;
next	1.164;

1.164
date	2004.01.21.21.21.12;	author clement;	state Exp;
branches;
next	1.163;

1.163
date	2004.01.16.00.30.22;	author clement;	state Exp;
branches;
next	1.162;

1.162
date	2004.01.13.22.12.11;	author clement;	state Exp;
branches;
next	1.161;

1.161
date	2004.01.10.22.24.51;	author clement;	state Exp;
branches;
next	1.160;

1.160
date	2004.01.09.23.11.17;	author clement;	state Exp;
branches;
next	1.159;

1.159
date	2004.01.09.18.56.12;	author clement;	state Exp;
branches;
next	1.158;

1.158
date	2004.01.08.17.42.03;	author clement;	state Exp;
branches;
next	1.157;

1.157
date	2003.12.13.14.16.15;	author kuriyama;	state Exp;
branches;
next	1.156;

1.156
date	2003.11.09.03.22.49;	author naddy;	state Exp;
branches;
next	1.155;

1.155
date	2003.10.30.09.37.13;	author perky;	state Exp;
branches;
next	1.154;

1.154
date	2003.10.29.22.46.44;	author trevor;	state Exp;
branches;
next	1.153;

1.153
date	2003.10.25.20.47.38;	author dinoex;	state Exp;
branches;
next	1.152;

1.152
date	2003.10.18.17.00.18;	author naddy;	state Exp;
branches;
next	1.151;

1.151
date	2003.10.14.15.47.28;	author dinoex;	state Exp;
branches;
next	1.150;

1.150
date	2003.09.24.08.37.38;	author edwin;	state Exp;
branches;
next	1.149;

1.149
date	2003.08.15.00.49.30;	author kuriyama;	state Exp;
branches;
next	1.148;

1.148
date	2003.07.09.15.31.40;	author cy;	state Exp;
branches;
next	1.147;

1.147
date	2003.07.06.11.12.23;	author kris;	state Exp;
branches;
next	1.146;

1.146
date	2003.07.03.08.09.31;	author erwin;	state Exp;
branches;
next	1.145;

1.145
date	2003.07.02.18.08.49;	author perky;	state Exp;
branches;
next	1.144;

1.144
date	2003.06.12.09.35.21;	author perky;	state Exp;
branches;
next	1.143;

1.143
date	2003.06.06.01.01.13;	author perky;	state Exp;
branches;
next	1.142;

1.142
date	2003.06.01.00.09.42;	author perky;	state Exp;
branches;
next	1.141;

1.141
date	2003.04.16.21.33.58;	author perky;	state Exp;
branches;
next	1.140;

1.140
date	2003.04.04.02.36.57;	author perky;	state Exp;
branches;
next	1.139;

1.139
date	2003.02.25.06.25.35;	author perky;	state Exp;
branches;
next	1.138;

1.138
date	2003.01.31.11.50.50;	author perky;	state Exp;
branches;
next	1.137;

1.137
date	2003.01.21.17.54.18;	author perky;	state Exp;
branches;
next	1.136;

1.136
date	2003.01.08.11.29.55;	author perky;	state Exp;
branches;
next	1.135;

1.135
date	2002.11.15.13.35.56;	author perky;	state Exp;
branches;
next	1.134;

1.134
date	2002.10.12.21.55.47;	author knu;	state Exp;
branches;
next	1.133;

1.133
date	2002.10.05.09.18.45;	author kris;	state Exp;
branches;
next	1.132;

1.132
date	2002.09.25.16.42.24;	author perky;	state Exp;
branches;
next	1.131;

1.131
date	2002.09.17.07.41.02;	author kuriyama;	state Exp;
branches;
next	1.130;

1.130
date	2002.08.10.00.56.51;	author perky;	state Exp;
branches;
next	1.129;

1.129
date	2002.08.04.17.45.43;	author perky;	state Exp;
branches;
next	1.128;

1.128
date	2002.07.21.02.23.33;	author perky;	state Exp;
branches;
next	1.127;

1.127
date	2002.07.21.02.17.48;	author kuriyama;	state Exp;
branches;
next	1.126;

1.126
date	2002.07.14.03.57.59;	author perky;	state Exp;
branches;
next	1.125;

1.125
date	2002.07.09.11.22.19;	author perky;	state Exp;
branches;
next	1.124;

1.124
date	2002.07.08.07.42.03;	author perky;	state Exp;
branches;
next	1.123;

1.123
date	2002.06.28.00.10.18;	author perky;	state Exp;
branches;
next	1.122;

1.122
date	2002.06.27.00.22.40;	author perky;	state Exp;
branches;
next	1.121;

1.121
date	2002.06.21.23.47.23;	author pat;	state Exp;
branches;
next	1.120;

1.120
date	2002.06.20.11.03.08;	author naddy;	state Exp;
branches;
next	1.119;

1.119
date	2002.06.19.08.18.09;	author sobomax;	state Exp;
branches;
next	1.118;

1.118
date	2002.06.18.23.02.04;	author pat;	state Exp;
branches;
next	1.117;

1.117
date	2002.06.18.12.33.14;	author nectar;	state Exp;
branches;
next	1.116;

1.116
date	2002.05.26.13.25.04;	author ijliao;	state Exp;
branches;
next	1.115;

1.115
date	2002.05.23.00.31.44;	author pat;	state Exp;
branches;
next	1.114;

1.114
date	2002.05.09.03.55.18;	author cy;	state Exp;
branches;
next	1.113;

1.113
date	2002.04.18.20.29.40;	author ijliao;	state Exp;
branches;
next	1.112;

1.112
date	2002.04.11.05.16.07;	author ijliao;	state Exp;
branches;
next	1.111;

1.111
date	2002.04.08.13.30.01;	author roberto;	state Exp;
branches;
next	1.110;

1.110
date	2002.04.08.06.45.25;	author pat;	state Exp;
branches;
next	1.109;

1.109
date	2002.04.07.06.21.53;	author obrien;	state Exp;
branches;
next	1.108;

1.108
date	2002.03.23.08.31.54;	author pat;	state Exp;
branches;
next	1.107;

1.107
date	2002.01.22.16.01.35;	author dwcjr;	state Exp;
branches;
next	1.106;

1.106
date	2001.12.13.10.12.38;	author ijliao;	state Exp;
branches;
next	1.105;

1.105
date	2001.12.07.23.12.32;	author ache;	state Exp;
branches;
next	1.104;

1.104
date	2001.12.01.15.34.47;	author kuriyama;	state Exp;
branches;
next	1.103;

1.103
date	2001.12.01.07.58.09;	author kuriyama;	state Exp;
branches;
next	1.102;

1.102
date	2001.11.23.05.03.13;	author dwcjr;	state Exp;
branches;
next	1.101;

1.101
date	2001.11.19.22.47.46;	author dwcjr;	state Exp;
branches;
next	1.100;

1.100
date	2001.11.06.21.37.06;	author knu;	state Exp;
branches;
next	1.99;

1.99
date	2001.10.29.20.11.04;	author ache;	state Exp;
branches;
next	1.98;

1.98
date	2001.10.29.20.05.37;	author ache;	state Exp;
branches;
next	1.97;

1.97
date	2001.10.24.16.03.34;	author ache;	state Exp;
branches;
next	1.96;

1.96
date	2001.04.17.17.26.54;	author will;	state Exp;
branches;
next	1.95;

1.95
date	2001.04.13.14.48.48;	author will;	state Exp;
branches;
next	1.94;

1.94
date	2001.04.13.04.43.47;	author will;	state Exp;
branches;
next	1.93;

1.93
date	2001.04.07.00.41.51;	author ache;	state Exp;
branches;
next	1.92;

1.92
date	2001.03.06.22.51.34;	author ache;	state Exp;
branches;
next	1.91;

1.91
date	2001.02.12.16.27.35;	author ache;	state Exp;
branches;
next	1.90;

1.90
date	2001.02.12.16.19.19;	author ache;	state Exp;
branches;
next	1.89;

1.89
date	2001.02.05.15.33.12;	author olgeni;	state Exp;
branches;
next	1.88;

1.88
date	2001.01.30.11.55.00;	author ache;	state Exp;
branches;
next	1.87;

1.87
date	2001.01.16.17.32.53;	author sobomax;	state Exp;
branches;
next	1.86;

1.86
date	2001.01.01.10.15.11;	author will;	state Exp;
branches;
next	1.85;

1.85
date	2000.12.27.22.47.56;	author ache;	state Exp;
branches;
next	1.84;

1.84
date	2000.10.14.07.00.09;	author ache;	state Exp;
branches;
next	1.83;

1.83
date	2000.10.11.22.37.56;	author ache;	state Exp;
branches;
next	1.82;

1.82
date	2000.08.22.03.41.03;	author kuriyama;	state Exp;
branches;
next	1.81;

1.81
date	2000.07.05.12.36.59;	author tg;	state Exp;
branches;
next	1.80;

1.80
date	2000.04.10.19.26.55;	author cpiazza;	state Exp;
branches;
next	1.79;

1.79
date	2000.04.10.00.04.17;	author cpiazza;	state Exp;
branches;
next	1.78;

1.78
date	2000.02.26.10.35.03;	author ache;	state Exp;
branches;
next	1.77;

1.77
date	2000.02.02.21.14.03;	author ache;	state Exp;
branches;
next	1.76;

1.76
date	2000.01.24.17.57.57;	author ache;	state Exp;
branches;
next	1.75;

1.75
date	99.09.03.16.07.23;	author ache;	state Exp;
branches;
next	1.74;

1.74
date	99.08.31.02.42.38;	author peter;	state Exp;
branches;
next	1.73;

1.73
date	99.08.27.22.30.18;	author mharo;	state Exp;
branches;
next	1.72;

1.72
date	99.08.22.19.00.30;	author mharo;	state Exp;
branches;
next	1.71;

1.71
date	99.06.25.21.53.06;	author sada;	state Exp;
branches;
next	1.70;

1.70
date	99.03.25.22.25.43;	author ache;	state Exp;
branches;
next	1.69;

1.69
date	99.03.13.17.57.44;	author billf;	state Exp;
branches;
next	1.68;

1.68
date	99.03.13.17.11.02;	author billf;	state Exp;
branches;
next	1.67;

1.67
date	99.03.08.07.28.31;	author asami;	state Exp;
branches;
next	1.66;

1.66
date	99.03.07.18.34.56;	author ache;	state Exp;
branches;
next	1.65;

1.65
date	99.01.15.00.26.19;	author ache;	state Exp;
branches;
next	1.64;

1.64
date	99.01.13.02.47.32;	author scrappy;	state Exp;
branches;
next	1.63;

1.63
date	98.10.19.12.48.55;	author smace;	state Exp;
branches;
next	1.62;

1.62
date	98.09.24.01.24.04;	author ache;	state Exp;
branches;
next	1.61;

1.61
date	98.09.24.01.06.18;	author ache;	state Exp;
branches;
next	1.60;

1.60
date	98.09.20.23.55.38;	author ache;	state Exp;
branches;
next	1.59;

1.59
date	98.07.23.13.15.57;	author ache;	state Exp;
branches;
next	1.58;

1.58
date	98.06.24.19.54.05;	author ache;	state Exp;
branches;
next	1.57;

1.57
date	98.06.18.11.56.17;	author ache;	state Exp;
branches;
next	1.56;

1.56
date	98.06.18.11.51.03;	author ache;	state Exp;
branches;
next	1.55;

1.55
date	98.06.13.08.33.41;	author ache;	state Exp;
branches;
next	1.54;

1.54
date	98.06.09.19.49.59;	author ache;	state Exp;
branches;
next	1.53;

1.53
date	98.06.07.02.39.22;	author asami;	state Exp;
branches;
next	1.52;

1.52
date	98.06.06.19.09.23;	author ache;	state Exp;
branches;
next	1.51;

1.51
date	98.06.05.17.16.01;	author ache;	state Exp;
branches;
next	1.50;

1.50
date	98.04.22.16.28.43;	author ache;	state Exp;
branches;
next	1.49;

1.49
date	98.04.22.12.39.33;	author asami;	state Exp;
branches;
next	1.48;

1.48
date	98.04.22.12.38.13;	author asami;	state Exp;
branches;
next	1.47;

1.47
date	98.04.21.21.57.36;	author ache;	state Exp;
branches;
next	1.46;

1.46
date	98.03.12.04.05.01;	author ache;	state Exp;
branches;
next	1.45;

1.45
date	98.02.25.06.23.55;	author asami;	state Exp;
branches;
next	1.44;

1.44
date	98.02.20.11.08.40;	author ache;	state Exp;
branches;
next	1.43;

1.43
date	98.01.07.22.19.03;	author ache;	state Exp;
branches;
next	1.42;

1.42
date	97.11.21.21.10.15;	author ache;	state Exp;
branches;
next	1.41;

1.41
date	97.10.23.16.39.46;	author ache;	state Exp;
branches;
next	1.40;

1.40
date	97.10.22.23.51.17;	author ache;	state Exp;
branches;
next	1.39;

1.39
date	97.08.25.23.02.41;	author ache;	state Exp;
branches;
next	1.38;

1.38
date	97.08.13.15.09.53;	author ache;	state Exp;
branches;
next	1.37;

1.37
date	97.08.12.18.20.00;	author peter;	state Exp;
branches;
next	1.36;

1.36
date	97.08.12.11.49.12;	author peter;	state Exp;
branches;
next	1.35;

1.35
date	97.07.08.13.04.09;	author ache;	state Exp;
branches;
next	1.34;

1.34
date	97.06.06.13.45.07;	author ache;	state Exp;
branches;
next	1.33;

1.33
date	97.05.31.20.34.09;	author ache;	state Exp;
branches;
next	1.32;

1.32
date	97.05.31.20.26.38;	author ache;	state Exp;
branches;
next	1.31;

1.31
date	97.05.31.20.16.01;	author ache;	state Exp;
branches;
next	1.30;

1.30
date	97.05.02.18.22.03;	author ache;	state Exp;
branches;
next	1.29;

1.29
date	97.04.14.18.54.26;	author ache;	state Exp;
branches;
next	1.28;

1.28
date	97.02.26.01.23.10;	author ache;	state Exp;
branches;
next	1.27;

1.27
date	97.01.28.05.39.31;	author ache;	state Exp;
branches;
next	1.26;

1.26
date	97.01.02.16.39.55;	author ache;	state Exp;
branches;
next	1.25;

1.25
date	96.12.25.22.53.22;	author ache;	state Exp;
branches;
next	1.24;

1.24
date	96.12.11.21.04.21;	author markm;	state Exp;
branches;
next	1.23;

1.23
date	96.12.11.19.09.59;	author ache;	state Exp;
branches;
next	1.22;

1.22
date	96.11.18.11.40.33;	author asami;	state Exp;
branches;
next	1.21;

1.21
date	96.11.07.01.53.14;	author ache;	state Exp;
branches;
next	1.20;

1.20
date	96.11.07.01.49.46;	author ache;	state Exp;
branches;
next	1.19;

1.19
date	96.10.31.17.42.13;	author markm;	state Exp;
branches;
next	1.18;

1.18
date	96.10.26.18.49.52;	author markm;	state Exp;
branches;
next	1.17;

1.17
date	96.08.11.14.49.21;	author markm;	state Exp;
branches;
next	1.16;

1.16
date	96.07.12.10.27.53;	author asami;	state Exp;
branches;
next	1.15;

1.15
date	96.07.12.06.41.05;	author pst;	state Exp;
branches;
next	1.14;

1.14
date	96.07.11.11.03.17;	author ache;	state Exp;
branches;
next	1.13;

1.13
date	96.06.15.17.51.08;	author jkh;	state Exp;
branches;
next	1.12;

1.12
date	96.06.15.16.58.06;	author jkh;	state Exp;
branches;
next	1.11;

1.11
date	96.05.20.07.37.06;	author asami;	state Exp;
branches;
next	1.10;

1.10
date	96.05.19.22.21.42;	author ache;	state Exp;
branches;
next	1.9;

1.9
date	96.04.21.08.54.24;	author pst;	state Exp;
branches;
next	1.8;

1.8
date	96.02.22.21.54.58;	author ache;	state Exp;
branches;
next	1.7;

1.7
date	96.02.07.03.15.26;	author jfieber;	state Exp;
branches;
next	1.6;

1.6
date	95.12.04.12.56.18;	author jfieber;	state Exp;
branches;
next	1.5;

1.5
date	95.12.02.23.07.08;	author jfieber;	state Exp;
branches;
next	1.4;

1.4
date	95.11.27.04.10.09;	author asami;	state Exp;
branches;
next	1.3;

1.3
date	95.09.23.18.47.45;	author pst;	state Exp;
branches;
next	1.2;

1.2
date	95.09.19.07.03.17;	author pst;	state Exp;
branches;
next	1.1;

1.1
date	95.08.28.13.28.45;	author jkh;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	95.08.28.13.28.45;	author jkh;	state Exp;
branches;
next	;


desc
@@


1.233
log
@- retire www/apache2
@
text
@# New ports collection makefile for:	apache2
# Date created:				7 April 2001
# Whom:					Hye-Shik Chang <perky@@fallin.lv>
#
# $FreeBSD: ports/www/apache2/Makefile,v 1.232 2005/11/15 06:51:28 ade Exp $
#
# For more information, please read Makefile.doc
#

PORTNAME=	apache
PORTVERSION=	2.0.55
CATEGORIES=	www
MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
		${MASTER_SITE_LOCAL:S/$/:powerlogo/}
MASTER_SITE_SUBDIR=	clement/:powerlogo
DISTNAME=	httpd-${PORTVERSION}
DISTFILES=	${DISTNAME}.tar.bz2 powerlogo.gif:powerlogo
DIST_SUBDIR=	apache2
EXTRACT_ONLY=	${DISTNAME}.tar.bz2

MAINTAINER?=	clement@@FreeBSD.org
COMMENT?=	Version 2 of Apache web server with ${WITH_MPM:L} MPM.

LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2

LATEST_LINK=	apache2

CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* \
		apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \
		apache+mod_ssl+mod_snmp+mod_accel-1.* \
		apache+ipv6-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
		caudium-devel-1.* caudium10-1.* caudium12-* \
		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*

# patch files
EXTRA_PATCHES+=		${FILESDIR}/build-fix-openssl_beta

.if defined (WITH_WINDOWSUPDATEFIX)
EXTRA_PATCHES+=		${FILESDIR}/exp-windowsupdate.patch
.endif

.if defined(WITH_EXPERIMENTAL_PATCHES)
IGNORE=		: Please define WITH_KQUEUE_SUPPORT instead
.endif

.if defined(WITH_KQUEUE_SUPPORT)
EXTRA_PATCHES+=		${FILESDIR}/exp-apr-kqueue.patch
.endif

SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
			AUTOHEADER=${AUTOHEADER}
USE_ICONV=		yes
USE_AUTOTOOLS=	autoconf:259 libtool:15
USE_PERL5=		yes
USE_RC_SUBR=		yes
USE_REINPLACE=		yes
LIBTOOLFILES=		configure
INSTALLS_SHLIB=		yes
LDCONFIG_DIRS=		${PREFIX}/lib/apache2
USE_BZIP2=		yes

CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
		--enable-layout=FreeBSD \
		--with-perl=${PERL5} \
		--with-port=${WITH_HTTP_PORT} \
		--with-expat=${LOCALBASE} \
		--with-iconv=${LOCALBASE} \
		--libdir=${PREFIX_RELDEST}/lib/apache2 \
		--includedir=${PREFIX_RELDEST}/include/apache2

CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" \
		CFLAGS="${CFLAGS}" \
		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \
		LOCALBASE="${LOCALBASE}"

PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}

MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes

WITH_MPM?=	prefork # or worker, perchild, threadpool

WITH_HTTP_PORT?=	80

.if defined(WITHOUT_IPV6)
CONFIGURE_ARGS+=	--disable-ipv6
.else
CATEGORIES+=		ipv6
.   if defined(WITH_IPV6_V6ONLY) && defined(WITHOUT_V4MAPPED)
CONFIGURE_ARGS+=	--disable-v4-mapped
.   else
CONFIGURE_ARGS+=	--enable-v4-mapped
.   endif
.endif

#backward compatibility
.if defined(WITHOUT_SSL)
WITHOUT_SSL_MODULES=	YES
.endif

.if !defined(WITHOUT_SSL_MODULES)
USE_OPENSSL=	yes
.endif

.if defined(WITH_STATIC_SUPPORT)
CONFIGURE_ARGS+=	--enable-static-support
.endif

.if defined(WITH_SSL_EXPERIMENTAL_ENGINE)
CFLAGS+=	-DSSL_EXPERIMENTAL_ENGINE
.endif

# debug overrides CFLAGS
.if defined(WITH_DEBUG)
DEBUG_FLAGS?=	-O0 -g -ggdb3
CFLAGS=		${DEBUG_FLAGS}
CONFIGURE_ARGS+=	--enable-maintainer-mode
WITH_EXCEPTION_HOOK=	YES
.endif

.if defined(WITH_EXCEPTION_HOOK)
CONFIGURE_ARGS+=	--enable-exception-hook
.endif

# for slave ports
.if !defined(MASTERDIR)
APACHEDIR=	${.CURDIR}
.else
APACHEDIR=	${MASTERDIR}
.endif

.if defined (WITH_LDAP) || defined (WITH_LDAP_MODULES)
USE_OPENLDAP=		YES
CONFIGURE_ARGS+=	--with-ldap \
			--with-ldap-lib="${LOCALBASE}/lib" \
			--with-ldap-include="${LOCALBASE}/include"
.endif

.include <bsd.port.pre.mk>

.if exists(${LOCALBASE}/lib/libapr-0.so) || defined(WITH_APR_FROM_PORTS)
IGNORE=	: apr from ports (WITH_APR_FROM_PORTS) is no longer supported
.endif

WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//:S/-//}
WITH_PTHREAD_CFLAGS?=	${PTHREAD_CFLAGS}

.include "${APACHEDIR}/Makefile.doc"
.include "${APACHEDIR}/Makefile.modules"
WANT_APACHE=	common2
.include "${APACHEDIR}/Makefile.modules.3rd"

CONFIGURE_ARGS+=	--with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET}

show-options:
	@@${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc

show-categories:
.for category in ${ALL_MODULES_CATEGORIES}
	@@${ECHO_MSG} "${category} contains these modules:"
	@@${ECHO_MSG} "  ${${category}_MODULES}"
.endfor

show-modules:
	@@for module in ${AVAILABLE_MODULES} ; do \
	${ECHO_MSG} -n "$${module}: ";\
	if ${ECHO_CMD} ${APACHE_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
			${ECHO_CMD} -n "enabled "; \
				if ${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
					${ECHO_CMD} "(static)" ; \
				else \
					${ECHO_CMD} "(shared)" ;\
				fi;\
			else\
			${ECHO_CMD} disabled ;\
		fi;\
	done

pre-everything::
	@@${ECHO_MSG}	""
	@@${ECHO_MSG}	" To enable a module category: WITH_<CATEGORY>_MODULES"
	@@${ECHO_MSG}	" To disable a module category: WITHOUT_<CATEGORY>_MODULES"
	@@${ECHO_MSG}	""
	@@${ECHO_MSG}	" Per default categories are:"
	@@${ECHO_MSG}	"  ${DEFAULT_MODULES_CATEGORIES}"
	@@${ECHO_MSG}	" Categories available:"
	@@${ECHO_MSG}	"  ${ALL_MODULES_CATEGORIES}"
	@@${ECHO_MSG}	""
	@@${ECHO_MSG}	"  To see all available knobs, type make show-options"
	@@${ECHO_MSG}	"  To see all modules in different categories, type make show-categories"
	@@${ECHO_MSG}    "  You can check your modules configuration by using make show-modules"
	@@${ECHO_MSG}	""
	@@${ECHO_MSG}    "To save apache.org bandwidth, please use the closest"
	@@${ECHO_MSG}    "mirror. Hit Ctrl+C now and do a "make print-closest-mirrors."
	@@${ECHO_MSG}	"To automatically update /etc/make.conf do:"
	@@${ECHO_MSG}	"make print-closest-mirrors >> /etc/make.conf"
	@@${ECHO_MSG}	""

print-closest-mirrors:
	@@${ECHO_MSG} -n "Fetching list of nearest mirror: " >&2
	@@MIRRORS=`${FETCH_CMD} -T 30 -qo - http://www.apache.org/dyn/closer.cgi/httpd/ 2> /dev/null\
	| ${GREP} /httpd/ | ${SED} 's/.*href="\(.*\)"><str.*/\1/g' | \
	${HEAD} -7 | ${TAIL} -6` ; \
	${ECHO_MSG} done >&2; if [ "x$$MIRRORS" != "x" ]; then \
	${ECHO_MSG} -n "MASTER_SITE_APACHE_HTTPD?= ";\
	${ECHO_MSG} $$MIRRORS; else \
	${ECHO_MSG} "No mirrors found!">&2 ; fi

post-extract:
	@@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif

post-patch:
	@@cd ${WRKSRC}/docs/docroot && \
	 for f in index.html.*; do (\
	  ${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
		ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
	 ); done
	@@${RM} -f ${WRKSRC}/docs/docroot/*.bak
	@@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
		${FILESDIR}/apache.sh > ${WRKDIR}/apache2.sh
	@@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
		${FILESDIR}/apache2libs.sh > ${WRKDIR}/apache2libs.sh
	@@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
	@@${RM} -f ${WRKSRC}/docs/conf/highperformance-std.conf
	@@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
			${WRKSRC}/server/core.c
	@@${REINPLACE_CMD} -e 's,freebsd\[2345\],freebsd\[23456\],' \
			${WRKSRC}/srclib/apr/build/apr_hints.m4
	@@${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual

pre-configure:
	@@cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ./buildconf

post-configure:
	@@FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\
	${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$$FTPUSERS, ; \
			s,%%WWWOWN%%,${WWWOWN}, ; \
			s,%%WWWGRP%%,${WWWGRP}, ; \
			s,%%WWWBASEDIR%%,${PREFIX}/www," \
			${WRKSRC}/docs/conf/httpd-std.conf
	@@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," \
			${WRKSRC}/support/envvars-std

pre-install:
	@@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

install-startup-script:
.if !exists(${WRKDIR}/apache2libs.sh) || !exists(${WRKDIR}/apache2.sh)
	@@${MKDIR} ${WRKDIR}
	@@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
		${FILESDIR}/apache.sh > ${WRKDIR}/apache2.sh
	@@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
		${FILESDIR}/apache2libs.sh > ${WRKDIR}/apache2libs.sh
.endif
	@@${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup script."
	@@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache2libs.sh ${PREFIX}/etc/rc.d/000.apache2libs.sh
	@@${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/apache2.sh startup script."
	@@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh

post-install: install-startup-script
	@@${MKDIR} ${PREFIX}/etc/apache2/envvars.d
	@@${MKDIR} ${PREFIX}/etc/apache2/Includes
	@@${ECHO_CMD} ""
	@@${CAT} ${PKGMESSAGE}

.include <bsd.port.post.mk>
@


1.232
log
@Mass-conversion to the USE_AUTOTOOLS New World Order.  The code present
in bsd.autotools.mk essentially makes this a no-op given that all the
old variables set a USE_AUTOTOOLS_COMPAT variable, which is parsed in
exactly the same way as USE_AUTOTOOLS itself.

Moreover, USE_AUTOTOOLS has already been extensively tested by the GNOME
team -- all GNOME 2.12.x ports use it.

Preliminary documentation can be found at:
	http://people.FreeBSD.org/~ade/autotools.txt

which is in the process of being SGMLized before introduction into the
Porters Handbook.

Light blue touch-paper.  Run.
@
text
@d5 1
a5 1
# $FreeBSD$
@


1.231
log
@Use the proper syntax for groups when using ${MASTER_SITE_foo}

Approved by:	MAINTAINER timeout (2 weeks)
@
text
@d55 1
a55 2
USE_AUTOCONF_VER=	259
USE_LIBTOOL_VER=	15
@


1.230
log
@- Update to 2.0.55
@
text
@d14 2
a15 1
		${MASTER_SITE_LOCAL:S/%SUBDIR%/clement/}:powerlogo
@


1.229
log
@- Apply openssl 0.9.8 fix by default. OpenSSL 0.9.8 is now the default
  from ports

Reported by:	erwin
@
text
@d11 1
a11 2
PORTVERSION=	2.0.54
PORTREVISION=	4
@


1.228
log
@- remove a whitespace
@
text
@d36 2
a49 4
.if defined(WITH_OPENSSL_BETA)
EXTRA_PATCHES+=		${FILESDIR}/build-fix-openssl_beta
.endif

@


1.227
log
@- Fix build if WITH_OPENSSL_BETA is defined.

PR:		ports/85457
Submitted by:	Daniel Roethlisberger <daniel@@roe.ch>
@
text
@d102 1
a102 1
.if defined(WITHOUT_SSL) 
@


1.226
log
@- Fix 	CAN-2005-2700

* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Ensure that
renegotiation is performed for a transition from "SSLVerifyClient
optional" to "SSLVerifyClient require".
@
text
@d48 4
@


1.225
log
@- Fix CAN-2005-2491 (integer overflow in pcre)
- Fix memory leak in byterange stuff, which can lead to DoS.
  http://issues.apache.org/bugzilla/show_bug.cgi?id=29962

Obtained from:  Apache SVN repo
Reported by:    simon
Approved by:    portmgr (self)
@
text
@d12 1
a12 1
PORTREVISION=	3
@


1.224
log
@- make sure SSL dependency doesn't exists if WITHOUT_MODULES_SSL is defined
@
text
@d12 1
a12 1
PORTREVISION=	2
@


1.223
log
@- Add fix for CAN-2005-2088
From Changelog:
  *) SECURITY: CAN-2005-2088
     core: If a request contains both Transfer-Encoding and Content-Length
     headers, remove the Content-Length, mitigating some HTTP Request
     Splitting/Spoofing attacks.  [Paul Querna, Joe Orton]

- Rename previous patch to CVE ID
- bump PORTREVISION

Security:       CAN-2005-2088
Obtained From: Apache repository
@
text
@d97 6
a102 1
.if !defined(WITHOUT_SSL) || defined(WITHOUT_SSL_MODULES)
@


1.222
log
@Security: fix a buffer overrun in ssl_callback_SSLVerify_CRL()
Reported by:	thierry
@
text
@d12 1
a12 1
PORTREVISION=	1
@


1.221
log
@- Update to 2.0.54
@
text
@d12 1
@


1.220
log
@- Fix memory leak
  *) core_input_filter: Move buckets to a persistent brigade instead of
     creating a new brigade. This stop a memory leak when proxying a
     Streaming Media Server.

Obtained from:  Apache httpd repository
@
text
@d11 1
a11 2
PORTVERSION=	2.0.53
PORTREVISION=	1
@


1.219
log
@- promote kqueue to not-so-experiemental status.
  Please use WITH_KQUEUE_SUPPORT instead.

Success story reported by:	pav
@
text
@d12 1
@


1.218
log
@- Update to 2.0.53
- Download bz2'd tarball [1]
- Add print-closest-mirrors target.
  It allows you to find the 6 (3 http/3 ftp) closest mirror,
  base on http://www.apache.org/dyn/closer.cgi/httpd/
  make print-closest-mirrors >> /etc/make.conf automatically add
  the six closest mirror to the head of ${MASTER_SITE_APACHE_HTTPD}.

Requested by:	delphij
@
text
@d38 1
d40 4
@


1.217
log
@o startup script:
- Use apache{2,21}flags variable in apache{2,21}_checkconfig().
  It fixes restart when apache2ssl_enable is set to YES in rc.conf
  and httpd.conf is "old" (i.e. non -DSSL safe) [1]

o Makefile
- split post-install target to add install-startup-script:
  User can now upgrade startup script without reinstalling apache2.
  NOTE: this is NOT package-safe and NOT supported, even if in most of
  cases they're no risk.

Noticed by:     many [1]
@
text
@d11 1
a11 2
PORTVERSION=	2.0.52
PORTREVISION=	4
d16 1
a16 1
DISTFILES=	${DISTNAME}.tar.gz powerlogo.gif:powerlogo
d18 1
a18 1
EXTRACT_ONLY=	${DISTNAME}.tar.gz
d55 1
d183 15
@


1.216
log
@- Bump PORTREVISION to refect recent changes.
  Since www/mod_python3 needs envvars.d stuff to work.
@
text
@d222 14
a235 1
post-install:
a237 4
	@@${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup script."
	@@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2libs.sh ${PREFIX}/etc/rc.d/000.apache2libs.sh
	@@${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/apache2.sh startup script."
	@@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh
@


1.215
log
@- Remove useless APR_FROM_PORTS check in post-install
- Add support for modular sbin/envvars
  You can now put your own scripts you want to execute at envvars
  stage in ${PREFIX}/etc/apache2/envvars.d
  Only script ending by *.env are run.

  Example:
	/usr/local/etc/apache2/envvars.d/mod_python3.env

Discussed with:	perky on -apache@@
@
text
@d12 1
a12 1
PORTREVISION=	3
@


1.214
log
@- s/INSTALLS_SHILB/INSTALLS_SHLIB/
@
text
@d216 2
d223 1
d225 1
a225 2
.if !defined(WITH_APR_FROM_PORTS)
	@@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup script."
d227 1
a227 2
.endif
	@@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup script."
@


1.213
log
@- Remove installation of unused highperformance*.conf
- Move examples config files to ${EXAMPLESDIR}
- Relax permissions on ${PREFIX}/www instead of ${PREFIX}/www/data
@
text
@d54 1
a54 1
INSTALLS_SHILB=		yes
@


1.212
log
@- minor cleanups.
@
text
@d199 1
d213 2
a214 1
			s,%%WWWGRP%%,${WWWGRP}, " \
d228 2
a229 1
	@@@@${CAT} ${PKGMESSAGE}
@


1.211
log
@- Fix memory consumption DoS, CVE CAN-2004-0942

Reported by:    josef
Obtained from:  Apache CVS
@
text
@d149 1
a149 1
.for category in ${ALL_MODULES_CATEGORIES:S/SLAVE_PORT//}
d175 1
a175 1
	@@${ECHO_MSG}	"  ${DEFAULT_MODULES_CATEGORIES:C/SLAVE_PORT//}"
d177 1
a177 1
	@@${ECHO_MSG}	"  ${ALL_MODULES_CATEGORIES:C/SLAVE_PORT//}"
a195 1
.if !defined(WITH_APR_FROM_PORTS)
a197 1
.endif
@


1.210
log
@- ldconfig'ify ${PREFIX}/lib/apache2 at install time.

PR:             ports/73566
Submitted by:   lev
@
text
@d12 1
a12 1
PORTREVISION=	2
@


1.209
log
@Makefile was errornously committed. Revert the changes
@
text
@d54 2
@


1.208
log
@- Fix apache2 build, I hope...

Noticed by:  many
Committed from: EuroBSDcon Hotel's bar.
Pointy hat to:	me
Under supervision from: mat, thierry, erwin (former mentor)
@
text
@d48 2
a49 2
#USE_AUTOCONF_VER=	259
#USE_LIBTOOL_VER=	15
@


1.207
log
@util_ald_cache_purge() fails to relink the cache entries during a cache purge.
So apply the official patch
@
text
@d48 2
a49 2
USE_AUTOCONF_VER=	259
USE_LIBTOOL_VER=	15
@


1.206
log
@- Remove WITH_APR_FROM_PORTS knob
- Add a note to UPDATING, to warn users they won't be able to build apache2
  if they keep apr 0.9.x

Discussed with: Craig Rodrigues (apr maintainer), kuriyama
@
text
@d12 1
a12 1
PORTREVISION=	1
@


1.205
log
@- Fix apr detection
  WARNING: apache2 + apr 1.0 is BROKEN
  I'm working on a small compat hack. But don't dream too much.
  apache 2.0.x is not designed to work with apr 1.x.

Forgotten by:	kuriyama
@
text
@d129 2
a130 19
# Untested and may fail !
.if defined(WITH_APR_FROM_PORTS)
.    if defined (WITH_BDB) || defined(WITH_BERKELEYDB)
IGNORE=			"You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is defined"
.    endif
LIB_DEPENDS+=		apr-1:${PORTSDIR}/devel/apr
CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}/bin/apr-1-config \
			--with-apr-util=${LOCALBASE}/bin/apu-1-config
CONFIGURE_ENV+=		LTFLAGS="--tag=CXX"
PLIST_SUB+=	PORTS_APR="@@comment "
.else
.   if exists(${LOCALBASE}/lib/libapr-1.so)
IGNORE=			apr is installed and may conflict with apache one\
				(if you want to use apr port define WITH_APR_FROM_PORTS,\
				at your own risk)
.   endif
PLIST_SUB+=	PORTS_APR=""
INSTALLS_SHLIB=		yes
LDCONFIG_DIRS=		%%PREFIX%%/lib/apache2
@


1.204
log
@- Chase apr shlib version bump.

Pointy Hat Autumn Collection 2004 to:	kuriyama
@
text
@d135 2
a136 2
CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}/bin/apr-config \
			--with-apr-util=${LOCALBASE}/bin/apu-config
@


1.203
log
@- Use ${WWWOWN} and ${WWWGRP} for apache's user. (instead of harcoded
  www/www).
  It should help to keep consistancy in www-related ports.
@
text
@d134 1
a134 1
LIB_DEPENDS+=		apr-0.9:${PORTSDIR}/devel/apr
d140 1
a140 1
.   if exists(${LOCALBASE}/lib/libapr-0.so)
@


1.202
log
@- Yet Another Security Fix
  Fix CAN-2004-0885:

  * modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Ensure that a
  correct cipher suite has been negotiated, else deny access.

  * modules/ssl/ssl_engine_init.c (ssl_init_ctx_protocol): With OpenSSL
  0.9.7, prevent session resumption during a renegotiation to force the
  client to negotiate a new (and acceptable) cipher suite.

Credits:	Hartmut Keil, Joe Orton
@
text
@d227 3
a229 1
	${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$$FTPUSERS," \
@


1.201
log
@- Update to 2.0.52
- Use "PORTDOCS= #" and get rid of docs entry in plist.
- Support for FreeBSD 6 in apr
- Move of cache modules from THREADS to EXPERIMENTAL category and make
  sure we enable THREADS modules (cgid only) when a threaded MPM is
  selected.
- Resurect WITH_EXTRA_MODULES knob
- powerlogo.gif is now hosted by FreeBSD mirrors
- WITH_<category> is definitively no longer supported.
- Add Includes dir when installed via a package [1]

PR:             ports/72309 [1]
Submitted by:   Christian Kratzer <ck at cksoft dot de> [1]
@
text
@d12 1
@


1.200
log
@- Fix compilation with threads enabled on 5.x (due to PTHREAD_LIBS changes)

Approved by:	portmgr (krion)
@
text
@d11 1
a11 2
PORTVERSION=	2.0.50
PORTREVISION=	3
d14 1
a14 1
		http://sheepkiller.nerim.net/ports/${PORTNAME}/:powerlogo
d39 1
a39 2
EXTRA_PATCHES+=		${FILESDIR}/exp-apr-kqueue.patch \
			${FILESDIR}/exp-http-ready.patch
d189 1
a189 1
	@@${ECHO_MSG}	"  ${DEFAULT_MODULES_CATEGORIES}"
d194 2
a195 1
	@@${ECHO_MSG}    "  You can check your modules configuration by using show-modules"
d217 2
d235 1
a235 1
	@@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup file."
d238 1
a238 1
	@@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."
@


1.199
log
@Security fixes [1]:
  *) SECURITY: CAN-2004-0786 (cve.mitre.org)
     Fix an input validation issue in apr-util which could be
     triggered by malformed IPv6 literal addresses.  [Joe Orton]

  *) SECURITY: CAN-2004-0747 (cve.mitre.org)
     Fix buffer overflow in expansion of environment variables in
     configuration file parsing.  [Andr<E9> Malo]

  *) SECURITY: CAN-2004-0809 (cve.mitre.org)
     mod_dav_fs: Fix a segfault in the handling of an indirect lock
     refresh.  PR 31183.  [Joe Orton]

- Update documentation (finally!) and fix WITH_<CATEGORY>_MODULES
  for special modules like LDAP or SSL [2]

Noticed by:     nectar [1]
Requested by:   Emile Heitor <imil at home dot imil dot net> [2]
Approved by:    portmgr (marcus)
@
text
@d151 1
a151 1
WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//}
@


1.198
log
@- Add support for exception hook:
  * WITH_EXCEPTION_HOOK now exists
  * Automatically add if WITH_DEBUG is set
  * Update still-outdated-documentation
- Remove automatic debuf mode if DEBUG_FLAGS is set

Exception hook is very useful for debugging (upcoming www/mod_backtrace
and www/mod_whatkilledus modules)

Makefile.modules.3rd:
- Fix CONFIGURE_ARGS for dynamic module selection.
  It's now fully usuable for apache13 ports
- Remove an useless WANT_APACHE check
- Move apxs detection at the beginning of the file, to use APXS_PREFIX
  for apache major version detection [1]
  The main advantage of this patch is to provide a nice way to
  have multiple apache versions, without altering ${LOCALBASE}.

Submitted by:    "ports/c0decafe.net" <ports at c0decafe dot net> [1]
@
text
@d12 1
a12 1
PORTREVISION=	2
d90 1
a90 1
.if !defined(WITHOUT_SSL)
d121 1
a121 1
.if defined (WITH_LDAP)
d164 6
d186 8
@


1.197
log
@- Backport security fixes in ssl_engine_io.c

* [SECURITY] mod_ssl: Fix potential input filter segfaults in
  SPECULATIVE mode. (rollback handling for AP_MODE_SPECULATIVE)
  "This issue has possible security implications; it's been assigned CVE
  CAN-2004-0751 (cve.mitre.org)."
  http://issues.apache.org/bugzilla/show_bug.cgi?id=30134

* [SECURITY] mod_ssl: Fix potential infinite loop.
  (potential infinite loop in ssl_io_input_getline if connection is
  aborted without inctx->rc being set.)
  http://issues.apache.org/bugzilla/show_bug.cgi?id=27945
  http://issues.apache.org/bugzilla/show_bug.cgi?id=29690

Obtained from:  Apache CVS (httpd-2.0 HEAD)
@
text
@d103 1
a103 1
.if defined(WITH_DEBUG) || defined (DEBUG_FLAGS)
d107 5
@


1.196
log
@- Bump PORTREVISION for all previous changes
- Allow access to /home if mod_userdir is loaded
- We don't need apache2libs.sh if apr is installed from ports.
- Add recent changes to UPGRADING
@
text
@d12 1
a12 1
PORTREVISION=	1
@


1.195
log
@Remove our config.layout support. FreeBSD layout is in apache2's one
since 2.0.48
@
text
@d12 2
a13 1
CATEGORIES=	www ipv6
d81 3
a83 1
.elif defined(WITH_IPV6_V6ONLY) && defined(WITHOUT_V4MAPPED)
d85 1
a85 1
.else
d87 1
d192 1
d195 1
d214 4
a219 2
	@@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup file."
	@@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2libs.sh ${PREFIX}/etc/rc.d/000.apache2libs.sh
@


1.194
log
@- Add ldconfig -m to apache2's apr libs (install time and boot time)

Requested by, discussed with: lev
@
text
@a189 1
	@@${CAT} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
@


1.193
log
@apache2 NG patch 2/5.
Makefile.modules:
   - Export rewritten modules selection from Makefile.modules
     to Makefile.modules.3rd
   - Remove proxy support by default.

Makefile.modules.3rd:
   - Add support for WANT_APACHE common13/common2 to share
     code/functionalities between apache13 and apache2 server ports.

Rewrite of modules selection:
   - WITH_MODULES and WITHOUT_MODULES are no more conflicting
     WITHOUT_MODULES can be safely used internally to remove conflicting
     modules
   - Selection is based on modules categories to improve flexibility
        - WITH_${category}[_MODULES]
        - WITHOUT_${category}
        - WITH_CUSTOM_${category}
   -  Support apache13, apache2{0,1}
        This is EXPERIMENTAL. I'll test it IRL with www/apache13-ssl,
        and it should be easily usuable in future bsd.apache.mk
@
text
@d138 2
d188 2
d209 5
a213 5
	@@if [ ! -f ${PREFIX}/etc/rc.d/apache2.sh ]; then \
		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."; \
		${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
	fi
	@@${CAT} ${PKGMESSAGE}
@


1.192
log
@apache2 NG patch 1/5.

o Changes in httpd.conf
  - mod_userdir:
        . set Userdir if mod_userdir is loaded [1]
        . Userdir is denied for users from /etc/ftpusers
  - set more "secure" permissions.
    By default, policy is to deny access to filesystem.
    You HAVE to _ENABLE_ access to your filesystem in httpd.conf.
  - Add an "Includes" directory to ${PREFIX}/etc/apache2/
    to make configuration more flexible
    ${PREFIX}/etc/apache2/*.conf files are now automatically loaded.

o apache.sh
  - be closer to apachectl, apache.sh need envvars [2]
    It should restore subversion behavior.

Partially submitted by:
                kuriyama [1],
                Gregory (Grisha) Trubetskoy <grisha at apache dot org> [2]

Future changes are mostly written, they should be committed during the
week-end.
If you're interrested in changes, feel free contact me.
@
text
@d145 2
@


1.191
log
@- Fix hostname resolution if IPv4 are mapped. [1]
- Add WITHOUT_V4MAPPED knob and explicitly set --disable-v4-mapped
  if WITHOUT_V4MAPPED or WITH_IPV6_V6ONLY

Also submitted by:	Tsurutani Naoki <turutani@@scphys.kyoto-u.ac.jp> [1]
@
text
@a174 3
pre-configure:
	@@cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ./buildconf

d190 8
d202 1
@


1.190
log
@- Add WITHOUT_IPV6 knob to workaround problem with IP resolution
  when --enable-v4-mapped is used (default).
  Use WITHOUT_IPV6 knob if you have problem with "HostnameLookup On" on
  IPv4-only server(s).
  I hope I can provide a real fix soon.
@
text
@d80 3
a82 1
.elif !defined(WITH_IPV6_V6ONLY)
@


1.189
log
@- Make configure script define DEFAULT_SCOREBOARD.
- Add NOTICE file to respect Apache 2.0 license
@
text
@d78 3
a80 1
.if !defined(WITH_IPV6_V6ONLY)
@


1.188
log
@- revert ade's commit, since it breaks the ports due to something
  looking like a reverse patching.
@
text
@d187 1
@


1.187
log
@Autotools cleanup.  Remove autoconf257 (259), automake17 (18), and
libtool14 (13/15).

PR:		67768
Submitted by:	ade
Approved by:	4-exp bento runs (thanks, kris!)
@
text
@a46 1

d48 1
a48 6
SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
			AUTOHEADER=${AUTOHEADER}

USE_AUTOCONF_VER=	257
@


1.186
log
@- Update to 2.0.50
  Important changes:
  *) SECURITY: CAN-2004-0493 (cve.mitre.org)
     Close a denial of service vulnerability identified by Georgi
     Guninski which could lead to memory exhaustion with certain
     input data.  [Jeff Trawick]
  *) SECURITY: CAN-2004-0488 (cve.mitre.org)
     mod_ssl: Fix a buffer overflow in the FakeBasicAuth code for a
     (trusted) client certificate subject DN which exceeds 6K in length.
     [Joe Orton]
  Details can be found here:
        http://www.apache.org/dist/httpd/CHANGES_2.0
- Use autoconf 2.59
- Add add SUEXEC_LOGFILE tunable to set suexec logfile [1]
- Silently ignore removal of libexec/apache2 directory
- Import latest version of apr_reslit.c from apr CVS which
  adds timeout feature to apr_reslist_acquire().
  This is required for future mod_logio-st.
- Add explicit dependency on libiconv (so nowwe support libiconv)
- Move Windows Update fix from MASTER_SITE_LOCAL to ports tree
- add WITH_EXPERIMENTAL_PATCHES knobs:
  These patches are backports from apache CVS HEAD or apr CVS HEAD.
  They have positive impacts on apache responsiveness but can be
instable
  and are NOT currently supported by apache/apr teams.
  * exp-http-ready.patch: add "httpready" support for ACCEPT_FILTER
    (currently apache 2 only support "dataready")
  * exp-apr-kqueue.patch: add support for kqueue in apr_poll().
    This patch greatly improves apache network performance (up to
    18% according to the author, on my test box, between 13% and 21%)
    Test and feedback on -STABLE are welcome ;)
    For more details, please see:
    http://marc.theaimsgroup.com/?t=108650227500001&r=1&w=2

Submitted by:   knu [1]

NOTE:
Please set MASTER_SITE_APACHE_HTTPD to closest mirrors.
you can easily find them from:
http://www.apache.org/dyn/closer.cgi/httpd/
Thanks :
@
text
@d49 6
a54 1
USE_AUTOCONF_VER=	259
@


1.185
log
@- Security fix.
  CAN-2004-0493 - memory exhaustion denial of service
  http://www.freebsd.org/ports/portaudit/81a8c9c2-c94f-11d8-8898-000d6111a684.html

Noticed by:	eik
Obtained from:	apache CVS
@
text
@d11 1
a11 2
PORTVERSION=	2.0.49
PORTREVISION=	3
a34 2
PATCH_SITES+=		${MASTER_SITE_LOCAL:S/$/:clement/}
PATCH_SITE_SUBDIR=	clement/:clement
d36 5
a40 1
PATCHFILES+=		httpd-${PORTVERSION}-windowsupdate.patch:clement
d48 2
a49 1
USE_AUTOCONF_VER=	257
d61 1
d75 1
a75 1
WITH_MPM?=	prefork # or worker, perchild
@


1.184
log
@- change limits from user www to daemon class to be in sync with
  apachectl
- fix limits (missing eval)
@
text
@d12 1
a12 1
PORTREVISION=	2
@


1.183
log
@-1- make show-options readable from a vt100 ;-)
-2- add WITH_DEBUG knob (supports DEBUG_FLAGS)
-3- convert start script to RCng [1]
    - add possibility to run limits(1) before apache starts
    - apache2.sh reload = apachectl graceful
-4- Add threadpool MPM
-5- Adapt COMMENT to fit MPM.
-6- Bump PORTREVISION

PR:             ports/66955 [1]
Submitted by:   nork [1] (partially)
Requested by:   ume [1]
@
text
@d68 1
a68 1
RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} WWWOWN=${WWWOWN}
@


1.182
log
@- remove quotes from "bogus" IGNORE string

Noticed by:	kris
@
text
@d12 1
a12 1
PORTREVISION=	1
d22 1
a22 1
COMMENT?=	Version 2 of the extremely popular Apache http server
d50 1
d68 2
a69 1
RC_SUB=		-e 's,@@@@PREFIX@@@@,${PREFIX_RELDEST},g'
d92 7
d179 3
a181 2
	@@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
	@@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
d194 1
@


1.181
log
@- Fix IGNORE s,(,\(,
@
text
@d118 3
a120 3
IGNORE=				"apr is installed and may conflict with apache one\
					\(if you want to use apr port define WITH_APR_FROM_PORTS,\
					at your own risk\)"
@


1.180
log
@- s/BROKEN/IGNORE/
@
text
@d119 2
a120 2
					(if you want to use apr port define WITH_APR_FROM_PORTS,\
					at your own risk)"
@


1.179
log
@- Fix build if WITH_APR_FROM_PORTS is defined.
- Advertise ServerToken i.e.:
Apache/2.0.49 (FreeBSD) Server at satan.cultdeadsheep.org Port 80
@
text
@d109 1
a109 1
BROKEN=			"You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is defined"
d118 1
a118 1
BROKEN=				"apr is installed and may conflict with apache one\
@


1.178
log
@- Import security fix from Apache CVS...
* modules/ssl/ssl_engine_kernel.c (ssl_hook_UserCheck): Fix buffer
overflow in FakeBasicAuth code if client's subject DN exceeds 6K in
length (CVE CAN-2004-0488); switch to using apr-util base64 encoder
functions.
- ... and of course bump PORTREVISION.

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0488
http://secunia.com/advisories/11534/

Reported by:    Charles-Damien Orbello <tazma@@cultdeadsheep.org>
@
text
@d114 1
d173 2
@


1.177
log
@- import buildconf patch in ports tree.
  It has been living out the tree for historical reason.
@
text
@d12 1
@


1.176
log
@- use autoconf 2.57
- use libtool 1.5.6
@
text
@a36 2
PATCHFILES+=		httpd-${PORTVERSION}-buildconf.patch:clement
PATCH_DIST_STRIP+=	-p1:clement
@


1.175
log
@Update to 2.0.49

Full ChangeLogand announcement:
http://www.apache.org/dist/httpd/Announcement2.html

Port changes:
- buildconf patches improvement
- Fix typo [1]

PR:             64297 [1]
Submitted by:   TSUMAI Yasuyuki <ral@@ta-ko.jp> [1]
@
text
@d48 2
a49 2
USE_AUTOCONF_VER=	253
USE_LIBTOOL_VER=	13
@


1.174
log
@- CONFLICTS extended
@
text
@d11 1
a11 2
PORTVERSION=	2.0.48
PORTREVISION=	5
d37 1
a37 1
PATCHFILES+=		httpd-2.0.48-buildconf.patch:clement
a38 3
.if defined (WITH_LDAPFIX)
PATCHFILES+=		httpd-2.0.48-ldap-fix.patch:clement
.endif
d40 1
a40 1
PATCHFILES+=		httpd-2.0.48-windowsupdate.patch:clement
d44 9
a52 1
			LIBTOOL_VERSION=${LIBTOOL_VERSION}
a53 5
USE_AUTOCONF_VER=253
USE_LIBTOOL_VER=13
USE_PERL5=	yes
USE_REINPLACE=	yes
LIBTOOLFILES=	configure
d137 1
a137 1
	@@for module in $(AVAILABLE_MODULES) ; do \
d175 1
a175 1
	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@


1.173
log
@o Bump $LIB_DEPENDS line to chase expat's shlib version.
o Bump $PORTREVISION.
@
text
@d28 4
a31 1
CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
@


1.172
log
@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.
@
text
@d12 1
a12 1
PORTREVISION=	4
d24 1
a24 1
LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
@


1.171
log
@Fix configure.
@
text
@d47 2
a48 2
USE_AUTOCONF_VER?=	253
USE_LIBTOOL=	yes
@


1.170
log
@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.
@
text
@d51 1
@


1.169
log
@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
@
text
@d47 1
a47 1
WANT_AUTOCONF_VER?=	253
@


1.168
log
@- 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]
@
text
@d12 1
a12 1
PORTREVISION=	3
@


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

Submitted by:   kuriyama
@
text
@d40 4
@


1.166
log
@- 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]
@
text
@d57 1
a57 1
 		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \
d104 1
a104 1
.endif
d108 1
d115 1
@


1.165
log
@o Use appropriate comment for WITH_IPV6_V6ONLY knob.
o Fix apu-config command name in WITH_APR_FROM_PORTS condition.
@
text
@d35 5
a39 3
PATCHFILES+=		httpd-2.0.48-buildconf.patch:clement \
			httpd-2.0.48-ldap-fix.patch:clement
PATCH_DIST_STRIP+=	-p1:apache-clem
d117 1
@


1.164
log
@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)
@
text
@d105 1
a105 1
					--with-apr-util=${LOCALBASE}/bin/apr-config
@


1.163
log
@- 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)
@
text
@d114 2
@


1.162
log
@- 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)
@
text
@d33 2
a34 2
PATCH_SITES+=		http://sheepkiller.nerim.net/ports/apache2/:clement \
			http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/:clement
d54 1
a54 2
		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
		LIBS="${PTHREAD_LIBS}" \
d147 1
a147 1
	cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
@


1.161
log
@- 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]
@
text
@d12 1
a12 1
PORTREVISION=	2
@


1.160
log
@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)
@
text
@d33 4
a36 3
PATCH_SITES+=		http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/:apache
PATCHFILES+=		httpd-2.0.48-buildconf.patch:apache \
			httpd-2.0.48-ldap-fix.patch:apache
d56 2
a57 1
 		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}"
d79 4
d141 1
@


1.159
log
@- 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)
@
text
@a76 10
# Untested and may fail !
.if defined(WITH_APR_FROM_PORTS)
.    if defined (WITH_BDB) || defined(WITH_BERKELEYDB)
BROKEN=			"You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is defined"
.endif	
LIB_DEPENDS+=		apr-0.9:${PORTSDIR}/devel/apr
CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}/bin/apr-config \
                	--with-apr-util=${LOCALBASE}/bin/apr-config
.endif

d92 16
@


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

PRs:                60444 [1], 61030 [4]
Requested by:       Matthias Andree <matthias.andree@@gmx.de> [7]
Suggested by:       kuriyama [2] [5]
Submitted by:       Daniel Tasov <danielt@@pilgerer.org> [1],
                    kuriyama [5],
                    motoyuki [3],
                    Scott Michel <scottm@@cs.ucla.edu> [4]
Obtained from:      Apache CVS [6]
Reviewed by:        erwin, linimon
Approved by:        erwin (mentor)
@
text
@d77 10
@


1.157
log
@Remove duplicated WITH_EXPERIMENTAL comment.

Reviewed by:	maintainer
@
text
@d7 2
d12 1
a12 1
PORTREVISION=	1
d21 1
a21 1
MAINTAINER?=	sheepkiller@@cultdeadsheep.org
d32 7
a38 46
## Available knobs:
## By default, modules are compiled as dynamically loadable (DSO) modules.
##
##   Apache-related
##      WITH_MPM:                 prefork (default)
##                                worker
##                                perchild
##      WITH_HTTP_PORT:           default: 80
##      WITH_LDAP:                Enable LDAP support (mod_auth_ldap)
##      WITHOUT_PROXY:            Disable proxy support
##          WITH_CUSTOM_PROXY:    Let you choose which proxy modules you wish
##      WITHOUT_AUTH:             Disable auth modules
##          WITH_CUSTOM_AUTH:     Let you choose which auth modules you wish
##      WITHOUT_DAV:              Disable DAV support
##      WITH_IPV6_V6ONLY:         Disable IPv4 support
##      WITHOUT_SSL:              Disable SSL support
##      WITH_THREADS:             Enable threads support !! USE IT WITH CARE !!
##           WITH_CUSTOM_THREADS: Let you choose which threaded modules you want
##      WITH_DBM:                 Choose your DBM: bdb (Berkeley DB), gdbm or ndbm (default)
##          WITH_BERKELEYDB:      Choose your BerkeleyDB version: db2, db3, db4, db41 or FreeBSD (1.85)(default)
##      WITH_STATIC_SUPPORT:      Build statically linked support binaries
##      WITH_STATIC_APACHE:       Build a static version of httpd (implies WITH_STATIC_MODULES)
##      WITH_ALL_STATIC_MODULES:  All modules will be statically linked.
##      WITH_STATIC_MODULES:      List of modules to build modules statics (usefull for slave ports)
##                                (They must be already enabled (i.e. WITH_MODULES or with default configuration
##                                use 'make show-modules', to check if they are enabled)
##      WITH_EXPERIMENTAL:        Build and install experimental modules
##      WITH_EXTRA_MODULES:       To add addtionnal modules
##      WITH_MODULES:             List of your own modules
##      WITHOUT_MODULES:          Disable listed modules
##
##
##   Port-related:
##      WITHOUT_WWW:              Implies NO_CGI, NO_WWWDATA, NO_ICONS and NO_ERROR
##           WITH_CUSTOM_WWW:     Let you choose your ${LOCALBASE}/www components: [cgi|errordocs|icons|wwwdata]
##
## Available make targets:
##      show-options:             prints this message
##      show-modules:             prints list of available modules
##
## Examples:
##      make WITHOUT_SSL=yes WITH_EXTRA_MODULES="bucketeer case_filter case_filter_in" WITHOUT_PROXY=yes
##      make WITH_STATIC_MODULES="ssl rewrite include" WITH_EXPERIMENTAL=yes WITH_CUSTOM_AUTH="auth auth_dbm"
##      make WITH_EXPERIMENTAL=yes WITHOUT_MODULES="access speling status"
##      make WITH_MODULES="include rewrite auth"
##
d40 1
a40 4
WITH_MPM?=	prefork # or worker, perchild
HTTP_PORT?=	${WITH_HTTP_PORT}

GNU_CONFIGURE=	yes
d47 1
a47 1
		--with-port=${HTTP_PORT} \
d52 4
a55 2
CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}"
a56 1
DOCSDIR=	share/doc/apache2
d61 1
a61 3
.if defined(NOPORTDOCS)
MAKE_ENV+=	NOPORTDOCS=yes
.endif
d63 1
a63 2
MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
d73 2
a74 5
.if defined(WITH_LDAP)
USE_OPENLDAP=	YES
CONFIGURE_ARGS+=	--with-ldap \
			--with-ldap-lib="${LOCALBASE}/lib" \
			--with-ldap-include="${LOCALBASE}/include"
d77 5
a81 5
.if defined(WITHOUT_WWW)
NO_CGI=		YES
NO_WWWDATA=	YES
NO_ICONS=	YES
NO_ERROR=	YES
d84 5
a88 17
.if defined(WITH_CUSTOM_WWW)
.    if ${WITH_CUSTOM_WWW:Mcgi} == ""
NO_CGI=		YES
.    endif
.    if ${WITH_CUSTOM_WWW:Mwwwdata} == ""
NO_WWWDATA=		YES
.    endif
.    if ${WITH_CUSTOM_WWW:Merrordocs} == ""
NO_ERROR=		YES
.    endif
.    if ${WITH_CUSTOM_WWW:Micons} == ""
NO_ICONS=		YES
.    endif
.endif

.if defined(WITH_STATIC_SUPPORT)
CONFIGURE_ARGS+=	--enable-static-support
d93 2
a94 1
.include "${.CURDIR}/Makefile.modules"
d99 1
a99 1
	@@${SED} -ne 's/^##//p' ${.CURDIR}/Makefile
d123 3
@


1.156
log
@- 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>
@
text
@a47 1
##      WITH_EXPERIMENTAL:        Enable Experimental modules
@


1.155
log
@Fix build.

PR:		58711
Submitted by:	Yusuke Matsuoka <yusmat@@iris.dti.ne.jp>
Approved by:	maintainer
@
text
@d10 1
d37 1
a37 1
##      HTTP_PORT:                default: 80
d44 1
a44 1
##      IPV6_V6ONLY:              Disable IPv4 support
d50 1
a50 1
##          WITH_BERKELEYDB:      Choose your BerkeleyDB version: db2, db3 or db4 (default)
d53 1
a53 1
##      WITH_ALL_STATIC_APACHE:   All modules statically linked.
d64 2
a65 6
##      NOPORTDOCS:               Do not install documentation
##      NO_CGI:                   Do not instal www/cgi-bin*
##      NO_ERROR:                   Do not instal www/error
##      NO_WWWDATA:               Do not instal www/data*
##      NO_ICONS:                 Do not instal www/icons*
##      NO_WWW:                   Implies NO_CGI, NO_WWWDATA, NO_ICONS and NO_ERROR
d79 1
a79 1
HTTP_PORT?=	80
d108 1
a108 1
.if !defined(IPV6_V6ONLY)
d117 1
a117 1
USE_LDAP=	YES
d123 1
a123 1
.if defined(NO_WWW)
d130 13
a142 26
.if defined(NO_CGI)
MAKE_ENV+=	NO_CGI=yes
PLIST_SUB+=	CGI="@@comment "
.else
PLIST_SUB+=	CGI=""
.endif

.if defined(NO_ICONS)
MAKE_ENV+=	NO_ICONS=yes
PLIST_SUB+=	ICONS="@@comment "
.else
PLIST_SUB+=	ICONS=""
.endif

.if defined(NO_WWWDATA)
MAKE_ENV+=	NO_WWWDATA=yes
PLIST_SUB+=	WWWDATA="@@comment "
.else
PLIST_SUB+=	WWWDATA=""
.endif

.if defined(NO_ERROR)
MAKE_ENV+=	NO_ERROR=yes
PLIST_SUB+=	ERROR="@@comment "
.else
PLIST_SUB+=	ERROR=""
d156 1
a156 1
	@@${EGREP} '^##' ${.CURDIR}/Makefile | ${SED} 's/##//'
@


1.154
log
@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)
@
text
@d195 1
a195 1
	@@${INSTALL_DATA} ${DISTDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif
@


1.153
log
@- fix spelling in CONFLICTS
@
text
@d9 1
a9 2
PORTVERSION=	2.0.47
PORTREVISION=	1
d11 2
a12 1
MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
d14 2
a15 1
DISTFILES=	${DISTNAME}.tar.gz powerlogo.gif:freebsd
d23 3
a25 1
CONFLICTS=	apache+ipv6-1.* apache+mod_ssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
d28 52
a79 1
LATEST_LINK=	apache2
d85 1
a90 2
		--enable-so \
		--with-mpm=${WITH_MPM} \
d95 1
d98 2
a99 2
SHARED_MODULES= all cgid deflate ext_filter proxy proxy-connect proxy-ftp \
		proxy-http
d108 3
d112 1
a112 1
CONFIGURE_ARGS+= --enable-v4-mapped
d119 6
a124 1
.include <bsd.port.pre.mk>
d126 5
a130 15
.if defined(WITH_SUEXEC)
SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
SUEXEC_USERDIR?= public_html
SUEXEC_SAFEPATH?=${PREFIX_RELDEST}/bin:${LOCALBASE}/bin:/usr/bin:/bin
CONFIGURE_ARGS+= --enable-suexec \
		--with-suexec-caller=www \
		--with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \
		--with-suexec-userdir="${SUEXEC_USERDIR}" \
		--with-suexec-docroot="${SUEXEC_DOCROOT}" \
		--with-suexec-safepath="${SUEXEC_SAFEPATH}" \
		--with-suexec-logfile="/var/log/httpd-suexec.log" \
		--with-suexec-bin="${PREFIX_RELDEST}/sbin/suexec"
PLIST_SUB+=	SUEXEC=""
.else
PLIST_SUB+=	SUEXEC="@@comment "
d133 3
a135 7
.if defined(WITH_LDAP)
LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21-client
CONFIGURE_ARGS+= --with-ldap \
		--enable-ldap --enable-auth-ldap \
		--with-ldap-lib="${LOCALBASE}/lib" \
		--with-ldap-include="${LOCALBASE}/include"
PLIST_SUB+=	LDAP=""
d137 1
a137 1
PLIST_SUB+=	LDAP="@@comment "
d140 3
a142 5
.if ${WITH_MPM} != "prefork"
PKGNAMESUFFIX=	-${WITH_MPM}
WITH_THREADS=	yes
.if ${WITH_MPM} == "worker"
PLIST_SUB+=	PREFORK="@@comment " WORKER=""
d144 1
a144 1
PLIST_SUB+=	PREFORK="@@comment " WORKER="@@comment "
d146 4
d151 1
a151 1
PLIST_SUB+=	PREFORK="" WORKER="@@comment "
d154 3
a156 5
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
CFLAGS+=	-DFREEBSD_THREAD_HACK
SHARED_MODULES+= cache file-cache disk-cache mem_cache
PLIST_SUB+=	THREADS=""
d158 1
a158 1
PLIST_SUB+=	THREADS="@@comment "
d161 2
a162 8
.if !defined(WITHOUT_SSL)
SHARED_MODULES+= ssl
CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
PLIST_SUB+=	MODSSL=""
RC_SUB+=	-e 's,@@@@SSL@@@@,ssl,g'
.else
PLIST_SUB+=	MODSSL="@@comment "
RC_SUB+=	-e 's,@@@@SSL@@@@,,g'
d165 5
a169 8
.if defined(WITH_EXPERIMENTAL)
SHARED_MODULES+= bucketeer case_filter case_filter_in ext_filter charset_lite \
		optional_hook_export optional_hook_import \
		optional_fn_import optional_fn_export
PLIST_SUB+=	EXPERIMENTAL=""
.else
PLIST_SUB+=	EXPERIMENTAL="@@comment "
.endif
d171 2
a172 1
CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}" ${CONFIGURE_TARGET}
d174 19
a192 2
MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
@


1.152
log
@Add forgotten file to plist.

PR:		58211
Submitted by:	Dimitry Andric <dimitry@@andric.com>
Approved by:	maintainer
@
text
@d22 1
a22 1
CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
@


1.151
log
@- add CONFLICTS
Submitted by:   eikemeier@@fillmore-labs.com
Approved by:    kris
@
text
@d10 1
@


1.150
log
@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>
@
text
@d21 3
@


1.149
log
@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...
@
text
@d16 1
a16 1
MAINTAINER?=	dominic.marks@@btinternet.com
@


1.148
log
@Update 2.0.46 --> 2.0.47

Approved by:	MAINTAINER (dominic.marks@@btinternet.com)
Notified by:	striker@@apache.org on announce@@apache.org
@
text
@d78 1
a78 1
LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21
@


1.147
log
@Set GNU_CONFIGURE instead of HAS_CONFIGURE.

Reviewed by:	maintainer
@
text
@d9 1
a9 1
PORTVERSION=	2.0.46
@


1.146
log
@Hand maintainership to submitter

PR:		54053
Submitted by:	Dominic Marks <dom@@cus.org.uk>
@
text
@d26 1
a26 1
HAS_CONFIGURE=	yes
@


1.145
log
@Set maintainer to ports@@FreeBSD.org
@
text
@d16 1
a16 1
MAINTAINER?=	ports@@FreeBSD.org
@


1.144
log
@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>,
@
text
@d16 1
a16 1
MAINTAINER?=	perky@@FreeBSD.org
@


1.143
log
@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>
@
text
@d77 11
@


1.142
log
@[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>
@
text
@d137 1
a137 1
	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
@


1.141
log
@- Utilize MASTER_SITE_APACHE_HTTPD [1]
- Allow to override SUEXEC_SAFEPATH [2]

Submitted by:	naddy [1],
		Eugene M. Kim <ab@@astralblue.net> [2]
@
text
@d9 1
a9 1
PORTVERSION=	2.0.45
d120 1
a120 1
MAN8=		ab.8 apxs.8 logresolve.8 rotatelogs.8 suexec.8
@


1.140
log
@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
@
text
@d11 1
a11 9
MASTER_SITES=	http://www.apache.org/dist/httpd/ \
		http://apache.mirrorcentral.com/dist/httpd/ \
		http://apache.missouri.edu/dist/httpd/ \
		http://ftp.epix.net/apache/dist/httpd/ \
		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/ \
		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd,} \
		http://www.freebsd.org/gifs/:freebsd \
		http://www2.freebsd.org/gifs/:freebsd
d63 1
d69 1
a69 1
		--with-suexec-safepath="${PREFIX_RELDEST}/bin:${LOCALBASE}/bin:/usr/bin:/bin" \
@


1.139
log
@De-pkg-comment for my ports.
@
text
@d9 1
a9 1
PORTVERSION=	2.0.44
@


1.138
log
@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>
@
text
@d25 1
@


1.137
log
@Update to 2.0.44

New knob IPV6_V6ONLY=yes disables accepting v4 connection via v4-mapped
v6 socket.
@
text
@a107 6
_SSLBUGGY!=	${OPENSSLBASE}/bin/openssl version | \
		${EGREP} "OpenSSL ([1-9]+)|([0\.9\.[6-9][e-z])|(0\.[1-9][0-9]+)" \
		|| ${TRUE}
.if empty(_SSLBUGGY)
IGNORE=		"requires OpenSSL 0.9.6e or higher. Upgrade your base system"
.endif
@


1.136
log
@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>
@
text
@d9 1
a9 2
PORTVERSION=	2.0.43
PORTREVISION=	2
d57 4
d132 1
a132 1
MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
@


1.135
log
@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]
@
text
@d10 1
a10 1
PORTREVISION=	1
@


1.134
log
@Add MASTER_SITE_RINGSERVER to MASTER_SITES.
@
text
@d10 1
@


1.133
log
@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
@
text
@d17 1
@


1.132
log
@Update to 2.0.42

Approved by:	will (portmgr)
@
text
@d9 1
a9 1
PORTVERSION=	2.0.42
@


1.131
log
@Bump PORTREVISION and expat shlib.
@
text
@d9 1
a9 2
PORTVERSION=	2.0.40
PORTREVISION=	1
@


1.130
log
@Update to 2.0.40
@
text
@d10 1
d26 1
a26 1
LIB_DEPENDS=	expat.3:${PORTSDIR}/textproc/expat2
@


1.129
log
@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]
@
text
@d9 1
a9 2
PORTVERSION=	2.0.39
PORTREVISION=	7
d46 2
a47 1
SHARED_MODULES= all cgid deflate ext_filter
d56 6
a80 5
.if !defined(FORCE_THREADING_MPM)
FORBIDDEN=	"doesn't support threads on FreeBSD, officially. If you are\
		prepared to risk unintended problems, make again with\
		-DFORCE_THREADING_MPM"
.endif
d93 4
d99 1
a99 1
.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
d101 1
d103 6
a114 14
.if !defined(WITHOUT_CACHE) && defined(WITH_THREADS)
SHARED_MODULES+= cache file-cache disk-cache mem_cache
PLIST_SUB+=	MODCACHE=""
.else
PLIST_SUB+=	MODCACHE="@@comment "
.endif

.if !defined(WITHOUT_PROXY)
SHARED_MODULES+= proxy proxy-connect proxy-ftp proxy-http
PLIST_SUB+=	MODPROXY=""
.else
PLIST_SUB+=	MODPROXY="@@comment "
.endif

d138 1
a138 1
	@@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
d152 1
a152 1
.include <bsd.port.mk>
@


1.128
log
@- 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]
@
text
@d53 1
a53 1
MAKE_ENV+=	-DNOPORTDOCS
@


1.127
log
@Bump portrevision (textproc/expat2 shlib bump).
@
text
@d76 3
a78 2
FORBIDDEN=	"doesn't work with threading MPMs on FreeBSD. If you are\
		brave enough, make again with FORCE_THREADING_MPM=yes"
d80 7
d91 1
@


1.126
log
@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>
@
text
@d10 1
a10 1
PORTREVISION=	6
d26 1
a26 1
LIB_DEPENDS=	expat.2:${PORTSDIR}/textproc/expat2
@


1.125
log
@- 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)
@
text
@d10 1
a10 1
PORTREVISION=	5
d47 1
a47 1
SHARED_MODULES= all cgid ext_filter bucketeer
d109 3
a111 1
SHARED_MODULES+= case_filter case_filter_in deflate ext_filter charset_lite
@


1.124
log
@Fix more fatal bugs on htpasswd(1)

Requested by:	"Jon Noack" <noackjr@@compgeek.com>
Obtained from:	Apache Group CVS (rev 1.49-1.51)
@
text
@d10 1
a10 1
PORTREVISION=	4
d24 1
a24 1
MAINTAINER?=	perky@@fallin.lv
@


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

PR:		38389
Submitted by:	abatko@@cs.mcgill.ca
@
text
@d10 1
a10 1
PORTREVISION=	3
@


1.122
log
@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)
@
text
@d121 1
a121 1
	@@${CP} ${DISTDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif
@


1.121
log
@- 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
@
text
@d10 1
a10 1
PORTREVISION=	2
d26 2
d42 1
a55 9
.if !defined(WITHOUT_BUNDLED_EXPAT)
EXPAT_PATHS=	xml/expat-cvs xml/expat $$srcdir/xml/expat
PLIST_SUB+=	EXPAT=""
.else
LIB_DEPENDS=	expat.2:${PORTSDIR}/textproc/expat2
EXPAT_PATHS=	${LOCALBASE} ${PREFIX} ${LOCALBASE:S,^${DESTDIR},,}
PLIST_SUB+=	EXPAT="@@comment "
.endif

a128 2
	@@${REINPLACE_CMD} -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
		${WRKSRC}/srclib/apr-util/configure
@


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

Submitted by:	maintainer Hye-Shik Chang <perky@@fallin.lv>
@
text
@d10 1
a10 1
PORTREVISION=	1
d28 1
a28 1
WITH_MPM?=	prefork
d45 1
a45 1
PREFIX_RELDEST=	${PREFIX:S,${DESTDIR},,}
a47 1
PLIST_SUB+=	DESTDIR=${DESTDIR}
d53 1
a53 1
.if defined(WITH_BUNDLED_EXPAT)
d58 1
a58 1
EXPAT_PATHS=	${LOCALBASE} ${PREFIX} ${LOCALBASE:S,${DESTDIR},,}
a61 9
.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
SHARED_MODULES+= ssl
PLIST_SUB+=	MODSSL=""
RC_SUB+=	-e 's,@@@@SSL@@@@,ssl,g'
.else
PLIST_SUB+=	MODSSL="@@comment "
RC_SUB+=	-e 's,@@@@SSL@@@@,,g'
.endif

d78 22
a120 13
.if ${WITH_MPM} != "prefork"
PKGNAMESUFFIX=	-${WITH_MPM}
WITH_THREADS=	yes
.if !defined(FORCE_THREADING_MPM)
FORBIDDEN=	"doesn\'t work with threading MPMs on FreeBSD. If you are \
		brave enough, make again with -DFORCE_THREADING_MPM"
.endif
.endif

.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
.endif

d132 1
a132 1
	  ${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif" \
@


1.119
log
@Add USE_REINPLACE where appropriate.
@
text
@d43 1
a43 1
		LDFLAGS="${LDFLAGS}" EXPAT_PATHS="${EXPAT_PATHS}"
d136 1
a136 1
	@@${REINPLACE_CMD} -e 's,/usr .*/xml/expat,\$${EXPAT_PATHS},g' \
@


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

PR:		ports/39477
Submitted by:	maintainer
@
text
@d33 1
@


1.117
log
@Mark FORBIDDEN until an update is available.
See <URL:http://httpd.apache.org/info/security_bulletin_20020617.txt>.
@
text
@d9 1
a9 1
PORTVERSION=	2.0.36
a25 3
FORBIDDEN=	"Vulnerable to denial-of-service.  See" \
		"http://httpd.apache.org/info/security_bulletin_20020617.txt"

d28 1
a28 1
WITH_MPM?=	prefork # or worker, perchild (neither of them still has a problem on FreeBSD)
d31 1
a31 1
GNU_CONFIGURE=	yes
d33 1
a33 1
CONFIGURE_ARGS=	--prefix=${PREFIX} \
d39 2
a40 2
		--libdir=${PREFIX}/lib/apache2 \
		--includedir=${PREFIX}/include/apache2
d42 1
a42 1
		LDFLAGS="${LDFLAGS}"
d44 2
a45 1
RC_SUB=		-e 's,@@@@PREFIX@@@@,${PREFIX},g' -e 's,@@@@DESTDIR@@@@,${DESTDIR},g'
d50 1
a50 1
MAKE_ENV+=	NOPORTDOCS=YES
d58 1
a58 1
EXPAT_PATHS=	${LOCALBASE} ${PREFIX} ${EXPATLIBPATH}
a61 4
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
.endif

d72 1
a72 1
SUEXEC_DOCROOT?= ${PREFIX}/www/data
d79 3
a81 3
		--with-suexec-safepath="${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin" \
		--with-suexec-logfile="${DESTDIR}/var/log/httpd-suexec.log" \
		--with-suexec-bin="${PREFIX}/sbin/suexec"
d110 4
a113 2
.if !defined(WITH_THREADS)
IGNORE=		"requires threads for ${WITH_MPM} mpm"
d117 5
a121 1
CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}"
a125 2
.include <bsd.port.pre.mk>

d132 2
a133 1
	  ${PERL} -pi -e 's,apache_pb,icons/freebsd.gif" ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
d135 1
a135 2
	@@${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
	@@${PERL} -pi -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
d137 1
d140 1
a149 2
	@@[ -d ${DESTDIR}/var/log ] || ${MKDIR} ${DESTDIR}/var/log
	@@[ -d ${DESTDIR}/var/run ] || ${MKDIR} ${DESTDIR}/var/run
d151 1
a151 1
.include <bsd.port.post.mk>
@


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

PR:		38552
Submitted by:	maintainer
@
text
@d26 3
@


1.115
log
@Fix ports for building with -current without perl

PR:		38359
Submitted by:	maintainer
@
text
@d10 1
d43 1
a43 2
SHARED_MODULES= all cgid charset_lite ext_filter case_filter case_filter_in \
		deflate bucketeer
d52 9
d75 1
d79 1
d81 1
a81 2
		--with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \
		--with-suexec-docroot="${PREFIX}/www/data" \
d83 2
a84 1
		--with-suexec-logfile="${DESTDIR}/var/log/httpd-suexec.log"
d104 7
d134 2
@


1.114
log
@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>
@
text
@d31 1
d34 1
a34 1
		--with-perl=${PERL} \
@


1.113
log
@Respect $DESTDIR for all paths

PR:		37211
Submitted by:	maintainer
@
text
@d9 1
a9 2
PORTVERSION=	2.0.35
PORTREVISION=	1
d44 1
a44 1
MAKE_ENV+=	DESTDIR=${DESTDIR}
a116 7
.if ${OSVERSION} >= 500032
.for ltfile in srclib/pcre/ltmain.sh srclib/apr/build/ltmain.sh \
		srclib/apr-util/xml/expat/conftools/ltmain.sh
	@@${PERL} -pi.orig -e 's|expr|expr --|' \
		${WRKSRC}/${ltfile}
.endfor
.endif
d126 2
a127 2
	[ -d ${DESTDIR}/var/log ] || ${MKDIR} ${DESTDIR}/var/log
	[ -d ${DESTDIR}/var/run ] || ${MKDIR} ${DESTDIR}/var/run
@


1.112
log
@- 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
@
text
@d44 3
a46 1
RC_SUB=		-e 's,@@@@PREFIX@@@@,${PREFIX},g'
d73 1
a73 1
		--with-suexec-logfile="/var/log/httpd-suexec.log"
d117 1
d134 2
@


1.111
log
@Fix typo in the optional WITH_SUEXEC section.

PR:		ports/36872
Submitted by:	Hye-Shik Chang <perky@@fallin.lv> (MAINTAINER)
@
text
@d10 1
d50 1
a50 1
.if !defined(WITHOUT_THREADS)
d77 1
a77 1
.if !defined(WITHOUT_CACHE) && !defined(WITHOUT_THREADS)
d93 1
a93 1
.if defined(WITHOUT_THREADS)
d116 2
d119 2
a120 1
		${WRKSRC}/srclib/apr/build/ltmain.sh
@


1.110
log
@Update to 2.0.35 (first GA release!)

PR:		36834
Submitted by:	maintainer
@
text
@d67 1
a67 1
		--with-suexec-uidmim=1000 --with-suexec-gidmin=1000 \
@


1.109
log
@Don't try to fetch the "-beta" file.  `make fetch' returns "Multiple files".
@
text
@d9 1
a9 1
PORTVERSION=	2.0.32
a11 1
		http://www.freebsd.org/gifs/ \
a12 1
		http://www2.freebsd.org/gifs/ \
d16 3
a18 1
		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/
d20 1
a20 1
DISTFILES=	${DISTNAME}.tar.gz powerlogo.gif
d27 1
a27 2
WRKSRC=		${WRKDIR}/httpd-${PORTVERSION}
WITH_MPM?=	prefork # or worker, perchild (neither of them is working yet)
a34 1
		--with-suexec-docroot=${PREFIX}/www/data \
d37 2
a38 2
		--libdir=${PREFIX}/lib/apache \
		--includedir=${PREFIX}/include/apache
d41 3
a43 2
SHARED_MODULES=	all cgid cache file-cache disk-cache proxy proxy-connect \
		proxy-ftp proxy-http
d49 4
d55 24
a78 1
PLIST_SUB+=	SSLOPT=""
d80 8
a87 1
PLIST_SUB+=	SSLOPT="@@comment "
a90 3
CONFIGURE_ARGS+= --enable-threads
SHARED_MODULES+= mem-cache
PLIST_SUB+=	THREADONLY=""
d92 3
a94 2
.else
PLIST_SUB+=	THREADONLY="@@comment "
d102 1
a102 4
pre-extract:
.if !defined(WITHOUT_SSL)
	@@${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL."
.endif
d113 5
d123 3
a125 3
	@@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \
d128 1
a128 1
.include <bsd.port.mk>
@


1.108
log
@Update to 2.0.32

PR:		36040
Submitted by:	maintainer
@
text
@d19 1
a19 1
DISTNAME=	httpd-${PORTVERSION}-beta
@


1.107
log
@Fix problem where installation would overwrite existing config files
Bump PORTREVISION

Submitted by:	maintainer
@
text
@d9 1
a9 2
PORTVERSION=	2.0.28
PORTREVISION=	5
d12 1
d14 1
d19 3
a21 4
DISTNAME=	httpd-${PORTVERSION:S/./_/g}-beta

PATCH_SITES=	http://fallin.lv/distfiles/
PATCHFILES=	${PORTNAME}-${PORTVERSION}_1.diff
d27 2
a28 4
WRKSRC=		${WRKDIR}/httpd-${PORTVERSION:S/./_/g}
FIND=		find

WITH_MPM?=	prefork # or perchild, threaded
d39 2
a40 1
		--includedir=${PREFIX}/include/apache # for apr, apr-util
d43 2
a44 1
SHARED_MODULES=	all cgid
d57 5
a61 10
.if !defined(WITHOUT_PROXY)
SHARED_MODULES+= proxy proxy-connect proxy-ftp proxy-http
PLIST_SUB+=	PROXYOPT=""
.else
PLIST_SUB+=	PROXYOPT="@@comment "
.endif

.if !defined(WITHOUT_CACHE)
SHARED_MODULES+= cache mem-cache file-cache #disk-cache
PLIST_SUB+=	CACHEOPT=""
d63 1
a63 1
PLIST_SUB+=	CACHEOPT="@@comment "
d76 3
d80 5
a84 1
	@@${FIND} ${WRKSRC} -name "*.orig" -exec rm -f {} \;
@


1.106
log
@Fix invalid path problem on building extension module with apxs.

PR:		32638
Submitted by:	maintainer
@
text
@d10 1
a10 1
PORTREVISION=	4
@


1.105
log
@Suggest a command to delete user instead of actually deleting it

PR:		32536
@
text
@d10 1
a10 1
PORTREVISION=	3
@


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

Submitted by:	Christian Weisgerber <naddy@@freebsd.org>
@
text
@d10 1
a10 1
PORTREVISION=	2
@


1.103
log
@PLIST cleanup.

Found by:	bento
@
text
@d21 1
a21 1
PATCHFILES=	${PKGNAME}.diff
@


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

PR:		32208
Submitted by:	maintainer
Pointed out by:	Jos Backus <josb@@cncdsl.com>
@
text
@d10 1
a10 1
PORTREVISION=	1
@


1.101
log
@Update to 2.0.28

PR:		32043
Submitted by:	maintainer
@
text
@d10 1
d19 3
@


1.100
log
@Set LATEST_LINK to apache2 in favor of www/apache13.
@
text
@d9 1
a9 2
PORTVERSION=	2.0.16
PORTREVISION=	3
d11 4
a14 8
MASTER_SITES=	http://httpd.apache.org/dist/httpd/ \
		http://www.cybernic.com/mirror/dist/httpd/ \
		http://mirrors.partnersforever.net/apache/dist/httpd/ \
		http://www.technotopia.com/vroom/apache/dist/httpd/ \
		http://www.tux.org/pub/net/apache/dist/httpd/ \
		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
		ftp://ftp.epix.net/pub/apache/dist/httpd/ \
		ftp://ftp.connectnet.com/pub/www/apache/httpd/ \
d16 1
a16 1
		ftp://ftp.cuckoo.com/pub/mirrors/apache/httpd/
d24 1
a24 2
FIND?=		find
XARGS?=		xargs
d26 2
a27 9
# apache2 doesn't process '--enable-share=max' option yet.
# and some modules are very unstable at DSO mode.
SHARED_MODS?=	unique_id mime_magic rewrite speling auth_db \
		auth_anon digest headers cern_meta expires include \
		cgid status info usertrack dav dav_fs imap proxy \
		auth_digest file_cache echo optional_fn_import \
		optional_fn_export
STATIC_MODS?=	so env setenvif dir autoindex access auth negotiation \
		userdir alias asis cgi mime log_config vhost_alias actions
d30 1
a30 2
CONFIGURE_ARGS=	\
		--prefix=${PREFIX} \
d33 1
d35 31
a65 3
		--enable-shared \
		--disable-threads \
		--with-mpm=prefork  # Apache's thread doesn't work well in FreeBSD
d67 1
a67 4
OPTIM+=		-DHARD_SERVER_LIMIT=512 \
		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"

CONFIGURE_ENV=	OPTIM='${OPTIM}'
d72 4
a75 6
.for mod in ${SHARED_MODS}
CONFIGURE_ARGS+= --enable-${mod}=shared
.endfor
.for mod in ${STATIC_MODS}
CONFIGURE_ARGS+= --enable-${mod}=yes
.endfor
d78 1
a78 1
	@@${FIND} ${WRKSRC} -name "*.orig"|${XARGS} ${RM} -f
@


1.99
log
@Oops, CVS not change access bits on removing/adding, so use ${SH} trick
@
text
@d26 2
@


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

PR:		31599
@
text
@d69 1
a69 1
	PKG_PREFIX=${PREFIX} ./pkg-install ${PKGNAME} PRE-INSTALL
@


1.97
log
@Sync with main Apache

Submitted by:	MAINTAINER
@
text
@d10 1
a10 1
PORTREVISION=	2
@


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

PR:		26570
Submitted by:	maintainer
Found by:	mharo
@
text
@d3 1
a3 1
# Whom:					Hye-Shik Chang <perky@@python.or.kr>
d5 1
a5 1
# $FreeBSD: ports/www/apache2/Makefile,v 1.95 2001/04/13 14:48:48 will Exp $
d10 1
a10 1
PORTREVISION=	1
d24 1
a24 1
MAINTAINER?=	perky@@python.or.kr
d67 3
@


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

Submitted by:	ume
@
text
@d5 1
a5 1
# $FreeBSD: ports/www/apache2/Makefile,v 1.94 2001/04/13 04:43:47 will Exp $
d10 1
@


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

PR:		26410
Submitted by:	Chang, Hye-Shik <perky@@python.or.kr>
Repocopied by:	asami
@
text
@d5 1
a5 1
# $FreeBSD$
d10 1
a10 1
CATEGORIES=	www
@


1.93
log
@Apache dist moved to another subdir
Bump PORTREVISION for util.c patch

PR:		26383
Submitted by:	Chang, Hye-Shik <perky@@python.or.kr>
@
text
@d1 3
a3 3
# New ports collection makefile for:    apache HTTPD
# Date created:         Fri Aug 25 16:42:36 CDT 1995
# Whom:                 ache@@freebsd.org
d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.92 2001/03/06 22:51:34 ache Exp $
d9 1
a9 2
PORTVERSION=    1.3.19
PORTREVISION=   1
d11 6
a16 5
MASTER_SITES=   http://httpd.apache.org/dist/httpd/ \
		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
		ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \
		ftp://apache.compuex.com/pub/apache/dist/httpd/ \
		ftp://apache.arctic.org/pub/apache/dist/httpd/ \
a17 1
		ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/httpd/ \
d19 19
a37 17
		ftp://apache.technomancer.com/mirrors/apache/dist/httpd/ \
		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
		ftp://www3.service.digital.com/apache/dist/httpd/ \
		ftp://galileo.galilei.com/pub/apache/httpd/ \
		ftp://ftp.mtnranch.net/pub/apache/dist/httpd/ \
		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \
		ftp://apache.nextpath.com/pub/apache/dist/httpd/
DISTNAME=	apache_${PORTVERSION}

#PATCH_SITES=    ${MASTER_SITES}
#PATCHFILES=     apache_${PORTVERSION}-fix.diff

MAINTAINER=	ache@@freebsd.org

#
# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
#
d39 1
a39 1
HAS_CONFIGURE=	yes
d42 1
a42 1
		--server-gid=nogroup \
d44 7
a50 18
		--with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
		--suexec-docroot=${PREFIX}/www/data \
		--without-confadjust \
		--enable-module=most \
		--enable-module=auth_db \
		--enable-module=mmap_static \
		--disable-module=auth_dbm \
		--enable-shared=max

OPTIM=		-DHARD_SERVER_LIMIT=512 \
		-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" \
		-DACCEPT_FILTER_NAME=\\"httpready\\"

.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
OPTIM+=		-DBUFFERED_LOGS
CFLAGS+=	-O6 -fomit-frame-pointer
.endif
d55 11
a65 1
MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
@


1.92
log
@Upgrade to 1.3.19
@
text
@d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.91 2001/02/12 16:27:35 ache Exp $
d10 1
d12 15
a26 15
MASTER_SITES=	http://www.apache.org/dist/ \
		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
		ftp://ftp.rge.com/pub/infosystems/apache/dist/ \
		ftp://apache.compuex.com/pub/apache/dist/ \
		ftp://apache.arctic.org/pub/apache/dist/ \
		ftp://ftp.epix.net/pub/apache/dist/ \
		ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/ \
		ftp://ftp.connectnet.com/pub/www/apache/ \
		ftp://apache.technomancer.com/mirrors/apache/dist/ \
		ftp://ftp.raver.net/pub/ftp.apache.org/ \
		ftp://www3.service.digital.com/apache/dist/ \
		ftp://galileo.galilei.com/pub/apache/ \
		ftp://ftp.mtnranch.net/pub/apache/dist/ \
		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
		ftp://apache.nextpath.com/pub/apache/dist/
@


1.91
log
@bump portrevision
@
text
@d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.90 2001/02/12 16:19:19 ache Exp $
d9 1
a9 2
PORTVERSION=	1.3.17
PORTREVISION=	1
d28 2
a29 2
PATCH_SITES=    ${MASTER_SITES}
PATCHFILES=     apache_1.3.17-fix.diff
@


1.90
log
@Add official fix for RewriteMap bug
@
text
@d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.89 2001/02/05 15:33:12 olgeni Exp $
d10 1
@


1.89
log
@Some spaces -> tabs for ports/www.
@
text
@d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.88 2001/01/30 11:55:00 ache Exp $
d27 3
@


1.88
log
@Upgrade to 1.3.17
@
text
@d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.87 2001/01/16 17:32:53 sobomax Exp $
d9 1
a9 1
PORTVERSION=    1.3.17
@


1.87
log
@Massive style enforcement - use ^I instead of spaces for variables identation.
@
text
@d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.86 2001/01/01 10:15:11 will Exp $
d9 1
a9 2
PORTVERSION=	1.3.14
PORTREVISION=	1
a26 3

PATCH_SITES=	${MASTER_SITES}
PATCHFILES=	apache_${PORTVERSION}-fix.diff
@


1.86
log
@Goodbye, YEAR2000.  Hello, 2001.

Approved by:	asami
@
text
@d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.85 2000/12/27 22:47:56 ache Exp $
d9 2
a10 2
PORTVERSION=    1.3.14
PORTREVISION=   1
d29 2
a30 2
PATCH_SITES=    ${MASTER_SITES}
PATCHFILES=     apache_${PORTVERSION}-fix.diff
@


1.85
log
@Add official mod_rewrite fix
@
text
@d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.84 2000/10/14 07:00:09 ache Exp $
a32 2

Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
@


1.84
log
@Upgrade to 1.3.14
@
text
@d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.83 2000/10/11 22:37:56 ache Exp $
d10 1
d28 3
@


1.83
log
@Move all modules from static to shared to allow maximal configuration
flexibility.

WARNING: existing configurations should be updated with 'LoadModule' for
previously static modules.
@
text
@d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.82 2000/08/22 03:41:03 kuriyama Exp $
d9 1
a9 2
PORTVERSION= 	1.3.12
PORTREVISION=   1
d52 2
a53 1
		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
@


1.82
log
@Cosmetic changes to reduce difference between apache13 ports.
(whitespace/tab, re-ordering, same $DISTNAME)

This is preparation for ports/18788 updates.

Approved by:		adam@@algroup.co.uk, sumikawa
No response from:	ache (sorry for stepping on your toes)
@
text
@d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.81 2000/07/05 12:36:59 tg Exp $
d10 1
a44 1
		--enable-shared=remain \
d47 3
a49 1
		--disable-module=auth_dbm
@


1.81
log
@As threatened on freebsd-ports: all startup scripts know about the two
options `start' and `stop' now (unless I have forgotten any). This allows
us to call the scripts from /etc/rc.shutdown with the correct option.

The (42 or so) ports that already DTRT before are unchanged.
@
text
@d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.80 2000/04/10 19:26:55 cpiazza Exp $
d11 1
a11 1
MASTER_SITES=   http://www.apache.org/dist/ \
d26 1
a26 1
DISTNAME=	${PORTNAME}_${PORTVERSION}
d28 1
a28 1
MAINTAINER=     ache@@freebsd.org
d36 16
a51 16
HAS_CONFIGURE=  yes
CONFIGURE_ARGS= \
		 --prefix=${PREFIX} \
		 --server-gid=nogroup \
		 --with-perl=${PERL} \
		 --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
		 --suexec-docroot=${PREFIX}/www/data \
		 --without-confadjust \
		 --enable-shared=remain \
		 --enable-module=most \
		 --enable-module=auth_db \
		 --disable-module=auth_dbm

OPTIM=-DHARD_SERVER_LIMIT=512 \
-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
d54 2
a55 2
OPTIM+= -DBUFFERED_LOGS
CFLAGS+= -O6 -fomit-frame-pointer
d58 1
a58 1
CONFIGURE_ENV= OPTIM='${OPTIM}'
d60 2
a61 2
MAN1= dbmmanage.1 htdigest.1 htpasswd.1
MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
@


1.80
log
@Fix typo

Submitted by: "Gary D. Margiotta" <gary@@tbe.net>
@
text
@d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.79 2000/04/10 00:04:17 cpiazza Exp $
d66 1
a66 3
		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
		${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
		${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
@


1.79
log
@Update with the new PORTNAME/PORTVERSION variables
@
text
@d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.78 2000/02/26 10:35:03 ache Exp $
d26 1
a26 1
DISTNAME=	${PORTNAME_${PORTVERSION}
@


1.78
log
@upgrade to 1.3.12
@
text
@a1 1
# Version required:     1.3*
d5 1
a5 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.77 2000/02/02 21:14:03 ache Exp $
d8 2
a9 2
DISTNAME=       apache_1.3.12
PKGNAME=        apache-1.3.12
d26 1
@


1.77
log
@Add official cross side scripting security patch
@
text
@d6 1
a6 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.76 2000/01/24 17:57:57 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.3.11
PKGNAME=        apache-1.3.11
a26 3

PATCH_SITES=    http://www.apache.org/info/css-security/
PATCHFILES=     apache_1.3.11_css_patch.txt
@


1.76
log
@upgrade to 1.3.11
@
text
@d6 1
a6 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.75 1999/09/03 16:07:23 ache Exp $
d27 3
@


1.75
log
@upgrade to 1.3.9
@
text
@d6 1
a6 1
# $FreeBSD: ports/www/apache13/Makefile,v 1.74 1999/08/31 02:42:38 peter Exp $
d9 2
a10 2
DISTNAME=       apache_1.3.9
PKGNAME=        apache-1.3.9
d39 1
@


1.74
log
@$Id$ -> $FreeBSD$
@
text
@d4 1
a4 1
# Whom:                 ache@@nagual.pp.ru
d6 1
a6 1
# $FreeBSD$
d9 2
a10 2
DISTNAME=       apache_1.3.6
PKGNAME=        apache-1.3.6
d39 2
a40 5
		 --with-layout=GNU \
		 --sysconfdir=${PREFIX}/etc/apache \
		 --includedir=${PREFIX}/include/apache \
		 --localstatedir=/var \
		 --datadir=${PREFIX}/www \
a41 2
		 --proxycachedir=${PREFIX}/www/proxy \
		 --libexecdir=${PREFIX}/libexec/apache \
a46 3

# Currently perl version don't matter
#                 --with-perl=${PERL5}
@


1.73
log
@echo -> ${ECHO} or ${ECHO_MSG}  and in some cases, move echo stuff
to pkg/MESSAGE and use ${CAT} ${PKGMESSAGE}
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.72 1999/08/22 19:00:30 mharo Exp $
@


1.72
log
@chmod -> ${CHMOD}
chown -> ${CHOWN}
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.71 1999/06/25 21:53:06 sada Exp $
d72 3
a74 3
		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
		echo "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
@


1.71
log
@www/apache13 rc.d startup script has /usr/local hardcoded.
PR:		ports/12206
Submitted by:	Matt Behrens <matt@@zigg.com>
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.70 1999/03/25 22:25:43 ache Exp $
d75 1
a75 1
		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
@


1.70
log
@upgrade to 1.3.6
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.69 1999/03/13 17:57:44 billf Exp $
d74 1
a74 1
		echo "[ -x /usr/local/sbin/apachectl ] && /usr/local/sbin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
@


1.69
log
@Fix missing "\"s

Noticed By:	#FreeBSD
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.68 1999/03/13 17:11:02 billf Exp $
d9 2
a10 2
DISTNAME=       apache_1.3.4
PKGNAME=        apache-1.3.4
d67 2
a68 2
MAN1=   ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
MAN8=   apxs.8 httpd.8 logresolve.8 rotatelogs.8
@


1.68
log
@Add the Apache mirror sites. For ports with 'mods' attached to them, the MASTER_SITEs
were alternated so the user does not have to get 10 apache MASTER_SITEs when all
they need is one 'mod' MASTER_SITE, which is what would happen if we used a
MASTER_SITE_APACHE or added all of the mirrors in a row.

Approved By:	apache maintainers, asami
Submitted By: 	Brian Feldman <green@@unixhelp.org>, billf
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.67 1999/03/08 07:28:31 asami Exp $
d12 1
a12 1
MASTER_SITES=   http://www.apache.org/dist/
@


1.67
log
@Fix to make ports work with bsd.port.mk rev. 1.306.
${MACHINE_ARCH}--freebsd${OSREL} is now passed to CONFIGURE_ARGS if
GNU_CONFIGURE is defined.  Take the target out of CONFIGURE_ARGS of
some ports that added it explicitly; define it as
${MACHINE_ARCH}--freebsd if the port doesn't like the ${OSREL} part;
define it as something else (such as ${MACHINE_ARCH}--freebsdelf if
the port requires that; define it as an empty string if the port
doesn't like it at all.

The last might be a sign that a GNU_CONFIGURE port actually doesn't
use GNU's version of configure at all; but I don't have time to go
look at them all, we'll fix them as time goes on.

At least we've got much fewer "-unknown-"s in the tree as the result. :)
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.66 1999/03/07 18:34:56 ache Exp $
d13 14
@


1.66
log
@change master site to http://
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.65 1999/01/15 00:26:19 ache Exp $
d22 1
a22 1
GNU_CONFIGURE=  yes
d24 1
@


1.65
log
@upgrade to 1.3.4
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.64 1999/01/13 02:47:32 scrappy Exp $
d12 1
a12 1
MASTER_SITES=   ftp://www.apache.org/apache/dist/
@


1.64
log
@More Y2K Statement Links...
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.63 1998/10/19 12:48:55 smace Exp $
d9 2
a10 2
DISTNAME=       apache_1.3.3
PKGNAME=        apache-1.3.3
a13 2
#PATCH_SITES=    ftp://www.apache.org/apache/dist/patches/apply_to_1.3.3/

d17 1
d24 1
d27 1
a27 2
		 --logfiledir=/var/log \
		 --runtimedir=/var/run \
d29 1
@


1.63
log
@Upgrade to 1.3.3
Fix module loading under ELF
PR:		ports/8267 ports/8362
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.62 1998/09/24 01:24:04 ache Exp $
d18 1
@


1.62
log
@coment out --with-perl option, currently perl version don't matter
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.61 1998/09/24 01:06:18 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.3.2
PKGNAME=        apache-1.3.2
d14 1
a14 1
#PATCH_SITES=    ftp://www.apache.org/apache/dist/patches/apply_to_1.3.2/
@


1.61
log
@upgrade to 1.3.2
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.60 1998/09/20 23:55:38 ache Exp $
a30 1
		 --with-perl=${PERL5} \
d36 3
@


1.60
log
@Remove expensive-optimization -O6 already include it
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.59 1998/07/23 13:15:57 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.3.1
PKGNAME=        apache-1.3.1
d14 1
a14 1
#PATCH_SITES=    ftp://www.apache.org/apache/dist/patches/apply_to_1.3.1/
d31 1
a42 1
CONFIGURE_ARGS+= --disable-rule=STATUS
@


1.59
log
@Upgrade to 1.3.1
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.58 1998/06/24 19:54:05 ache Exp $
d44 1
a44 1
CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
@


1.58
log
@Make performance tuning conditionaly depends on APACHE_PERF_TUNING
variable. Add more optimization there.
@
text
@d2 1
a2 1
# Version required:     1.3
d6 1
a6 1
# $Id: Makefile,v 1.57 1998/06/18 11:56:17 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.3.0
PKGNAME=        apache-1.3.0
d14 1
a14 1
#PATCH_SITES=    ftp://www.apache.org/apache/dist/patches/apply_to_1.3.0/
d24 2
d31 1
@


1.57
log
@Redirect apachectl output to devnull in apache.sh
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.56 1998/06/18 11:51:03 ache Exp $
d18 4
a28 1
		 --disable-rule=STATUS \
d34 11
a44 4
CONFIGURE_ENV= \
OPTIM='-DBUFFERED_LOGS -DHARD_SERVER_LIMIT=512 \
-DDOCUMENT_LOCATION=\\"'${PREFIX}'/www/data/\\" \
-DDEFAULT_PATH=\\"/bin:/usr/bin:'${PREFIX}'/bin\\"'
@


1.56
log
@Use apachectl to start apache in rc.d/apache.sh
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.55 1998/06/13 08:33:41 ache Exp $
d43 1
a43 1
		echo "[ -x /usr/local/sbin/apachectl ] && /usr/local/sbin/apachectl start && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
@


1.55
log
@Increase HARD_SERVER_LIMIT to 512, it is already limited by MaxClients
directive installed by default and this needs to avoid unnecessary
recompilation
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.54 1998/06/09 19:49:59 ache Exp $
d43 1
a43 1
		echo "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && echo -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
@


1.54
log
@Performance tuning as described in http://www.apache.org/docs/misc/perf-tuning.html
Add --disable-rule=STATUS and -DBUFFERED_LOGS
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.53 1998/06/07 02:39:22 asami Exp $
d32 2
a33 1
OPTIM='-DBUFFERED_LOGS -DDOCUMENT_LOCATION=\\"'${PREFIX}'/www/data/\\" \
@


1.53
log
@Adjust NO_LATEST_LINK (now apache-1.3 is the default) after repository
copy of apache -> apache12 and apache-current -> apache13.

Requested by:	ache
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.52 1998/06/06 19:09:23 ache Exp $
d25 1
d32 1
a32 1
OPTIM='-DDOCUMENT_LOCATION=\\"'${PREFIX}'/www/data/\\" \
@


1.52
log
@upgrade to 1.3.0
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.51 1998/06/05 17:16:01 ache Exp $
a16 2

NO_LATEST_LINK=	yes
@


1.51
log
@upgrade to 1.3b7
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.50 1998/04/22 16:28:43 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.3b7
PKGNAME=        apache-1.3b7
d14 1
a14 1
#PATCH_SITES=    ftp://www.apache.org/apache/dist/patches/apply_to_1.3b7/
@


1.50
log
@Fix PLIST
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.49 1998/04/22 12:39:33 asami Exp $
d9 2
a10 2
DISTNAME=       apache_1.3b6
PKGNAME=        apache-1.3b6
d14 1
a14 1
#PATCH_SITES=    ftp://www.apache.org/apache/dist/patches/apply_to_1.3b6/
d22 2
a23 1
	         --localstatedir=/var \
d25 1
@


1.49
log
@===>  Building package for apache-1.3b6
Creating package /usr/ports/packages/All/apache-1.3b6.tgz
Registering depends:.
Creating gzip'd tar ball in '/usr/ports/packages/All/apache-1.3b6.tgz'
tar: can't add file sbin/dbmmanage : No such file or directory
tar: can't add file sbin/htdigest : No such file or directory
tar: can't add file sbin/htpasswd : No such file or directory
*** Error code 1
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.48 1998/04/22 12:38:13 asami Exp $
a16 2

BROKEN=		package
@


1.48
log
@Minor cleanup -- HAS_CONFIGURE + "--prefix=${PREFIX}" -> GNU_CONFIGURE.
Also, don't use "+=" to define variable defined only once.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.47 1998/04/21 21:57:36 ache Exp $
d17 2
@


1.47
log
@Upgrade to 1.3b6, now with loadable modules!
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.46 1998/03/12 04:05:01 ache Exp $
d20 3
a22 3
HAS_CONFIGURE=  yes
CONFIGURE_ARGS+= --prefix=${PREFIX} \
		 --localstatedir=/var \
d30 1
a30 1
CONFIGURE_ENV+= \
@


1.46
log
@Add dist patches set locally since bsd.port.mk can't handle different base
directory per each dist patch
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.45 1998/02/25 06:23:55 asami Exp $
d9 2
a10 2
DISTNAME=       apache_1.3b5
PKGNAME=        apache-1.3b5
d14 1
a14 3
# bsd.port.mk can't handle different base directory per dist patch yet
#PATCH_SITES=    ftp://www.apache.org/apache/dist/patches/apply_to_1.3b5/
#PATCHFILES=     PR1847.patch PR1850.patch PR1889.patch
d20 13
a32 2
# Set it for local-supplied patch, f.e.
# VERS_ID = mods-1.0/me
d34 2
a35 52
post-patch:
	@@cd ${WRKSRC}/conf && \
	for I in access.conf-dist srm.conf-dist; do \
	    sed -e "s#@@@@ServerRoot@@@@#${PREFIX}/www#g" < $${I} > $${I}.new; \
	    mv $${I}.new $${I}; \
	done
	@@cd ${WRKSRC}/conf && \
	sed -e "s#@@@@ServerRoot@@@@#${PREFIX}/etc/apache#g" < \
		httpd.conf-dist > httpd.conf-dist.new && \
	mv httpd.conf-dist.new httpd.conf-dist
	@@${RM} -rf ${WRKSRC}/icons/CVS
.if defined(VERS_ID)
	@@cd ${WRKSRC}/src && \
	mv Configuration Configuration.old && \
	sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
	< Configuration.old > Configuration
.endif

CONF_DIR=   ${PREFIX}/etc/apache
MAN1=   apachectl.1 htpasswd.1
MAN8=   httpd.8

do-install:
	install -d -m 755 -o bin -g bin ${CONF_DIR} ${PREFIX}/www/data \
		${PREFIX}/www/icons ${PREFIX}/www/cgi-bin
	${INSTALL_PROGRAM} ${WRKSRC}/src/httpd ${PREFIX}/sbin
	cd ${WRKSRC}/src/support && \
		${INSTALL_PROGRAM} htdigest htpasswd logresolve rotatelogs \
		${PREFIX}/sbin
	cd ${WRKSRC}/src/support && \
		${INSTALL_SCRIPT} apachectl dbmmanage log_server_status \
		${PREFIX}/sbin
	${INSTALL_DATA} -o nobody ${WRKSRC}/icons/* ${PREFIX}/www/icons
	${INSTALL_MAN} ${WRKSRC}/src/support/httpd.8 \
		${PREFIX}/man/man8
	${INSTALL_MAN} ${WRKSRC}/src/support/htpasswd.1 \
		       ${WRKSRC}/src/support/apachectl.1 \
		${PREFIX}/man/man1
	cd ${WRKSRC} && \
	for file in httpd.conf srm.conf access.conf ; do \
	    if [ ! -f ${CONF_DIR}/$$file ] ; then \
		${INSTALL_DATA} conf/$$file-dist ${CONF_DIR}/$$file ; \
	    fi ; \
	    ${INSTALL_DATA} conf/$$file-dist ${CONF_DIR} ; \
	done
	cd ${WRKSRC} && \
	for file in mime.types magic ; do \
	    if [ ! -f ${CONF_DIR}/$$file ] ; then \
		${INSTALL_DATA} conf/$$file ${CONF_DIR} ; \
	    fi ; \
	    ${INSTALL_DATA} conf/$$file ${CONF_DIR}/$${file}-dist ; \
	done
@


1.45
log
@Define NO_LATEST_LINK.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.44 1998/02/20 11:08:40 ache Exp $
d14 1
d16 1
a16 2
#PATCHFILES=
#PATCH_DIST_ARGS= -d ${WRKSRC}/src/main -E -p0
@


1.44
log
@Upgrade to 1.3b5
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.43 1998/01/07 22:19:03 ache Exp $
d19 2
@


1.43
log
@Add official patch for //// attack
@
text
@d2 1
a2 1
# Version required:     1.3b3
d6 1
a6 1
# $Id: Makefile,v 1.42 1997/11/21 21:10:15 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.3b3
PKGNAME=        apache-1.3b3
d13 4
a16 3
PATCH_SITES=    ftp://www.apache.org/apache/dist/patches/apply_to_1.3b3/
PATCHFILES=     no2slash-loop-fix.patch
PATCH_DIST_ARGS= -d ${WRKSRC}/src/main -E -p0
@


1.42
log
@Upgrade to 1.3b3
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.41 1997/10/23 16:39:46 ache Exp $
d13 3
@


1.41
log
@Compile with -funsigned-char instead of (unsigned char) cast
and not replace Apache functions now
@
text
@d2 1
a2 1
# Version required:     1.3b2
d6 1
a6 1
# $Id: Makefile,v 1.39 1997/08/25 23:02:41 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.3b2
PKGNAME=        apache-1.3b2
d38 1
a38 1
MAN1=   htpasswd.1
d55 1
@


1.40
log
@Upgrade to 1.3b2, now with support files and docs installed
@
text
@a19 2
	@@cp /usr/include/md5.h ${WRKSRC}/src/main/freebsd_md5.h
	@@cp /usr/include/fnmatch.h ${WRKSRC}/src/main/freebsd_fnmatch.h
@


1.39
log
@Do not replace Apache md5 with FreeBSD one, it cause
support problems and gains almost nothing
@
text
@d2 1
a2 1
# Version required:     1.3a1
d6 1
a6 1
# $Id: Makefile,v 1.38 1997/08/13 15:09:53 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.3a1
PKGNAME=        apache-1.3a1
d19 13
a32 1
post-patch:
d38 34
@


1.38
log
@Tweak comment
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.37 1997/08/12 18:20:00 peter Exp $
a25 3

post-patch:
	${CP} /usr/include/md5.h ${WRKSRC}/src/md5.h
@


1.37
log
@Update the repository copied (with history) apache 1.2.1 to 1.3a1 from the
original apache-current port.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.1.1.1 1997/07/26 17:14:02 ache Exp $
a15 1
# User-controlled variable:
@


1.36
log
@The great apache shuffle, part 1.. Revive files and break out SSL..
@
text
@d2 1
a2 1
# Version required:     1.2.1
d4 1
a4 1
# Whom:                 erich@@rrnet.com
d6 1
a6 1
# $Id: Makefile,v 1.35 1997/07/08 13:04:09 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2.1
PKGNAME=        apache-1.2.1
d16 3
a18 10
# User-controlled variables list
# DIR_ACHE      - add SuppressHTMLPreamble option to directory index
#                 see http://www.nagual.ru/~ache/apache_dir.html
# SECURE_SERVER - build Apache with SSL

.if defined(DIR_ACHE)
PATCH_SITES+=   http://www.nagual.pp.ru/~ache/
PATCHFILES+=    dir.patch
VERS_ID=        dir/ache
.endif
d27 3
@


1.35
log
@Upgrade to 1.2.1
@
text
@d1 1
a1 1
# New ports collection makefile for:    apache HTTPD and HTTPSD
d6 1
a6 1
# $Id: Makefile,v 1.34 1997/06/06 13:45:07 ache Exp $
a13 1
.if !defined(SECURE_SERVER)
a14 3
.else
MAINTAINER=	markm@@freebsd.org
.endif
a34 31
.if defined(SECURE_SERVER)

BROKEN=		"SSLeay has changed, and the patches for apache need more work"
PKGNAME=        apache_SSL-1.1.1
MAIN_SRC=	${DISTNAME}${EXTRACT_SUFX}
SSL_EXTRAS=	${DISTNAME}+1.3.ssl${EXTRACT_SUFX}
DISTFILES=	${MAIN_SRC} ${SSL_EXTRAS}
MASTER_SITES+=  ftp://ftp.ox.ac.uk/pub/crypto/SSL/
EXTRACT_ONLY=	${MAIN_SRC}
MD5_FILE=	${FILESDIR}/md5.SSL
PATCHDIR=	${.CURDIR}/patches.SSL
PKGDIR=		${.CURDIR}/pkg.SSL
CONFIGURE_SCRIPT=	configure.SSL
DEPENDS=	${PORTSDIR}/security/SSLeay

post-extract:
	@@cd ${WRKSRC} && tar xzf ${DISTDIR}/${SSL_EXTRAS}

pre-patch:
	@@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch

post-install:
	@@if [ ! -f ${PREFIX}/etc/rc.d/apache_ssl.sh ]; then \
		echo "Installing ${PREFIX}/etc/rc.d/apache_ssl.sh startup file."; \
		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache_ssl.sh; \
		echo "[ -x /usr/local/sbin/httpsd ] && /usr/local/sbin/httpsd && echo -n ' httpsd'" >> ${PREFIX}/etc/rc.d/apache_ssl.sh; \
		chmod 751 ${PREFIX}/etc/rc.d/apache_ssl.sh; \
	fi

.else

a41 2

.endif
@


1.34
log
@Update to 1.2.0
@
text
@d2 1
a2 1
# Version required:     1.2.0
d6 1
a6 1
# $Id: Makefile,v 1.33 1997/05/31 20:34:09 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2.0
PKGNAME=        apache-1.2.0
@


1.33
log
@More fixing of OPTIM replacement
@
text
@d2 1
a2 1
# Version required:     1.2b11
d6 1
a6 1
# $Id: Makefile,v 1.30 1997/05/02 18:22:03 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b11
PKGNAME=        apache-1.2b11
@


1.32
log
@Fix OPTIM= patching
@
text
@d35 1
a35 1
	sed 's;^#*OPTIM=.*;& -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
@


1.31
log
@Upgrade to 1.2b11
@
text
@d35 1
a35 1
	sed 's;^OPTIM=.*;& -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
@


1.30
log
@Upgrade to 1.2b10
@
text
@d2 1
a2 1
# Version required:     1.2b10
d6 1
a6 1
# $Id: Makefile,v 1.29 1997/04/14 18:54:26 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b10
PKGNAME=        apache-1.2b10
d26 1
a26 1
PATCH_SITES+=   http://www.nagual.ru/~ache/
@


1.29
log
@Upgrade to 1.2b8
@
text
@d2 1
a2 1
# Version required:     1.2b8
d6 1
a6 1
# $Id: Makefile,v 1.28 1997/02/26 01:23:10 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b8
PKGNAME=        apache-1.2b8
@


1.28
log
@Upgrade to 1.2b7
@
text
@d2 1
a2 1
# Version required:     1.2b7
d6 1
a6 1
# $Id: Makefile,v 1.27 1997/01/28 05:39:31 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b7
PKGNAME=        apache-1.2b7
d14 5
a18 1
MAINTAINER=	ache@@freebsd.org
a41 1
MAINTAINER=	markm@@freebsd.org
@


1.27
log
@Upgrade to 1.2b6
@
text
@d2 1
a2 1
# Version required:     1.2b6
d6 1
a6 1
# $Id: Makefile,v 1.26 1997/01/02 16:39:55 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b6
PKGNAME=        apache-1.2b6
@


1.26
log
@Upgrade to 1.2b4
@
text
@d2 1
a2 1
# Version required:     1.2b4
d6 1
a6 1
# $Id: Makefile,v 1.25 1996/12/25 22:53:22 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b4
PKGNAME=        apache-1.2b4
@


1.25
log
@Upgrade to 1.2b3
Submitted by: mostly by peter
@
text
@d2 1
a2 1
# Version required:     1.2b3
d6 1
a6 1
# $Id: Makefile,v 1.24 1996/12/11 21:04:21 markm Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b3
PKGNAME=        apache-1.2b3
@


1.24
log
@Mark the SSL'ed version as BROKEN, until the official patches appear. Also
add myself as maintainer of the SSL version.
@
text
@d2 1
a2 1
# Version required:     1.2b2
d6 1
a6 1
# $Id: Makefile,v 1.23 1996/12/11 19:09:59 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.2b2
PKGNAME=        apache-1.2b2
d29 4
a32 4
	@@cd ${WRKSRC}/src; \
	mv httpd.h httpd.h.old; \
	sed 's=SERVER_VERSION *"\(.*\)"=SERVER_VERSION "\1 '"${VERS_ID}"'"=' \
	< httpd.h.old > httpd.h
@


1.23
log
@Upgrade to 1.2b2
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.22 1996/11/18 11:40:33 asami Exp $
d37 2
@


1.22
log
@Use MAN? macros.  CATEGORIES+= -> CATEGORIES.
@
text
@d2 1
a2 1
# Version required:     1.1.1
d6 1
a6 1
# $Id: Makefile,v 1.21 1996/11/07 01:53:14 ache Exp $
d9 2
a10 2
DISTNAME=       apache_1.1.1
PKGNAME=        apache-1.1.1
a16 2
# CHARSET_ACHE  - add charset negotiation to .var files and charset guessing
#                 see http://www.nagual.ru/~ache/apache_var.html
a18 2
# ALL_ACHE      - both patches from above
#
d21 1
a21 5
.if defined(ALL_ACHE)
CHARSET_ACHE=YES
DIR_ACHE=YES
.endif
.if defined(CHARSET_ACHE) || defined(DIR_ACHE)
a22 6
.endif
.if defined(CHARSET_ACHE)
PATCHFILES+=    mod.patch
VERS_ID1=       charset/
.endif
.if defined(DIR_ACHE)
d24 1
a24 4
VERS_ID2=       dir/
.endif
.if defined(VERS_ID1) || defined(VERS_ID2)
VERS_ID=        ${VERS_ID1}${VERS_ID2}ache
@


1.21
log
@Add information URLs comment
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.20 1996/11/07 01:49:46 ache Exp $
d11 1
a11 1
CATEGORIES+=	www
@


1.20
log
@Conditionalize all my patches
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.19 1996/10/31 17:42:13 markm Exp $
d17 6
a22 3
# CHARSET_ACHE - add charset negotiation to .var files and charset guessing
# DIR_ACHE - add SuppressHTMLPreamble option to directory index
# ALL_ACHE - both patches from above
@


1.19
log
@Uncomment the DEPENDS= line. Sheesh.
Reminded by:	ache
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.18 1996/10/26 18:49:52 markm Exp $
d15 33
@


1.18
log
@FINALLY - commit the SSL'ed version of this. (ye gods, this has been a while
:-) )
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.17 1996/08/11 14:49:21 markm Exp $
d28 1
a28 1
#DEPENDS=	${PORTSDIR}/security/SSLeay
@


1.17
log
@1) Add the ability to build a secure (SSL'ed) server, conditionalised
   on the presence of SECURE_SERVER.

2) Clean up the installation in accordance with BSD religion:
   Now all the configs go in ${PREFIX}/etc/apache and the
   data (documents) stay in ${PREFIX}/www.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.16 1996/07/12 10:27:53 asami Exp $
d17 1
d28 1
a28 1
DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
d35 10
a44 1
.endif
d53 2
@


1.16
log
@Remove unnecessary DISTFILES and EXTRACT_ONLY.

Remove pst's address from MAINTAINER, I don't know if any script
will fail if we have two addresses here so I don't want to risk
breaking something right before the release.
@
text
@d1 1
a1 1
# New ports collection makefile for:    apache HTTPD
d6 1
a6 1
# $Id: Makefile,v 1.15 1996/07/12 06:41:05 pst Exp $
d15 20
@


1.15
log
@...just changed maintainer to match reality
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.14 1996/07/11 11:03:17 ache Exp $
a12 1
DISTFILES=      ${DISTNAME}.tar.gz
d14 1
a14 3
MAINTAINER=	ache@@freebsd.org,pst@@freebsd.org

EXTRACT_ONLY=   ${DISTNAME}.tar.gz
@


1.14
log
@Upgrade to 1.1.1
OK-ed by: gpalmer
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.13 1996/06/15 17:51:08 jkh Exp $
d15 1
a15 1
MAINTAINER=	pst@@freebsd.org
@


1.13
log
@Slight revision:  If startup file already there, leave it alone.
@
text
@d2 1
a2 1
# Version required:     1.0.5
d6 1
a6 1
# $Id: Makefile,v 1.12 1996/06/15 16:58:06 jkh Exp $
d9 2
a10 2
DISTNAME=       apache_1.0.5
PKGNAME=        apache-1.0.5
d12 2
a13 3
MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
		ftp://www.apache.org/apache/dist/contrib/modules/
DISTFILES=      ${DISTNAME}.tar.gz mod_env.c
a17 3

post-extract:
	cp ${DISTDIR}/mod_env.c ${WRKSRC}/src
@


1.12
log
@Install an apache.sh startup file in /usr/local/etc/rc.d/

Now that apache_httpd is gone from /etc/sysconfig, this is the canonical
way to make apache start automatically in a new system installation.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.11 1996/05/20 07:37:06 asami Exp $
d24 6
a29 4
	@@echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."
	@@echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh
	@@echo "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && echo -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh
	@@chmod 751 ${PREFIX}/etc/rc.d/apache.sh
@


1.11
log
@Variable reorderization.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.10 1996/05/19 22:21:42 ache Exp $
d22 6
@


1.10
log
@Use mod_env.c to pass environment to CGI instead of local hack
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.9 1996/04/21 08:54:24 pst Exp $
d11 3
a14 4
EXTRACT_ONLY=   ${DISTNAME}.tar.gz
CATEGORIES+=	www
MASTER_SITES=	ftp://www.apache.org/apache/dist/
MASTER_SITES+=  ftp://www.apache.org/apache/dist/contrib/modules/
d17 2
@


1.9
log
@Update to Apache 1.0.5 (security fix)
@
text
@d1 2
a2 2
# New ports collection makefile for:    apache
# Version required:     1.0.3
d6 1
a6 1
# $Id: Makefile,v 1.8 1996/02/22 21:54:58 ache Exp $
d11 2
d15 1
a15 5
MASTER_SITES+=	ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/
MASTER_SITES+=	ftp://ftp.uni-regensburg.de/pub/comp/infosystems/www/daemons/apache/dist/
MASTER_SITES+=	ftp://Bond.edu.au/pub/apache/dist/
MASTER_SITES+=	ftp://sunsite.mff.cuni.cz/Net/Infosystems/WWW/Servers/Apache/dist/
MASTER_SITES+=	ftp://ftp.ast.cam.ac.uk/pub/WWW/apache/
d18 3
@


1.8
log
@Upgrade to 1.0.3
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.7 1996/02/07 03:15:26 jfieber Exp $
d9 2
a10 2
DISTNAME=       apache_1.0.3
PKGNAME=        apache-1.0.3
@


1.7
log
@Upgrade to 1.0.2.
@
text
@d2 1
a2 1
# Version required:     1
d6 1
a6 1
# $Id: Makefile,v 1.6 1995/12/04 12:56:18 jfieber Exp $
d9 2
a10 2
DISTNAME=	apache_1.0.2
PKGNAME=	apache-1.0.2
@


1.6
log
@Fix MASTER_SITES.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.5 1995/12/02 23:07:08 jfieber Exp $
d9 2
a10 2
DISTNAME=	apache_1.0.0
PKGNAME=	apache-1.0.0
@


1.5
log
@Update to 1.0
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.4 1995/11/27 04:10:09 asami Exp $
d12 6
a17 1
MASTER_SITES=	ftp://ftp.ast.cam.ac.uk/pub/WWW/apache/
@


1.4
log
@Change categories to "www".  gn has "net" in there too.
@
text
@d2 1
a2 1
# Version required:     08
d6 1
a6 1
# $Id: Makefile,v 1.3 1995/09/23 18:47:45 pst Exp $
d9 2
a10 2
DISTNAME=	apache_0.8.14
PKGNAME=	apache-0.8.14
@


1.3
log
@Upgrade apache to 0.8.14, completely restructure port, and list myself as
maintainer.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.1.1.1 1995/08/28 13:28:45 jkh Exp $
d11 1
a11 1
CATEGORIES+=	networking
@


1.2
log
@Upgrade apache to 0.8.13
@
text
@d2 1
a2 1
# Version required:     08.13
d9 2
a10 2
DISTNAME=	apache_0.8.13
PKGNAME=	apache-0.8.13
d13 2
@


1.1
log
@Initial revision
@
text
@d2 1
a2 1
# Version required:     08.11
d6 1
a6 1
# $Id$
d9 2
a10 2
DISTNAME=	apache_0.8.11
PKGNAME=	apache-0.8.11
@


1.1.1.1
log
@Port of the APACHE web server.
Submitted by:	"Eric L. Hernes" <erich@@lodgenet.com>
@
text
@@
