Index: head/comms/gmfsk/Makefile
===================================================================
--- head/comms/gmfsk/Makefile	(revision 299909)
+++ head/comms/gmfsk/Makefile	(revision 299910)
@@ -1,51 +1,58 @@
 # New ports collection makefile for:   gmfsk
 # Date created:                29th May 2003
 # Whom:                        Carl Makin <carl@stagecraft.cx>
 #
 # $FreeBSD$
 #
 
 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
 
 LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw
 
 GNU_CONFIGURE=	yes
 # This is pure evil but it looks like autoconf 2.53 has a bug in linking the
 # preprocessor include tests.  The following line is a work around.
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 USE_GMAKE=	yes
 USE_GNOME=	libgnomeui gnomehack gnomeprefix
 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:
 	@${REINPLACE_CMD} -e 's|[$$][(]localstatedir[)]/lib/scrollkeeper|${SCROLLKEEPER_DIR}|g' \
 		${WRKSRC}/omf.make ${WRKSRC}/help/gmfsk/C/Makefile.in
 
 post-install:
 	@${CAT} pkg-message
 
 .include <bsd.port.post.mk>

Property changes on: head/comms/gmfsk/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.21
\ No newline at end of property
+1.22
\ No newline at end of property
Index: head/comms/gmfsk/files/extra-patch-misc_misc.c
===================================================================
--- head/comms/gmfsk/files/extra-patch-misc_misc.c	(nonexistent)
+++ head/comms/gmfsk/files/extra-patch-misc_misc.c	(revision 299910)
@@ -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
+ /* ---------------------------------------------------------------------- */
+ 
+ /*

Property changes on: head/comms/gmfsk/files/extra-patch-misc_misc.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/comms/gmfsk/files/extra-patch-misc_misc.h
===================================================================
--- head/comms/gmfsk/files/extra-patch-misc_misc.h	(nonexistent)
+++ head/comms/gmfsk/files/extra-patch-misc_misc.h	(revision 299910)
@@ -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
+ /* ---------------------------------------------------------------------- */
+ 
+ /*

Property changes on: head/comms/gmfsk/files/extra-patch-misc_misc.h
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/comms/gmfsk/pkg-message
===================================================================
--- head/comms/gmfsk/pkg-message	(revision 299909)
+++ head/comms/gmfsk/pkg-message	(revision 299910)
@@ -1,25 +1,14 @@
 
 ********************************************************************
 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
 carl@stagecraft.cx
 ********************************************************************

Property changes on: head/comms/gmfsk/pkg-message
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property