diff options
| author | xride <xride@FreeBSD.org> | 2009-12-25 04:24:42 +0800 |
|---|---|---|
| committer | xride <xride@FreeBSD.org> | 2009-12-25 04:24:42 +0800 |
| commit | 4e773a7e4309f787937e0380962cda57422feef1 (patch) | |
| tree | cca83de5a18f5aac8b63f6ae330a8eb5b4a4d7ed /comms | |
| parent | 11d714a3d7f61a0466d0f3960592b97d23a96b5d (diff) | |
| download | freebsd-ports-gnome-4e773a7e4309f787937e0380962cda57422feef1.tar.gz freebsd-ports-gnome-4e773a7e4309f787937e0380962cda57422feef1.tar.zst freebsd-ports-gnome-4e773a7e4309f787937e0380962cda57422feef1.zip | |
Previous update to 1.9.6 could conflict with shapelib port in default
configuration. This update fixes that by requiring shapelib port
by default and not enabling option that could install duplicate files.
PR: ports/141911
Submitted by: maintainer (Carl Makin)
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/xastir/Makefile | 16 | ||||
| -rw-r--r-- | comms/xastir/pkg-plist | 4 |
2 files changed, 1 insertions, 19 deletions
diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile index 11820c375ddd..5e76a24165a2 100644 --- a/comms/xastir/Makefile +++ b/comms/xastir/Makefile @@ -7,6 +7,7 @@ PORTNAME= xastir PORTVERSION= 1.9.6 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION} @@ -29,8 +30,6 @@ 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 [Image|Graphics]Magick Support" On \ GRAPHICK "Use GraphicsMagick instead of ImageMagick" Off \ @@ -46,15 +45,8 @@ OPTIONS= SHAPELIB "Include Shapelib support" On \ .include <bsd.port.pre.mk> -# Split this way to keep portlint happy. .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 .endif @@ -72,12 +64,6 @@ CONFIGURE_ARGS+= --without-graphicsmagick .if defined(WITHOUT_DBFAWK) CONFIGURE_ARGS+= --without-dbfawk -WITH_PCRE= true -.undef WITHOUT_PCRE -.endif - -.if defined(WITHOUT_PCRE) -CONFIGURE_ARGS+= --without-pcre .else LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre .endif diff --git a/comms/xastir/pkg-plist b/comms/xastir/pkg-plist index bd2feb82b018..8651caf9099e 100644 --- a/comms/xastir/pkg-plist +++ b/comms/xastir/pkg-plist @@ -1,8 +1,4 @@ bin/callpass -%%INCSHAPE%%bin/dbfadd -%%INCSHAPE%%bin/dbfcreate -%%INCSHAPE%%bin/shpadd -%%INCSHAPE%%bin/shpcreate bin/testdbfawk bin/xastir bin/xastir_udp_client |