diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2012-01-15 16:20:02 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2012-01-15 16:20:02 +0000 |
| commit | b0062dfa3cc1ded2413e1ee54152f61c458112b4 (patch) | |
| tree | f9ad76ae44641309a3b9e957e2bf6e4fb9531ad1 /astro | |
| parent | - Update to 0.14 (diff) | |
- Update to 3.4
Submitted by: glebius (maintainer)
Diffstat (limited to 'astro')
| -rw-r--r-- | astro/gpsd/Makefile | 4 | ||||
| -rw-r--r-- | astro/gpsd/distinfo | 4 | ||||
| -rw-r--r-- | astro/gpsd/files/patch-SConstruct | 10 | ||||
| -rw-r--r-- | astro/gpsd/files/patch-libgps.h | 10 | ||||
| -rw-r--r-- | astro/gpsd/pkg-plist | 2 |
5 files changed, 22 insertions, 8 deletions
diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile index 9943a068a487..ea6ec96a9c38 100644 --- a/astro/gpsd/Makefile +++ b/astro/gpsd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gpsd -PORTVERSION= 3.3 +PORTVERSION= 3.4 CATEGORIES= astro geography MASTER_SITES= SAVANNAH @@ -26,7 +26,7 @@ PYDISTUTILS_EGGINFO= gps-${PORTVERSION}.egg-info MAKE_JOBS_SAFE= yes SCONS_BUILDENV= ${SCONS_ENV} -SCONS_ARGS= prefix="${PREFIX}" mandir="/man" pkgconfig="/libdata/pkgconfig" +SCONS_ARGS= prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" MAN1= cgps.1 gegps.1 gps.1 gpscat.1 gpsctl.1 gpsdecode.1 \ gpsfake.1 gpspipe.1 gpsprof.1 xgps.1 xgpsspeed.1 \ diff --git a/astro/gpsd/distinfo b/astro/gpsd/distinfo index 700841a91b9e..822a507d322d 100644 --- a/astro/gpsd/distinfo +++ b/astro/gpsd/distinfo @@ -1,2 +1,2 @@ -SHA256 (gpsd-3.3.tar.gz) = 1dbc1813f94f7f05fbf3341bf0154bae26903d1fb90c33b63d5458373ea931b9 -SIZE (gpsd-3.3.tar.gz) = 1401206 +SHA256 (gpsd-3.4.tar.gz) = 79f7de9ead63c7f5d2c9a92e85b5f82e53323c4d451ef8e27ea265ac3ef9a70f +SIZE (gpsd-3.4.tar.gz) = 1422890 diff --git a/astro/gpsd/files/patch-SConstruct b/astro/gpsd/files/patch-SConstruct index 6fa45500121a..0df663e19370 100644 --- a/astro/gpsd/files/patch-SConstruct +++ b/astro/gpsd/files/patch-SConstruct @@ -1,6 +1,6 @@ ---- SConstruct.orig 2011-10-26 07:05:02.000000000 +0400 -+++ SConstruct 2011-10-26 16:22:43.000000000 +0400 -@@ -385,12 +385,7 @@ +--- SConstruct.orig 2012-01-12 20:41:41.000000000 +0400 ++++ SConstruct 2012-01-14 03:42:13.000000000 +0400 +@@ -423,14 +423,7 @@ # are like FreeBSD. ncurseslibs= [] if env['ncurses']: @@ -10,11 +10,13 @@ - ncurseslibs = ['!ncurses5-config --libs --cflags'] - elif sys.platform.startswith('freebsd'): - ncurseslibs= [ '-lncurses' ] +- elif sys.platform.startswith('openbsd'): +- ncurseslibs= [ '-lcurses' ] + ncurseslibs= [ '-lncurses' ] if env['usb']: # In FreeBSD except version 7, USB libraries are in the base system -@@ -1111,7 +1106,7 @@ +@@ -1150,7 +1143,7 @@ if not env['python']: python_install = [] else: diff --git a/astro/gpsd/files/patch-libgps.h b/astro/gpsd/files/patch-libgps.h new file mode 100644 index 000000000000..e4cf6b7ec4f0 --- /dev/null +++ b/astro/gpsd/files/patch-libgps.h @@ -0,0 +1,10 @@ +--- libgps.h.orig 2011-11-22 12:49:33.000000000 +0400 ++++ libgps.h 2012-01-15 16:48:21.469612990 +0400 +@@ -21,6 +21,7 @@ + #ifdef DBUS_EXPORT_ENABLE + dbus, + #endif /* DBUS_EXPORT_ENABLE */ ++ dummy, /* so it compiles when all exports are disabled */ + }; + + /* values to poke in the gps_fd member if we get it via something special */ diff --git a/astro/gpsd/pkg-plist b/astro/gpsd/pkg-plist index 459b3c99d36c..db695039f22f 100644 --- a/astro/gpsd/pkg-plist +++ b/astro/gpsd/pkg-plist @@ -13,6 +13,7 @@ bin/xgpsspeed %%CURSES%%bin/gpsmon include/gps.h include/libgpsmm.h +%%QTBIND%%lib/libQgpsmm.prl %%QTBIND%%lib/libQgpsmm.so %%QTBIND%%lib/libQgpsmm.so.20 %%QTBIND%%lib/libQgpsmm.so.20.0 @@ -43,6 +44,7 @@ lib/libgpsd.so.20.0.0 %%PYTHON_SITELIBDIR%%/gps/misc.pyo %%PYTHON_SITELIBDIR%%/gps/packet.so @dirrm %%PYTHON_SITELIBDIR%%/gps +%%QTBIND%%libdata/pkgconfig/Qgpsmm.pc libdata/pkgconfig/libgps.pc libdata/pkgconfig/libgpsd.pc sbin/gpsd |