[csw-devel] SF.net SVN: gar:[15751] csw/mgar/pkg/php5_apc/trunk

[bdwalton at users.sourceforge.net]

Revision: 15751
          http://gar.svn.sourceforge.net/gar/?rev=15751&view=rev
Author:   bdwalton
Date:     2011-09-25 23:53:02 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
php5_apc/trunk: drop old patch (struct changed, not needed); arrange to export NO_INTERACTION during test suite to make it skip interactive question; drop manual test target as no longer needed; test suite passing

Modified Paths:
--------------
    csw/mgar/pkg/php5_apc/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/php5_apc/trunk/files/apc_pool.diff

Modified: csw/mgar/pkg/php5_apc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_apc/trunk/Makefile	2011-09-25 17:16:20 UTC (rev 15750)
+++ csw/mgar/pkg/php5_apc/trunk/Makefile	2011-09-25 23:53:02 UTC (rev 15751)
@@ -17,9 +17,6 @@
 STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/
 STRIP_DIRS += $(PHP5ROOT)/bin
 
-PATCHFILES = apc_pool.diff
-PACKAGES = CSWphp5apc
-
 SPKG_SOURCEURL = http://us.php.net/apc/
 MASTER_SITES = http://pecl.php.net/package/apc/
 UFILES_REGEX = (\d+(?:\.\d+)*).tgz
@@ -36,15 +33,15 @@
 CONFIGURE_ARGS += --with-php-config=$(bindir)/php-config
 CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs
 
+# These should stop the test suite from asking to send results by
+# mail.
+NO_INTERACTION = 1
+EXTRA_TEST_EXPORTS = NO_INTERACTION
+
+TEST_TARGET = test
+
 post-extract-modulated:
 	@( cd $(WORKSRC) ; $(PHP_BIN)/phpize )
 	$(DONADA)
 
-TEST_SCRIPTS = manual
-
-test-manual:
-	@( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \
-		cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q )
-	$(DONADA)
-
 include gar/category.mk

Deleted: csw/mgar/pkg/php5_apc/trunk/files/apc_pool.diff
===================================================================
--- csw/mgar/pkg/php5_apc/trunk/files/apc_pool.diff	2011-09-25 17:16:20 UTC (rev 15750)
+++ csw/mgar/pkg/php5_apc/trunk/files/apc_pool.diff	2011-09-25 23:53:02 UTC (rev 15751)
@@ -1,11 +0,0 @@
---- ./apc_pool.c.orig	2009-02-18 15:11:37.456436248 -0600
-+++ ./apc_pool.c	2009-02-18 15:07:42.710261378 -0600
-@@ -43,7 +43,7 @@
-     unsigned char       *mark;
-     struct _pool_block  *next;
-     unsigned             :0; /* this should align to word */
--    unsigned char       data[0]; 
-+    unsigned char       data[]; 
- }pool_block;
- 
- /*

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