Date: Tue, 10 Jun 2014 22:06:16 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357392 - in head/astro/gpsbabel: . files Message-ID: <201406102206.s5AM6GZX047895@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Jun 10 22:06:15 2014 New Revision: 357392 URL: http://svnweb.freebsd.org/changeset/ports/357392 QAT: https://qat.redports.org/buildarchive/r357392/ Log: - Update to 1.5.1 - Add LICENSE - Convert extra-patch'es to plain patches PR: 190791 Submitted by: glebius Approved by: Oliver Heesakkers <dev2@heesakkers.info> (maintainer) Added: head/astro/gpsbabel/files/patch-libusb - copied unchanged from r357383, head/astro/gpsbabel/files/extra-patch-libusb head/astro/gpsbabel/files/patch-mkstyle (contents, props changed) Deleted: head/astro/gpsbabel/files/extra-patch-libusb Modified: head/astro/gpsbabel/Makefile head/astro/gpsbabel/distinfo Modified: head/astro/gpsbabel/Makefile ============================================================================== --- head/astro/gpsbabel/Makefile Tue Jun 10 22:03:56 2014 (r357391) +++ head/astro/gpsbabel/Makefile Tue Jun 10 22:06:15 2014 (r357392) @@ -2,23 +2,28 @@ # $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 +CONFLICTS= gpsbabel14-[0-9]* .include <bsd.port.mk> Modified: head/astro/gpsbabel/distinfo ============================================================================== --- head/astro/gpsbabel/distinfo Tue Jun 10 22:03:56 2014 (r357391) +++ head/astro/gpsbabel/distinfo Tue Jun 10 22:06:15 2014 (r357392) @@ -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 Copied: head/astro/gpsbabel/files/patch-libusb (from r357383, head/astro/gpsbabel/files/extra-patch-libusb) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/gpsbabel/files/patch-libusb Tue Jun 10 22:06:15 2014 (r357392, copy of r357383, head/astro/gpsbabel/files/extra-patch-libusb) @@ -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) Added: head/astro/gpsbabel/files/patch-mkstyle ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/gpsbabel/files/patch-mkstyle Tue Jun 10 22:06:15 2014 (r357392) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406102206.s5AM6GZX047895>