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

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Mon Apr 18 02:15:54 CEST 2011


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

Log Message:
-----------
php5/trunk: move some overrides to -dev after fixing pkgfiles; update cswreleasenotes for -dev and main

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

Added Paths:
-----------
    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:11:36 UTC (rev 14305)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-04-18 00:15:54 UTC (rev 14306)
@@ -69,17 +69,12 @@
 INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5
 # 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/build/libtool.m4
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4
 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
 
-
 PACKAGES += CSWphp5-dev
 CATALOGNAME_CSWphp5-dev   = php5_dev
 SPKG_DESC_CSWphp5-dev     = Development files for php5
@@ -104,6 +99,10 @@
 PKGFILES_CSWphp5-dev += $(prefix)/php5/man/man1/php-config.1
 PKGFILES_CSWphp5-dev += $(prefix)/php5/man/man1/phpize.1
 CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5
+CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4
+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
 
 PACKAGES += CSWap2-modphp5
 CATALOGNAME_CSWap2-modphp5 = ap2_modphp5

Added: csw/mgar/pkg/php5/trunk/files/CSWphp5-dev.cswreleasenotes
===================================================================
--- csw/mgar/pkg/php5/trunk/files/CSWphp5-dev.cswreleasenotes	                        (rev 0)
+++ csw/mgar/pkg/php5/trunk/files/CSWphp5-dev.cswreleasenotes	2011-04-18 00:15:54 UTC (rev 14306)
@@ -0,0 +1,3 @@
+/usr/local references:
+	   php/build/* -> build stuff that doesn't matter
+	   PEAR/Config.php -> default for gpg if not in $PATH

Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.cswreleasenotes
===================================================================
--- csw/mgar/pkg/php5/trunk/files/CSWphp5.cswreleasenotes	2011-04-18 00:11:36 UTC (rev 14305)
+++ csw/mgar/pkg/php5/trunk/files/CSWphp5.cswreleasenotes	2011-04-18 00:15:54 UTC (rev 14306)
@@ -1,6 +1,4 @@
 /usr/local references:
 	   bin/php -> embeds 'magic' filetype info in the binary
 	   bin/php-cgi -> embeds 'magic' filetype info in the binary
-	   php/build/* -> build stuff that doesn't matter
 	   PEAR/Config.php -> default for gpg if not in $PATH
-	   man1/php-config.1 -> an example path


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


More information about the devel mailing list