From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jul 11 06:10:08 2010 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 05C49106566C for ; Sun, 11 Jul 2010 06:10:08 +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 D620A8FC15 for ; Sun, 11 Jul 2010 06:10:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o6B6A7iT035345 for ; Sun, 11 Jul 2010 06:10:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o6B6A75d035344; Sun, 11 Jul 2010 06:10:07 GMT (envelope-from gnats) Resent-Date: Sun, 11 Jul 2010 06:10:07 GMT Resent-Message-Id: <201007110610.o6B6A75d035344@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 E84A4106566B for ; Sun, 11 Jul 2010 06:05:51 +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 4D9918FC14 for ; Sun, 11 Jul 2010 06:05:50 +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 o6B65oXc049976 for ; Sun, 11 Jul 2010 16:05:50 +1000 (EST) (envelope-from carl@bumper.stagecraft.cx) Received: (from carl@localhost) by bumper.stagecraft.cx (8.14.3/8.14.3/Submit) id o6B65olS049975; Sun, 11 Jul 2010 16:05:50 +1000 (EST) (envelope-from carl) Message-Id: <201007110605.o6B65olS049975@bumper.stagecraft.cx> Date: Sun, 11 Jul 2010 16:05:50 +1000 (EST) From: Carl Makin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/148491: Maintainter Update port: 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: Sun, 11 Jul 2010 06:10:08 -0000 >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@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: