ports/141911: Maintainer Update comms/xastir

[Carl Makin]

>Number:         141911
>Category:       ports
>Synopsis:       Maintainer Update comms/xastir
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 23 03:10: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 at bumper.stagecraft.cx:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
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.

>How-To-Repeat:
	
>Fix:

	

--- xastir.1.9.6_1.diff begins here ---
--- /usr/ports/comms/xastir/Makefile	2009-12-21 04:48:40.000000000 +1100
+++ xastir/Makefile	2009-12-22 22:24:44.000000000 +1100
@@ -2,11 +2,12 @@
 # Date created:				17th June 2004
 # Whom:					Carl Makin <carl at stagecraft.cx>
 #
-# $FreeBSD: ports/comms/xastir/Makefile,v 1.26 2009/12/20 17:48:40 xride Exp $
+# $FreeBSD: ports/comms/xastir/Makefile,v 1.25 2009/08/22 00:15:14 amdmi3 Exp $
 #
 
 PORTNAME=	xastir
 PORTVERSION=	1.9.6
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
 
@@ -29,8 +30,6 @@
 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 @@
 
 .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 @@
 
 .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
--- /usr/ports/comms/xastir/pkg-plist	2009-12-21 04:48:40.000000000 +1100
+++ xastir/pkg-plist	2009-12-22 22:30:22.000000000 +1100
@@ -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
--- xastir.1.9.6_1.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: