From owner-svn-ports-all@freebsd.org Fri Jul 19 14:30:24 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5F439A417F; Fri, 19 Jul 2019 14:30:24 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 406D56FFD7; Fri, 19 Jul 2019 14:30:24 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A33C223C3; Fri, 19 Jul 2019 14:30:24 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6JEUNhN026981; Fri, 19 Jul 2019 14:30:23 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6JEUNcD026979; Fri, 19 Jul 2019 14:30:23 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201907191430.x6JEUNcD026979@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 19 Jul 2019 14:30:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506937 - in head/comms/xastir: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/comms/xastir: . files X-SVN-Commit-Revision: 506937 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 406D56FFD7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.949,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jul 2019 14:30:24 -0000 Author: swills Date: Fri Jul 19 14:30:23 2019 New Revision: 506937 URL: https://svnweb.freebsd.org/changeset/ports/506937 Log: comms/xastir: put back ImageMagick/GraphicsMagick choice While here, improve formatting PR: 239217 Submitted by: carl@stagecraft.cx (maintainer) Modified: head/comms/xastir/Makefile (contents, props changed) head/comms/xastir/files/pkg-message.in (contents, props changed) Modified: head/comms/xastir/Makefile ============================================================================== --- head/comms/xastir/Makefile Fri Jul 19 14:14:45 2019 (r506936) +++ head/comms/xastir/Makefile Fri Jul 19 14:30:23 2019 (r506937) @@ -4,6 +4,7 @@ PORTNAME= xastir DISTVERSIONPREFIX= Release- DISTVERSION= 2.1.4 +PORTREVISION= 1 CATEGORIES= comms hamradio MAINTAINER= carl@stagecraft.cx @@ -14,21 +15,23 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= xfontsel:x11-fonts/xfontsel RUN_DEPENDS= wget:ftp/wget -LIB_DEPENDS= libtiff.so:graphics/tiff \ - libpng.so:graphics/png \ +LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libjasper.so:graphics/jasper \ libjbig.so:graphics/jbigkit \ + liblcms2.so:graphics/lcms2 \ + libpng.so:graphics/png \ + libshp.so:devel/shapelib \ + libtiff.so:graphics/tiff \ libwebp.so:graphics/webp \ libwebpmux.so:graphics/webp \ - liblcms2.so:graphics/lcms2 \ - libfreetype.so:print/freetype2 \ - libjasper.so:graphics/jasper \ - libwmflite.so:graphics/libwmf \ - libshp.so:devel/shapelib + libwmflite.so:graphics/libwmf -GNU_CONFIGURE= yes USES= gettext gmake jpeg motif python:run shebangfix -USE_XORG= x11 xt xext sm ice + +USE_XORG= ice sm x11 xext xt USE_GNOME+= libxml2 +GNU_CONFIGURE= yes + SHEBANG_FILES= scripts/gpx2shape SHEBANG_REGEX= ./scripts/.*\.(sh|pl|py) @@ -38,28 +41,33 @@ GH_PROJECT= Xastir SUB_FILES= pkg-message -OPTIONS_DEFINE= DAVIS DBFAWK MAGICK CURL GEOTIFF GPSMAN FESTIVAL \ - RTREE ERRORPOP BDB +OPTIONS_DEFINE= BDB CURL DAVIS DBFAWK ERRORPOP FESTIVAL GEOTIFF GPSMAN +OPTIONS_RADIO= MGG +OPTIONS_RADIO_MGG= GMAGICK IMAGICK DAVIS_DESC= Include Davis Weatherstation Support DBFAWK_DESC= Include DBFAWK Support -MAGICK_DESC= Include GraphicsMagick Support CURL_DESC= Include CURL Internet Image support GEOTIFF_DESC= Include GeoTIFF Support GPSMAN_DESC= Include GPSMAN Support FESTIVAL_DESC= Include Festival Voice Synthesis Support -RTREE_DESC= Enable spatial indexing of shapefiles ERRORPOP_DESC= Send error popups to stderr BDB_DESC= Tiger Map Caching using Berkeley DB +MGG_DESC= Image library for raster map processing +IMAGICK_DESC= ImageMagick (Version 6) +GMAGICK_DESC= GraphicsMagick (Needs GCC to compile) -OPTIONS_DEFAULT= DBFAWK MAGICK CURL RTREE BDB +OPTIONS_DEFAULT= BDB CURL DBFAWK GMAGICK DAVIS_CONFIGURE_ON= --enable-davis -MAGICK_LIB_DEPENDS= libGraphicsMagickWand.so:graphics/GraphicsMagick -MAGICK_CONFIGURE_WITH= graphicsmagick -MAGICK_USES= compiler:gcc-c++11-lib +IMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 +IMAGICK_CONFIGURE_WITH= imagemagick +GMAGICK_LIB_DEPENDS= libGraphicsMagickWand.so:graphics/GraphicsMagick +GMAGICK_CONFIGURE_WITH= graphicsmagick +GMAGICK_USES= compiler:gcc-c++11-lib + DBFAWK_LIB_DEPENDS= libpcre.so:devel/pcre DBFAWK_CONFIGURE_WITH= dbfawk @@ -71,14 +79,15 @@ GPSMAN_BUILD_DEPENDS= ${LOCALBASE}/share/doc/gpsmanshp GPSMAN_IMPLIES= SHAPELIB GPSMAN_CONFIGURE_WITH= gpsman -FESTIVAL_BUILD_DEPENDS= festival:audio/festival -FESTIVAL_CONFIGURE_WITH=festival +FESTIVAL_BUILD_DEPENDS= festival:audio/festival +FESTIVAL_CONFIGURE_WITH= festival -RTREE_CONFIGURE_WITH= rtree +#RTREE_CONFIGURE_WITH= rtree ERRORPOP_CONFIGURE_WITH= errorpopups BDB_USES= bdb -BDB_CONFIGURE_ON= --with-bdb-incdir=${BDB_INCLUDE_DIR} --with-bdb-libdir=${BDB_LIB_DIR} +BDB_CONFIGURE_ON= --with-bdb-incdir=${BDB_INCLUDE_DIR} \ + --with-bdb-libdir=${BDB_LIB_DIR} .include Modified: head/comms/xastir/files/pkg-message.in ============================================================================== --- head/comms/xastir/files/pkg-message.in Fri Jul 19 14:14:45 2019 (r506936) +++ head/comms/xastir/files/pkg-message.in Fri Jul 19 14:30:23 2019 (r506937) @@ -1,13 +1,6 @@ ******************************************************************** Xastir is now installed. -**** Important **** -If you are upgrading from v2.0.0 and using the -"TNC with GPS on AUX port" interface then unless you have a KPC-3+ TNC -or other TNC that requires a Control-E to be sent to receive GPS data -you will need to deselect "Send Control-E to receive GPS data?" in -the interface properties. D700s and similar do NOT need this setting. - Hop on over to http://www.xastir.org/ for details on getting maps and for more information on using Xastir.