4 files changed, 52 insertions, 16 deletions

diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile
index b544498199c8..8714dbc36095 100644
--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@@ -9,7 +9,9 @@ PORTNAME=	gmfsk
 PORTVERSION=	0.6
 PORTREVISION=	10
 CATEGORIES=	comms audio hamradio
-MASTER_SITES=	http://gmfsk.connect.fi/
+MASTER_SITES=	http://gmfsk.connect.fi/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	db
 
 MAINTAINER=	carl@stagecraft.cx
 COMMENT=	The Gnome MFSK terminal program
@@ -27,18 +29,23 @@ INSTALLS_OMF=	yes
 
 GCONF_SCHEMAS=	gmfsk.schemas
 
-OPTIONS=	HAMLIB "Enable HAMLIB Support" On
+OPTIONS_DEFINE=	HAMLIB
+HAMLIB_DESC=	Enable HAMLIB Support
+OPTIONS_DEFAULT=	HAMLIB
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_HAMLIB)
+.if ${PORT_OPTIONS:MHAMLIB}
 LIB_DEPENDS+=	hamlib:${PORTSDIR}/comms/hamlib
 CONFIGURE_ARGS+=	--enable-hamlib
 CONFIGURE_ENV+=	PKG_CONFIG_PATH=${LOCALBASE}/lib/pkgconfig
+.else
+CONFIGURE_ARGS+=	--disable-hamlib
 .endif
 
 .if ( ${OSVERSION} >= 802502 && ${OSVERSION} < 900000 ) || ${OSVERSION} >= 900027
-BROKEN=		does not build after log2 addition
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-misc_misc.c
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-misc_misc.h
 .endif
 
 post-patch:
diff --git a/comms/gmfsk/files/extra-patch-misc_misc.c b/comms/gmfsk/files/extra-patch-misc_misc.c
new file mode 100644
index 000000000000..659155b3e737
--- /dev/null
+++ b/comms/gmfsk/files/extra-patch-misc_misc.c
@@ -0,0 +1,20 @@
+--- src/misc/misc.c.orig	2004-04-13 07:49:04.000000000 -0500
++++ src/misc/misc.c	2012-06-22 20:40:53.000000000 -0500
+@@ -101,7 +101,7 @@
+ }
+ 
+ /* ---------------------------------------------------------------------- */
+-
++#if 0
+ /*
+  * Integer base-2 logarithm
+  */
+@@ -118,7 +118,7 @@
+ 
+ 	return y;
+ }
+-
++#endif
+ /* ---------------------------------------------------------------------- */
+ 
+ /*
diff --git a/comms/gmfsk/files/extra-patch-misc_misc.h b/comms/gmfsk/files/extra-patch-misc_misc.h
new file mode 100644
index 000000000000..944ceb0f442f
--- /dev/null
+++ b/comms/gmfsk/files/extra-patch-misc_misc.h
@@ -0,0 +1,20 @@
+--- src/misc/misc.h.orig	2004-04-13 07:45:19.000000000 -0500
++++ src/misc/misc.h	2012-06-22 20:41:11.000000000 -0500
+@@ -102,7 +102,7 @@
+ }
+ 
+ /* ---------------------------------------------------------------------- */
+-
++#if 0
+ /*
+  * Integer base-2 logarithm
+  */
+@@ -119,7 +119,7 @@
+ 
+ 	return y;
+ }
+-
++#endif
+ /* ---------------------------------------------------------------------- */
+ 
+ /*
diff --git a/comms/gmfsk/pkg-message b/comms/gmfsk/pkg-message
index fec5f3bc9f6e..bc41f9887335 100644
--- a/comms/gmfsk/pkg-message
+++ b/comms/gmfsk/pkg-message
@@ -5,19 +5,8 @@ gMFSK by Tomi Manninen, OH2BNS, is now installed!
 Start it using the command "gmfsk".  You may need to type "rehash"
 first.
 
-Upon first starting it, go to Settings->Preferences and fill out
-all your details.
-
-Under Settings->Preferences->Devices->Sound set your sound device to
-/dev/dspW0
-This will use the 16bit sound device rather than /dev/dsp0 which is
-the 8bit sound device.
-
-Then use the Gnome-volume-control or your favourite mixer program
+Use the Gnome-volume-control or your favourite mixer program
 to set your receive and transmit levels.  DO NOT OVERDRIVE YOUR RIG.  
-I recommend you head over to
-http://www.w5bbr.com/
-which has links to useful info.
 
 Enjoy!
 Carl, VK1KCM