trivial version bump. a number of patches have been accepted upstream.

ok naddy.
This commit is contained in:
ckuethe 2006-11-09 02:31:30 +00:00
parent 6389ca99b2
commit c3bf6e7bab
14 changed files with 29 additions and 265 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
# $OpenBSD: Makefile,v 1.2 2006/11/09 02:31:30 ckuethe Exp $
COMMENT= "GPS waypoint, track, and route conversion tool"
COMMENT-gui= "Tk front-end to gpsbabel"
VERSION= 1.3.1
VERSION= 1.3.2
DISTNAME= gpsbabel-${VERSION}
PKGNAME-gui= gpsbabel-gui-${VERSION}
CATEGORIES= geo
@ -22,7 +22,9 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpsbabel/}
AUTOCONF_VERSION= 2.59
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS+= --with-zlib=system --with-shapefile=system
CONFIGURE_ARGS+= --with-zlib=system \
--with-shapefile=system \
--with-doc=./babelweb
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
WEB=${WRKSRC}

View File

@ -1,4 +1,4 @@
MD5 (gpsbabel-1.3.1.tar.gz) = 0f108ae0eb32ba440124cebe8cb6e95a
RMD160 (gpsbabel-1.3.1.tar.gz) = d428a9937d004258319e8e27e92407feb8dfe97b
SHA1 (gpsbabel-1.3.1.tar.gz) = 2b406180a51346de9aefb6be161cea17129911b8
SIZE (gpsbabel-1.3.1.tar.gz) = 2817202
MD5 (gpsbabel-1.3.2.tar.gz) = 5a9c442bc681035b1dfdbb32b1d3fa8b
RMD160 (gpsbabel-1.3.2.tar.gz) = 0f0c05e67eaa77f8325b22ac8ed874ac5cee28e7
SHA1 (gpsbabel-1.3.2.tar.gz) = 4f061c77505000b918d476f99a115af9a5d412c3
SIZE (gpsbabel-1.3.2.tar.gz) = 2983808

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
--- Makefile.in.orig Sat Sep 2 17:41:01 2006
+++ Makefile.in Mon Oct 30 10:06:04 2006
$OpenBSD: patch-Makefile_in,v 1.2 2006/11/09 02:31:30 ckuethe Exp $
--- Makefile.in.orig Mon Nov 6 22:38:42 2006
+++ Makefile.in Mon Nov 6 22:39:56 2006
@@ -84,7 +84,7 @@ LIBOBJS = queue.o route.o waypt.o filter
uuid.o formspec.o xmltag.o cet.o cet_util.o fatal.o rgbcolors.o \
inifile.o garmin_fs.o gbsleep.o units.o @GBSER@ gbser.o \
@ -10,16 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
.c.o:
@@ -93,7 +93,7 @@ OBJS = main.o globals.o $(LIBOBJS) @FILE
# Directory of local web doc. Traditionally a sibling to the GPSBabel tree.
-WEB=../babelweb/
+WEB=babelweb/
all: gpsbabel$(EXEEXT)
@@ -149,6 +149,7 @@ dep:
@@ -155,6 +155,7 @@ dep:
echo Edit Makefile.in and bring in /tmp/dep
$(WEB)/htmldoc-$(DOCVERSION)/readme.html: FORCE

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
--- configure.in.orig Tue Oct 10 18:42:22 2006
+++ configure.in Tue Oct 10 18:47:43 2006
@@ -49,16 +49,22 @@ if test "$cet" = "default"; then
$OpenBSD: patch-configure_in,v 1.2 2006/11/09 02:31:30 ckuethe Exp $
--- configure.in.orig Sun Nov 5 16:54:07 2006
+++ configure.in Mon Nov 6 22:41:20 2006
@@ -50,16 +50,22 @@ if test "$cet" = "default"; then
fi
AC_MSG_CHECKING(whether to support shapefiles)
@ -32,7 +32,7 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
AC_MSG_CHECKING(whether to support Palm/OS pdb formats)
AC_ARG_ENABLE(pdb,
[ --enable-pdb=[(yes)|no]],
@@ -179,6 +185,7 @@ AC_SUBST(USB_LIBS)
@@ -180,6 +186,7 @@ AC_SUBST(USB_LIBS)
AC_SUBST(USB_CFLAGS)
AC_SUBST(OSJEEPS)
AC_SUBST(GBSER)

View File

@ -1,38 +0,0 @@
$OpenBSD: patch-easygps_c,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
--- easygps.c.orig Tue Oct 10 18:28:02 2006
+++ easygps.c Tue Oct 10 18:28:37 2006
@@ -77,7 +77,7 @@ wr_deinit(void)
* storage.
*/
static void *
-pread(void)
+pas_read(void)
{
char *d;
int ilen;
@@ -106,20 +106,20 @@ data_read(void)
for (tag = fgetc(file_in); tag != 0xff; tag = fgetc(file_in)) {
switch (tag) {
case 1:
- wpt_tmp->shortname = (char *) pread();
+ wpt_tmp->shortname = (char *) pas_read();
break;
case 2:
case 3:
- wpt_tmp->description = (char *) pread();
+ wpt_tmp->description = (char *) pas_read();
break;
case 5:
- wpt_tmp->notes = (char *) pread();
+ wpt_tmp->notes = (char *) pas_read();
break;
case 6:
- wpt_tmp->url_link_text = (char *) pread();
+ wpt_tmp->url_link_text = (char *) pas_read();
break;
case 7:
- wpt_tmp->icon_descr = (char *) pread();
+ wpt_tmp->icon_descr = (char *) pas_read();
wpt_tmp->wpt_flags.icon_descr_is_dynamic = 1;
break;
case 8: /* NULL Terminated (vs. pascal) descr */

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-hsa_ndv_c,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
--- hsa_ndv.c.orig Thu Oct 19 13:21:16 2006
+++ hsa_ndv.c Thu Oct 19 13:25:28 2006
@@ -233,7 +233,7 @@ hsa_ndv_read(void)
{
char *bad;
- buf[len] = 0;
+ buf[len-1] = '\0';
if (NULL != strstr(buf, "nver=1"))
{//its the older format, not xml
fseek(fd, 0, SEEK_SET);

View File

@ -1,39 +0,0 @@
$OpenBSD: patch-html_c,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
--- html.c.orig Tue Oct 10 18:29:56 2006
+++ html.c Tue Oct 10 18:30:40 2006
@@ -28,7 +28,7 @@ static FILE *file_out;
static short_handle mkshort_handle;
static char *stylesheet = NULL;
-static char *encrypt = NULL;
+static char *html_encrypt = NULL;
static char *includelogs = NULL;
#define MYNAME "HTML"
@@ -37,7 +37,7 @@ static
arglist_t html_args[] = {
{ "stylesheet", &stylesheet,
"Path to HTML style sheet", NULL, ARGTYPE_STRING, ARG_NOMINMAX },
- { "encrypt", &encrypt,
+ { "encrypt", &html_encrypt,
"Encrypt hints using ROT13", NULL, ARGTYPE_BOOL, ARG_NOMINMAX },
{ "logs", &includelogs,
"Include groundspeak logs if present", NULL, ARGTYPE_BOOL, ARG_NOMINMAX },
@@ -120,7 +120,7 @@ html_disp(const waypoint *wpt)
}
if (wpt->gc_data.hint) {
char *hint = NULL;
- if ( encrypt )
+ if ( html_encrypt )
hint = rot13( wpt->gc_data.hint );
else
hint = xstrdup( wpt->gc_data.hint );
@@ -208,7 +208,7 @@ html_disp(const waypoint *wpt)
encstr = xml_attribute( logpart, "encoded" );
encoded = (encstr[0] != 'F');
- if ( encrypt && encoded ) {
+ if ( html_encrypt && encoded ) {
s = rot13( logpart->cdata );
}
else {

View File

@ -1,39 +0,0 @@
$OpenBSD: patch-palmdoc_c,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
--- palmdoc.c.orig Tue Oct 10 18:30:59 2006
+++ palmdoc.c Tue Oct 10 18:31:22 2006
@@ -44,7 +44,7 @@ static char *includelogs = NULL;
static int ct = 1;
static int offset = 0;
-static char *encrypt;
+static char *palm_encrypt;
#define MYNAME "PALMDOC"
@@ -71,7 +71,7 @@ arglist_t palmdoc_args[] = {
"No separator lines between waypoints", NULL,
ARGTYPE_BOOL, ARG_NOMINMAX },
{"dbname", &dbname, "Database name", NULL, ARGTYPE_STRING, ARG_NOMINMAX },
- {"encrypt", &encrypt, "Encrypt hints with ROT13", NULL,
+ {"encrypt", &palm_encrypt, "Encrypt hints with ROT13", NULL,
ARGTYPE_BOOL, ARG_NOMINMAX },
{ "logs", &includelogs,
"Include groundspeak logs if present", NULL, ARGTYPE_BOOL, ARG_NOMINMAX },
@@ -477,7 +477,7 @@ palmdoc_disp(const waypoint *wpt)
}
if (wpt->gc_data.hint) {
char *hint = NULL;
- if ( encrypt )
+ if ( palm_encrypt )
hint = rot13( wpt->gc_data.hint );
else
hint = xstrdup( wpt->gc_data.hint );
@@ -562,7 +562,7 @@ palmdoc_disp(const waypoint *wpt)
encstr = xml_attribute( logpart, "encoded" );
encoded = (encstr[0] != 'F');
- if ( encrypt && encoded ) {
+ if ( palm_encrypt && encoded ) {
s = rot13( logpart->cdata );
}
else {

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-testo,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
--- testo.orig Tue Aug 29 15:25:31 2006
+++ testo Thu Oct 19 14:41:16 2006
@@ -1,3 +1,4 @@
+#!/bin/sh
GPSBABEL_FREEZE_TIME=y
export GPSBABEL_FREEZE_TIME
@@ -8,7 +9,11 @@ export MALLOC_CHECK_
PNAME=${PNAME:-./gpsbabel}
DIFF=${DIFF:-diff}
REFERENCE=reference
-OD=${OD:-od -Ax -txC -v}
+if [ -x /usr/bin/hexdump ] ; then
+ OD=${OD:-hexdump -v -C}
+else
+ OD=${OD:-od -Ax -txC -v}
+fi
TMPDIR=/tmp/gpsbabel.$$
mkdir -p $TMPDIR
@@ -86,7 +91,7 @@ ${PNAME} -i gtm -f ${REFERENCE}/sample.g
${PNAME} -i gpx -f ${TMPDIR}/gtm1.gpx -o gtm -F ${TMPDIR}/gtm.gtm
${PNAME} -i gtm -f ${TMPDIR}/gtm.gtm -o gpx -F ${TMPDIR}/gtm2.gpx
compare ${TMPDIR}/gtm1.gpx ${TMPDIR}/gtm2.gpx
-compare ${TMPDIR}/gtm.gtm ${REFERENCE}/sample.gtm
+bincompare ${TMPDIR}/gtm.gtm ${REFERENCE}/sample.gtm
# Magellan Mapsend
rm -f ${TMPDIR}/mm.mapsend ${TMPDIR}/mm.gps

View File

@ -1,39 +0,0 @@
$OpenBSD: patch-text_c,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
--- text.c.orig Tue Oct 10 18:28:52 2006
+++ text.c Tue Oct 10 18:29:31 2006
@@ -28,7 +28,7 @@ static gbfile *file_out;
static short_handle mkshort_handle;
static char *suppresssep = NULL;
-static char *encrypt = NULL;
+static char *txt_encrypt = NULL;
static char *includelogs = NULL;
#define MYNAME "TEXT"
@@ -38,7 +38,7 @@ arglist_t text_args[] = {
{ "nosep", &suppresssep,
"Suppress separator lines between waypoints",
NULL, ARGTYPE_BOOL, ARG_NOMINMAX },
- { "encrypt", &encrypt,
+ { "encrypt", &txt_encrypt,
"Encrypt hints using ROT13", NULL, ARGTYPE_BOOL, ARG_NOMINMAX },
{ "logs", &includelogs,
"Include groundspeak logs if present", NULL, ARGTYPE_BOOL, ARG_NOMINMAX },
@@ -108,7 +108,7 @@ text_disp(const waypoint *wpt)
}
if (wpt->gc_data.hint) {
char *hint = NULL;
- if ( encrypt )
+ if ( txt_encrypt )
hint = rot13( wpt->gc_data.hint );
else
hint = xstrdup( wpt->gc_data.hint );
@@ -193,7 +193,7 @@ text_disp(const waypoint *wpt)
encstr = xml_attribute( logpart, "encoded" );
encoded = (encstr[0] != 'F');
- if ( encrypt && encoded ) {
+ if ( txt_encrypt && encoded ) {
s = rot13( logpart->cdata );
}
else {

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-tools_mkcapabilities,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
--- tools/mkcapabilities.orig Thu Jun 8 13:39:29 2006
+++ tools/mkcapabilities Sun Oct 15 16:03:32 2006
@@ -1,3 +1,4 @@
+#!/bin/sh
./gpsbabel -^2 | sed 's/\&/\&/' | awk -F'\t' '
function getcap(type, cap, sname, lname) {
if (type == "internal") return
@@ -28,4 +29,4 @@ function getcap(type, cap, sname, lname)
}
getcap($1, $2, $3, $5)
-' > ../babelweb/capabilities.inc > ../babelweb/capabilities.inc
+' > babelweb/capabilities.inc > babelweb/capabilities.inc

View File

@ -0,0 +1,8 @@
$OpenBSD: patch-tools_mkcapabilities_in,v 1.1 2006/11/09 02:31:30 ckuethe Exp $
--- tools/mkcapabilities.in.orig Mon Nov 6 22:44:57 2006
+++ tools/mkcapabilities.in Mon Nov 6 22:46:05 2006
@@ -1,3 +1,4 @@
+#!/bin/sh
#
# mkcapabilities.in is used to create mkcapabilities.
#

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-vcf_c,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
--- vcf.c.orig Tue Oct 10 18:32:35 2006
+++ vcf.c Tue Oct 10 18:32:55 2006
@@ -26,13 +26,13 @@
static FILE *file_out;
static short_handle mkshort_handle;
-static char *encrypt = NULL;
+static char *vcf_encrypt = NULL;
#define MYNAME "VCF"
static
arglist_t vcf_args[] = {
- { "encrypt", &encrypt,
+ { "encrypt", &vcf_encrypt,
"Encrypt hints using ROT13", NULL, ARGTYPE_BOOL, ARG_NOMINMAX },
ARG_TERMINATOR
};
@@ -107,7 +107,7 @@ vcf_disp(const waypoint *wpt)
fprintf(file_out, "\\n");
vcf_print_utf(&wpt->gc_data.desc_long);
fprintf(file_out, "\\n\\nHINT:\\n");
- if (encrypt) {
+ if (vcf_encrypt) {
char *s = rot13(wpt->gc_data.hint);
vcf_print(s);
xfree(s);

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/10/30 17:44:57 ckuethe Exp $
@comment $OpenBSD: PLIST,v 1.2 2006/11/09 02:31:30 ckuethe Exp $
bin/gpsbabel
share/doc/gpsbabel/
share/doc/gpsbabel/Advanced_Usage.html
@ -20,6 +20,7 @@ share/doc/gpsbabel/The_Formats.html
share/doc/gpsbabel/The_Problem.html
share/doc/gpsbabel/The_Solution.html
share/doc/gpsbabel/Usage.html
share/doc/gpsbabel/batchfile.html
share/doc/gpsbabel/filter_arc.html
share/doc/gpsbabel/filter_discard.html
share/doc/gpsbabel/filter_duplicate.html
@ -33,6 +34,7 @@ share/doc/gpsbabel/filter_simplify.html
share/doc/gpsbabel/filter_sort.html
share/doc/gpsbabel/filter_stack.html
share/doc/gpsbabel/filter_track.html
share/doc/gpsbabel/filter_transform.html
share/doc/gpsbabel/fmt_an1.html
share/doc/gpsbabel/fmt_arc.html
share/doc/gpsbabel/fmt_axim_gpb.html