summaryrefslogtreecommitdiff
path: root/geography
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2009-02-22 22:07:52 +0000
committergdt <gdt@pkgsrc.org>2009-02-22 22:07:52 +0000
commit40f437ad91f58eacc511ad07f816db40a20269c2 (patch)
treef77731fd1fb25ec7ffbf97f785bd6402e28b51fa /geography
parent7969d824d8bc712a449f494d4957855c338449de (diff)
downloadpkgsrc-40f437ad91f58eacc511ad07f816db40a20269c2.tar.gz
On Linux, define NEEDS_STRLCPY in MAKE_ENV.
In the patched Makefile, switch on NEEDS_STRLCPY instead of OPSYS, because OPSYS isn't defined in my world (vanilla netbsd-5 on i386), and I can't find any reason it should be. Add a comment to the patch explaining why the install: target was removed, and about NEEDS_STRLCPY.
Diffstat (limited to 'geography')
-rw-r--r--geography/garmin-utils/Makefile15
-rw-r--r--geography/garmin-utils/distinfo4
-rw-r--r--geography/garmin-utils/patches/patch-aa12
3 files changed, 22 insertions, 9 deletions
diff --git a/geography/garmin-utils/Makefile b/geography/garmin-utils/Makefile
index a6e0a44a8d3..435b292afb1 100644
--- a/geography/garmin-utils/Makefile
+++ b/geography/garmin-utils/Makefile
@@ -1,35 +1,40 @@
-# $NetBSD: Makefile,v 1.11 2009/02/22 20:57:25 gdt Exp $
+# $NetBSD: Makefile,v 1.12 2009/02/22 22:07:52 gdt Exp $
#
DISTNAME= garmin-utils-2.5
+PKGREVISION= 1
CATEGORIES= geography
MASTER_SITES= ftp://ftp.snafu.org/pub/
MAINTAINER= gson@NetBSD.org
+# also gdt@NetBSD.org is helping
HOMEPAGE= http://www.snafu.org/
COMMENT= Utilities for Garmin GPS receivers
PKG_DESTDIR_SUPPORT= user-destdir
+# This seems excessive; on other ones it can be made to work.
ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-*
INSTALLATION_DIRS= bin lib ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
USE_BSD_MAKEFILE= yes
+MAKE_JOBS_SAFE= no
+
# No actual serial port will be right for any significant number of users,
# so make everyone use a symlink.
MAKE_FLAGS+= GPS_SERIAL_PORT=/dev/gps
-MAKE_JOBS_SAFE= no
-
.include "../../mk/bsd.prefs.mk"
CPPFLAGS.Linux= -DLINUX
.if ${OPSYS} == "Linux"
-MAKE_FLAGS+= SIO_TYPE=-DSIO_TYPE=Linux \
- NEEDS_STRLCPY=1
+MAKE_FLAGS+= SIO_TYPE=-DSIO_TYPE=Linux
+
+# On Linux, libc apparently does not have strlcpy.
+MAKE_FLAGS+= NEEDS_STRLCPY=1
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/geography/garmin-utils/distinfo b/geography/garmin-utils/distinfo
index 46f83b7310e..657a1b459af 100644
--- a/geography/garmin-utils/distinfo
+++ b/geography/garmin-utils/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2009/02/22 20:57:25 gdt Exp $
+$NetBSD: distinfo,v 1.11 2009/02/22 22:07:52 gdt Exp $
SHA1 (garmin-utils-2.5.tar.gz) = 1b7ee9936a691bf5e5466a3efd052f71dd3cb63c
RMD160 (garmin-utils-2.5.tar.gz) = c32dd4b9efaef80fb203059ac399e52d0cd86fbe
Size (garmin-utils-2.5.tar.gz) = 174336 bytes
-SHA1 (patch-aa) = 650305540171cea6b77b52acbffe89fd76901d20
+SHA1 (patch-aa) = 3a04f974bd0eae012977dc3a8090b19032463ce7
diff --git a/geography/garmin-utils/patches/patch-aa b/geography/garmin-utils/patches/patch-aa
index 1b58e9449b9..fd834e21157 100644
--- a/geography/garmin-utils/patches/patch-aa
+++ b/geography/garmin-utils/patches/patch-aa
@@ -1,4 +1,12 @@
-$NetBSD: patch-aa,v 1.5 2009/02/21 14:53:43 gdt Exp $
+$NetBSD: patch-aa,v 1.6 2009/02/22 22:07:52 gdt Exp $
+
+Remove empty install target, to let the standard rules install the
+library.
+
+If NEEDS_STRLCPY is defined in the make environment, as it will be on
+at least Linux, compile and link with the provided version of strlcpy.
+
+As of 2009-02-22 neither patch has been sent upstream.
--- lib/Makefile.orig 2009-01-13 20:50:30.000000000 +0100
+++ lib/Makefile
@@ -7,7 +15,7 @@ $NetBSD: patch-aa,v 1.5 2009/02/21 14:53:43 gdt Exp $
gpsprint.c gpsversion.c gpsformat.c gpsload.c gpsfloat.c
-install:
-+.if defined(OPSYS) && ${OPSYS} == "Linux"
++.if defined(NEEDS_STRLCPY)
+SRCS+= strlcpy.c
+.endif