ports/148491: Maintainter Update port: comms/xastir

[Carl Makin]

>Number:         148491
>Category:       ports
>Synopsis:       Maintainter Update port: 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:   Sun Jul 11 06:10:07 UTC 2010
>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:
maintainer update of comms/xastir.  This applies the patch, ports/146380 
to fix an issue with Xastir/Motif and a certain level of Xorg server.
Note the real problem is with Xorg, this is just a work-around
however it will still work fine with the patched/fixed Xorg server.

This also updates the port to use GraphicsMagick 1.3.  I'm not entirely
certain how to handle the multiple versions of Graphics Magick.  Xastir
should be able to cope with 1.2 as well.  I don't know why 1.1 is still 
the default in FreeBSD as that is ancient.
>How-To-Repeat:
	
>Fix:

	

--- xastir-update.shar begins here ---
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	makefile.diff
#	files/patch-main.c
#
echo x - makefile.diff
sed 's/^X//' >makefile.diff << '499110be219d5b2a5f1a1ef7ad6bc7e1'
X--- /usr/ports/comms/xastir/Makefile	2010-05-31 11:57:43.000000000 +1000
X+++ Makefile	2010-07-11 14:50:08.000000000 +1000
X@@ -7,7 +7,7 @@
X 
X PORTNAME=	xastir
X PORTVERSION=	1.9.8
X-PORTREVISION=	4
X+PORTREVISION=	5
X CATEGORIES=	comms hamradio
X MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
X 
X@@ -58,7 +58,7 @@
X CONFIGURE_ARGS+=	--without-imagemagick --without-graphicsmagick
X .else
X .if defined(WITH_GRAPHICK)
X-LIB_DEPENDS+=	GraphicsMagickWand.3:${PORTSDIR}/graphics/GraphicsMagick
X+LIB_DEPENDS+=	GraphicsMagickWand.4:${PORTSDIR}/graphics/GraphicsMagick13
X .else
X LIB_DEPENDS+=	MagickWand.3:${PORTSDIR}/graphics/ImageMagick
X CONFIGURE_ARGS+=	--without-graphicsmagick
499110be219d5b2a5f1a1ef7ad6bc7e1
echo x - files/patch-main.c
sed 's/^X//' >files/patch-main.c << '22057d1ee35f956c4de8e62c994e541b'
X
X--- src/main.c      11 Mar 2010 04:03:58 -0000      1.792
X+++ src/main.c      7 May 2010 16:23:16 -0000       1.793
X@@ -9018,6 +9018,12 @@
X             "create_appshell Menu Popup",
X             al,
X             ac);
X+#if XmVersion >= 2000
X+    XtVaSetValues(right_menu_popup, XmNpopupEnabled, XmPOPUP_DISABLED, NULL);
X+    XtUngrabButton(da, AnyButton, AnyModifier);
X+#else
X+    XtVaSetValues(right_menu_popup, XmNpopupEnabled, False, NULL);
X+#endif
X     //XtVaSetValues(right_menu_popup, XmNwhichButton, 3, NULL);
X 
X     ac = 0;
X
X
X
22057d1ee35f956c4de8e62c994e541b
exit
--- xastir-update.shar ends here ---


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