Attachment 143650 Details for Bug 190791 – final version

[patch] final version

gpsbabel.patch (text/plain), 4.70 KB, created by Dmitry Marakasov on 2014-06-10 18:57:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2014-06-10 18:57:23 UTC

Size: 4.70 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 357199)
>+++ Makefile	(working copy)
>@@ -2,23 +2,26 @@
> # $FreeBSD$
> 
> PORTNAME=	gpsbabel
>-PORTVERSION=	1.4.4
>+PORTVERSION=	1.5.1
> CATEGORIES=	astro geography
> MASTER_SITES=	https://secure.ohos.nl/downloads/ \
>-		LOCAL/beech
>+		LOCAL/glebius
> 
> MAINTAINER=	dev2@heesakkers.info
> COMMENT=	GPS file translating tool
> 
>-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
>+
> USE_AUTOTOOLS=	autoconf
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS+=--with-expathdr=${LOCALBASE}/include \
>-		--with-libexpat=${LOCALBASE}/lib
> 
>+USES=		gettext
>+USE_QT4=	corelib linguist_build qmake_build
>+USE_GNOME=	glib20
>+
> PLIST_FILES=	bin/gpsbabel
> 
>-EXTRA_PATCHES=	${FILESDIR}/extra-patch-libusb
>-
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 357199)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (gpsbabel-1.4.4.tar.gz) = 9dd2a06e887cb286c9a07164a8f2ede11aed1147e6419007370c528412321944
>-SIZE (gpsbabel-1.4.4.tar.gz) = 7811264
>+SHA256 (gpsbabel-1.5.1.tar.gz) = 3feec7d43ca6cb5393645fe0df893d9f7bf5334849fa8abd4c5c3ee775c8cac3
>+SIZE (gpsbabel-1.5.1.tar.gz) = 8402088
>Index: files/extra-patch-libusb
>===================================================================
>--- files/extra-patch-libusb	(revision 357199)
>+++ files/extra-patch-libusb	(working copy)
>@@ -1,31 +0,0 @@
>---- configure.in.orig	2008-10-31 15:43:21.000000000 +0300
>-+++ configure.in	2009-03-07 01:08:46.000000000 +0300
>-@@ -170,6 +169,28 @@
>-       AC_DEFINE(HAVE_LIBUSB, 1)
>-       CFLAGS="$CFLAGS -Imac/libusb/"
>-       ;;
>-+    *-*-freebsd*)
>-+	GBSER=gbser_posix.o
>-+	AC_MSG_CHECKING(for libusb)
>-+	if test "$with_libusb" = no ; then
>-+		AC_MSG_RESULT(check not done)
>-+		OSJEEPS=jeeps/gpsusbstub.o
>-+	else
>-+		OLDFLAGS=$LDFLAGS
>-+		OCFLAGS=$CFLAGS
>-+		LDFLAGS="$LDFLAGS -lusb"
>-+		CFLAGS="$OCFLAGS"
>-+
>-+		AC_CHECK_LIB([usb], [usb_interrupt_read],
>-+			AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb])
>-+			[USB_CFLAGS=""]
>-+			[USB_LIBS="-lusb"]
>-+#			,[AC_MSG_ERROR([libusb is needed])]
>-+			)
>-+		OSJEEPS=jeeps/gpslibusb.o
>-+		CFLAGS="$OCFLAGS"
>-+	fi
>-+	;;
>-     *)
>- 	GBSER=gbser_posix.o
>- 	AC_MSG_CHECKING(for libusb)
>Index: files/patch-libusb
>===================================================================
>--- files/patch-libusb	(revision 0)
>+++ files/patch-libusb	(working copy)
>@@ -0,0 +1,31 @@
>+--- configure.in.orig	2008-10-31 15:43:21.000000000 +0300
>++++ configure.in	2009-03-07 01:08:46.000000000 +0300
>+@@ -170,6 +169,28 @@
>+       AC_DEFINE(HAVE_LIBUSB, 1)
>+       CFLAGS="$CFLAGS -Imac/libusb/"
>+       ;;
>++    *-*-freebsd*)
>++	GBSER=gbser_posix.o
>++	AC_MSG_CHECKING(for libusb)
>++	if test "$with_libusb" = no ; then
>++		AC_MSG_RESULT(check not done)
>++		OSJEEPS=jeeps/gpsusbstub.o
>++	else
>++		OLDFLAGS=$LDFLAGS
>++		OCFLAGS=$CFLAGS
>++		LDFLAGS="$LDFLAGS -lusb"
>++		CFLAGS="$OCFLAGS"
>++
>++		AC_CHECK_LIB([usb], [usb_interrupt_read],
>++			AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb])
>++			[USB_CFLAGS=""]
>++			[USB_LIBS="-lusb"]
>++#			,[AC_MSG_ERROR([libusb is needed])]
>++			)
>++		OSJEEPS=jeeps/gpslibusb.o
>++		CFLAGS="$OCFLAGS"
>++	fi
>++	;;
>+     *)
>+ 	GBSER=gbser_posix.o
>+ 	AC_MSG_CHECKING(for libusb)
>
>Property changes on: files/patch-libusb
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/patch-mkstyle
>===================================================================
>--- files/patch-mkstyle	(revision 0)
>+++ files/patch-mkstyle	(working copy)
>@@ -0,0 +1,21 @@
>+--- ./mkstyle.sh.orig	2013-09-01 16:29:29.000000000 +0200
>++++ ./mkstyle.sh	2014-06-10 13:47:27.000000000 +0200
>+@@ -9,17 +9,7 @@
>+ LC_COLLATE=C
>+ export LC_COLLATE
>+ 
>+-# require gnu sed even though we aren't using gnu extensions.
>+-# this avoids portability issues with other seds.
>+-if gsed v /dev/null 1>/dev/null 2>&1; then
>+-    SED=gsed
>+-elif sed v /dev/null 1>/dev/null 2>&1; then
>+-	# sed is gnu sed
>+-    SED=sed
>+-else
>+-	echo "Error: can't find gnu sed" 1>&2
>+-	exit 1
>+-fi
>++SED=sed
>+ 
>+ echo "#include \"defs.h\""
>+ echo "#if CSVFMTS_ENABLED"
>
>Property changes on: files/patch-mkstyle
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Flags:

amdmi3: maintainer-approval?

Actions: View | Diff

Attachments on bug 190791: 143527 | 143612 | 143613 | 143615 | 143617 | 143650