<!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>[126691] trunk/dports/net/gpsd</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/126691">126691</a></dd>
<dt>Author</dt> <dd>ctreleaven@macports.org</dd>
<dt>Date</dt> <dd>2014-10-13 13:46:48 -0700 (Mon, 13 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gpsd: update to 3.11, update patches</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetgpsdPortfile">trunk/dports/net/gpsd/Portfile</a></li>
<li><a href="#trunkdportsnetgpsdfilespatchpkgconfigdiff">trunk/dports/net/gpsd/files/patch-pkg-config.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsnetgpsdfilespatchSConstructdiff">trunk/dports/net/gpsd/files/patch-SConstruct.diff</a></li>
<li><a href="#trunkdportsnetgpsdfilespatchgpshstringdiff">trunk/dports/net/gpsd/files/patch-gps.h-string.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsnetgpsdfilesSConstructpatch">trunk/dports/net/gpsd/files/SConstruct.patch</a></li>
<li><a href="#trunkdportsnetgpsdfilesstringpatch">trunk/dports/net/gpsd/files/string.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetgpsdPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/gpsd/Portfile (126690 => 126691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/gpsd/Portfile 2014-10-13 20:34:27 UTC (rev 126690)
+++ trunk/dports/net/gpsd/Portfile 2014-10-13 20:46:48 UTC (rev 126691)
</span><span class="lines">@@ -8,8 +8,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> name gpsd
</span><del>-version 3.5
-revision 4
</del><ins>+version 3.11
</ins><span class="cx"> license BSD
</span><span class="cx"> categories net
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -24,13 +23,15 @@
</span><span class="cx"> homepage http://www.catb.org/${name}/
</span><span class="cx"> master_sites savannah
</span><span class="cx">
</span><del>-checksums rmd160 5d79e9bae1fa9d96c6104ebbec4386fbe1102a9a \
- sha256 5ebb0b00c49421eb8fbead81342e5ce63e82065e5ff27da586f10e342b999171
</del><ins>+checksums rmd160 1ec6f9bf50444a6cb0d4bed4dca8621a2f569102 \
+ sha256 ed66c6b6b1e2b4951de2c0b2399c22f77fe9f5927ef6b948dd8eb023ff53b7ee
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:ncurses port:python27
</span><span class="cx"> depends_build-append port:scons
</span><span class="cx">
</span><del>-patchfiles SConstruct.patch patch-pkg-config.diff string.patch
</del><ins>+patchfiles patch-SConstruct.diff \
+ patch-pkg-config.diff \
+ patch-gps.h-string.diff
</ins><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsnetgpsdfilesSConstructpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/net/gpsd/files/SConstruct.patch (126690 => 126691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/gpsd/files/SConstruct.patch 2014-10-13 20:34:27 UTC (rev 126690)
+++ trunk/dports/net/gpsd/files/SConstruct.patch 2014-10-13 20:46:48 UTC (rev 126691)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>---- SConstruct.orig 2012-04-14 08:36:18.000000000 -0500
-+++ SConstruct 2012-05-02 17:56:26.000000000 -0500
-@@ -397,7 +397,7 @@
- # use chrpath to edit this out of RPATH.
- if env["shared"]:
- env.Prepend(RPATH=[os.path.realpath(os.curdir)])
--else:
-+elif env.subst('$PLATFORM') != 'darwin':
- print "chrpath is not available, forcing static linking."
- env["shared"] = False
-
-@@ -700,6 +700,7 @@
- ilib_suffix = '.' + libgps_version + shlib_suffix
- shlink_flags += [ '-current_version', '%s' % libgps_version,
- '-compatibility_version', '%s' % libgps_version,
-+ '-install_name', '%s/%s/lib%s.%s.dylib' % (env['prefix'], env['libdir'], libname, libgps_version),
- '-undefined', 'dynamic_lookup' ]
-
- ilib = env.SharedLibrary(libname,lib_objs,
-@@ -1147,7 +1148,7 @@
- binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib))
-
- # We don't use installdir here in order to avoid having DESTDIR affect the rpath
--if env["shared"]:
-+if env["shared"] and env.subst('$PLATFORM') != 'darwin':
- env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \
- % (installdir('libdir', False), ))
-
</del></span></pre></div>
<a id="trunkdportsnetgpsdfilespatchSConstructdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/net/gpsd/files/patch-SConstruct.diff (0 => 126691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/gpsd/files/patch-SConstruct.diff (rev 0)
+++ trunk/dports/net/gpsd/files/patch-SConstruct.diff 2014-10-13 20:46:48 UTC (rev 126691)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+$ diff -u SConstruct SConstruct.orig
+--- SConstruct 2014-10-13 15:45:15.000000000 -0400
++++ SConstruct.orig 2014-10-13 15:45:33.000000000 -0400
+@@ -501,7 +501,7 @@
+ # here; it's a security risk. At install time we use
+ # chrpath to edit this out of RPATH.
+ env.Prepend(RPATH=[os.path.realpath(os.curdir)])
+- else:
++ elif env.subst('$PLATFORM') != 'darwin':
+ print "chrpath is not available; please build with chrpath=no."
+
+ confdefs = ["/* gpsd_config.h. Generated by scons, do not hand-hack. */\n"]
+@@ -874,6 +874,7 @@
+ ilib_suffix = '.' + version + shlib_suffix
+ shlink_flags += [ '-current_version', '%s' % version,
+ '-compatibility_version', '%s' % version,
++ '-install_name', '%s/%s/lib%s.%s.dylib' % (env['prefix'], env['libdir'], libname, '%s' % version),
+ '-undefined', 'dynamic_lookup' ]
+
+ ilib = env.SharedLibrary(libname,lib_objs,
+@@ -1343,7 +1344,7 @@
+ if qt_env:
+ binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib))
+
+-if env["shared"] and env["chrpath"]:
++if env["shared"] and env.subst('$PLATFORM') != 'darwin':
+ env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \
+ % (installdir('libdir', False), ))
+
</ins></span></pre></div>
<a id="trunkdportsnetgpsdfilespatchgpshstringdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/net/gpsd/files/patch-gps.h-string.diff (0 => 126691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/gpsd/files/patch-gps.h-string.diff (rev 0)
+++ trunk/dports/net/gpsd/files/patch-gps.h-string.diff 2014-10-13 20:46:48 UTC (rev 126691)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+$ diff -u gps.h.orig gps.h
+--- gps.h.orig 2014-10-13 16:00:01.000000000 -0400
++++ gps.h 2014-10-13 16:00:29.000000000 -0400
+@@ -2124,14 +2124,6 @@
+ #define strtok_r(s,d,p) strtok_s(s,d,p)
+ #endif
+
+-/* Some libcs don't have strlcat/strlcpy. Local copies are provided */
+-#ifndef HAVE_STRLCAT
+-size_t strlcat(/*@out@*/char *dst, /*@in@*/const char *src, size_t size);
+-#endif
+-#ifndef HAVE_STRLCPY
+-size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size);
+-#endif
+-
+ #ifdef __cplusplus
+ } /* End of the 'extern "C"' block */
+ #endif
</ins></span></pre></div>
<a id="trunkdportsnetgpsdfilespatchpkgconfigdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/gpsd/files/patch-pkg-config.diff (126690 => 126691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/gpsd/files/patch-pkg-config.diff 2014-10-13 20:34:27 UTC (rev 126690)
+++ trunk/dports/net/gpsd/files/patch-pkg-config.diff 2014-10-13 20:46:48 UTC (rev 126691)
</span><span class="lines">@@ -1,20 +1,11 @@
</span><del>---- libgps.pc.in.orig 2011-11-22 02:49:33.000000000 -0600
-+++ libgps.pc.in 2012-05-02 16:59:47.000000000 -0500
</del><ins>+$ diff -u libgps.pc.in.orig libgps.pc.in
+--- libgps.pc.in.orig 2014-10-13 16:24:36.000000000 -0400
++++ libgps.pc.in 2014-10-13 16:25:19.000000000 -0400
</ins><span class="cx"> @@ -1,6 +1,6 @@
</span><span class="cx"> prefix=@prefix@
</span><span class="cx"> exec_prefix=${prefix}
</span><del>--libdir=${exec_prefix}@libdir@
</del><ins>+-libdir=@libdir@
</ins><span class="cx"> +libdir=${exec_prefix}/@libdir@
</span><span class="cx"> includedir=${prefix}/include
</span><span class="cx">
</span><span class="cx"> Name: GPSD
</span><del>---- libgpsd.pc.in.orig 2011-11-22 02:49:33.000000000 -0600
-+++ libgpsd.pc.in 2012-05-02 16:59:37.000000000 -0500
-@@ -1,6 +1,6 @@
- prefix=@prefix@
- exec_prefix=${prefix}
--libdir=${exec_prefix}@libdir@
-+libdir=${exec_prefix}/@libdir@
- includedir=${prefix}/include
-
- Name: libgpsd
</del></span></pre></div>
<a id="trunkdportsnetgpsdfilesstringpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/net/gpsd/files/string.patch (126690 => 126691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/gpsd/files/string.patch 2014-10-13 20:34:27 UTC (rev 126690)
+++ trunk/dports/net/gpsd/files/string.patch 2014-10-13 20:46:48 UTC (rev 126691)
</span><span class="lines">@@ -1,17 +0,0 @@
</span><del>---- gps.h.orig 2013-08-11 22:22:02.000000000 -0700
-+++ gps.h 2013-08-11 22:24:03.000000000 -0700
-@@ -1798,14 +1798,6 @@ extern double wgs84_separation(double, d
- #define strtok_r(s,d,p) strtok_s(s,d,p)
- #endif
-
--/* Some libc's don't have strlcat/strlcpy. Local copies are provided */
--#ifndef HAVE_STRLCAT
--size_t strlcat(/*@out@*/char *dst, /*@in@*/const char *src, size_t size);
--#endif
--#ifndef HAVE_STRLCPY
--size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size);
--#endif
--
- #ifdef __cplusplus
- } /* End of the 'extern "C"' block */
- #endif
</del></span></pre>
</div>
</div>
</body>
</html>