From owner-svn-ports-head@FreeBSD.ORG Tue Jun 10 22:03:58 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E68DD8DF; Tue, 10 Jun 2014 22:03:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D344F2810; Tue, 10 Jun 2014 22:03:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5AM3vsF047359; Tue, 10 Jun 2014 22:03:57 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5AM3vMj047356; Tue, 10 Jun 2014 22:03:57 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201406102203.s5AM3vMj047356@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 10 Jun 2014 22:03:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357391 - in head/astro: . gpsbabel14 gpsbabel14/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jun 2014 22:03:58 -0000 Author: amdmi3 Date: Tue Jun 10 22:03:56 2014 New Revision: 357391 URL: http://svnweb.freebsd.org/changeset/ports/357391 QAT: https://qat.redports.org/buildarchive/r357391/ Log: - Preserve version 1.4.4 of astro/gpsbabel as astro/gpsbabel14 Newer gpsbabel version needlessly pulls in heavyweight dependencies (such as qt4-gui, qt4-webkit) via qt4-linguist, and until that's resolved, it's useful to keep around older version which doesn't have such problem. PR: 190791 Approved by: dev2@heesakkers.info (maintainer) Added: head/astro/gpsbabel14/ - copied from r357383, head/astro/gpsbabel/ head/astro/gpsbabel14/files/patch-libusb - copied unchanged from r357383, head/astro/gpsbabel/files/extra-patch-libusb Deleted: head/astro/gpsbabel14/files/extra-patch-libusb Modified: head/astro/Makefile head/astro/gpsbabel14/Makefile Modified: head/astro/Makefile ============================================================================== --- head/astro/Makefile Tue Jun 10 21:59:37 2014 (r357390) +++ head/astro/Makefile Tue Jun 10 22:03:56 2014 (r357391) @@ -22,6 +22,7 @@ SUBDIR += gmapcatcher SUBDIR += google-earth SUBDIR += gpsbabel + SUBDIR += gpsbabel14 SUBDIR += gpscorrelate SUBDIR += gpsd SUBDIR += gpsdrive Modified: head/astro/gpsbabel14/Makefile ============================================================================== --- head/astro/gpsbabel/Makefile Tue Jun 10 21:10:49 2014 (r357383) +++ head/astro/gpsbabel14/Makefile Tue Jun 10 22:03:56 2014 (r357391) @@ -6,9 +6,13 @@ PORTVERSION= 1.4.4 CATEGORIES= astro geography MASTER_SITES= https://secure.ohos.nl/downloads/ \ LOCAL/beech +PKGNAMESUFFIX= 14 MAINTAINER= dev2@heesakkers.info -COMMENT= GPS file translating tool +COMMENT= GPS file translating tool (pre-qt version) + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 @@ -19,6 +23,6 @@ CONFIGURE_ARGS+=--with-expathdr=${LOCALB PLIST_FILES= bin/gpsbabel -EXTRA_PATCHES= ${FILESDIR}/extra-patch-libusb +CONFLICTS= gpsbabel-[0-9]* .include Copied: head/astro/gpsbabel14/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/gpsbabel14/files/patch-libusb Tue Jun 10 22:03:56 2014 (r357391, 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)