pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/geography/garmin-utils Use BSD Makefiles on Linux. Set...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fab6ab94056c
branches:  trunk
changeset: 553067:fab6ab94056c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jan 13 21:24:58 2009 +0000

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

diffstat:

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

diffs (73 lines):

diff -r cfb1765fcae3 -r fab6ab94056c geography/garmin-utils/Makefile
--- a/geography/garmin-utils/Makefile   Tue Jan 13 20:11:36 2009 +0000
+++ b/geography/garmin-utils/Makefile   Tue Jan 13 21:24:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/11/12 13:37:36 gson Exp $
+# $NetBSD: Makefile,v 1.8 2009/01/13 21:24:58 joerg 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 cfb1765fcae3 -r fab6ab94056c geography/garmin-utils/PLIST
--- a/geography/garmin-utils/PLIST      Tue Jan 13 20:11:36 2009 +0000
+++ b/geography/garmin-utils/PLIST      Tue Jan 13 21:24:58 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.3 2009/01/13 21:24:58 joerg 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 cfb1765fcae3 -r fab6ab94056c geography/garmin-utils/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/geography/garmin-utils/patches/patch-aa   Tue Jan 13 21:24:58 2009 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.4 2009/01/13 21:24:58 joerg 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>



Home | Main Index | Thread Index | Old Index