summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrion <krion@FreeBSD.org>2004-10-09 07:51:12 +0000
committerkrion <krion@FreeBSD.org>2004-10-09 07:51:12 +0000
commitd20892c3aa78adcc72ee2bca2440087ccba6754f (patch)
tree7ee5ae0bf7733677f962dead4c601aebdff1180e
parent5a704938ab0c0820b2bd944f05cedf2919c4bf89 (diff)
downloadFreeBSD-ports-d20892c3aa78adcc72ee2bca2440087ccba6754f.zip
FreeBSD-ports-d20892c3aa78adcc72ee2bca2440087ccba6754f.tar.gz
Fix build with gcc-3.4
PR: ports/71941 Submitted by: maintainer Approved by: portmgr (implicit)
-rw-r--r--comms/grig/Makefile6
-rw-r--r--comms/grig/files/patch-aa18
-rw-r--r--comms/grig/files/patch-ab18
-rw-r--r--comms/grig/files/patch-ac18
-rw-r--r--comms/grig/files/patch-ad18
-rw-r--r--comms/grig/files/patch-ae (renamed from comms/grig/files/patch-src::grig-druid-loc.c)14
6 files changed, 83 insertions, 9 deletions
diff --git a/comms/grig/Makefile b/comms/grig/Makefile
index d861082..40cffd8 100644
--- a/comms/grig/Makefile
+++ b/comms/grig/Makefile
@@ -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
@@ -27,10 +27,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
.include <bsd.port.pre.mk>
-.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 --git a/comms/grig/files/patch-aa b/comms/grig/files/patch-aa
new file mode 100644
index 0000000..a0312ce
--- /dev/null
+++ b/comms/grig/files/patch-aa
@@ -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 --git a/comms/grig/files/patch-ab b/comms/grig/files/patch-ab
new file mode 100644
index 0000000..e360692
--- /dev/null
+++ b/comms/grig/files/patch-ab
@@ -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 --git a/comms/grig/files/patch-ac b/comms/grig/files/patch-ac
new file mode 100644
index 0000000..75e7c16
--- /dev/null
+++ b/comms/grig/files/patch-ac
@@ -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 --git a/comms/grig/files/patch-ad b/comms/grig/files/patch-ad
new file mode 100644
index 0000000..470ddb3
--- /dev/null
+++ b/comms/grig/files/patch-ad
@@ -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 --git a/comms/grig/files/patch-src::grig-druid-loc.c b/comms/grig/files/patch-ae
index 6d0f307..d11aaae 100644
--- a/comms/grig/files/patch-src::grig-druid-loc.c
+++ b/comms/grig/files/patch-ae
@@ -1,7 +1,6 @@
---- 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 @@
- */
+--- ./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),
@@ -10,4 +9,11 @@
gtk_entry_set_text (GTK_ENTRY (locatorwdg), g_strdup (loc));
}
#endif
+@@ -342,6 +342,7 @@
+ gtk_widget_set_sensitive (locatorwdg, FALSE);
+ break;
+ default:
++ break;
+ }
+ }
}
OpenPOWER on IntegriCloud