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

[bdwalton at users.sourceforge.net]

Revision: 14172
          http://gar.svn.sourceforge.net/gar/?rev=14172&view=rev
Author:   bdwalton
Date:     2011-04-14 01:16:02 +0000 (Thu, 14 Apr 2011)

Log Message:
-----------
php5/trunk: no longer support apache 1.3

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/Makefile
    csw/mgar/pkg/php5/trunk/files/scripts.mk

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-04-14 01:02:38 UTC (rev 14171)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-04-14 01:16:02 UTC (rev 14172)
@@ -89,21 +89,15 @@
 PACKAGES += CSWphp5-xmlwriter
 PACKAGES += CSWphp5-xsl
 PACKAGES += CSWphp5-zip
-PACKAGES += CSWmod-php5
 
 BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils
 
-CATALOGNAME_CSWmod-php5 = mod_php5
-SPKG_DESC_CSWmod-php5 = The apache 1.3.x php5 module
-RUNTIME_DEP_PKGS_CSWmod-php5 = CSWphp5 CSWapache CSWlibxml2 CSWiconv
-RUNTIME_DEP_PKGS_CSWmod-php5 += CSWexpat CSWzlib
-OBSOLETED_BY_CSWmod-php5 = CSWmodphp5
-
 CATALOGNAME_CSWphp5        = php5
 SPKG_DESC_CSWphp5          = A High-Level Scripting Language
 RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2 CSWiconv CSWexpat CSWzlib
 INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase
-INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses
+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
@@ -408,8 +402,6 @@
 
 PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.*
 
-PKGFILES_CSWmod-php5 += $(prefix)/apache/.*
-
 PKGFILES_CSWphp5-bcmath = .*/lib/php/extensions/.*/bcmath.*
 
 PKGFILES_CSWphp5-bz2 = .*/lib/php/extensions/.*/bz2.*
@@ -660,8 +652,6 @@
 #ENABLE_CHECK = 0
 
 CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5
-CHECKPKG_OVERRIDES_CSWmod-php5 += surplus-dependency|CSWphp5
-CHECKPKG_OVERRIDES_CSWmod-php5 += surplus-dependency|CSWapache
 CHECKPKG_OVERRIDES_CSWphp5-pdo += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphp5-bcmath += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWphp5-gd += surplus-dependency|CSWphp5

Modified: csw/mgar/pkg/php5/trunk/files/scripts.mk
===================================================================
--- csw/mgar/pkg/php5/trunk/files/scripts.mk	2011-04-14 01:02:38 UTC (rev 14171)
+++ csw/mgar/pkg/php5/trunk/files/scripts.mk	2011-04-14 01:16:02 UTC (rev 14172)
@@ -16,7 +16,6 @@
 
 PI_SCRIPTS  = install-extras
 PI_SCRIPTS += install-ap2modphp5
-PI_SCRIPTS += install-modphp5
 PI_SCRIPTS += install-cleanup
 
 post-install-modulated: $(PI_SCRIPTS)
@@ -39,27 +38,13 @@
 	@$(MAKECOOKIE)
 
 install-ap2modphp5:
-	@echo "[====> Now Building ap2_modphp5 <====]"
-	if [ -f $(WORKSRC)/Makefile ]; then \
-		$(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi
-	cd $(WORKSRC) && $(BUILD_ENV) \
-		./configure $(CONFIGURE_ARGS) --with-apxs2=$(prefix)/apache2/sbin/apxs
-	$(GARBIN)/fixlibtool $(WORKSRC)
+	@echo "[====> Now Installing ap2_modphp5 <====]"
 	$(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
 	strip $(DESTDIR)$(prefix)/apache2/libexec/libphp5.so
 	ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
 	ginstall -m 0644 $(DOWNLOADDIR)/httpd-php5.conf.CSW $(DESTDIR)$(prefix)/apache2/etc/extra
 	@$(MAKECOOKIE)
 
-install-modphp5:
-	@echo "[====> Now Building mod_php5 <====]"
-	if [ -f $(WORKSRC)/Makefile ]; then $(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi
-	cd $(WORKSRC) && $(BUILD_ENV) ./configure $(CONFIGURE_ARGS) --with-apxs=$(prefix)/apache/bin/apxs
-	$(GARBIN)/fixlibtool $(WORKSRC)
-	$(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
-	strip $(DESTDIR)$(prefix)/apache/libexec/libphp5.so
-	@$(MAKECOOKIE)
-
 install-cleanup:
 	@echo "[====> Cleaning Up Extra Install Files <====]"
 	gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr


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