Attachment #143650 for bug #190791

Lines 2-24 Link Here

(-)Makefile (-7 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gpsbabel	4	PORTNAME= gpsbabel
5	PORTVERSION= 1.4.4	5	PORTVERSION= 1.5.1
6	CATEGORIES= astro geography	6	CATEGORIES= astro geography
7	MASTER_SITES= https://secure.ohos.nl/downloads/ \	7	MASTER_SITES= https://secure.ohos.nl/downloads/ \
8	LOCAL/beech	8	LOCAL/glebius
9		9
10	MAINTAINER= dev2@heesakkers.info	10	MAINTAINER= dev2@heesakkers.info
11	COMMENT= GPS file translating tool	11	COMMENT= GPS file translating tool
12		12
13	LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2	13	LICENSE= GPLv2
		14	LICENSE_FILE= ${WRKSRC}/COPYING
14		15
		16	LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
		17
15	USE_AUTOTOOLS= autoconf	18	USE_AUTOTOOLS= autoconf
16	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
17	CONFIGURE_ARGS+=--with-expathdr=${LOCALBASE}/include \
18	--with-libexpat=${LOCALBASE}/lib
19		20
		21	USES= gettext
		22	USE_QT4= corelib linguist_build qmake_build
		23	USE_GNOME= glib20
		24
20	PLIST_FILES= bin/gpsbabel	25	PLIST_FILES= bin/gpsbabel
21		26
22	EXTRA_PATCHES= ${FILESDIR}/extra-patch-libusb
23
24	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (gpsbabel-1.4.4.tar.gz) = 9dd2a06e887cb286c9a07164a8f2ede11aed1147e6419007370c528412321944	1	SHA256 (gpsbabel-1.5.1.tar.gz) = 3feec7d43ca6cb5393645fe0df893d9f7bf5334849fa8abd4c5c3ee775c8cac3
2	SIZE (gpsbabel-1.4.4.tar.gz) = 7811264	2	SIZE (gpsbabel-1.5.1.tar.gz) = 8402088




--- 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)




--- 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)




--- ./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"

Return to bug 190791

Lines 1-31 Link Here

(-)files/extra-patch-libusb (-31 lines)
1	--- configure.in.orig 2008-10-31 15:43:21.000000000 +0300
2	+++ configure.in 2009-03-07 01:08:46.000000000 +0300
3	@@ -170,6 +169,28 @@
4	AC_DEFINE(HAVE_LIBUSB, 1)
5	CFLAGS="$CFLAGS -Imac/libusb/"
6	;;
7	+ --freebsd*)
8	+ GBSER=gbser_posix.o
9	+ AC_MSG_CHECKING(for libusb)
10	+ if test "$with_libusb" = no ; then
11	+ AC_MSG_RESULT(check not done)
12	+ OSJEEPS=jeeps/gpsusbstub.o
13	+ else
14	+ OLDFLAGS=$LDFLAGS
15	+ OCFLAGS=$CFLAGS
16	+ LDFLAGS="$LDFLAGS -lusb"
17	+ CFLAGS="$OCFLAGS"
18	+
19	+ AC_CHECK_LIB([usb], [usb_interrupt_read],
20	+ AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb])
21	+ [USB_CFLAGS=""]
22	+ [USB_LIBS="-lusb"]
23	+# ,[AC_MSG_ERROR([libusb is needed])]
24	+ )
25	+ OSJEEPS=jeeps/gpslibusb.o
26	+ CFLAGS="$OCFLAGS"
27	+ fi
28	+ ;;
29	*)
30	GBSER=gbser_posix.o
31	AC_MSG_CHECKING(for libusb)

Line 0 Link Here

(-)files/patch-libusb (+31 lines)
	1	--- configure.in.orig 2008-10-31 15:43:21.000000000 +0300
	2	+++ configure.in 2009-03-07 01:08:46.000000000 +0300
	3	@@ -170,6 +169,28 @@
	4	AC_DEFINE(HAVE_LIBUSB, 1)
	5	CFLAGS="$CFLAGS -Imac/libusb/"
	6	;;
	7	+ --freebsd*)
	8	+ GBSER=gbser_posix.o
	9	+ AC_MSG_CHECKING(for libusb)
	10	+ if test "$with_libusb" = no ; then
	11	+ AC_MSG_RESULT(check not done)
	12	+ OSJEEPS=jeeps/gpsusbstub.o
	13	+ else
	14	+ OLDFLAGS=$LDFLAGS
	15	+ OCFLAGS=$CFLAGS
	16	+ LDFLAGS="$LDFLAGS -lusb"
	17	+ CFLAGS="$OCFLAGS"
	18	+
	19	+ AC_CHECK_LIB([usb], [usb_interrupt_read],
	20	+ AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb])
	21	+ [USB_CFLAGS=""]
	22	+ [USB_LIBS="-lusb"]
	23	+# ,[AC_MSG_ERROR([libusb is needed])]
	24	+ )
	25	+ OSJEEPS=jeeps/gpslibusb.o
	26	+ CFLAGS="$OCFLAGS"
	27	+ fi
	28	+ ;;
	29	*)
	30	GBSER=gbser_posix.o
	31	AC_MSG_CHECKING(for libusb)

Line 0 Link Here

(-)files/patch-mkstyle (+21 lines)
	1	--- ./mkstyle.sh.orig 2013-09-01 16:29:29.000000000 +0200
	2	+++ ./mkstyle.sh 2014-06-10 13:47:27.000000000 +0200
	3	@@ -9,17 +9,7 @@
	4	LC_COLLATE=C
	5	export LC_COLLATE
	6
	7	-# require gnu sed even though we aren't using gnu extensions.
	8	-# this avoids portability issues with other seds.
	9	-if gsed v /dev/null 1>/dev/null 2>&1; then
	10	- SED=gsed
	11	-elif sed v /dev/null 1>/dev/null 2>&1; then
	12	- # sed is gnu sed
	13	- SED=sed
	14	-else
	15	- echo "Error: can't find gnu sed" 1>&2
	16	- exit 1
	17	-fi
	18	+SED=sed
	19
	20	echo "#include \"defs.h\""
	21	echo "#if CSVFMTS_ENABLED"