[135077] trunk/dports/net/gpsd
ryandesign at macports.org
ryandesign at macports.org
Wed Apr 15 03:38:50 PDT 2015
Revision: 135077
https://trac.macports.org/changeset/135077
Author: ryandesign at macports.org
Date: 2015-04-15 03:38:50 -0700 (Wed, 15 Apr 2015)
Log Message:
-----------
gpsd: update to 3.14
Modified Paths:
--------------
trunk/dports/net/gpsd/Portfile
trunk/dports/net/gpsd/files/leopard-IPV6_TCLASS.patch
trunk/dports/net/gpsd/files/patch-SConstruct.diff
Added Paths:
-----------
trunk/dports/net/gpsd/files/patch-libgps.pc.in.diff
trunk/dports/net/gpsd/files/patch-libgpsd.pc.in.diff
Removed Paths:
-------------
trunk/dports/net/gpsd/files/patch-gps.h-string.diff
trunk/dports/net/gpsd/files/patch-pkg-config.diff
Modified: trunk/dports/net/gpsd/Portfile
===================================================================
--- trunk/dports/net/gpsd/Portfile 2015-04-15 09:48:57 UTC (rev 135076)
+++ trunk/dports/net/gpsd/Portfile 2015-04-15 10:38:50 UTC (rev 135077)
@@ -8,10 +8,10 @@
}
name gpsd
-version 3.11
+version 3.14
license BSD
categories net
-maintainers nomaintainer
+maintainers ryandesign maintainer
platforms darwin
description GPS service daemon
@@ -23,15 +23,15 @@
homepage http://www.catb.org/${name}/
master_sites savannah
-checksums rmd160 1ec6f9bf50444a6cb0d4bed4dca8621a2f569102 \
- sha256 ed66c6b6b1e2b4951de2c0b2399c22f77fe9f5927ef6b948dd8eb023ff53b7ee
+checksums rmd160 fe0059e2b3d64af5857f9c150ef2fdd6bc6e115f \
+ sha256 504fc812f3c1525a1a48e04bf4d77f9a8066c201448d98089df89d58ef53a8cb
depends_lib-append port:ncurses port:python27
depends_build-append port:scons
patchfiles patch-SConstruct.diff \
- patch-pkg-config.diff \
- patch-gps.h-string.diff \
+ patch-libgps.pc.in.diff \
+ patch-libgpsd.pc.in.diff \
leopard-IPV6_TCLASS.patch
use_configure no
Modified: trunk/dports/net/gpsd/files/leopard-IPV6_TCLASS.patch
===================================================================
--- trunk/dports/net/gpsd/files/leopard-IPV6_TCLASS.patch 2015-04-15 09:48:57 UTC (rev 135076)
+++ trunk/dports/net/gpsd/files/leopard-IPV6_TCLASS.patch 2015-04-15 10:38:50 UTC (rev 135077)
@@ -1,6 +1,6 @@
---- gpsd.c.orig 2014-12-31 17:27:26.000000000 -0800
-+++ gpsd.c 2014-12-31 17:31:10.000000000 -0800
-@@ -149,11 +149,13 @@ static struct gps_context_t context;
+--- gpsd.c.orig 2015-03-13 06:41:37.000000000 -0500
++++ gpsd.c 2015-04-15 05:28:28.000000000 -0500
+@@ -153,11 +153,13 @@
static int sd_socket_count = 0;
#endif
@@ -17,16 +17,16 @@
+# endif
#endif
-
-@@ -451,10 +453,12 @@ static socket_t passivesock_af(int af, c
+ #define UNALLOCATED_FD -1
+@@ -420,10 +422,12 @@
(void)close(s);
return -1;
}
+#ifdef IPV6_TCLASS
/* Set packet priority */
if (setsockopt(s, IPPROTO_IPV6, IPV6_TCLASS, &dscp, sizeof(dscp)) == -1)
- gpsd_report(context.debug, LOG_WARN,
- "Warning: SETSOCKOPT TOS failed\n");
+ gpsd_log(&context.errout, LOG_WARN,
+ "Warning: SETSOCKOPT TOS failed\n");
+#endif /* IPV6_TCLASS */
}
#endif /* S_SPLINT_S */
Modified: trunk/dports/net/gpsd/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/net/gpsd/files/patch-SConstruct.diff 2015-04-15 09:48:57 UTC (rev 135076)
+++ trunk/dports/net/gpsd/files/patch-SConstruct.diff 2015-04-15 10:38:50 UTC (rev 135077)
@@ -1,7 +1,6 @@
-$ 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 @@
+--- SConstruct.orig 2015-03-14 06:24:41.000000000 -0500
++++ SConstruct 2015-04-15 05:18:13.000000000 -0500
+@@ -522,7 +522,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)])
@@ -10,7 +9,7 @@
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 @@
+@@ -922,6 +922,7 @@
ilib_suffix = '.' + version + shlib_suffix
shlink_flags += [ '-current_version', '%s' % version,
'-compatibility_version', '%s' % version,
@@ -18,7 +17,7 @@
'-undefined', 'dynamic_lookup' ]
ilib = env.SharedLibrary(libname,lib_objs,
-@@ -1343,7 +1344,7 @@
+@@ -1397,7 +1398,7 @@
if qt_env:
binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib))
Deleted: trunk/dports/net/gpsd/files/patch-gps.h-string.diff
===================================================================
--- trunk/dports/net/gpsd/files/patch-gps.h-string.diff 2015-04-15 09:48:57 UTC (rev 135076)
+++ trunk/dports/net/gpsd/files/patch-gps.h-string.diff 2015-04-15 10:38:50 UTC (rev 135077)
@@ -1,18 +0,0 @@
-$ 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
Copied: trunk/dports/net/gpsd/files/patch-libgps.pc.in.diff (from rev 135040, trunk/dports/net/gpsd/files/patch-pkg-config.diff)
===================================================================
--- trunk/dports/net/gpsd/files/patch-libgps.pc.in.diff (rev 0)
+++ trunk/dports/net/gpsd/files/patch-libgps.pc.in.diff 2015-04-15 10:38:50 UTC (rev 135077)
@@ -0,0 +1,10 @@
+--- libgps.pc.in.orig 2015-01-25 06:09:01.000000000 -0600
++++ libgps.pc.in 2015-04-15 05:31:55.000000000 -0500
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=@libdir@
++libdir=${exec_prefix}/@libdir@
+ includedir=${prefix}/include
+
+ Name: GPSD
Added: trunk/dports/net/gpsd/files/patch-libgpsd.pc.in.diff
===================================================================
--- trunk/dports/net/gpsd/files/patch-libgpsd.pc.in.diff (rev 0)
+++ trunk/dports/net/gpsd/files/patch-libgpsd.pc.in.diff 2015-04-15 10:38:50 UTC (rev 135077)
@@ -0,0 +1,10 @@
+--- libgpsd.pc.in.orig 2015-01-23 12:48:09.000000000 -0600
++++ libgpsd.pc.in 2015-04-15 05:32:19.000000000 -0500
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}@libdir@
++libdir=${exec_prefix}/@libdir@
+ includedir=${prefix}/include
+
+ Name: libgpsd
Deleted: trunk/dports/net/gpsd/files/patch-pkg-config.diff
===================================================================
--- trunk/dports/net/gpsd/files/patch-pkg-config.diff 2015-04-15 09:48:57 UTC (rev 135076)
+++ trunk/dports/net/gpsd/files/patch-pkg-config.diff 2015-04-15 10:38:50 UTC (rev 135077)
@@ -1,11 +0,0 @@
-$ 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
-@@ -1,6 +1,6 @@
- prefix=@prefix@
- exec_prefix=${prefix}
--libdir=@libdir@
-+libdir=${exec_prefix}/@libdir@
- includedir=${prefix}/include
-
- Name: GPSD
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150415/2f420c77/attachment.html>
More information about the macports-changes
mailing list