diff options
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/xastir/Makefile | 19 | ||||
| -rw-r--r-- | comms/xastir/distinfo | 6 | ||||
| -rw-r--r-- | comms/xastir/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | comms/xastir/pkg-plist | 32 |
4 files changed, 43 insertions, 25 deletions
diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile index 000b5365ff0c..b3fd3d643d39 100644 --- a/comms/xastir/Makefile +++ b/comms/xastir/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xastir -PORTVERSION= 1.8.4 -PORTREVISION= 2 +PORTVERSION= 1.9.2 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= xastir @@ -30,6 +29,7 @@ MAN1= xastir.1 SUB_FILES= pkg-message OPTIONS= SHAPELIB "Include Shapelib support" On \ + 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 \ @@ -48,16 +48,22 @@ OPTIONS= SHAPELIB "Include Shapelib support" On \ .include <bsd.port.pre.mk> -.if defined(WITHOUT_SHAPELIB) -CONFIGURE_ARGS+= --without-shapelib +# Split this way to keep portlint happy. +.if defined(WITH_SHAPELIB) +.if defined(WITH_INCSHAPE) +CONFIGURE_ARGS+= --with-internal-shapelib .else LIB_DEPENDS+= shp.1:${PORTSDIR}/devel/shapelib .endif +.else +CONFIGURE_ARGS+= --without-shapelib +.endif .if defined(WITHOUT_MAGICK) -CONFIGURE_ARGS+= --without-imagemagick +CONFIGURE_ARGS+= --without-imagemagick --without-graphicsmagick .else LIB_DEPENDS+= Magick.10:${PORTSDIR}/graphics/ImageMagick +CONFIGURE_ARGS+= --without-graphicsmagick .endif .if defined(WITHOUT_DBFAWK) @@ -137,9 +143,6 @@ WITH_OPTCFLAGS= true CFLAGS+= -O2 -pipe .endif -post-patch: - @${REINPLACE_CMD} -e 's|-O2||' ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - post-install: @${CAT} ${PKGMESSAGE} diff --git a/comms/xastir/distinfo b/comms/xastir/distinfo index 787387849c0e..50fc7eedaf47 100644 --- a/comms/xastir/distinfo +++ b/comms/xastir/distinfo @@ -1,3 +1,3 @@ -MD5 (xastir-1.8.4.tar.gz) = 10fcf7a63b0696ab6fefc40f1a80fd1d -SHA256 (xastir-1.8.4.tar.gz) = 2c020dd4bbea8d8b6f7773ab6b1327f9c8252e4e3dbf384e200b4531a51b80fc -SIZE (xastir-1.8.4.tar.gz) = 1685220 +MD5 (xastir-1.9.2.tar.gz) = 8608afa8f8f0c441a37ba72aeeccdcac +SHA256 (xastir-1.9.2.tar.gz) = 4fb9ebc84113a504c8c08c563e7f0f5a53688f9aa144c8f21ecd41bc65db0e10 +SIZE (xastir-1.9.2.tar.gz) = 2253001 diff --git a/comms/xastir/files/patch-Makefile.in b/comms/xastir/files/patch-Makefile.in new file mode 100644 index 000000000000..0931331e5b64 --- /dev/null +++ b/comms/xastir/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2007-12-21 16:43:24.000000000 -0500 ++++ Makefile.in 2007-12-21 16:43:30.000000000 -0500 +@@ -205,7 +205,7 @@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + lpr = @lpr@ +-mandir = ${prefix}/share/man ++mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ diff --git a/comms/xastir/pkg-plist b/comms/xastir/pkg-plist index 2a9e56feb201..cef8f47ef063 100644 --- a/comms/xastir/pkg-plist +++ b/comms/xastir/pkg-plist @@ -29,6 +29,20 @@ lib/xastir/update_langfile.pl lib/xastir/waypoint-get.pl lib/xastir/xastir-fixcfg.sh lib/xastir/xastir-migrate.sh +%%DOCSDIR%%/AUTHORS +%%DOCSDIR%%/COPYING +%%DOCSDIR%%/COPYING.LIB.LESSTIF +%%DOCSDIR%%/ChangeLog +%%DOCSDIR%%/FAQ +%%DOCSDIR%%/INSTALL +%%DOCSDIR%%/LICENSE +%%DOCSDIR%%/README +%%DOCSDIR%%/README.CVS +%%DOCSDIR%%/README.Contributing +%%DOCSDIR%%/README.Getting-Started +%%DOCSDIR%%/README.MAPS +%%DOCSDIR%%/README.win32 +%%DOCSDIR%%/UPGRADE %%DATADIR%%/Counties/placeholder %%DATADIR%%/GNIS/placeholder %%DATADIR%%/config/24kgrid.dbfawk @@ -49,8 +63,10 @@ lib/xastir/xastir-migrate.sh %%DATADIR%%/config/nwszoddmmyy.dbfawk %%DATADIR%%/config/predefined_EVENT.sys %%DATADIR%%/config/predefined_SAR.sys +%%DATADIR%%/config/stored_track.dbfawk %%DATADIR%%/config/tgr2shp.dbfawk %%DATADIR%%/config/tgr2shppoly.dbfawk +%%DATADIR%%/config/tgr2shppoly_2006.dbfawk %%DATADIR%%/config/tgrcty.dbfawk %%DATADIR%%/config/tgrkgl.dbfawk %%DATADIR%%/config/tgrlk.dbfawk @@ -75,19 +91,6 @@ lib/xastir/xastir-migrate.sh %%DATADIR%%/config/tnc-stop.thd7 %%DATADIR%%/config/tnc-stop.tnc2-ui %%DATADIR%%/config/xastir.rgb -%%DATADIR%%/doc/AUTHORS -%%DATADIR%%/doc/COPYING -%%DATADIR%%/doc/ChangeLog -%%DATADIR%%/doc/FAQ -%%DATADIR%%/doc/INSTALL -%%DATADIR%%/doc/LICENSE -%%DATADIR%%/doc/README -%%DATADIR%%/doc/README.CVS -%%DATADIR%%/doc/README.Contributing -%%DATADIR%%/doc/README.Getting-Started -%%DATADIR%%/doc/README.MAPS -%%DATADIR%%/doc/README.win32 -%%DATADIR%%/doc/UPGRADE %%DATADIR%%/fcc/placeholder %%DATADIR%%/help/help-Dutch.dat %%DATADIR%%/help/help-English.dat @@ -107,6 +110,7 @@ lib/xastir/xastir-migrate.sh %%DATADIR%%/maps/Online/terraserver-urban.geo %%DATADIR%%/maps/Online/terraserver.geo %%DATADIR%%/maps/Online/tigermap.geo +%%DATADIR%%/maps/worldhi.map %%DATADIR%%/sounds/placeholder %%DATADIR%%/symbols/13pct.xbm %%DATADIR%%/symbols/25pct.xbm @@ -127,9 +131,9 @@ lib/xastir/xastir-migrate.sh @dirrm %%DATADIR%%/maps @dirrm %%DATADIR%%/help @dirrm %%DATADIR%%/fcc -@dirrm %%DATADIR%%/doc @dirrm %%DATADIR%%/config @dirrm %%DATADIR%%/GNIS @dirrm %%DATADIR%%/Counties @dirrm %%DATADIR%% +@dirrm share/doc/xastir @dirrm lib/xastir |