From eff33d58c93714a50157f53fccda3edbc87a8544 Mon Sep 17 00:00:00 2001 From: uriahheep Date: Thu, 17 Sep 2015 23:54:56 +0000 Subject: [PATCH 01/12] New package: pps-tools-20120407 --- srcpkgs/pps-tools-devel | 1 + srcpkgs/pps-tools/template | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 120000 srcpkgs/pps-tools-devel create mode 100644 srcpkgs/pps-tools/template diff --git a/srcpkgs/pps-tools-devel b/srcpkgs/pps-tools-devel new file mode 120000 index 00000000000..cfe4ea55cfa --- /dev/null +++ b/srcpkgs/pps-tools-devel @@ -0,0 +1 @@ +pps-tools \ No newline at end of file diff --git a/srcpkgs/pps-tools/template b/srcpkgs/pps-tools/template new file mode 100644 index 00000000000..96d2fdf973a --- /dev/null +++ b/srcpkgs/pps-tools/template @@ -0,0 +1,27 @@ +# Template file for 'pps-tools' + +_githash="0deb9c7e135e9380a6d09e9d2e938a146bb698c8" + +pkgname="pps-tools" +version="20120407" +revision=1 +build_style=gnu-makefile +short_desc="Tools for LinuxPPS (pulse-per-second)" +maintainer="uriahheep " +license="GPL-2" +homepage="http://linuxpps.org/wiki/index.php/Main_Page" +distfiles="https://github.com/ago/pps-tools/archive/${_githash}.tar.gz" +checksum="28d4e5aa845f659a6ab4174bbf579e22e2d2c87dc72fd6d07306a6a249c27c76" +wrksrc=pps-tools-$_githash + +do_install() { + mkdir -p ${DESTDIR}/usr/bin ${DESTDIR}/usr/include/sys + make DESTDIR=${DESTDIR} install +} + +pps-tools-devel_package() { + short_desc+=" - development files" + pkg_install() { + vmove usr/include + } +} From 95d374053e3cbb537450dbac1bc9bd9e94e02960 Mon Sep 17 00:00:00 2001 From: uriahheep Date: Fri, 18 Sep 2015 00:04:30 +0000 Subject: [PATCH 02/12] New package: gpsd-3.15 --- srcpkgs/gpsd-devel | 1 + srcpkgs/gpsd-python | 1 + srcpkgs/gpsd-qt | 1 + srcpkgs/gpsd-qt-devel | 1 + srcpkgs/gpsd-xgps | 1 + srcpkgs/gpsd/patches/musl-gpsmon-ctrl-l.patch | 38 +++++++ srcpkgs/gpsd/patches/musl-sockaddr.patch | 12 ++ srcpkgs/gpsd/patches/ncurses-pkgconfig.patch | 14 +++ srcpkgs/gpsd/template | 105 ++++++++++++++++++ 9 files changed, 174 insertions(+) create mode 120000 srcpkgs/gpsd-devel create mode 120000 srcpkgs/gpsd-python create mode 120000 srcpkgs/gpsd-qt create mode 120000 srcpkgs/gpsd-qt-devel create mode 120000 srcpkgs/gpsd-xgps create mode 100644 srcpkgs/gpsd/patches/musl-gpsmon-ctrl-l.patch create mode 100644 srcpkgs/gpsd/patches/musl-sockaddr.patch create mode 100644 srcpkgs/gpsd/patches/ncurses-pkgconfig.patch create mode 100644 srcpkgs/gpsd/template diff --git a/srcpkgs/gpsd-devel b/srcpkgs/gpsd-devel new file mode 120000 index 00000000000..f2e69cfb352 --- /dev/null +++ b/srcpkgs/gpsd-devel @@ -0,0 +1 @@ +gpsd \ No newline at end of file diff --git a/srcpkgs/gpsd-python b/srcpkgs/gpsd-python new file mode 120000 index 00000000000..f2e69cfb352 --- /dev/null +++ b/srcpkgs/gpsd-python @@ -0,0 +1 @@ +gpsd \ No newline at end of file diff --git a/srcpkgs/gpsd-qt b/srcpkgs/gpsd-qt new file mode 120000 index 00000000000..f2e69cfb352 --- /dev/null +++ b/srcpkgs/gpsd-qt @@ -0,0 +1 @@ +gpsd \ No newline at end of file diff --git a/srcpkgs/gpsd-qt-devel b/srcpkgs/gpsd-qt-devel new file mode 120000 index 00000000000..f2e69cfb352 --- /dev/null +++ b/srcpkgs/gpsd-qt-devel @@ -0,0 +1 @@ +gpsd \ No newline at end of file diff --git a/srcpkgs/gpsd-xgps b/srcpkgs/gpsd-xgps new file mode 120000 index 00000000000..f2e69cfb352 --- /dev/null +++ b/srcpkgs/gpsd-xgps @@ -0,0 +1 @@ +gpsd \ No newline at end of file diff --git a/srcpkgs/gpsd/patches/musl-gpsmon-ctrl-l.patch b/srcpkgs/gpsd/patches/musl-gpsmon-ctrl-l.patch new file mode 100644 index 00000000000..43b15e6c9eb --- /dev/null +++ b/srcpkgs/gpsd/patches/musl-gpsmon-ctrl-l.patch @@ -0,0 +1,38 @@ +From 95c99f69e026e8c57aecba545e51c97f3b284e75 Mon Sep 17 00:00:00 2001 +From: Gary E. Miller +Date: Tue, 23 Jun 2015 21:36:26 +0000 +Subject: Remove a BSD-ism. + +CTRL('L') is a BSD-ism. CTRL() is defined in sys/ttydefaults.h +which does not always exist. Instead of adding scons tests for +needing CTRL() and its include files just replace with a simple +constant. + +Needed for musl and found by Baruch Siach +--- +diff --git a/gpsmon.c b/gpsmon.c +index c3001c8..58c8300 100644 +--- a/gpsmon.c ++++ b/gpsmon.c +@@ -583,6 +583,9 @@ static void select_packet_monitor(struct gps_device_t *device) + (void)wnoutrefresh(devicewin); + } + ++/* Control-L character */ ++#define CTRL_L 0x0C ++ + static char *curses_get_command(void) + /* char-by-char nonblocking input, return accumulated command line on \n */ + { +@@ -591,7 +594,8 @@ static char *curses_get_command(void) + int c; + + c = wgetch(cmdwin); +- if (c == CTRL('L')) { ++ if (CTRL_L == c) { ++ /* ^L is to repaint the screen */ + (void)clearok(stdscr, true); + if (active != NULL && (*active)->initialize != NULL) + (void)(*active)->initialize(); +-- +cgit v0.9.0.2 diff --git a/srcpkgs/gpsd/patches/musl-sockaddr.patch b/srcpkgs/gpsd/patches/musl-sockaddr.patch new file mode 100644 index 00000000000..9caf0e1f6f6 --- /dev/null +++ b/srcpkgs/gpsd/patches/musl-sockaddr.patch @@ -0,0 +1,12 @@ +diff -urN gpsd-3.15-old/SConstruct gpsd-3.15-new/SConstruct +--- gpsd-3.15-old/SConstruct 2015-09-17 01:33:26.227445589 -0400 ++++ gpsd-3.15-new/SConstruct 2015-09-17 01:34:11.761522374 -0400 +@@ -613,7 +613,7 @@ + confdefs.append("#define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) + strlen((ptr)->sun_path))\n") + confdefs.append("#endif /* SUN_LEN */\n") + +- if config.CheckHeader(["bits/sockaddr.h", "linux/can.h"]): ++ if config.CheckHeader(["linux/can.h"]): + confdefs.append("#define HAVE_LINUX_CAN_H 1\n") + announce("You have kernel CANbus available.") + else: diff --git a/srcpkgs/gpsd/patches/ncurses-pkgconfig.patch b/srcpkgs/gpsd/patches/ncurses-pkgconfig.patch new file mode 100644 index 00000000000..7bbba0aff0e --- /dev/null +++ b/srcpkgs/gpsd/patches/ncurses-pkgconfig.patch @@ -0,0 +1,14 @@ +diff -urN gpsd-3.15-old/SConstruct gpsd-3.15-new/SConstruct +--- gpsd-3.15-old/SConstruct 2015-06-03 14:09:31.000000000 +0000 ++++ gpsd-3.15-new/SConstruct 2015-09-17 18:17:49.140818485 +0000 +@@ -539,8 +539,8 @@ + # are like FreeBSD. + ncurseslibs= [] + if env['ncurses']: +- if config.CheckPKG('ncurses'): +- ncurseslibs = pkg_config('ncurses') ++ if config.CheckPKG('ncursesw'): ++ ncurseslibs = pkg_config('ncursesw') + elif WhereIs('ncurses5-config'): + ncurseslibs = ['!ncurses5-config --libs --cflags'] + elif WhereIs('ncursesw5-config'): diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template new file mode 100644 index 00000000000..860805610ad --- /dev/null +++ b/srcpkgs/gpsd/template @@ -0,0 +1,105 @@ +# Template file for 'gpsd' +pkgname=gpsd +version=3.15 +revision=1 +build_style=scons +patch_args=-p1 +make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin udevdir=/usr/lib/udev" +make_install_args="${make_build_args}" +short_desc="A GPS/AIS receiver monitoring daemon" +maintainer="uriahheep " +license="BSD" +homepage="http://www.catb.org/gpsd/" +distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.gz" +checksum="81c89e271ae112313e68655ab30d227bc38fe7841ffbff0f1860b12a9d7696ea" +system_groups="gpsd" +system_accounts="gpsd" +gpsd_pgroup="gpsd" + +depends="virtual?ntp-daemon ncurses libusb libcap libbluetooth pps-tools" +hostmakedepends="scons pkg-config bc python libxslt xmlto asciidoc" +makedepends="libudev-devel ntp libusb-devel python-devel pygtk-devel ncurses-devel pps-tools-devel libcap-devel libbluetooth-devel" + +case "$XBPS_TARGET_MACHINE" in + *-musl) :;; + *) hostmakedepends+=" qt-devel" ;; +esac + +pre_build() { + unset CPPFLAGS +} + +pre_install() { + export DESTDIR=${DESTDIR} +} + +do_install() { + scons ${makejobs} CC=$CC CXX=$CXX CCFLAGS="$CFLAGS" \ + CXXFLAGS="$CXXFLAGS" LINKFLAGS="$LDFLAGS" \ + prefix=/usr destdir=${DESTDIR} DESTDIR=${DESTDIR} \ + ${make_install_args} udev-install +} + +gpsd-python_package() { + short_desc+=" - python tools/bindings" + depends="python gnuplot ${sourcepkg}>=${version}_${revision}" + pycompile_module="gpsd" + pkg_install() { + vmove usr/lib/python2.7 + vmove usr/bin/gegps + vmove usr/bin/gpscat + vmove usr/bin/gpsfake + vmove usr/bin/gpsprof + vmove usr/share/man/man1/gegps.1 + vmove usr/share/man/man1/gpscat.1 + vmove usr/share/man/man1/gpsfake.1 + vmove usr/share/man/man1/gpsprof.1 + } +} + +gpsd-xgps_package() { + short_desc+=" - PyGTK based clients" + depends="pygtk ${sourcepkg}-python>=${version}_${revision}" + pkg_install() { + vmove usr/bin/xgps + vmove usr/bin/xgpsspeed + vmove usr/share/man/man1/xgps* + } +} + +gpsd-qt_package() { + short_desc+=" - Qt bindings" + depends="qt ${sourcepkg}>=${version}_${revision}" + pkg_install() { + case "$XBPS_TARGET_MACHINE" in + *-musl) :;; + *) + vmove usr/lib/libQgpsmm.so.* + vmove usr/lib/pkgconfig/Qgpsmm.pc ;; + esac + vmove usr/share/man/*/libQgpsmm* + } +} + +gpsd-qt-devel_package() { + short_desc+=" - Qt development files" + depends="qt-devel ${sourcepkg}-devel>=${version}_${revision}" + pkg_install() { + case "$XBPS_TARGET_MACHINE" in + *-musl) :;; + *) + vmove usr/lib/libQgpsmm.so + vmove usr/lib/libQgpsmm.prl ;; + esac + } +} + +gpsd-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/*.so + } +} From fc8df5f242e218016520f2903fa249c0ddb6c7aa Mon Sep 17 00:00:00 2001 From: uriahheep Date: Fri, 18 Sep 2015 02:09:24 +0000 Subject: [PATCH 03/12] gpsd: try to solve build failures --- srcpkgs/gpsd/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index 860805610ad..0a587dd0c4b 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -73,11 +73,10 @@ gpsd-qt_package() { pkg_install() { case "$XBPS_TARGET_MACHINE" in *-musl) :;; + arm*) :;; *) - vmove usr/lib/libQgpsmm.so.* - vmove usr/lib/pkgconfig/Qgpsmm.pc ;; + vmove usr/lib/libQgpsmm.so.* ;; esac - vmove usr/share/man/*/libQgpsmm* } } @@ -88,8 +87,9 @@ gpsd-qt-devel_package() { case "$XBPS_TARGET_MACHINE" in *-musl) :;; *) - vmove usr/lib/libQgpsmm.so - vmove usr/lib/libQgpsmm.prl ;; + vmove usr/lib/pkgconfig/Qgpsmm.pc + vmove usr/lib/libQgpsmm.prl + vmove usr/share/man/man3/libQgpsmm.3 ;; esac } } From 80a5883299afe9f4307fe588c0318c9030235070 Mon Sep 17 00:00:00 2001 From: uriahheep Date: Fri, 18 Sep 2015 02:25:49 +0000 Subject: [PATCH 04/12] gpsd: rearrange files into proper packages --- srcpkgs/gpsd/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index 0a587dd0c4b..4d2ac19f970 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -38,6 +38,8 @@ do_install() { CXXFLAGS="$CXXFLAGS" LINKFLAGS="$LDFLAGS" \ prefix=/usr destdir=${DESTDIR} DESTDIR=${DESTDIR} \ ${make_install_args} udev-install + vlicense COPYING + vlicense AUTHORS } gpsd-python_package() { @@ -87,6 +89,7 @@ gpsd-qt-devel_package() { case "$XBPS_TARGET_MACHINE" in *-musl) :;; *) + vmove usr/lib/libQgpsmm.so vmove usr/lib/pkgconfig/Qgpsmm.pc vmove usr/lib/libQgpsmm.prl vmove usr/share/man/man3/libQgpsmm.3 ;; @@ -99,7 +102,7 @@ gpsd-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/*.so + vmove usr/lib/pkgconfig/libgps*.pc + vmove usr/lib/libgps.so } } From 13b37452deb8bcc1acabf845afb94c0818dd838d Mon Sep 17 00:00:00 2001 From: uriahheep Date: Fri, 18 Sep 2015 02:59:28 +0000 Subject: [PATCH 05/12] gpsd: added libs to common/shlibs --- common/shlibs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/shlibs b/common/shlibs index 56bc28ac32b..6eedce2e15c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -81,6 +81,7 @@ libmenuw.so.5 ncurses-libs-5.9_13 ignore libmenuw.so.6 ncurses-libs-5.8_1 ignore libobjc.so.4 libobjc-4.7.3_12 libgomp.so.1 libgomp-4.4.0_1 +libgps.so.22 gpsd-3.15_1 libmagic.so.1 libmagic-5.12_1 libbluetooth.so.3 libbluetooth-4.58_1 libwmf-0.2.so.7 libwmf-0.2.8.4_1 @@ -435,6 +436,7 @@ libdca.so.0 libdca-0.0.5_1 libmpeg2.so.0 libmpeg2-0.5.1_1 libmpeg2convert.so.0 libmpeg2-0.5.1_1 libmng.so.2 libmng-2.0.2_1 +libQgpsmm.so.22 gpsd-qt-3.15_1 libQtAssistantClient.so qt-4.5.3_1 libQtXmlPatterns.so.4 qt-4.5.3_1 libQtScriptTools.so.4 qt-4.5.3_1 From 3e305accc7fda07ebe1b20cc231c2e1c98b2d471 Mon Sep 17 00:00:00 2001 From: uriahheep Date: Fri, 18 Sep 2015 05:46:37 +0000 Subject: [PATCH 06/12] gpsd: make changes suggested by xtraeme --- srcpkgs/gpsd/template | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index 4d2ac19f970..2aa8e089346 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -4,17 +4,15 @@ version=3.15 revision=1 build_style=scons patch_args=-p1 -make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin udevdir=/usr/lib/udev" -make_install_args="${make_build_args}" +make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin udevdir=/usr/lib/udev CC=${CC}" +make_install_args="${make_build_args} udev_install" short_desc="A GPS/AIS receiver monitoring daemon" maintainer="uriahheep " license="BSD" homepage="http://www.catb.org/gpsd/" distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.gz" checksum="81c89e271ae112313e68655ab30d227bc38fe7841ffbff0f1860b12a9d7696ea" -system_groups="gpsd" system_accounts="gpsd" -gpsd_pgroup="gpsd" depends="virtual?ntp-daemon ncurses libusb libcap libbluetooth pps-tools" hostmakedepends="scons pkg-config bc python libxslt xmlto asciidoc" @@ -22,9 +20,15 @@ makedepends="libudev-devel ntp libusb-devel python-devel pygtk-devel ncurses-dev case "$XBPS_TARGET_MACHINE" in *-musl) :;; + arm*) make_build_args+=" python=0" ;; *) hostmakedepends+=" qt-devel" ;; esac +subpackages="gpsd-devel gpsd-python gpsd-xgps" +if [ -z "$CROSS_BUILD" ]; then + subpackages+=" gpsd-qt gpsd-qt-devel" +fi + pre_build() { unset CPPFLAGS } @@ -33,11 +37,7 @@ pre_install() { export DESTDIR=${DESTDIR} } -do_install() { - scons ${makejobs} CC=$CC CXX=$CXX CCFLAGS="$CFLAGS" \ - CXXFLAGS="$CXXFLAGS" LINKFLAGS="$LDFLAGS" \ - prefix=/usr destdir=${DESTDIR} DESTDIR=${DESTDIR} \ - ${make_install_args} udev-install +post_install() { vlicense COPYING vlicense AUTHORS } @@ -73,12 +73,7 @@ gpsd-qt_package() { short_desc+=" - Qt bindings" depends="qt ${sourcepkg}>=${version}_${revision}" pkg_install() { - case "$XBPS_TARGET_MACHINE" in - *-musl) :;; - arm*) :;; - *) - vmove usr/lib/libQgpsmm.so.* ;; - esac + vmove usr/lib/libQgpsmm.so.* ;; } } @@ -86,14 +81,10 @@ gpsd-qt-devel_package() { short_desc+=" - Qt development files" depends="qt-devel ${sourcepkg}-devel>=${version}_${revision}" pkg_install() { - case "$XBPS_TARGET_MACHINE" in - *-musl) :;; - *) - vmove usr/lib/libQgpsmm.so - vmove usr/lib/pkgconfig/Qgpsmm.pc - vmove usr/lib/libQgpsmm.prl - vmove usr/share/man/man3/libQgpsmm.3 ;; - esac + vmove usr/lib/libQgpsmm.so + vmove usr/lib/pkgconfig/Qgpsmm.pc + vmove usr/lib/libQgpsmm.prl + vmove usr/share/man/man3/libQgpsmm.3 ;; } } From 4e019430ec0220dac173047e8e8adc6d4dc402c2 Mon Sep 17 00:00:00 2001 From: uriahheep Date: Fri, 18 Sep 2015 05:50:54 +0000 Subject: [PATCH 07/12] gpsd: fix typoes and remove python packages from arm --- srcpkgs/gpsd/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index 2aa8e089346..d02fe169b14 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -24,9 +24,9 @@ case "$XBPS_TARGET_MACHINE" in *) hostmakedepends+=" qt-devel" ;; esac -subpackages="gpsd-devel gpsd-python gpsd-xgps" +subpackages="gpsd-devel" if [ -z "$CROSS_BUILD" ]; then - subpackages+=" gpsd-qt gpsd-qt-devel" + subpackages+=" gpsd-python gpsd-xgps gpsd-qt gpsd-qt-devel" fi pre_build() { @@ -73,7 +73,7 @@ gpsd-qt_package() { short_desc+=" - Qt bindings" depends="qt ${sourcepkg}>=${version}_${revision}" pkg_install() { - vmove usr/lib/libQgpsmm.so.* ;; + vmove usr/lib/libQgpsmm.so.* } } @@ -84,7 +84,7 @@ gpsd-qt-devel_package() { vmove usr/lib/libQgpsmm.so vmove usr/lib/pkgconfig/Qgpsmm.pc vmove usr/lib/libQgpsmm.prl - vmove usr/share/man/man3/libQgpsmm.3 ;; + vmove usr/share/man/man3/libQgpsmm.3 } } From a9224fd794f24d18b479b80bb4dd15980f09a144 Mon Sep 17 00:00:00 2001 From: uriahheep Date: Fri, 18 Sep 2015 06:02:31 +0000 Subject: [PATCH 08/12] gpsd: fix another typo and make more suggested changes --- srcpkgs/gpsd/template | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index d02fe169b14..e8c2a496964 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -5,7 +5,8 @@ revision=1 build_style=scons patch_args=-p1 make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin udevdir=/usr/lib/udev CC=${CC}" -make_install_args="${make_build_args} udev_install" +make_install_args="${make_build_args}" +make_install_target="udev_install" short_desc="A GPS/AIS receiver monitoring daemon" maintainer="uriahheep " license="BSD" @@ -18,15 +19,12 @@ depends="virtual?ntp-daemon ncurses libusb libcap libbluetooth pps-tools" hostmakedepends="scons pkg-config bc python libxslt xmlto asciidoc" makedepends="libudev-devel ntp libusb-devel python-devel pygtk-devel ncurses-devel pps-tools-devel libcap-devel libbluetooth-devel" -case "$XBPS_TARGET_MACHINE" in - *-musl) :;; - arm*) make_build_args+=" python=0" ;; - *) hostmakedepends+=" qt-devel" ;; -esac - subpackages="gpsd-devel" if [ -z "$CROSS_BUILD" ]; then subpackages+=" gpsd-python gpsd-xgps gpsd-qt gpsd-qt-devel" + hostmakedepends+=" qt-devel" +else + make_build_args+=" python=0" fi pre_build() { From e63892922fa2944af20dff7dd7b0216fde0f1f7b Mon Sep 17 00:00:00 2001 From: uriahheep Date: Fri, 18 Sep 2015 06:05:46 +0000 Subject: [PATCH 09/12] gpsd: fix a final typo (hopefully...) --- srcpkgs/gpsd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index e8c2a496964..af4d0cbd1cd 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -6,7 +6,7 @@ build_style=scons patch_args=-p1 make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin udevdir=/usr/lib/udev CC=${CC}" make_install_args="${make_build_args}" -make_install_target="udev_install" +make_install_target="udev-install" short_desc="A GPS/AIS receiver monitoring daemon" maintainer="uriahheep " license="BSD" From c41ef63ebc3d32071221ab4149a6bd41a32eb631 Mon Sep 17 00:00:00 2001 From: uriahheep Date: Fri, 18 Sep 2015 06:33:01 +0000 Subject: [PATCH 10/12] gpsd: remove unneeded dependencies --- srcpkgs/gpsd/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index af4d0cbd1cd..7d803353610 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -15,14 +15,13 @@ distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version} checksum="81c89e271ae112313e68655ab30d227bc38fe7841ffbff0f1860b12a9d7696ea" system_accounts="gpsd" -depends="virtual?ntp-daemon ncurses libusb libcap libbluetooth pps-tools" hostmakedepends="scons pkg-config bc python libxslt xmlto asciidoc" -makedepends="libudev-devel ntp libusb-devel python-devel pygtk-devel ncurses-devel pps-tools-devel libcap-devel libbluetooth-devel" +makedepends="libudev-devel ntp libusb-devel ncurses-devel pps-tools-devel libcap-devel libbluetooth-devel" subpackages="gpsd-devel" if [ -z "$CROSS_BUILD" ]; then subpackages+=" gpsd-python gpsd-xgps gpsd-qt gpsd-qt-devel" - hostmakedepends+=" qt-devel" + makedepends+=" qt-devel" else make_build_args+=" python=0" fi From 7a349fba697ae278d9f26bcb54a7c370690dc691 Mon Sep 17 00:00:00 2001 From: uriahheep Date: Fri, 18 Sep 2015 06:41:59 +0000 Subject: [PATCH 11/12] gpsd: re-add python-devel makedepend --- srcpkgs/gpsd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index 7d803353610..cb441246d16 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -21,7 +21,7 @@ makedepends="libudev-devel ntp libusb-devel ncurses-devel pps-tools-devel libcap subpackages="gpsd-devel" if [ -z "$CROSS_BUILD" ]; then subpackages+=" gpsd-python gpsd-xgps gpsd-qt gpsd-qt-devel" - makedepends+=" qt-devel" + makedepends+=" qt-devel python-devel" else make_build_args+=" python=0" fi From 6d8a072831bc0d36c28435fdf811d375be7cb202 Mon Sep 17 00:00:00 2001 From: uriahheep Date: Fri, 18 Sep 2015 07:08:18 +0000 Subject: [PATCH 12/12] gpsd: remove qt dependency for gpsd-qt --- srcpkgs/gpsd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index cb441246d16..b211c5b83f7 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -68,7 +68,7 @@ gpsd-xgps_package() { gpsd-qt_package() { short_desc+=" - Qt bindings" - depends="qt ${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/lib/libQgpsmm.so.* }