Module Name:	pkgsrc
Committed By:	agc
Date:		Mon Jul 26 07:22:52 UTC 2004

Modified Files:
	pkgsrc/doc [pkgsrc-2004Q2]: CHANGES-pkgsrc-2004Q2
	pkgsrc/www/apache2 [pkgsrc-2004Q2]: Makefile PLIST
Removed Files:
	pkgsrc/www/apache2 [pkgsrc-2004Q2]: PLIST.deffiles

Log Message:
Pullup ticket 63 to the pkgsrc-2004Q2 branch, requested by Grant Beattie

Complete ticket 57 - security fix for apache2

	Module Name:    pkgsrc
	Committed By:   adrianp
	Date:           Thu Jul 15 04:38:17 UTC 2004

	Modified Files:
		pkgsrc/www/apache2: Makefile PLIST
	Removed Files:
		pkgsrc/www/apache2: PLIST.deffiles

	Log Message:
	- Backout recent APACHE_DEFAULT_FILES build def as some ppl are having
	problems with it and it also looks like it might be breaking some
	apache related packages.


To generate a diff of this commit:
cvs rdiff -r1.1.2.28 -r1.1.2.29 pkgsrc/doc/CHANGES-pkgsrc-2004Q2
cvs rdiff -r1.36.2.1 -r1.36.2.2 pkgsrc/www/apache2/Makefile
cvs rdiff -r1.20.2.1 -r1.20.2.2 pkgsrc/www/apache2/PLIST
cvs rdiff -r1.1.2.1 -r0 pkgsrc/www/apache2/PLIST.deffiles

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.