9 files changed, 23 insertions, 111 deletions
diff --git a/comms/grig/Makefile b/comms/grig/Makefile
index d8e0d94c24ac..661cedb85263 100644
--- a/comms/grig/Makefile
+++ b/comms/grig/Makefile
@@ -5,28 +5,21 @@
 # $FreeBSD$
 
 PORTNAME=	grig
-PORTVERSION=	0.2.2
-PORTREVISION=	4
+PORTVERSION=	0.7.1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	groundstation
 
-MAINTAINER=	matt@mattsnetwork.co.uk
+MAINTAINER=	matt@chronos.org.uk
 COMMENT=	Amateur Radio control front-end
 
 LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib
 
-USE_X_PREFIX=	yes
-USE_GNOME=	gconf gtk12 gnomecanvas
+USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--disable-nls	# nls not supported yet
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 
-.include <bsd.port.pre.mk>
+MAN1=		grig.1
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|GCONF_LIBS="`|GCONF_LIBS="-lgconf-gtk-1 `|' ${WRKSRC}/configure
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/grig/distinfo b/comms/grig/distinfo
index c43772239ad1..4eebd720a8f2 100644
--- a/comms/grig/distinfo
+++ b/comms/grig/distinfo
@@ -1,3 +1,3 @@
-MD5 (grig-0.2.2.tar.gz) = 6d9786c7a5ee5e1f95d2572d3c7ce277
-SHA256 (grig-0.2.2.tar.gz) = f5fa1c698980fe5577d30537ac779519e6dc5f02835cf37b25c034e2e9a631b8
-SIZE (grig-0.2.2.tar.gz) = 227274
+MD5 (grig-0.7.1.tar.gz) = d490fa348fa2edfd6f6e3723d47a5684
+SHA256 (grig-0.7.1.tar.gz) = cc84d1a685801ebdf9e8afc70da2a3fab9b572e71d3d762a46454ec79ab2ef85
+SIZE (grig-0.7.1.tar.gz) = 494181
diff --git a/comms/grig/files/patch-aa b/comms/grig/files/patch-aa
deleted file mode 100644
index a0312ceb5bda..000000000000
--- a/comms/grig/files/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./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
deleted file mode 100644
index e3606929be20..000000000000
--- a/comms/grig/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./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
deleted file mode 100644
index 75e7c16f1dc5..000000000000
--- a/comms/grig/files/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./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
deleted file mode 100644
index 470ddb30889c..000000000000
--- a/comms/grig/files/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./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-ae b/comms/grig/files/patch-ae
deleted file mode 100644
index d11aaae5dee5..000000000000
--- a/comms/grig/files/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./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 --git a/comms/grig/pkg-descr b/comms/grig/pkg-descr
index 06ccd885dc3b..3977841cd18f 100644
--- a/comms/grig/pkg-descr
+++ b/comms/grig/pkg-descr
@@ -4,8 +4,7 @@ written using Gtk+ and Gnome widgets by Alexandru Csete.
 Part of the grounstation suite, it purpose is to control
 an amateur radio transceiver from X. It supports any of
 the transceivers that hamlib supports, including rpc.rigd
-over the network. However, at present only a subset of the
-hamlib functions are provided.
+over the network.
 
 The groundstation suite comprises Gnome-rig and Gnome-predict
 and is intended to provide a low-cost amateur radio station
diff --git a/comms/grig/pkg-plist b/comms/grig/pkg-plist
index 596867e19693..9df9ce4f74c7 100644
--- a/comms/grig/pkg-plist
+++ b/comms/grig/pkg-plist
@@ -1,4 +1,15 @@
 bin/grig
-share/pixmaps/grig/digits_normal.xpm
-share/pixmaps/grig/digits_small.xpm
+%%DATADIR%%/AUTHORS
+%%DATADIR%%/COPYING
+%%DATADIR%%/ChangeLog
+%%DATADIR%%/NEWS
+%%DATADIR%%/README
+share/pixmaps/grig/digits_normal.png
+share/pixmaps/grig/digits_small.png
+share/pixmaps/grig/grig-logo.png
+share/pixmaps/grig/ic910.png
+share/pixmaps/grig/smeter.png
 @dirrm share/pixmaps/grig
+@dirrmtry share/pixmaps
+@dirrm %%DATADIR%%
+@dirrmtry locale