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

[bdwalton at users.sourceforge.net]

Revision: 13492
          http://gar.svn.sourceforge.net/gar/?rev=13492&view=rev
Author:   bdwalton
Date:     2011-02-27 21:57:50 +0000 (Sun, 27 Feb 2011)

Log Message:
-----------
apache2/branches/open-bug-squash: modify some /export/home strings in the manual and drop the checkpkg overrides for them

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

Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-02-27 21:52:45 UTC (rev 13491)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-02-27 21:57:50 UTC (rev 13492)
@@ -292,6 +292,12 @@
 			 perl -pi \
 			  -e 's@/usr/local/apache2*@/opt/csw/apache2 at g;' \
 			  -e 's@/usr/local@/opt/csw/apache2 at g')
+	@echo Fixing export/home references in the online manaual...
+	@(cd $(PKGROOT)/$(prefix)/apache2/share/manual; \
+		/opt/csw/bin/gfind . -type f -print0 | \
+		/opt/csw/bin/gxargs -0 \
+			 perl -pi \
+			  -e 's@/export/home@/home at g;')
 	@echo Fixing usr/local reference in the cgi-bin scripts
 	@(cd $(PKGROOT)/$(prefix)/apache2/share/cgi-bin; \
 		perl -pi -e 's@/usr/local/bin@/opt/csw/bin at g' *)

Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/checkpkg.mak
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/checkpkg.mak	2011-02-27 21:52:45 UTC (rev 13491)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/checkpkg.mak	2011-02-27 21:57:50 UTC (rev 13492)
@@ -364,14 +364,5 @@
 CHECKPKG_OVERRIDES_CSWapache2-devel += file-collision|/opt/csw/apache2/share/error/include/top.html|CSWapache2-devel|CSWapache2c
 CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-info.conf.CSW|CSWapache2|CSWapache2c
 
-CHECKPKG_OVERRIDES_CSWapache2-manual += file-with-bad-content|/export/home|root/opt/csw/apache2/share/manual/logs.html.en
-CHECKPKG_OVERRIDES_CSWapache2-manual += file-with-bad-content|/export/home|root/opt/csw/apache2/share/manual/logs.html.ja.utf8
-CHECKPKG_OVERRIDES_CSWapache2-manual += file-with-bad-content|/export/home|root/opt/csw/apache2/share/manual/logs.html.tr.utf8
-CHECKPKG_OVERRIDES_CSWapache2-manual += file-with-bad-content|/export/home|root/opt/csw/apache2/share/manual/logs.html.ko.euc-kr
-CHECKPKG_OVERRIDES_CSWapache2-manual += file-with-bad-content|/export/home|root/opt/csw/apache2/share/manual/mod/mod_ext_filter.html.ja.utf8
-CHECKPKG_OVERRIDES_CSWapache2-manual += file-with-bad-content|/export/home|root/opt/csw/apache2/share/manual/mod/mod_charset_lite.html.ko.euc-kr
-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/sbin/httpd.prefork
 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.