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

valholla at users.sourceforge.net valholla at users.sourceforge.net
Thu May 14 20:41:38 CEST 2009


Revision: 4851
          http://gar.svn.sourceforge.net/gar/?rev=4851&view=rev
Author:   valholla
Date:     2009-05-14 18:41:38 +0000 (Thu, 14 May 2009)

Log Message:
-----------
cleanup old files and rename GARNAME to php5

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

Removed Paths:
-------------
    csw/mgar/pkg/php5/trunk/files/config.diff
    csw/mgar/pkg/php5/trunk/files/extensions.mk

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2009-05-14 18:41:08 UTC (rev 4850)
+++ csw/mgar/pkg/php5/trunk/Makefile	2009-05-14 18:41:38 UTC (rev 4851)
@@ -1,6 +1,7 @@
-GARNAME    = php
+GARNAME    = php5
 GARVERSION = 5.2.9
 CATEGORIES = lang
+SF_PROJ = $(shell echo $(GARNAME) | sed -e 's/[0-9]//g')
 
 DESCRIPTION = A high-level scripting language.
 define BLURB
@@ -22,7 +23,7 @@
 
 MASTER_SITES   = http://us.php.net/distributions/
 SPKG_SOURCEURL = http://www.php.net/downloads.php
-DISTFILES     += $(GARNAME)-$(GARVERSION).tar.bz2
+DISTFILES     += $(SF_PROJ)-$(GARVERSION).tar.bz2
 
 INSTALL_ENV   += INSTALL_ROOT=$(DESTDIR)
 PHP5ROOT       = $(DESTDIR)$(prefix)/php5

Deleted: csw/mgar/pkg/php5/trunk/files/config.diff
===================================================================
--- csw/mgar/pkg/php5/trunk/files/config.diff	2009-05-14 18:41:08 UTC (rev 4850)
+++ csw/mgar/pkg/php5/trunk/files/config.diff	2009-05-14 18:41:38 UTC (rev 4851)
@@ -1,132 +0,0 @@
---- php-5.2.6/configure.orig	2009-03-02 19:48:06.545907523 -0600
-+++ php-5.2.6/configure	2009-03-02 19:44:49.225016959 -0600
-@@ -4714,7 +4714,7 @@
-   $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
- 
-   if test "$?" != "0"; then
--    APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
-+    APACHE_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option
-   else 
-     APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-     if test -z `$APXS -q SYSCONFDIR`; then
-@@ -4727,7 +4727,7 @@
-                       \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
-                        $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                              -S SYSCONFDIR='$APXS_SYSCONFDIR' \
--                             -i -a -n php5 $SAPI_SHARED"
-+                             -i -n php5 $SAPI_SHARED"
-     fi
-   fi
- 
-@@ -5875,7 +5875,7 @@
-                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
-                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                        -S SYSCONFDIR='$APXS_SYSCONFDIR' \
--                       -i -a -n php5"
-+                       -i -n php5"
-   fi
- 
-   case $host_alias in
-@@ -6723,7 +6723,7 @@
-                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
-                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                        -S SYSCONFDIR='$APXS_SYSCONFDIR' \
--                       -i -a -n php5"
-+                       -i -n php5"
-   fi
- 
-   case $host_alias in
-@@ -7740,7 +7740,7 @@
-   $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
- 
-   if test "$?" != "0"; then
--    APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
-+    APACHE_HOOKS_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option
-   else 
-     APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-     if test -z `$APXS -q SYSCONFDIR`; then
-@@ -7753,7 +7753,7 @@
-                       \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
-                        $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                              -S SYSCONFDIR='$APXS_SYSCONFDIR' \
--                             -i -a -n php5 $SAPI_SHARED"
-+                             -i -n php5 $SAPI_SHARED"
-     fi
-   fi
- 
-@@ -19871,7 +19871,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
--  for i in $PHP_LIBXML_DIR /usr/local /usr; do
-+  for i in $PHP_LIBXML_DIR /opt/csw /usr/local /usr; do
-     if test -x "$i/bin/xml2-config"; then
-       ac_cv_php_xml2_config_path="$i/bin/xml2-config"
-       break
-@@ -45789,7 +45789,7 @@
- 
-         if test "$found_iconv" = "no"; then
- 
--    for i in $PHP_ICONV /usr/local /usr; do
-+    for i in $PHP_ICONV /opt/csw /usr/local /usr; do
-       if test -r $i/include/giconv.h; then
-         cat >> confdefs.h <<\EOF
- #define HAVE_GICONV_H 1
-@@ -46270,7 +46270,7 @@
- 
-   if test "$iconv_avail" != "no"; then
-     if test -z "$ICONV_DIR"; then
--      for i in /usr/local /usr; do
-+      for i in /opt/csw /usr/local /usr; do
-         if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
-           PHP_ICONV_PREFIX="$i"
-           break
-@@ -68070,7 +68070,7 @@
-     echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6
- echo "configure:68072: checking for unixODBC support" >&5
-     if test "$PHP_UNIXODBC" = "yes"; then
--      PHP_UNIXODBC=/usr/local
-+      PHP_UNIXODBC=/opt/csw
-     fi
-     ODBC_INCDIR=$PHP_UNIXODBC/include
-     ODBC_LIBDIR=$PHP_UNIXODBC/$PHP_LIBDIR
-@@ -76646,8 +76646,8 @@
-   echo $ac_n "checking for pg_config""... $ac_c" 1>&6
- echo "configure:76648: checking for pg_config" >&5
-   for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
--    if test -x $i/pg_config; then
--      PG_CONFIG="$i/pg_config"
-+    if test -x $i/pg_config32; then
-+      PG_CONFIG="$i/pg_config32"
-       break;
-     fi
-   done
-@@ -79427,8 +79427,8 @@
-   echo $ac_n "checking for pg_config""... $ac_c" 1>&6
- echo "configure:79429: checking for pg_config" >&5
-   for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
--	if test -x $i/pg_config; then
--      PG_CONFIG="$i/pg_config"
-+	if test -x $i/pg_config32; then
-+      PG_CONFIG="$i/pg_config32"
-       break;
-     fi
-   done
-@@ -82574,7 +82574,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lreadline  $LIBS"
-+LIBS="-lreadline -lcurses $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 82580 "configure"
- #include "confdefs.h"
-@@ -102614,7 +102614,7 @@
-   else
-     echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6
- echo "configure:102617: checking for XMLRPC-EPI in default path" >&5
--    for i in /usr/local /usr; do
-+    for i in /opt/csw /usr/local /usr; do
-       if test -r $i/include/xmlrpc.h; then
-         XMLRPC_DIR=$i/include
-         echo "$ac_t""found in $i" 1>&6

Deleted: csw/mgar/pkg/php5/trunk/files/extensions.mk
===================================================================
--- csw/mgar/pkg/php5/trunk/files/extensions.mk	2009-05-14 18:41:08 UTC (rev 4850)
+++ csw/mgar/pkg/php5/trunk/files/extensions.mk	2009-05-14 18:41:38 UTC (rev 4851)
@@ -1,31 +0,0 @@
-
-# PHP Extensions
-XLIST  = bz2
-XLIST += curl
-XLIST += dba
-XLIST += ftp
-XLIST += gd
-XLIST += gettext
-XLIST += gmp
-XLIST += imap
-XLIST += ldap
-XLIST += mcrypt
-XLIST += mhash
-XLIST += mssql
-XLIST += mysql
-XLIST += mysqli
-XLIST += odbc
-XLIST += pdomysql
-XLIST += pdoodbc
-XLIST += pdopgsql
-XLIST += pdosqlite
-XLIST += pgsql
-XLIST += pspell
-XLIST += readline
-XLIST += snmp
-XLIST += sqlite
-XLIST += wddx
-XLIST += xsl
-
-DISTFILES += $(foreach N,$(XLIST),$(call admfiles,CSWphp5$(N),prototype))
-


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