Date: Sat, 29 Jan 2005 05:44:40 +0000 From: Matt Dawson <matt@mattsnetwork.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/76807: [Maintainer Update] comms/grig to ver 0.4.1 Message-ID: <200501290544.41504.matt@mattsnetwork.co.uk> Resent-Message-ID: <200501290550.j0T5oBfl086803@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 76807
>Category: ports
>Synopsis: [Maintainer Update] comms/grig to ver 0.4.1
>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: Sat Jan 29 05:50:10 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Matt Dawson
>Release: FreeBSD 5.3-RELEASE-p2 i386
>Organization:
N/A
>Environment:
System: FreeBSD workstation1 5.3-RELEASE-p2 FreeBSD 5.3-RELEASE-p2 #1: Tue Dec
7 21:23:42 GMT 2004 md001@workstation1:/usr/obj/usr/src/sys/WORKSTATION1 i386
>Description:
comms/grig is out of date. current version in 0.4.1
>How-To-Repeat:
>Fix:
diff attached.
--- grig-0.4.1.diff begins here ---
diff -ruN ./grig/Makefile /usr/ports/comms/grig/Makefile
--- ./grig/Makefile Sat Jan 29 05:22:49 2005
+++ /usr/ports/comms/grig/Makefile Sat Oct 9 11:01:09 2004
@@ -5,7 +5,8 @@
# $FreeBSD: ports/comms/grig/Makefile,v 1.5 2004/10/09 07:51:12 krion Exp $
PORTNAME= grig
-PORTVERSION= 0.4.1
+PORTVERSION= 0.2.2
+PORTREVISION= 3
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= groundstation
@@ -16,8 +17,17 @@
LIB_DEPENDS= hamlib:${PORTSDIR}/comms/hamlib
USE_X_PREFIX= yes
-USE_GNOME= gtk20
+USE_GNOME= gconf gtk12 gnomecanvas
GNU_CONFIGURE= yes
USE_GMAKE= yes
+USE_REINPLACE= yes
+CONFIGURE_ARGS= --disable-nls # nls not supported yet
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|GCONF_LIBS="`|GCONF_LIBS="-lgconf-gtk-1 `|'
${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff -ruN ./grig/OLD-DIRS /usr/ports/comms/grig/OLD-DIRS
--- ./grig/OLD-DIRS Sat Jan 29 05:26:52 2005
+++ /usr/ports/comms/grig/OLD-DIRS Thu Jan 1 01:00:00 1970
@@ -1,287 +0,0 @@
-bin
-etc
-etc/rc.d
-include
-include/DPS
-include/GL
-include/X11
-include/X11/ICE
-include/X11/PEX5
-include/X11/PM
-include/X11/SM
-include/X11/Xaw
-include/X11/Xcursor
-include/X11/Xft
-include/X11/Xmu
-include/X11/bitmaps
-include/X11/extensions
-include/X11/fonts
-include/X11/fonts/codeconv
-include/X11/pixmaps
-include/bitmaps
-include/freetype2
-include/freetype2/freetype
-include/freetype2/freetype/cache
-include/freetype2/freetype/config
-include/freetype2/freetype/internal
-info
-lib
-lib/X11
-lib/X11/XF86Setup
-lib/X11/XF86Setup/pics
-lib/X11/XF86Setup/scripts
-lib/X11/XF86Setup/tcllib
-lib/X11/app-defaults
-lib/X11/config
-lib/X11/doc
-lib/X11/doc/PostScript
-lib/X11/doc/html
-lib/X11/etc
-lib/X11/fonts
-lib/X11/fonts/100dpi
-lib/X11/fonts/75dpi
-lib/X11/fonts/CID
-lib/X11/fonts/PEX
-lib/X11/fonts/Speedo
-lib/X11/fonts/TTF
-lib/X11/fonts/Type1
-lib/X11/fonts/cyrillic
-lib/X11/fonts/encodings
-lib/X11/fonts/encodings/large
-lib/X11/fonts/latin2
-lib/X11/fonts/latin2/100dpi
-lib/X11/fonts/latin2/75dpi
-lib/X11/fonts/local
-lib/X11/fonts/misc
-lib/X11/fonts/util
-lib/X11/fs
-lib/X11/icons
-lib/X11/lbxproxy
-lib/X11/locale
-lib/X11/locale/C
-lib/X11/locale/armscii-8
-lib/X11/locale/common
-lib/X11/locale/el_GR.UTF-8
-lib/X11/locale/en_US.UTF-8
-lib/X11/locale/en_US.utf
-lib/X11/locale/georgian-academy
-lib/X11/locale/georgian-ps
-lib/X11/locale/ibm-cp1133
-lib/X11/locale/iscii-dev
-lib/X11/locale/isiri-3342
-lib/X11/locale/iso8859-1
-lib/X11/locale/iso8859-10
-lib/X11/locale/iso8859-11
-lib/X11/locale/iso8859-13
-lib/X11/locale/iso8859-14
-lib/X11/locale/iso8859-15
-lib/X11/locale/iso8859-2
-lib/X11/locale/iso8859-3
-lib/X11/locale/iso8859-4
-lib/X11/locale/iso8859-5
-lib/X11/locale/iso8859-6
-lib/X11/locale/iso8859-7
-lib/X11/locale/iso8859-8
-lib/X11/locale/iso8859-9
-lib/X11/locale/iso8859-9e
-lib/X11/locale/ja
-lib/X11/locale/ja.JIS
-lib/X11/locale/ja.SJIS
-lib/X11/locale/ja_JP.UTF-8
-lib/X11/locale/ko
-lib/X11/locale/ko_KR.UTF-8
-lib/X11/locale/koi8-c
-lib/X11/locale/koi8-r
-lib/X11/locale/koi8-u
-lib/X11/locale/lib
-lib/X11/locale/lib/common
-lib/X11/locale/microsoft-cp1251
-lib/X11/locale/microsoft-cp1255
-lib/X11/locale/microsoft-cp1256
-lib/X11/locale/mk_MK.UTF-8
-lib/X11/locale/mulelao-1
-lib/X11/locale/nokhchi-1
-lib/X11/locale/tatar-cyr
-lib/X11/locale/tbl_data
-lib/X11/locale/th_TH
-lib/X11/locale/th_TH.TACTIS
-lib/X11/locale/th_TH.UTF-8
-lib/X11/locale/tscii-0
-lib/X11/locale/vi_VN.tcvn
-lib/X11/locale/vi_VN.viscii
-lib/X11/locale/zh
-lib/X11/locale/zh_CN
-lib/X11/locale/zh_CN.gbk
-lib/X11/locale/zh_HK.big5
-lib/X11/locale/zh_HK.big5hkscs
-lib/X11/locale/zh_TW
-lib/X11/locale/zh_TW.Big5
-lib/X11/locale/zh_TW.UTF-8
-lib/X11/locale/zh_TW.big5
-lib/X11/proxymngr
-lib/X11/rstart
-lib/X11/rstart/commands
-lib/X11/rstart/commands/x11r6
-lib/X11/rstart/contexts
-lib/X11/twm
-lib/X11/x11perfcomp
-lib/X11/xdm
-lib/X11/xdm/pixmaps
-lib/X11/xedit
-lib/X11/xedit/lisp
-lib/X11/xedit/lisp/progmodes
-lib/X11/xinit
-lib/X11/xkb
-lib/X11/xkb/compat
-lib/X11/xkb/compiled
-lib/X11/xkb/geometry
-lib/X11/xkb/geometry/digital
-lib/X11/xkb/geometry/sgi
-lib/X11/xkb/keycodes
-lib/X11/xkb/keycodes/digital
-lib/X11/xkb/keycodes/sgi
-lib/X11/xkb/keymap
-lib/X11/xkb/keymap/digital
-lib/X11/xkb/keymap/sgi
-lib/X11/xkb/keymap/sun
-lib/X11/xkb/rules
-lib/X11/xkb/semantics
-lib/X11/xkb/symbols
-lib/X11/xkb/symbols/digital
-lib/X11/xkb/symbols/fujitsu
-lib/X11/xkb/symbols/hp
-lib/X11/xkb/symbols/macintosh
-lib/X11/xkb/symbols/nec
-lib/X11/xkb/symbols/pc
-lib/X11/xkb/symbols/sgi
-lib/X11/xkb/symbols/sony
-lib/X11/xkb/symbols/sun
-lib/X11/xkb/symbols/xfree68
-lib/X11/xkb/types
-lib/X11/xserver
-lib/X11/xsm
-lib/aout
-lib/modules
-lib/modules/codeconv
-lib/modules/dri
-lib/modules/drivers
-lib/modules/extensions
-lib/modules/fonts
-lib/modules/freebsd
-lib/modules/input
-libdata
-libdata/pkgconfig
-libexec
-man
-man/cat1
-man/cat2
-man/cat3
-man/cat4
-man/cat5
-man/cat6
-man/cat7
-man/cat8
-man/cat9
-man/catl
-man/catn
-man/ja
-man/ja/cat1
-man/ja/cat2
-man/ja/cat3
-man/ja/cat4
-man/ja/cat5
-man/ja/cat6
-man/ja/cat7
-man/ja/cat8
-man/ja/cat9
-man/ja/catl
-man/ja/catn
-man/ja/man1
-man/ja/man2
-man/ja/man3
-man/ja/man4
-man/ja/man5
-man/ja/man6
-man/ja/man7
-man/ja/man8
-man/ja/man9
-man/ja/manl
-man/ja/mann
-man/man1
-man/man2
-man/man3
-man/man4
-man/man5
-man/man6
-man/man7
-man/man8
-man/man9
-man/manl
-man/mann
-share
-share/aclocal
-share/doc
-share/doc/ja
-share/examples
-share/locale
-share/locale/af
-share/locale/am
-share/locale/az
-share/locale/be
-share/locale/bg
-share/locale/bs
-share/locale/ca
-share/locale/cs
-share/locale/cy
-share/locale/da
-share/locale/de
-share/locale/el
-share/locale/en
-share/locale/en_CA
-share/locale/en_GB
-share/locale/eo
-share/locale/es
-share/locale/es_ES
-share/locale/es_MX
-share/locale/et
-share/locale/fa
-share/locale/fi
-share/locale/fr
-share/locale/ga
-share/locale/gl
-share/locale/he
-share/locale/hr
-share/locale/hu
-share/locale/id
-share/locale/it
-share/locale/ja
-share/locale/kn
-share/locale/ko
-share/locale/lt
-share/locale/lv
-share/locale/mk
-share/locale/ml
-share/locale/ms
-share/locale/nl
-share/locale/nn
-share/locale/no
-share/locale/pl
-share/locale/pt
-share/locale/pt_BR
-share/locale/pt_PT
-share/locale/ro
-share/locale/ru
-share/locale/sk
-share/locale/sl
-share/locale/sq
-share/locale/sr
-share/locale/sr@Latn
-share/locale/sv
-share/locale/ta
-share/locale/th
-share/locale/tr
-share/locale/uk
-share/locale/vi
-share/locale/zh_CN
-share/locale/zh_TW
-share/locale/zh_TW.Big5
diff -ruN ./grig/distinfo /usr/ports/comms/grig/distinfo
--- ./grig/distinfo Sat Jan 29 05:23:22 2005
+++ /usr/ports/comms/grig/distinfo Wed Mar 31 04:06:28 2004
@@ -1,2 +1,2 @@
-MD5 (grig-0.4.1.tar.gz) = 5b0be31f0c574c4bf1eabf5236779f0d
-SIZE (grig-0.4.1.tar.gz) = 434941
+MD5 (grig-0.2.2.tar.gz) = 6d9786c7a5ee5e1f95d2572d3c7ce277
+SIZE (grig-0.2.2.tar.gz) = 227274
diff -ruN ./grig/files/patch-aa /usr/ports/comms/grig/files/patch-aa
--- ./grig/files/patch-aa Thu Jan 1 01:00:00 1970
+++ /usr/ports/comms/grig/files/patch-aa Sat Oct 9 08:51:12 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 ./grig/files/patch-ab /usr/ports/comms/grig/files/patch-ab
--- ./grig/files/patch-ab Thu Jan 1 01:00:00 1970
+++ /usr/ports/comms/grig/files/patch-ab Sat Oct 9 08:51:12 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 ./grig/files/patch-ac /usr/ports/comms/grig/files/patch-ac
--- ./grig/files/patch-ac Thu Jan 1 01:00:00 1970
+++ /usr/ports/comms/grig/files/patch-ac Sat Oct 9 08:51:12 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 ./grig/files/patch-ad /usr/ports/comms/grig/files/patch-ad
--- ./grig/files/patch-ad Thu Jan 1 01:00:00 1970
+++ /usr/ports/comms/grig/files/patch-ad Sat Oct 9 08:51:12 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 ./grig/files/patch-ae /usr/ports/comms/grig/files/patch-ae
--- ./grig/files/patch-ae Thu Jan 1 01:00:00 1970
+++ /usr/ports/comms/grig/files/patch-ae Sat Oct 9 08:51:12 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 ./grig/pkg-descr /usr/ports/comms/grig/pkg-descr
--- ./grig/pkg-descr Sat Jan 29 05:24:21 2005
+++ /usr/ports/comms/grig/pkg-descr Thu Jan 22 21:56:22 2004
@@ -1,5 +1,5 @@
Grig is a graphical front-end to the Ham Radio libraries
-written using Gtk2 by Alexandru Csete.
+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
diff -ruN ./grig/pkg-plist /usr/ports/comms/grig/pkg-plist
--- ./grig/pkg-plist Sat Jan 29 05:28:22 2005
+++ /usr/ports/comms/grig/pkg-plist Thu Jan 22 21:56:22 2004
@@ -1,9 +1,4 @@
bin/grig
-man/man1/grig.1
-share/grig/pixmaps/digits_normal.png
-share/grig/pixmaps/digits_small.png
-share/grig/pixmaps/grig-logo.png
-share/grig/pixmaps/ic910.png
-share/grig/pixmaps/smeter.png
-@dirrm share/grig/pixmaps
-@dirrm share/grig
+share/pixmaps/grig/digits_normal.xpm
+share/pixmaps/grig/digits_small.xpm
+@dirrm share/pixmaps/grig
--- grig-0.4.1.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200501290544.41504.matt>