diff options
| author | adrianp <adrianp@pkgsrc.org> | 2008-06-21 18:35:03 +0000 |
|---|---|---|
| committer | adrianp <adrianp@pkgsrc.org> | 2008-06-21 18:35:03 +0000 |
| commit | d265a22c86e1cfe8f35c084bdc3432e652bac224 (patch) | |
| tree | dd403a9c590777f6286a10aa4d1c2abe0d30b28c | |
| parent | 777b323f540c1f1aefa36649aef984caa39fe9a8 (diff) | |
| download | pkgsrc-d265a22c86e1cfe8f35c084bdc3432e652bac224.tar.gz | |
Fix builds on Darwin
| -rw-r--r-- | geography/gpsbabel/Makefile | 4 | ||||
| -rw-r--r-- | geography/gpsbabel/distinfo | 3 | ||||
| -rw-r--r-- | geography/gpsbabel/patches/patch-ad | 35 |
3 files changed, 40 insertions, 2 deletions
diff --git a/geography/gpsbabel/Makefile b/geography/gpsbabel/Makefile index 315e7b554b4..69767642956 100644 --- a/geography/gpsbabel/Makefile +++ b/geography/gpsbabel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:21 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2008/06/21 18:35:03 adrianp Exp $ # DISTNAME= gpsbabel-1.3.4 @@ -12,6 +12,8 @@ COMMENT= Utility to convert and fetch GPS related data PKG_DESTDIR_SUPPORT= user-destdir +LIBS.Darwin+= -lexpat + GNU_CONFIGURE= yes .include "../../devel/libusb/buildlink3.mk" diff --git a/geography/gpsbabel/distinfo b/geography/gpsbabel/distinfo index ddc4ac7cb7b..c40d3c27c12 100644 --- a/geography/gpsbabel/distinfo +++ b/geography/gpsbabel/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/09/21 05:12:08 martti Exp $ +$NetBSD: distinfo,v 1.2 2008/06/21 18:35:03 adrianp Exp $ SHA1 (gpsbabel-1.3.4.tar.gz) = 9b504ce151bb44b86558cce5c3f727819cdb30c5 RMD160 (gpsbabel-1.3.4.tar.gz) = 2391f0b3aef271567808edbed6fc2c481d5514ea @@ -6,3 +6,4 @@ Size (gpsbabel-1.3.4.tar.gz) = 3547058 bytes SHA1 (patch-aa) = 06166a96029100d6e5828875d00d7dde1acf90f9 SHA1 (patch-ab) = 194779944c80cbab89563dad1d7876564bd374df SHA1 (patch-ac) = 3d464f3fc7786f1a5dff61e4a3b88b0f358081e7 +SHA1 (patch-ad) = f5ce3036d1e2cff1d25333a547ded859a21312cd diff --git a/geography/gpsbabel/patches/patch-ad b/geography/gpsbabel/patches/patch-ad new file mode 100644 index 00000000000..cdff49e6980 --- /dev/null +++ b/geography/gpsbabel/patches/patch-ad @@ -0,0 +1,35 @@ +$NetBSD: patch-ad,v 1.1 2008/06/21 18:35:03 adrianp Exp $ + +--- Makefile.in.orig 2007-07-23 22:30:00.000000000 +0100 ++++ Makefile.in +@@ -90,7 +90,7 @@ LIBOBJS = queue.o route.o waypt.o filter + OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ + + .c.o: +- $(CC) @CPPFLAGS@ -c $(GBCFLAGS) $< $(OUTPUT_SWITCH)$@ ++ $(CC) @CPPFLAGS@ -c $(GBCFLAGS) $< $(OUTPUT_SWITCH) $@ + + + +@@ -101,10 +101,10 @@ WEB=@DOCDIR@ + all: gpsbabel$(EXEEXT) + + gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@ +- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH) $@ + + gpsbabel-debug: $(OBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH) $@ + + Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in gbversion.h.in + CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status +@@ -113,7 +113,7 @@ config.status: configure + $(SHELL) config.status --recheck + + jeeps/gpslibusb.o: +- $(CC) @CPPFLAGS@ -c $(GBCFLAGS) @USB_CFLAGS@ @srcdir@/jeeps/gpslibusb.c $(OUTPUT_SWITCH)$@ ++ $(CC) @CPPFLAGS@ -c $(GBCFLAGS) @USB_CFLAGS@ @srcdir@/jeeps/gpslibusb.c $(OUTPUT_SWITCH) $@ + + fileinfo.o: win32/gpsbabel.rc + $(RC) -o fileinfo.o win32/gpsbabel.rc |