[pkgsrc/pkgsrc-2008Q4]: pkgsrc/geography/garmin-utils pullup ticket #2640 - r...

[rtr <rtr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8be8da02ca9e
branches:  pkgsrc-2008Q4
changeset: 552240:8be8da02ca9e
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Sun Jan 18 12:03:39 2009 +0000

description:
pullup ticket #2640 - requested by joerg
garmin-utils: build fix for newer netbsd

revisions pulled up:
pkgsrc/geography/garmin-utils/Makefile          1.8
pkgsrc/geography/garmin-utils/PLIST             1.3
pkgsrc/geography/garmin-utils/patches/patch-aa  1.4
pkgsrc/geography/garmin-utils/distinfo          1.8

   Module Name:    pkgsrc
   Committed By:   joerg
   Date:           Tue Jan 13 21:24:58 UTC 2009

   Modified Files:
           pkgsrc/geography/garmin-utils: Makefile PLIST
   Added Files:
           pkgsrc/geography/garmin-utils/patches: patch-aa

   Log Message:
   Use BSD Makefiles on Linux. Set USE_BSD_MAKEFILE. Add DESTDIR support.
   Tested by maintainer. Fixes PR 40390.

------------------------------------------------------------------------

   Module Name:    pkgsrc
   Committed By:   joerg
   Date:           Tue Jan 13 21:25:29 UTC 2009

   Modified Files:
           pkgsrc/geography/garmin-utils: distinfo

   Log Message:
   Regen for patch-aa.

diffstat:

 geography/garmin-utils/Makefile         |  22 ++++++++++------------
 geography/garmin-utils/PLIST            |   4 +++-
 geography/garmin-utils/distinfo         |   3 ++-
 geography/garmin-utils/patches/patch-aa |  14 ++++++++++++++
 4 files changed, 29 insertions(+), 14 deletions(-)

diffs (84 lines):

diff -r 3b0cdc5bff7e -r 8be8da02ca9e geography/garmin-utils/Makefile
--- a/geography/garmin-utils/Makefile   Sun Jan 18 11:55:28 2009 +0000
+++ b/geography/garmin-utils/Makefile   Sun Jan 18 12:03:39 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/11/12 13:37:36 gson Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2009/01/18 12:03:39 rtr Exp $
 #
 
 DISTNAME=              garmin-utils-2.4
@@ -9,23 +9,21 @@
 HOMEPAGE=              http://www.snafu.org/
 COMMENT=               Utilities for Garmin GPS receivers
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 ONLY_FOR_PLATFORM=     NetBSD-*-* Linux-*-*
 
-MAKE_FLAGS+=           MKCATPAGES=no
-INSTALLATION_DIRS=     bin lib ${PKGMANDIR}/man1
+INSTALLATION_DIRS=     bin lib ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
+
+USE_BSD_MAKEFILE=      yes
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${OPSYS} == "Linux")
-USE_TOOLS+=            gmake
-MAKE_FILE=             GNUmakefile
+CPPFLAGS.Linux=                -DLINUX
 
-do-install:
-                       ${INSTALL_PROGRAM} ${WRKSRC}/gardump/gardump ${PREFIX}/bin
-                       ${INSTALL_MAN} ${WRKSRC}/gardump/gardump.1 ${PREFIX}/${PKGMANDIR}/man1
-                       ${INSTALL_PROGRAM} ${WRKSRC}/garload/garload ${PREFIX}/bin
-                       ${INSTALL_MAN} ${WRKSRC}/garload/garload.1 ${PREFIX}/${PKGMANDIR}/man1
-                       ${INSTALL_LIB} ${WRKSRC}/lib/libgarmin.a ${PREFIX}/lib
+.if ${OPSYS} == "Linux"
+MAKE_FLAGS+=   SIO_TYPE=-DSIO_TYPE=Linux GPG_SERIAL_PORT=/dev/gps \
+               NEEDS_STRLCPY=1
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r 3b0cdc5bff7e -r 8be8da02ca9e geography/garmin-utils/PLIST
--- a/geography/garmin-utils/PLIST      Sun Jan 18 11:55:28 2009 +0000
+++ b/geography/garmin-utils/PLIST      Sun Jan 18 12:03:39 2009 +0000
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/08 20:47:54 gson Exp $
+@comment $NetBSD: PLIST,v 1.2.40.1 2009/01/18 12:03:40 rtr Exp $
 bin/gardump
 bin/garload
 lib/libgarmin.a
+man/cat1/gardump.0
+man/cat1/garload.0
 man/man1/gardump.1
 man/man1/garload.1
diff -r 3b0cdc5bff7e -r 8be8da02ca9e geography/garmin-utils/distinfo
--- a/geography/garmin-utils/distinfo   Sun Jan 18 11:55:28 2009 +0000
+++ b/geography/garmin-utils/distinfo   Sun Jan 18 12:03:39 2009 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2006/07/19 16:07:29 gson Exp $
+$NetBSD: distinfo,v 1.7.24.1 2009/01/18 12:03:40 rtr Exp $
 
 SHA1 (garmin-utils-2.4.tar.gz) = be2a95930745d84d5f1bffd91a2c01851c498bce
 RMD160 (garmin-utils-2.4.tar.gz) = cc3363d429c81a7e65d0287972bdaaac4b115812
 Size (garmin-utils-2.4.tar.gz) = 172650 bytes
+SHA1 (patch-aa) = c78988c80993ecd92c00f380dbd1222fa33fd846
diff -r 3b0cdc5bff7e -r 8be8da02ca9e geography/garmin-utils/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/geography/garmin-utils/patches/patch-aa   Sun Jan 18 12:03:39 2009 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.3.22.1 2009/01/18 12:03:40 rtr Exp $
+
+--- lib/Makefile.orig  2009-01-13 20:50:30.000000000 +0100
++++ lib/Makefile
+@@ -11,6 +11,8 @@ NOLINT=              yes
+ SRCS=         gps1.c gps2.c gpsdisplay.c gpsprod.c gpscap.c gpsdump.c \
+               gpsprint.c gpsversion.c gpsformat.c gpsload.c gpsfloat.c
+ 
+-install:
++.if ${OPSYS} == "Linux"
++SRCS+=                strlcpy.c
++.endif
+ 
+ .include <bsd.lib.mk>