From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Sep 20 15:00:45 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C46C916A4D1 for ; Mon, 20 Sep 2004 15:00:45 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E44543D41 for ; Mon, 20 Sep 2004 15:00:40 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i8KF0dnr038185 for ; Mon, 20 Sep 2004 15:00:39 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i8KF0d6W038179; Mon, 20 Sep 2004 15:00:39 GMT (envelope-from gnats) Resent-Date: Mon, 20 Sep 2004 15:00:39 GMT Resent-Message-Id: <200409201500.i8KF0d6W038179@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, Matt Dawson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB23916A4CE for ; Mon, 20 Sep 2004 14:54:14 +0000 (GMT) Received: from msgdirector4.onetel.net.uk (msgdirector4.onetel.net.uk [212.67.96.160]) by mx1.FreeBSD.org (Postfix) with ESMTP id D17BA43D5C for ; Mon, 20 Sep 2004 14:54:13 +0000 (GMT) (envelope-from matt@mattsnetwork.co.uk) Received: from workstation1.local.mattsnetwork.co.uk (213-78-97-179.friaco.onetel.net.uk [213.78.97.179]) by msgdirector4.onetel.net.uk (MOS 3.4.6-GR) with ESMTP id CGD14214; Mon, 20 Sep 2004 15:54:09 +0100 (BST) Received: from workstation1.local.mattsnetwork.co.uk (localhost [127.0.0.1]) id i8KEs9Ff011913 for ; Mon, 20 Sep 2004 15:54:09 +0100 (BST) (envelope-from matt@mattsnetwork.co.uk) Received: (from root@localhost)i8KErw4J011912; Mon, 20 Sep 2004 15:53:58 +0100 (BST) (envelope-from matt@mattsnetwork.co.uk) Message-Id: <200409201453.i8KErw4J011912@workstation1.local.mattsnetwork.co.uk> Date: Mon, 20 Sep 2004 15:53:58 +0100 (BST) From: Matt Dawson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/71941: [Maintainer Update] Fix broken comms/grig and gcc-3.4.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Matt Dawson List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Sep 2004 15:00:45 -0000 >Number: 71941 >Category: ports >Synopsis: [Maintainer Update] Fix broken comms/grig and gcc-3.4.2 >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: Mon Sep 20 15:00:39 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Matt Dawson >Release: FreeBSD 5.2.1-RELEASE-p9 i386 >Organization: n/a >Environment: System: FreeBSD workstation1.local.mattsnetwork.co.uk 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #1: Thu Jul 1 16:03:11 BST 2004 md001@workstation1.local.mattsnetwork.co.uk:/usr/obj/usr/src/sys/WORKSTATION1 i386 >Description: comms/grig does not compile on -CURRENT or RELENG_5 due to new compiler >How-To-Repeat: >Fix: .diff attached --- grig-0.2.2_3.diff begins here --- diff -ruN /usr/ports/comms/grig/Makefile ./grig/Makefile --- /usr/ports/comms/grig/Makefile Mon Sep 20 01:10:38 2004 +++ ./grig/Makefile Mon Sep 20 15:49:29 2004 @@ -6,7 +6,7 @@ PORTNAME= grig PORTVERSION= 0.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= groundstation @@ -26,10 +26,6 @@ LIBS="-L${LOCALBASE}/lib" .include - -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif post-patch: @${REINPLACE_CMD} -e 's|GCONF_LIBS="`|GCONF_LIBS="-lgconf-gtk-1 `|' ${WRKSRC}/configure diff -ruN /usr/ports/comms/grig/files/patch-aa ./grig/files/patch-aa --- /usr/ports/comms/grig/files/patch-aa Thu Jan 1 01:00:00 1970 +++ ./grig/files/patch-aa Mon Sep 20 15:47:05 2004 @@ -0,0 +1,18 @@ +--- ./src/gnome-hamlib-rig.c.orig Mon Sep 20 15:35:02 2004 ++++ ./src/gnome-hamlib-rig.c Mon Sep 20 15:38:35 2004 +@@ -495,6 +495,7 @@ + case 2: pbwidth = rig_passband_narrow (GNOME_HAMLIB_RIG (ghr)->rig, mode); + break; + default: /* THIS SHOULD NEVER HAVE HAPPENED ERROR */ ++ break; + } + retcode = rig_set_mode (GNOME_HAMLIB_RIG (ghr)->rig, RIG_VFO_CURR, mode, pbwidth); + if (retcode != RIG_OK) { +@@ -1367,6 +1368,7 @@ + case 2: pbwidth = rig_passband_narrow (ghr->rig, mode); + break; + default: /* THIS SHOULD NEVER HAVE HAPPENED ERROR */ ++ break; + } + retcode = rig_set_mode (ghr->rig, RIG_VFO_CURR, mode, pbwidth); + if (retcode == RIG_OK) { diff -ruN /usr/ports/comms/grig/files/patch-ab ./grig/files/patch-ab --- /usr/ports/comms/grig/files/patch-ab Thu Jan 1 01:00:00 1970 +++ ./grig/files/patch-ab Mon Sep 20 15:47:05 2004 @@ -0,0 +1,18 @@ +--- ./src/grig-config-rig.c.orig Mon Sep 20 15:36:13 2004 ++++ ./src/grig-config-rig.c Mon Sep 20 15:37:42 2004 +@@ -433,6 +433,7 @@ + case 1: /* Cancel */ + break; + default: ++ break; + } + gnome_dialog_close (GNOME_DIALOG (dialog)); + } +@@ -575,6 +576,7 @@ + case 1: /* Cancel */ + break; + default: ++ break; + } + gnome_dialog_close (GNOME_DIALOG (dialog)); + } diff -ruN /usr/ports/comms/grig/files/patch-ac ./grig/files/patch-ac --- /usr/ports/comms/grig/files/patch-ac Thu Jan 1 01:00:00 1970 +++ ./grig/files/patch-ac Mon Sep 20 15:47:05 2004 @@ -0,0 +1,18 @@ +--- ./src/grig-config-rot.c.orig Mon Sep 20 15:39:11 2004 ++++ ./src/grig-config-rot.c Mon Sep 20 15:40:07 2004 +@@ -429,6 +429,7 @@ + case 1: /* Cancel */ + break; + default: ++ break; + } + gnome_dialog_close (GNOME_DIALOG (dialog)); + } +@@ -571,6 +572,7 @@ + case 1: /* Cancel */ + break; + default: ++ break; + } + gnome_dialog_close (GNOME_DIALOG (dialog)); + } diff -ruN /usr/ports/comms/grig/files/patch-ad ./grig/files/patch-ad --- /usr/ports/comms/grig/files/patch-ad Thu Jan 1 01:00:00 1970 +++ ./grig/files/patch-ad Mon Sep 20 15:47:05 2004 @@ -0,0 +1,18 @@ +--- ./src/grig-config.c.orig Mon Sep 20 15:40:26 2004 ++++ ./src/grig-config.c Mon Sep 20 15:41:25 2004 +@@ -161,6 +161,7 @@ + break; + #endif + default: ++ break; + } + } + +@@ -209,6 +210,7 @@ + break; + #endif + default: ++ break; + } + } + diff -ruN /usr/ports/comms/grig/files/patch-ae ./grig/files/patch-ae --- /usr/ports/comms/grig/files/patch-ae Thu Jan 1 01:00:00 1970 +++ ./grig/files/patch-ae Mon Sep 20 15:47:05 2004 @@ -0,0 +1,19 @@ +--- ./src/grig-druid-loc.c.orig Sun May 9 07:18:50 2004 ++++ ./src/grig-druid-loc.c Sat Aug 14 15:39:16 2004 +@@ -294,7 +294,7 @@ + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (radll))) { + longlat2locator (g_strtod (gtk_entry_get_text (GTK_ENTRY (lonwdg)), NULL), + g_strtod (gtk_entry_get_text (GTK_ENTRY (latwdg)), NULL), +- loc); ++ loc, 3); + gtk_entry_set_text (GTK_ENTRY (locatorwdg), g_strdup (loc)); + } + #endif +@@ -342,6 +342,7 @@ + gtk_widget_set_sensitive (locatorwdg, FALSE); + break; + default: ++ break; + } + } + } diff -ruN /usr/ports/comms/grig/files/patch-src::grig-druid-loc.c ./grig/files/patch-src::grig-druid-loc.c --- /usr/ports/comms/grig/files/patch-src::grig-druid-loc.c Tue May 11 01:15:37 2004 +++ ./grig/files/patch-src::grig-druid-loc.c Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ ---- src/grig-druid-loc.c.orig Sun May 9 07:18:50 2004 -+++ src/grig-druid-loc.c Sun May 9 07:16:04 2004 -@@ -293,9 +293,9 @@ - */ - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (radll))) { - longlat2locator (g_strtod (gtk_entry_get_text (GTK_ENTRY (lonwdg)), NULL), - g_strtod (gtk_entry_get_text (GTK_ENTRY (latwdg)), NULL), -- loc); -+ loc, 3); - gtk_entry_set_text (GTK_ENTRY (locatorwdg), g_strdup (loc)); - } - #endif - } --- grig-0.2.2_3.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: