svn commit: r313829 - in head/graphics/php-gdal: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sun Mar 10 14:54:52 2013
New Revision: 313829
URL: http://svnweb.freebsd.org/changeset/ports/313829

Log:
  - Add local patch to build with PHP 5.4
  - Add LICENSE
  - Change BUILD_DEPENDS to devel/swig20

Added:
  head/graphics/php-gdal/files/
  head/graphics/php-gdal/files/patch-gdal_wrap.cpp   (contents, props changed)
  head/graphics/php-gdal/files/patch-ogr_wrap.cpp   (contents, props changed)
  head/graphics/php-gdal/files/patch-osr_wrap.cpp   (contents, props changed)
Modified:
  head/graphics/php-gdal/Makefile

Modified: head/graphics/php-gdal/Makefile
==============================================================================
--- head/graphics/php-gdal/Makefile	Sun Mar 10 14:53:14 2013	(r313828)
+++ head/graphics/php-gdal/Makefile	Sun Mar 10 14:54:52 2013	(r313829)
@@ -12,13 +12,13 @@ PKGNAMEPREFIX=	php-
 MAINTAINER=	sunpoet at FreeBSD.org
 COMMENT=	PHP binding for GDAL
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
+LICENSE=	MIT
+
+BUILD_DEPENDS=	${LOCALBASE}/bin/swig2.0:${PORTSDIR}/devel/swig20
 LIB_DEPENDS=	gdal:${PORTSDIR}/graphics/gdal
 
 ALL_TARGET=	php_gdal.so php_gdalconst.so php_ogr.so php_osr.so
 CFLAGS+=	-I${LOCALBASE}/include -fPIC
-DEFAULT_PHP_VER=53
-IGNORE_WITH_PHP=5
 LIBTOOLFILES=	# empty
 MAKEFILE=	GNUmakefile
 PHP_MOD_NAME=	php_${PORTNAME}
@@ -29,6 +29,7 @@ USE_PHP_BUILD=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/swig/php
 
 post-patch:
+	@${REINPLACE_CMD} -e '/^SWIG = swig/ s|$$|2.0|' ${WRKSRC}/../SWIGmake.base
 	@${REINPLACE_CMD} -e 's|^CC=.*$$|CC=${CC}|; s|^CXX=.*$$|CXX=${CXX}|; s|^CFLAGS=.*$$|CFLAGS=${CFLAGS}|' ${WRKSRC}/${MAKEFILE}
 
 do-configure:

Added: head/graphics/php-gdal/files/patch-gdal_wrap.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/php-gdal/files/patch-gdal_wrap.cpp	Sun Mar 10 14:54:52 2013	(r313829)
@@ -0,0 +1,19 @@
+--- gdal_wrap.cpp.orig	2012-10-09 08:58:28.000000000 +0800
++++ gdal_wrap.cpp	2013-03-02 01:37:03.203201081 +0800
+@@ -932,7 +932,7 @@
+   p = value->ptr;
+   if (type==-1) return NULL;
+ 
+-  type_name=zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC);
++  type_name=(char *) zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC);
+ 
+   return SWIG_ZTS_ConvertResourceData(p, type_name, ty TSRMLS_CC);
+ }
+@@ -1423,6 +1423,7 @@
+     return;
+   }
+   if ( (*target)->type == IS_NULL ) {
++    TSRMLS_FETCH();
+     REPLACE_ZVAL_VALUE(target,o,1);
+     FREE_ZVAL(o);
+     return;

Added: head/graphics/php-gdal/files/patch-ogr_wrap.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/php-gdal/files/patch-ogr_wrap.cpp	Sun Mar 10 14:54:52 2013	(r313829)
@@ -0,0 +1,19 @@
+--- ogr_wrap.cpp.orig	2012-10-09 08:58:28.000000000 +0800
++++ ogr_wrap.cpp	2013-03-02 01:39:25.713195176 +0800
+@@ -932,7 +932,7 @@
+   p = value->ptr;
+   if (type==-1) return NULL;
+ 
+-  type_name=zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC);
++  type_name=(char *) zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC);
+ 
+   return SWIG_ZTS_ConvertResourceData(p, type_name, ty TSRMLS_CC);
+ }
+@@ -1343,6 +1343,7 @@
+     return;
+   }
+   if ( (*target)->type == IS_NULL ) {
++    TSRMLS_FETCH();
+     REPLACE_ZVAL_VALUE(target,o,1);
+     FREE_ZVAL(o);
+     return;

Added: head/graphics/php-gdal/files/patch-osr_wrap.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/php-gdal/files/patch-osr_wrap.cpp	Sun Mar 10 14:54:52 2013	(r313829)
@@ -0,0 +1,19 @@
+--- osr_wrap.cpp.orig	2012-10-09 08:58:28.000000000 +0800
++++ osr_wrap.cpp	2013-03-02 01:50:03.170201473 +0800
+@@ -932,7 +932,7 @@
+   p = value->ptr;
+   if (type==-1) return NULL;
+ 
+-  type_name=zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC);
++  type_name=(char *) zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC);
+ 
+   return SWIG_ZTS_ConvertResourceData(p, type_name, ty TSRMLS_CC);
+ }
+@@ -1147,6 +1147,7 @@
+     return;
+   }
+   if ( (*target)->type == IS_NULL ) {
++    TSRMLS_FETCH();
+     REPLACE_ZVAL_VALUE(target,o,1);
+     FREE_ZVAL(o);
+     return;