[153215] trunk/dports/php/php-uuid
ryandesign at macports.org
ryandesign at macports.org
Tue Sep 27 05:14:55 PDT 2016
Revision: 153215
https://trac.macports.org/changeset/153215
Author: ryandesign at macports.org
Date: 2016-09-27 05:14:55 -0700 (Tue, 27 Sep 2016)
Log Message:
-----------
php-uuid: update to 1.0.4 and add php70-uuid subport
Resolves #50021
Modified Paths:
--------------
trunk/dports/php/php-uuid/Portfile
trunk/dports/php/php-uuid/files/patch-osx_build.diff
Modified: trunk/dports/php/php-uuid/Portfile
===================================================================
--- trunk/dports/php/php-uuid/Portfile 2016-09-27 11:55:32 UTC (rev 153214)
+++ trunk/dports/php/php-uuid/Portfile 2016-09-27 12:14:55 UTC (rev 153215)
@@ -5,20 +5,20 @@
PortGroup php 1.1
name php-uuid
-version 1.0.3
+version 1.0.4
categories-append net www
platforms darwin
maintainers pixilla
-php.branches 5.3 5.4 5.5 5.6
+php.branches 5.3 5.4 5.5 5.6 7.0
php.pecl yes
description A wrapper around libuuid from the ext2utils project.
long_description ${description}
-checksums rmd160 5c49902e47b41cdd8e731fe88da2074818f6ac00 \
- sha256 6832c6453efec9800d2dc0bb9786cea02888378e88c15851f79210ef78369ef1
+checksums rmd160 5efc7fad2c43c029fa8a88e17356f3a8af9f5f8f \
+ sha256 63079b6a62a9d43691ecbcd4eb52e5e5fe17b5a3d0f8e46e3c17ff265c06a11f
use_parallel_build yes
Modified: trunk/dports/php/php-uuid/files/patch-osx_build.diff
===================================================================
--- trunk/dports/php/php-uuid/files/patch-osx_build.diff 2016-09-27 11:55:32 UTC (rev 153214)
+++ trunk/dports/php/php-uuid/files/patch-osx_build.diff 2016-09-27 12:14:55 UTC (rev 153215)
@@ -1,21 +1,18 @@
---- config.m4 2008-04-01 08:59:22.000000000 -0700
-+++ config.m4 2008-08-14 10:16:56.000000000 -0700
-@@ -8,16 +8,29 @@
- if test "$PHP_UUID" != "no"; then
- PHP_CHECK_FUNC_LIB(uuid_type, uuid)
- PHP_CHECK_FUNC_LIB(uuid_variant, uuid)
--
-+ PHP_CHECK_FUNC_LIB(uuid_time, uuid)
-+ PHP_CHECK_FUNC_LIB(uuid_mac, uuid)
-
+--- config.m4.orig 2015-05-08 09:51:01.000000000 -0500
++++ config.m4 2016-09-27 06:45:51.000000000 -0500
+@@ -21,16 +21,28 @@
PHP_ADD_INCLUDE($PHP_UUID_DIR/include)
+ PHP_CHECK_FUNC_LIB(uuid_type, uuid)
+ PHP_CHECK_FUNC_LIB(uuid_variant, uuid)
++ PHP_CHECK_FUNC_LIB(uuid_time, uuid)
++ PHP_CHECK_FUNC_LIB(uuid_mac, uuid)
export OLD_CPPFLAGS="$CPPFLAGS"
export CPPFLAGS="$CPPFLAGS $INCLUDES -DHAVE_UUID"
AC_CHECK_HEADER([uuid/uuid.h], [], AC_MSG_ERROR('uuid/uuid.h' header not found))
- PHP_SUBST(UUID_SHARED_LIBADD)
-- PHP_ADD_LIBRARY_WITH_PATH(uuid, $PHP_UUID_DIR/lib, UUID_SHARED_LIBADD)
+- PHP_ADD_LIBRARY_WITH_PATH(uuid, $PHP_UUID_DIR/$PHP_LIBDIR, UUID_SHARED_LIBADD)
+ AC_MSG_CHECKING(PHP version)
+ AC_TRY_COMPILE([], [
+#ifdef __APPLE__
@@ -25,53 +22,39 @@
+[],
+[export UUID_ON_MAC=true])
+
-+
+ if test $UUID_ON_MAC != "true"; then
+ PHP_SUBST(UUID_SHARED_LIBADD)
-+ PHP_ADD_LIBRARY_WITH_PATH(uuid, $PHP_UUID_DIR/lib, UUID_SHARED_LIBADD)
++ PHP_ADD_LIBRARY_WITH_PATH(uuid, $PHP_UUID_DIR/$PHP_LIBDIR, UUID_SHARED_LIBADD)
+ fi
export CPPFLAGS="$OLD_CPPFLAGS"
- export OLD_CPPFLAGS="$CPPFLAGS"
-@@ -35,7 +48,6 @@
- export CPPFLAGS="$OLD_CPPFLAGS"
-
-
- PHP_SUBST(UUID_SHARED_LIBADD)
AC_DEFINE(HAVE_UUID, 1, [ ])
PHP_NEW_EXTENSION(uuid, uuid.c , $ext_shared)
-diff -urp uuid-1.0.2/php_uuid.h uuid-1.0.2.mine/php_uuid.h
---- php_uuid.h 2008-04-01 08:59:22.000000000 -0700
-+++ php_uuid.h 2008-08-14 09:00:23.000000000 -0700
-@@ -145,6 +145,8 @@
- #endif
-
+--- php_uuid.h.orig 2015-05-08 09:51:01.000000000 -0500
++++ php_uuid.h 2016-09-27 07:07:15.000000000 -0500
+@@ -124,15 +124,19 @@
+ ZEND_END_ARG_INFO()
#endif /* HAVE_UUID_VARIANT */
-+
+
+#if HAVE_UUID_TIME
PHP_FUNCTION(uuid_time);
- #if (PHP_MAJOR_VERSION >= 5)
ZEND_BEGIN_ARG_INFO_EX(uuid_time_arg_info, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
-@@ -153,7 +155,9 @@
- #else /* PHP 4.x */
- #define uuid_time_arg_info NULL
- #endif
+ ZEND_ARG_INFO(0, uuid)
+ ZEND_END_ARG_INFO()
+#endif /* HAVE_UUID_TIME */
+#if HAVE_UUID_MAC
PHP_FUNCTION(uuid_mac);
- #if (PHP_MAJOR_VERSION >= 5)
ZEND_BEGIN_ARG_INFO_EX(uuid_mac_arg_info, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
-@@ -162,6 +166,7 @@
- #else /* PHP 4.x */
- #define uuid_mac_arg_info NULL
- #endif
+ ZEND_ARG_INFO(0, uuid)
+ ZEND_END_ARG_INFO()
+#endif /* HAVE_UUID_MAC */
PHP_FUNCTION(uuid_parse);
- #if (PHP_MAJOR_VERSION >= 5)
-@@ -185,6 +190,15 @@
+ ZEND_BEGIN_ARG_INFO_EX(uuid_parse_arg_info, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
+@@ -148,6 +152,14 @@
} // extern "C"
#endif
@@ -83,21 +66,27 @@
+#endif /* __MACOS__ */
+#endif /* UUID_TYPE_DCE_TIME */
+
-+
/* mirrored PHP Constants */
#define UUID_TYPE_DEFAULT 0
#define UUID_TYPE_TIME UUID_TYPE_DCE_TIME
-@@ -194,7 +208,7 @@
+@@ -157,8 +169,6 @@
#define UUID_TYPE_NULL -1
#define UUID_TYPE_INVALID -42
-#endif /* PHP_HAVE_UUID */
-+#endif /* HAVE_UUID */
+-
+ #if PHP_MAJOR_VERSION < 7
+ typedef long zend_long;
+ typedef int strsize;
+@@ -170,6 +180,8 @@
+ #define UUID_RETSTRL(a,l) RETURN_STRINGL(a,l)
+ #endif
++#endif /* HAVE_UUID */
++
#endif /* PHP_UUID_H */
-diff -urp uuid-1.0.2/tests/uuid_mac.phpt uuid-
-1.0.2.mine/tests/uuid_mac.phpt
+
--- tests/uuid_mac.phpt 2008-04-01 08:59:22.000000000 -0700
+++ tests/uuid_mac.phpt 2008-08-14 10:21:57.000000000 -0700
@@ -5,6 +5,8 @@
@@ -109,8 +98,6 @@
?>
--FILE--
<?php
-diff -urp uuid-1.0.2/tests/uuid_time.phpt uuid-
-1.0.2.mine/tests/uuid_time.phpt
--- tests/uuid_time.phpt 2008-04-01 08:59:22.000000000 -0700
+++ tests/uuid_time.phpt 2008-08-14 10:22:50.000000000 -0700
@@ -5,6 +5,8 @@
@@ -122,7 +109,6 @@
?>
--FILE--
<?php
-diff -urp uuid-1.0.2/uuid.c uuid-1.0.2.mine/uuid.c
--- uuid.c 2008-04-01 08:59:22.000000000 -0700
+++ uuid.c 2008-08-14 08:52:05.000000000 -0700
@@ -40,8 +40,12 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160927/0f093e43/attachment.html>
More information about the macports-changes
mailing list