[126691] trunk/dports/net/gpsd
ctreleaven at macports.org
ctreleaven at macports.org
Mon Oct 13 13:46:49 PDT 2014
Revision: 126691
https://trac.macports.org/changeset/126691
Author: ctreleaven at macports.org
Date: 2014-10-13 13:46:48 -0700 (Mon, 13 Oct 2014)
Log Message:
-----------
gpsd: update to 3.11, update patches
Modified Paths:
--------------
trunk/dports/net/gpsd/Portfile
trunk/dports/net/gpsd/files/patch-pkg-config.diff
Added Paths:
-----------
trunk/dports/net/gpsd/files/patch-SConstruct.diff
trunk/dports/net/gpsd/files/patch-gps.h-string.diff
Removed Paths:
-------------
trunk/dports/net/gpsd/files/SConstruct.patch
trunk/dports/net/gpsd/files/string.patch
Modified: trunk/dports/net/gpsd/Portfile
===================================================================
--- 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)
@@ -8,8 +8,7 @@
}
name gpsd
-version 3.5
-revision 4
+version 3.11
license BSD
categories net
maintainers nomaintainer
@@ -24,13 +23,15 @@
homepage http://www.catb.org/${name}/
master_sites savannah
-checksums rmd160 5d79e9bae1fa9d96c6104ebbec4386fbe1102a9a \
- sha256 5ebb0b00c49421eb8fbead81342e5ce63e82065e5ff27da586f10e342b999171
+checksums rmd160 1ec6f9bf50444a6cb0d4bed4dca8621a2f569102 \
+ sha256 ed66c6b6b1e2b4951de2c0b2399c22f77fe9f5927ef6b948dd8eb023ff53b7ee
depends_lib-append port:ncurses port:python27
depends_build-append port:scons
-patchfiles SConstruct.patch patch-pkg-config.diff string.patch
+patchfiles patch-SConstruct.diff \
+ patch-pkg-config.diff \
+ patch-gps.h-string.diff
use_configure no
Deleted: trunk/dports/net/gpsd/files/SConstruct.patch
===================================================================
--- 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)
@@ -1,28 +0,0 @@
---- 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), ))
-
Added: trunk/dports/net/gpsd/files/patch-SConstruct.diff
===================================================================
--- 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)
@@ -0,0 +1,29 @@
+$ 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), ))
+
Added: trunk/dports/net/gpsd/files/patch-gps.h-string.diff
===================================================================
--- 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)
@@ -0,0 +1,18 @@
+$ 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
Modified: trunk/dports/net/gpsd/files/patch-pkg-config.diff
===================================================================
--- 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)
@@ -1,20 +1,11 @@
---- libgps.pc.in.orig 2011-11-22 02:49:33.000000000 -0600
-+++ libgps.pc.in 2012-05-02 16:59:47.000000000 -0500
+$ 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=${exec_prefix}@libdir@
+-libdir=@libdir@
+libdir=${exec_prefix}/@libdir@
includedir=${prefix}/include
Name: GPSD
---- 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
Deleted: trunk/dports/net/gpsd/files/string.patch
===================================================================
--- 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)
@@ -1,17 +0,0 @@
---- 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141013/4aca2d79/attachment-0001.html>
More information about the macports-changes
mailing list