<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[153215] trunk/dports/php/php-uuid</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/153215">153215</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2016-09-27 05:14:55 -0700 (Tue, 27 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>php-uuid: update to 1.0.4 and add php70-uuid subport
Resolves #50021</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsphpphpuuidPortfile">trunk/dports/php/php-uuid/Portfile</a></li>
<li><a href="#trunkdportsphpphpuuidfilespatchosx_builddiff">trunk/dports/php/php-uuid/files/patch-osx_build.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsphpphpuuidPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/php/php-uuid/Portfile (153214 => 153215)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,20 +5,20 @@
</span><span class="cx"> PortGroup php 1.1
</span><span class="cx">
</span><span class="cx"> name php-uuid
</span><del>-version 1.0.3
</del><ins>+version 1.0.4
</ins><span class="cx"> categories-append net www
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers pixilla
</span><span class="cx">
</span><del>-php.branches 5.3 5.4 5.5 5.6
</del><ins>+php.branches 5.3 5.4 5.5 5.6 7.0
</ins><span class="cx"> php.pecl yes
</span><span class="cx">
</span><span class="cx"> description A wrapper around libuuid from the ext2utils project.
</span><span class="cx">
</span><span class="cx"> long_description ${description}
</span><span class="cx">
</span><del>-checksums rmd160 5c49902e47b41cdd8e731fe88da2074818f6ac00 \
- sha256 6832c6453efec9800d2dc0bb9786cea02888378e88c15851f79210ef78369ef1
</del><ins>+checksums rmd160 5efc7fad2c43c029fa8a88e17356f3a8af9f5f8f \
+ sha256 63079b6a62a9d43691ecbcd4eb52e5e5fe17b5a3d0f8e46e3c17ff265c06a11f
</ins><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsphpphpuuidfilespatchosx_builddiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/php/php-uuid/files/patch-osx_build.diff (153214 => 153215)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,21 +1,18 @@
</span><del>---- 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)
-
</del><ins>+--- 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 @@
</ins><span class="cx"> PHP_ADD_INCLUDE($PHP_UUID_DIR/include)
</span><ins>+ 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)
</ins><span class="cx">
</span><span class="cx"> export OLD_CPPFLAGS="$CPPFLAGS"
</span><span class="cx"> export CPPFLAGS="$CPPFLAGS $INCLUDES -DHAVE_UUID"
</span><span class="cx"> AC_CHECK_HEADER([uuid/uuid.h], [], AC_MSG_ERROR('uuid/uuid.h' header not found))
</span><span class="cx"> - PHP_SUBST(UUID_SHARED_LIBADD)
</span><span class="cx">
</span><del>-- PHP_ADD_LIBRARY_WITH_PATH(uuid, $PHP_UUID_DIR/lib, UUID_SHARED_LIBADD)
</del><ins>+- PHP_ADD_LIBRARY_WITH_PATH(uuid, $PHP_UUID_DIR/$PHP_LIBDIR, UUID_SHARED_LIBADD)
</ins><span class="cx"> + AC_MSG_CHECKING(PHP version)
</span><span class="cx"> + AC_TRY_COMPILE([], [
</span><span class="cx"> +#ifdef __APPLE__
</span><span class="lines">@@ -25,53 +22,39 @@
</span><span class="cx"> +[],
</span><span class="cx"> +[export UUID_ON_MAC=true])
</span><span class="cx"> +
</span><del>-+
</del><span class="cx"> + if test $UUID_ON_MAC != "true"; then
</span><span class="cx"> + PHP_SUBST(UUID_SHARED_LIBADD)
</span><del>-+ PHP_ADD_LIBRARY_WITH_PATH(uuid, $PHP_UUID_DIR/lib, UUID_SHARED_LIBADD)
</del><ins>++ PHP_ADD_LIBRARY_WITH_PATH(uuid, $PHP_UUID_DIR/$PHP_LIBDIR, UUID_SHARED_LIBADD)
</ins><span class="cx"> + fi
</span><span class="cx"> export CPPFLAGS="$OLD_CPPFLAGS"
</span><span class="cx">
</span><del>- export OLD_CPPFLAGS="$CPPFLAGS"
-@@ -35,7 +48,6 @@
- export CPPFLAGS="$OLD_CPPFLAGS"
-
-
</del><span class="cx"> - PHP_SUBST(UUID_SHARED_LIBADD)
</span><span class="cx"> AC_DEFINE(HAVE_UUID, 1, [ ])
</span><span class="cx">
</span><span class="cx"> PHP_NEW_EXTENSION(uuid, uuid.c , $ext_shared)
</span><del>-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
-
</del><ins>+--- 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()
</ins><span class="cx"> #endif /* HAVE_UUID_VARIANT */
</span><del>-+
</del><ins>+
</ins><span class="cx"> +#if HAVE_UUID_TIME
</span><span class="cx"> PHP_FUNCTION(uuid_time);
</span><del>- #if (PHP_MAJOR_VERSION >= 5)
</del><span class="cx"> ZEND_BEGIN_ARG_INFO_EX(uuid_time_arg_info, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
</span><del>-@@ -153,7 +155,9 @@
- #else /* PHP 4.x */
- #define uuid_time_arg_info NULL
- #endif
</del><ins>+ ZEND_ARG_INFO(0, uuid)
+ ZEND_END_ARG_INFO()
</ins><span class="cx"> +#endif /* HAVE_UUID_TIME */
</span><span class="cx">
</span><span class="cx"> +#if HAVE_UUID_MAC
</span><span class="cx"> PHP_FUNCTION(uuid_mac);
</span><del>- #if (PHP_MAJOR_VERSION >= 5)
</del><span class="cx"> ZEND_BEGIN_ARG_INFO_EX(uuid_mac_arg_info, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
</span><del>-@@ -162,6 +166,7 @@
- #else /* PHP 4.x */
- #define uuid_mac_arg_info NULL
- #endif
</del><ins>+ ZEND_ARG_INFO(0, uuid)
+ ZEND_END_ARG_INFO()
</ins><span class="cx"> +#endif /* HAVE_UUID_MAC */
</span><span class="cx">
</span><span class="cx"> PHP_FUNCTION(uuid_parse);
</span><del>- #if (PHP_MAJOR_VERSION >= 5)
-@@ -185,6 +190,15 @@
</del><ins>+ ZEND_BEGIN_ARG_INFO_EX(uuid_parse_arg_info, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
+@@ -148,6 +152,14 @@
</ins><span class="cx"> } // extern "C"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -83,21 +66,27 @@
</span><span class="cx"> +#endif /* __MACOS__ */
</span><span class="cx"> +#endif /* UUID_TYPE_DCE_TIME */
</span><span class="cx"> +
</span><del>-+
</del><span class="cx"> /* mirrored PHP Constants */
</span><span class="cx"> #define UUID_TYPE_DEFAULT 0
</span><span class="cx"> #define UUID_TYPE_TIME UUID_TYPE_DCE_TIME
</span><del>-@@ -194,7 +208,7 @@
</del><ins>+@@ -157,8 +169,6 @@
</ins><span class="cx"> #define UUID_TYPE_NULL -1
</span><span class="cx"> #define UUID_TYPE_INVALID -42
</span><span class="cx">
</span><span class="cx"> -#endif /* PHP_HAVE_UUID */
</span><del>-+#endif /* HAVE_UUID */
</del><ins>+-
+ #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
</ins><span class="cx">
</span><ins>++#endif /* HAVE_UUID */
++
</ins><span class="cx"> #endif /* PHP_UUID_H */
</span><span class="cx">
</span><del>-diff -urp uuid-1.0.2/tests/uuid_mac.phpt uuid-
-1.0.2.mine/tests/uuid_mac.phpt
</del><ins>+
</ins><span class="cx"> --- tests/uuid_mac.phpt 2008-04-01 08:59:22.000000000 -0700
</span><span class="cx"> +++ tests/uuid_mac.phpt 2008-08-14 10:21:57.000000000 -0700
</span><span class="cx"> @@ -5,6 +5,8 @@
</span><span class="lines">@@ -109,8 +98,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> --FILE--
</span><span class="cx"> <?php
</span><del>-diff -urp uuid-1.0.2/tests/uuid_time.phpt uuid-
-1.0.2.mine/tests/uuid_time.phpt
</del><span class="cx"> --- tests/uuid_time.phpt 2008-04-01 08:59:22.000000000 -0700
</span><span class="cx"> +++ tests/uuid_time.phpt 2008-08-14 10:22:50.000000000 -0700
</span><span class="cx"> @@ -5,6 +5,8 @@
</span><span class="lines">@@ -122,7 +109,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> --FILE--
</span><span class="cx"> <?php
</span><del>-diff -urp uuid-1.0.2/uuid.c uuid-1.0.2.mine/uuid.c
</del><span class="cx"> --- uuid.c 2008-04-01 08:59:22.000000000 -0700
</span><span class="cx"> +++ uuid.c 2008-08-14 08:52:05.000000000 -0700
</span><span class="cx"> @@ -40,8 +40,12 @@
</span></span></pre>
</div>
</div>
</body>
</html>