From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 17 07:20:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4D301065694 for ; Thu, 17 Dec 2009 07:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 94CD68FC22 for ; Thu, 17 Dec 2009 07:20:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nBH7K2dZ008989 for ; Thu, 17 Dec 2009 07:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nBH7K2Gu008988; Thu, 17 Dec 2009 07:20:02 GMT (envelope-from gnats) Resent-Date: Thu, 17 Dec 2009 07:20:02 GMT Resent-Message-Id: <200912170720.nBH7K2Gu008988@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Carl Makin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68CC31065672 for ; Thu, 17 Dec 2009 07:16:07 +0000 (UTC) (envelope-from carl@bumper.stagecraft.cx) Received: from bumper.stagecraft.cx (brain.stagecraft.cx [202.45.97.55]) by mx1.freebsd.org (Postfix) with ESMTP id 8FB868FC0C for ; Thu, 17 Dec 2009 07:16:05 +0000 (UTC) Received: from bumper.stagecraft.cx (localhost [127.0.0.1]) by bumper.stagecraft.cx (8.14.3/8.14.3) with ESMTP id nBH6rtMR041873 for ; Thu, 17 Dec 2009 17:53:55 +1100 (EST) (envelope-from carl@bumper.stagecraft.cx) Received: (from root@localhost) by bumper.stagecraft.cx (8.14.3/8.14.3/Submit) id nBH6rtsA041872; Thu, 17 Dec 2009 17:53:55 +1100 (EST) (envelope-from carl) Message-Id: <200912170653.nBH6rtsA041872@bumper.stagecraft.cx> Date: Thu, 17 Dec 2009 17:53:55 +1100 (EST) From: Carl Makin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/141701: Maintainer Update: comms/xastir X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Carl Makin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2009 07:20:02 -0000 >Number: 141701 >Category: ports >Synopsis: Maintainer Update: comms/xastir >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Dec 17 07:20:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Carl Makin >Release: FreeBSD 8.0-STABLE i386 >Organization: >Environment: System: FreeBSD bumper.stagecraft.cx 8.0-STABLE FreeBSD 8.0-STABLE #0: Tue Dec 1 09:09:22 EST 2009 root@bumper.stagecraft.cx:/usr/obj/usr/src/sys/GENERIC i386 >Description: This is an update to bring Xastir to the latest stable version. >How-To-Repeat: >Fix: --- xastir-196.diff begins here --- --- /usr/ports/comms/xastir/Makefile 2009-08-22 10:15:14.000000000 +1000 +++ xastir/Makefile 2009-12-17 17:48:51.000000000 +1100 @@ -6,8 +6,7 @@ # PORTNAME= xastir -PORTVERSION= 1.9.4 -PORTREVISION= 4 +PORTVERSION= 1.9.6 CATEGORIES= comms hamradio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION} @@ -33,18 +32,16 @@ INCSHAPE "Use Shapelib included with Xastir" On \ PCRE "Include Perl Compat Regular Expression Support" On \ DBFAWK "Include DBFAWK Support" On \ - MAGICK "Include ImageMagick Support" On \ + MAGICK "Include [Image|Graphics]Magick Support" On \ + GRAPHICK "Use GraphicsMagick instead of ImageMagick" Off \ CURL "Include CURL Internet Image support" On \ GEOTIFF "Include GeoTIFF Support" Off \ GDAL "Include GDAL Support" Off \ GPSMAN "Include GPSMAN Support" Off \ FESTIVAL "Include Festival Voice Synthesis Support" Off \ - RTREE "Enable spatial indexing of shapefiles" Off \ + RTREE "Enable spatial indexing of shapefiles" On \ ERRORPOP "Send error popups to stderr" Off \ - DB40 "Tiger Map Caching using Berkeley DB v4.0" Off \ - DB41 "Tiger Map Caching using Berkeley DB v4.1" Off \ - DB42 "Tiger Map Caching using Berkeley DB v4.2" Off \ - DB43 "Tiger Map Caching using Berkeley DB v4.3" Off \ + BDB "Tiger Map Caching using Berkeley DB" On \ OPTCFLAGS "Use optimized CFLAGS (-O2 -pipe)" Off .include @@ -53,8 +50,10 @@ .if defined(WITH_SHAPELIB) .if defined(WITH_INCSHAPE) CONFIGURE_ARGS+= --with-internal-shapelib +PLIST_SUB= INCSHAPE= .else LIB_DEPENDS+= shp.1:${PORTSDIR}/devel/shapelib +PLIST_SUB= INCSHAPE="@comment " .endif .else CONFIGURE_ARGS+= --without-shapelib @@ -63,9 +62,13 @@ .if defined(WITHOUT_MAGICK) CONFIGURE_ARGS+= --without-imagemagick --without-graphicsmagick .else +.if defined(WITH_GRAPHICK) +LIB_DEPENDS+= GraphicsMagickWand.3:${PORTSDIR}/graphics/GraphicsMagick +.else LIB_DEPENDS+= MagickWand.2:${PORTSDIR}/graphics/ImageMagick CONFIGURE_ARGS+= --without-graphicsmagick .endif +.endif .if defined(WITHOUT_DBFAWK) CONFIGURE_ARGS+= --without-dbfawk @@ -115,24 +118,11 @@ CONFIGURE_ARGS+= --with-errorpopups .endif -.if defined(WITH_DB40) -USE_BDB= 40 -.endif - -.if defined(WITH_DB41) -USE_BDB= 41 -.endif - -.if defined(WITH_DB42) -USE_BDB= 42 -.endif - -.if defined(WITH_DB43) -USE_BDB= 43 -.endif - -.if defined(WITH_DB40) || defined(WITH_DB41) || defined(WITH_DB42) || defined(WITH_DB43) -CONFIGURE_ARGS+= --with-bdb-incdir=${BDB_INCLUDE_DIR} +.if defined(WITH_BDB) +USE_BDB= 41+ +WITH_BDB_HIGHEST= ${TRUE} +INVALID_BDB_VER= 2 3 40 +CONFIGURE_ARGS+= --with-bdb-incdir=${BDB_INCLUDE_DIR} --with-bdb-libdir=${BDB_LIB_DIR} .endif .if defined(WITH_OPTIMIZED_CFLAGS) --- /usr/ports/comms/xastir/distinfo 2008-09-27 04:49:57.000000000 +1000 +++ xastir/distinfo 2009-12-05 09:57:12.000000000 +1100 @@ -1,3 +1,3 @@ -MD5 (xastir-1.9.4.tar.gz) = 415a19df810d0b28ac61aa444c3e7e0a -SHA256 (xastir-1.9.4.tar.gz) = b960449bc755e702013cdd62587262bd2be22cbfd5656e4bfe1dd12d62e4c174 -SIZE (xastir-1.9.4.tar.gz) = 2348880 +MD5 (xastir-1.9.6.tar.gz) = 78ed29f798c0d9d6ddee26831a1732ea +SHA256 (xastir-1.9.6.tar.gz) = e0c3efc41c79252d8ced7cebcd101051a873a73d4c0085c1f31452aee822c07e +SIZE (xastir-1.9.6.tar.gz) = 2464221 --- /usr/ports/comms/xastir/files/pkg-message.in 2005-05-25 15:24:30.000000000 +1000 +++ xastir/files/pkg-message.in 2009-12-17 17:47:00.000000000 +1100 @@ -5,10 +5,4 @@ maps and for more information on using Xastir. Your map directory is %%PREFIX%%/share/xastir/maps - -WARNING! File locations have changed since Xastir 1.2.0 (the stable -version). What used to be in /usr/local/xastir is now in -%%PREFIX%%/share/xastir. If you are upgrading from 1.2.0 or earlier -then you need to follow the instructions in the UPGRADING document -in %%PREFIX%%/share/xastir/doc. ******************************************************************** --- /usr/ports/comms/xastir/pkg-plist 2008-09-27 04:49:57.000000000 +1000 +++ xastir/pkg-plist 2009-12-16 22:23:46.000000000 +1100 @@ -1,4 +1,9 @@ bin/callpass +%%INCSHAPE%%bin/dbfadd +%%INCSHAPE%%bin/dbfcreate +%%INCSHAPE%%bin/shpadd +%%INCSHAPE%%bin/shpcreate +bin/testdbfawk bin/xastir bin/xastir_udp_client lib/xastir/Coordinate.pm @@ -8,17 +13,25 @@ lib/xastir/get-fcc-rac.pl lib/xastir/get-gnis lib/xastir/get-maptools.sh +lib/xastir/get-pop lib/xastir/get_shapelib.sh lib/xastir/gpx2shape lib/xastir/icontable.pl lib/xastir/inf2geo.pl lib/xastir/kiss-off.pl +lib/xastir/langElmerFudd.pl +lib/xastir/langMuppetsChef.pl +lib/xastir/langOldeEnglish.pl +lib/xastir/langPigLatin.pl +lib/xastir/langPirateEnglish.pl lib/xastir/mapblast2geo.pl lib/xastir/mapfgd.pl lib/xastir/object2shp.pl lib/xastir/overlay.pl lib/xastir/ozi2geo.pl lib/xastir/permutations.pl +lib/xastir/pos2shp.pl +lib/xastir/slideshow.pl lib/xastir/split_gnis.bash lib/xastir/split_gnis.pl lib/xastir/test_coord.pl @@ -26,6 +39,8 @@ lib/xastir/toporama50k.pl lib/xastir/track-get.pl lib/xastir/update_langfile.pl +lib/xastir/values +lib/xastir/values.pl lib/xastir/waypoint-get.pl lib/xastir/xastir-fixcfg.sh lib/xastir/xastir-migrate.sh @@ -46,15 +61,27 @@ %%DATADIR%%/Counties/placeholder %%DATADIR%%/GNIS/placeholder %%DATADIR%%/config/24kgrid.dbfawk +%%DATADIR%%/config/arealm.dbfawk +%%DATADIR%%/config/areawater.dbfawk +%%DATADIR%%/config/cousub.dbfawk +%%DATADIR%%/config/cousub00.dbfawk +%%DATADIR%%/config/edge.dbfawk +%%DATADIR%%/config/featnames.dbfawk %%DATADIR%%/config/gps_wpt.dbfawk %%DATADIR%%/config/language-Dutch.sys +%%DATADIR%%/config/language-ElmerFudd.sys %%DATADIR%%/config/language-English.sys %%DATADIR%%/config/language-French.sys %%DATADIR%%/config/language-German.sys %%DATADIR%%/config/language-Italian.sys +%%DATADIR%%/config/language-MuppetsChef.sys +%%DATADIR%%/config/language-OldeEnglish.sys +%%DATADIR%%/config/language-PigLatin.sys +%%DATADIR%%/config/language-PirateEnglish.sys %%DATADIR%%/config/language-Portuguese.sys %%DATADIR%%/config/language-Spanish.sys %%DATADIR%%/config/nwsc_ddmmyy.dbfawk +%%DATADIR%%/config/nwsc_ddmmyy_09.dbfawk %%DATADIR%%/config/nwsmzddmmyy.dbfawk %%DATADIR%%/config/nwsmzoddmmyy.dbfawk %%DATADIR%%/config/nwsozddmmyy.dbfawk @@ -62,9 +89,11 @@ %%DATADIR%%/config/nwsz1ddmmyy.dbfawk %%DATADIR%%/config/nwsz_ddmmyy.dbfawk %%DATADIR%%/config/nwszoddmmyy.dbfawk +%%DATADIR%%/config/pointlm.dbfawk %%DATADIR%%/config/predefined_EVENT.sys %%DATADIR%%/config/predefined_SAR.sys %%DATADIR%%/config/stored_track.dbfawk +%%DATADIR%%/config/tabblock.dbfawk %%DATADIR%%/config/tgr2shp.dbfawk %%DATADIR%%/config/tgr2shppoly.dbfawk %%DATADIR%%/config/tgr2shppoly_2006.dbfawk @@ -137,5 +166,4 @@ @dirrm %%DATADIR%%/Counties @dirrm %%DATADIR%% @dirrm %%DOCSDIR%% -@dirrm share/xastir @dirrm lib/xastir --- xastir-196.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: