- no longer include bundled gpsd

- instead depend on gpsd package
- fix missing libiconv buildlink
This commit is contained in:
tsarna 2003-01-05 17:26:00 +00:00
parent 4db4a0b9c4
commit 701fb1b9e7
4 changed files with 19 additions and 14 deletions

View file

@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.1.1.1 2002/12/26 19:55:01 tsarna Exp $
# $NetBSD: Makefile,v 1.2 2003/01/05 17:26:00 tsarna Exp $
DISTNAME= gpsdrive-1.31
PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://gpsdrive.kraftvoll.at/
@ -8,6 +9,8 @@ MAINTAINER= tsarna@netbsd.org
HOMEPAGE= http://gpsdrive.kraftvoll.at/
COMMENT= GPS Navigation system
DEPENDS+= gpsd>=1.07:../../misc/gpsd
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
@ -18,4 +21,5 @@ CONFIGURE_ARGS+= --disable-mysql
.include "../../devel/glib/buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"
.include "../../graphics/gdk-pixbuf/buildlink2.mk"
.include "../../converters/libiconv/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,6 +1,5 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/26 19:55:01 tsarna Exp $
@comment $NetBSD: PLIST,v 1.2 2003/01/05 17:26:00 tsarna Exp $
bin/garble
bin/gpsd
bin/gpsdrive
bin/gpsfetchmap
bin/gpsfetchmap.pl

View file

@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.1.1.1 2002/12/26 19:55:01 tsarna Exp $
$NetBSD: distinfo,v 1.2 2003/01/05 17:26:01 tsarna Exp $
SHA1 (gpsdrive-1.31.tar.gz) = 296a06d264c5fbb077c91f3529b4e6f122423f05
Size (gpsdrive-1.31.tar.gz) = 784379 bytes
SHA1 (patch-aa) = 0d00f82a560744a57a44a3af7ad25d5c943fb6cf
SHA1 (patch-aa) = cc5dd44020ffc5f22dc958c938b9f98ff6e01810

View file

@ -1,27 +1,29 @@
$NetBSD: patch-aa,v 1.1.1.1 2002/12/26 19:55:01 tsarna Exp $
$NetBSD: patch-aa,v 1.2 2003/01/05 17:26:01 tsarna Exp $
I don't care enough to fix friendsd... disabled for now
- We depend on the gpsd package instead of using the bundled one
- friendsd is broken and I don't care enough to fix it
--- src/Makefile.in.orig Sun Dec 8 13:30:56 2002
+++ src/Makefile.in Thu Dec 26 14:06:03 2002
+++ src/Makefile.in Sun Jan 5 12:15:01 2003
@@ -122,7 +122,7 @@
@DISABLEGARMIN_TRUE@PRG1 =
@DISABLEGARMIN_FALSE@PRG1 = garble
-bin_PROGRAMS = $(PRG1) gpsdrive gpsd friendsd
+bin_PROGRAMS = $(PRG1) gpsdrive gpsd
+bin_PROGRAMS = $(PRG1) gpsdrive
LIBS =
# gpsdrive_LDADD= $(GLIB_LIBS) $(GTK_LIBS) $(PIXLIBS)
@@ -176,9 +176,9 @@
@@ -175,10 +175,8 @@
libnautic_la_LIBADD =
am_libnautic_la_OBJECTS = nautic.lo
libnautic_la_OBJECTS = $(am_libnautic_la_OBJECTS)
@DISABLEGARMIN_TRUE@bin_PROGRAMS = gpsdrive$(EXEEXT) gpsd$(EXEEXT) \
-@DISABLEGARMIN_TRUE@bin_PROGRAMS = gpsdrive$(EXEEXT) gpsd$(EXEEXT) \
-@DISABLEGARMIN_TRUE@ friendsd$(EXEEXT)
+@DISABLEGARMIN_TRUE@
@DISABLEGARMIN_FALSE@bin_PROGRAMS = garble$(EXEEXT) gpsdrive$(EXEEXT) \
-@DISABLEGARMIN_FALSE@bin_PROGRAMS = garble$(EXEEXT) gpsdrive$(EXEEXT) \
-@DISABLEGARMIN_FALSE@ gpsd$(EXEEXT) friendsd$(EXEEXT)
+@DISABLEGARMIN_FALSE@ gpsd$(EXEEXT)
+@DISABLEGARMIN_TRUE@bin_PROGRAMS = gpsdrive$(EXEEXT)
+@DISABLEGARMIN_FALSE@bin_PROGRAMS = garble$(EXEEXT) gpsdrive$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
am_friendsd_OBJECTS = friendsd.$(OBJEXT)