[csw-devel] SF.net SVN: gar:[13484] csw/mgar/pkg/apache2/branches/open-bug-squash/ checkpkg.mak

[bdwalton at users.sourceforge.net]

Revision: 13484
          http://gar.svn.sourceforge.net/gar/?rev=13484&view=rev
Author:   bdwalton
Date:     2011-02-27 18:19:40 +0000 (Sun, 27 Feb 2011)

Log Message:
-----------
apache2/branches/open-bug-squash: drop checkpkg overrides for things that were patched out

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/open-bug-squash/checkpkg.mak

Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/checkpkg.mak
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/checkpkg.mak	2011-02-27 17:12:55 UTC (rev 13483)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/checkpkg.mak	2011-02-27 18:19:40 UTC (rev 13484)
@@ -1,4 +1,4 @@
-83;40003;0cCHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-info.conf.CSW|CSWapache2|CSWapache2c
+CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-info.conf.CSW|CSWapache2|CSWapache2c
 CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/etc/opt/csw/init.d/cswapache2|CSWapache2|CSWapache2c
 CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-autoindex.conf.CSW|CSWapache2|CSWapache2c
 CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-dav.conf.CSW|CSWapache2|CSWapache2c
@@ -492,9 +492,6 @@
 CHECKPKG_OVERRIDES_CSWapache2-manual += file-with-bad-content|/export/home|root/opt/csw/apache2/share/manual/mod/mod_charset_lite.html.en
 CHECKPKG_OVERRIDES_CSWapache2-manual += file-with-bad-content|/export/home|root/opt/csw/apache2/share/manual/mod/mod_ext_filter.html.en
 CHECKPKG_OVERRIDES_CSWapache2-manual += file-with-bad-content|/export/home|root/opt/csw/apache2/share/manual/mod/mod_ext_filter.html.ko.euc-kr
-CHECKPKG_OVERRIDES_CSWapache2 += file-with-bad-content|/usr/local|root/opt/csw/apache2/man/man1/htdbm.1
-CHECKPKG_OVERRIDES_CSWapache2 += file-with-bad-content|/usr/local|root/opt/csw/apache2/man/man1/htpasswd.1
-CHECKPKG_OVERRIDES_CSWapache2 += file-with-bad-content|/usr/local|root/opt/csw/apache2/man/man8/httpd.8
 CHECKPKG_OVERRIDES_CSWapache2 += file-with-bad-content|/usr/local|root/opt/csw/apache2/sbin/httpd.prefork
 CHECKPKG_OVERRIDES_CSWapache2 += file-with-bad-content|/usr/local|root/opt/csw/apache2/share/cgi-bin/printenv
 CHECKPKG_OVERRIDES_CSWap2worker += file-with-bad-content|/usr/local|root/opt/csw/apache2/sbin/httpd.worker


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.