[csw-devel] SF.net SVN: gar:[14308] csw/mgar/pkg/php5/trunk

[bdwalton at users.sourceforge.net]

Revision: 14308
          http://gar.svn.sourceforge.net/gar/?rev=14308&view=rev
Author:   bdwalton
Date:     2011-04-18 00:56:55 +0000 (Mon, 18 Apr 2011)

Log Message:
-----------
php5/trunk: move php-config.1 override of usr/local to -dev; update release notes

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/Makefile
    csw/mgar/pkg/php5/trunk/files/CSWphp5-dev.cswreleasenotes

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-04-18 00:17:25 UTC (rev 14307)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-04-18 00:56:55 UTC (rev 14308)
@@ -58,7 +58,6 @@
 RUNTIME_DEP_PKGS_CSWphp5-$(1) ?= CSWphp5 $(2)
 OBSOLETED_BY_CSWphp5-$(1) ?= CSWphp5$(1)
 PKGFILES_CSWphp5-$(1) ?= .*lib/php/extensions/.*/$(1).so .*php5/extensions/$(1)
-CHECKPKG_OVERRIDES_CSWphp5-$(1) += surplus-dependency|CSWphp5
 endef
 
 PACKAGES = CSWphp5
@@ -70,7 +69,6 @@
 # embeded 'magic' information to detect file types...odd, but...
 CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php
 CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1
 CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi
 # verify these...
 CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php.ini.CSW
@@ -103,6 +101,7 @@
 CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4
 CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool
 CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4
+CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1
 
 PACKAGES += CSWap2-modphp5
 CATALOGNAME_CSWap2-modphp5 = ap2_modphp5

Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5-dev.cswreleasenotes
===================================================================
--- csw/mgar/pkg/php5/trunk/files/CSWphp5-dev.cswreleasenotes	2011-04-18 00:17:25 UTC (rev 14307)
+++ csw/mgar/pkg/php5/trunk/files/CSWphp5-dev.cswreleasenotes	2011-04-18 00:56:55 UTC (rev 14308)
@@ -1,3 +1,4 @@
 /usr/local references:
 	   php/build/* -> build stuff that doesn't matter
 	   PEAR/Config.php -> default for gpg if not in $PATH
+	   man1/php-config.1 -> an example directory


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