CVS commit: [pkgsrc-2010Q2] pkgsrc/www

["Alistair G. Crooks" <agc%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   agc
Date:           Sun Jul  4 07:28:55 UTC 2010

Modified Files:
        pkgsrc/www [pkgsrc-2010Q2]: Makefile
        pkgsrc/www/ap2-cband [pkgsrc-2010Q2]: Makefile
        pkgsrc/www/ap2-fcgid [pkgsrc-2010Q2]: Makefile
        pkgsrc/www/ap22-dnssd [pkgsrc-2010Q2]: Makefile
        pkgsrc/www/cherokee [pkgsrc-2010Q2]: Makefile
        pkgsrc/www/emacs-w3m-snapshot [pkgsrc-2010Q2]: distinfo
        pkgsrc/www/lhs [pkgsrc-2010Q2]: PLIST
        pkgsrc/www/lhs/patches [pkgsrc-2010Q2]: patch-aa patch-ab patch-ac
        pkgsrc/www/lighttpd [pkgsrc-2010Q2]: options.mk
        pkgsrc/www/mknmz-wwwoffle [pkgsrc-2010Q2]: PLIST
        pkgsrc/www/nginx [pkgsrc-2010Q2]: options.mk
        pkgsrc/www/w3m [pkgsrc-2010Q2]: Makefile distinfo
        pkgsrc/www/w3m-img [pkgsrc-2010Q2]: Makefile
        pkgsrc/www/wwwcount [pkgsrc-2010Q2]: Makefile PLIST distinfo
        pkgsrc/www/wwwcount/patches [pkgsrc-2010Q2]: patch-ae
        pkgsrc/www/zope3 [pkgsrc-2010Q2]: Makefile distinfo
Added Files:
        pkgsrc/www/w3m/patches [pkgsrc-2010Q2]: patch-ac patch-ad
        pkgsrc/www/zope3/patches [pkgsrc-2010Q2]: patch-ad

Log Message:
Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching
error, and to sync with reality.


To generate a diff of this commit:
cvs rdiff -u -r1.731 -r1.731.2.1 pkgsrc/www/Makefile
cvs rdiff -u -r1.3 -r1.3.6.1 pkgsrc/www/ap2-cband/Makefile
cvs rdiff -u -r1.5 -r1.5.4.1 pkgsrc/www/ap2-fcgid/Makefile
cvs rdiff -u -r1.4 -r1.4.2.1 pkgsrc/www/ap22-dnssd/Makefile
cvs rdiff -u -r1.13 -r1.13.4.1 pkgsrc/www/cherokee/Makefile
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 pkgsrc/www/emacs-w3m-snapshot/distinfo
cvs rdiff -u -r1.1 -r1.1.64.1 pkgsrc/www/lhs/PLIST
cvs rdiff -u -r1.1 -r1.1.64.1 pkgsrc/www/lhs/patches/patch-aa \
    pkgsrc/www/lhs/patches/patch-ab pkgsrc/www/lhs/patches/patch-ac
cvs rdiff -u -r1.6 -r1.6.32.1 pkgsrc/www/lighttpd/options.mk
cvs rdiff -u -r1.1 -r1.1.64.1 pkgsrc/www/mknmz-wwwoffle/PLIST
cvs rdiff -u -r1.9 -r1.9.2.1 pkgsrc/www/nginx/options.mk
cvs rdiff -u -r1.57 -r1.57.4.1 pkgsrc/www/w3m/Makefile
cvs rdiff -u -r1.20 -r1.20.14.1 pkgsrc/www/w3m/distinfo
cvs rdiff -u -r1.19 -r1.19.4.1 pkgsrc/www/w3m-img/Makefile
cvs rdiff -u -r0 -r1.14.4.2 pkgsrc/www/w3m/patches/patch-ac
cvs rdiff -u -r0 -r1.8.4.2 pkgsrc/www/w3m/patches/patch-ad
cvs rdiff -u -r1.18 -r1.18.6.1 pkgsrc/www/wwwcount/Makefile
cvs rdiff -u -r1.4 -r1.4.10.1 pkgsrc/www/wwwcount/PLIST
cvs rdiff -u -r1.5 -r1.5.36.1 pkgsrc/www/wwwcount/distinfo
cvs rdiff -u -r1.4 -r1.4.66.1 pkgsrc/www/wwwcount/patches/patch-ae
cvs rdiff -u -r1.21 -r1.21.6.1 pkgsrc/www/zope3/Makefile
cvs rdiff -u -r1.6 -r1.6.26.1 pkgsrc/www/zope3/distinfo
cvs rdiff -u -r0 -r1.5.2.2 pkgsrc/www/zope3/patches/patch-ad

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