Date: Sat, 25 Sep 2004 11:37:55 +1000 (EST) From: Carl Makin <carl@stagecraft.cx> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/72072: [UPDATE] Update GMFSK from 0.5.1 to 0.6 including GCC3.4 fix. Message-ID: <200409250137.i8P1bttV032030@bumper.stagecraft.cx> Resent-Message-ID: <200409250140.i8P1eO7o012887@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 72072 >Category: ports >Synopsis: [UPDATE] Update GMFSK from 0.5.1 to 0.6 including GCC3.4 fix. >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 Sep 25 01:40:23 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Carl Makin >Release: FreeBSD 4.10-STABLE i386 >Organization: >Environment: System: FreeBSD bumper.stagecraft.cx 4.10-STABLE FreeBSD 4.10-STABLE #19: Fri Aug 6 00:32:55 EST 2004 root@bumper.stagecraft.cx:/usr/obj/usr/src/sys/BUMPER i386 >Description: Update GMFSK to the latest release. This includes a fix for GCC3.4 so it should compile on 5.3. >How-To-Repeat: >Fix: --- gmfsk-0.6.shar begins here --- # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # gmfsk # gmfsk/files # gmfsk/files/patch-omf.make # gmfsk/files/patch-help-makefile.in # gmfsk/files/patch-src-makefile.in # gmfsk/files/patch-mt63_dsp.h # gmfsk/pkg-plist # gmfsk/pkg-message # gmfsk/pkg-descr # gmfsk/distinfo # gmfsk/Makefile # echo c - gmfsk mkdir -p gmfsk > /dev/null 2>&1 echo c - gmfsk/files mkdir -p gmfsk/files > /dev/null 2>&1 echo x - gmfsk/files/patch-omf.make sed 's/^X//' >gmfsk/files/patch-omf.make << 'END-of-gmfsk/files/patch-omf.make' X--- omf.make.orig Fri May 30 10:40:27 2003 X+++ omf.make Sun Oct 26 21:32:17 2003 X@@ -28,7 +28,7 @@ X # !!!!!! added /lib/ to scrollkeeper_localstate_dir - oh2bns !!!!!! X X omf_dest_dir=$(datadir)/omf/@PACKAGE@ X-scrollkeeper_localstate_dir = $(localstatedir)/lib/scrollkeeper X+scrollkeeper_localstate_dir = $(localstatedir) X X omf: omf_timestamp X END-of-gmfsk/files/patch-omf.make echo x - gmfsk/files/patch-help-makefile.in sed 's/^X//' >gmfsk/files/patch-help-makefile.in << 'END-of-gmfsk/files/patch-help-makefile.in' X--- help/gmfsk/C/Makefile.in.orig Sat Jul 19 20:38:54 2003 X+++ help/gmfsk/C/Makefile.in Sat Jul 19 20:39:58 2003 X@@ -182,7 +182,7 @@ X CLEANFILES = omf_timestamp X X omf_dest_dir = $(datadir)/omf/@PACKAGE@ X-scrollkeeper_localstate_dir = $(localstatedir)/lib/scrollkeeper X+scrollkeeper_localstate_dir = $(localstatedir) X subdir = help/gmfsk/C X mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs X CONFIG_HEADER = $(top_builddir)/config.h END-of-gmfsk/files/patch-help-makefile.in echo x - gmfsk/files/patch-src-makefile.in sed 's/^X//' >gmfsk/files/patch-src-makefile.in << 'END-of-gmfsk/files/patch-src-makefile.in' X--- src/Makefile.in.orig Thu Dec 4 19:08:40 2003 X+++ src/Makefile.in Thu Dec 4 19:09:18 2003 X@@ -146,7 +146,7 @@ X SUBDIRS = misc mfsk rtty throb psk31 mt63 feld X X INCLUDES = \ X- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ X+ -DPACKAGE_DATA_DIR=\""$(datadir)/gnome"\" \ X -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ X @PACKAGE_CFLAGS@ \ X -I$(top_srcdir)/src/misc END-of-gmfsk/files/patch-src-makefile.in echo x - gmfsk/files/patch-mt63_dsp.h sed 's/^X//' >gmfsk/files/patch-mt63_dsp.h << 'END-of-gmfsk/files/patch-mt63_dsp.h' X--- src/mt63/dsp.h.orig Sat Sep 25 10:52:22 2004 X+++ src/mt63/dsp.h Sat Sep 25 10:58:58 2004 X@@ -555,15 +555,15 @@ X inline void LowPass2(typeInp Inp, LowPass2elem &Elem, X typeW W1, typeW W2, typeW W5) X { double Sum, Diff; X- Sum=Elem.Mid+Elem.Out; Diff=Elem.Mid-Elem.Out; Elem.Mid+=W2*Inp-W1*Sum; Out+=W5*Diff; } X+ Sum=Elem.Mid+Elem.Out; Diff=Elem.Mid-Elem.Out; Elem.Mid+=W2*Inp-W1*Sum; Elem.Out+=W5*Diff; } X X template <class typeInp> X inline void LowPass2(typeInp Inp, LowPass2elem &Elem, LowPass2weight &Weight) X { double Sum, Diff; X Sum=Elem.Mid+Elem.Out; X Diff=Elem.Mid-Elem.Out; X- Elem.Mid+=Weight.W2*Inp-Weigth.W1*Sum; X- Out+=Weight.W5*Diff; } X+ Elem.Mid+=Weight.W2*Inp-Weight.W1*Sum; X+ Elem.Out+=Weight.W5*Diff; } X X /* X inline void LowPass2(float Inp, double &Mid, double &Out, END-of-gmfsk/files/patch-mt63_dsp.h echo x - gmfsk/pkg-plist sed 's/^X//' >gmfsk/pkg-plist << 'END-of-gmfsk/pkg-plist' Xbin/gmfsk Xetc/gconf/gconf.xml.defaults/apps/gmfsk/%gconf.xml Xetc/gconf/gconf.xml.defaults/apps/gmfsk/colors/%gconf.xml Xetc/gconf/gconf.xml.defaults/apps/gmfsk/fonts/%gconf.xml Xetc/gconf/gconf.xml.defaults/apps/gmfsk/hell/%gconf.xml Xetc/gconf/gconf.xml.defaults/apps/gmfsk/info/%gconf.xml Xetc/gconf/gconf.xml.defaults/apps/gmfsk/macro/%gconf.xml Xetc/gconf/gconf.xml.defaults/apps/gmfsk/mfsk/%gconf.xml Xetc/gconf/gconf.xml.defaults/apps/gmfsk/misc/%gconf.xml Xetc/gconf/gconf.xml.defaults/apps/gmfsk/mt63/%gconf.xml Xetc/gconf/gconf.xml.defaults/apps/gmfsk/psk31/%gconf.xml Xetc/gconf/gconf.xml.defaults/apps/gmfsk/ptt/%gconf.xml Xetc/gconf/gconf.xml.defaults/apps/gmfsk/rtty/%gconf.xml Xetc/gconf/gconf.xml.defaults/apps/gmfsk/sound/%gconf.xml Xetc/gconf/gconf.xml.defaults/apps/gmfsk/throb/%gconf.xml Xetc/gconf/gconf.xml.defaults/apps/gmfsk/wf/%gconf.xml Xshare/gnome/help/gmfsk/C/fdl-appendix.xml Xshare/gnome/help/gmfsk/C/figures/gmfsk_start_window.png Xshare/gnome/help/gmfsk/C/figures/note.png Xshare/gnome/help/gmfsk/C/figures/tip.png Xshare/gnome/help/gmfsk/C/figures/warning.png Xshare/gnome/help/gmfsk/C/gmfsk.xml Xshare/gnome/help/gmfsk/C/legal.xml Xshare/omf/gmfsk/gmfsk-C.omf Xshare/pixmaps/gmfsk/gnome-screenshot.png Xshare/pixmaps/gmfsk/mfsk.png Xshare/pixmaps/gmfsk/pause.xpm Xshare/pixmaps/gmfsk/rx.xpm Xshare/pixmaps/gmfsk/tune.xpm Xshare/pixmaps/gmfsk/tx.xpm X@dirrm share/pixmaps/gmfsk X@dirrm share/omf/gmfsk X@dirrm share/gnome/help/gmfsk/C/figures X@dirrm share/gnome/help/gmfsk/C X@dirrm share/gnome/help/gmfsk X@dirrm etc/gconf/gconf.xml.defaults/apps/gmfsk/wf X@dirrm etc/gconf/gconf.xml.defaults/apps/gmfsk/throb X@dirrm etc/gconf/gconf.xml.defaults/apps/gmfsk/sound X@dirrm etc/gconf/gconf.xml.defaults/apps/gmfsk/rtty X@dirrm etc/gconf/gconf.xml.defaults/apps/gmfsk/ptt X@dirrm etc/gconf/gconf.xml.defaults/apps/gmfsk/psk31 X@dirrm etc/gconf/gconf.xml.defaults/apps/gmfsk/mt63 X@dirrm etc/gconf/gconf.xml.defaults/apps/gmfsk/misc X@dirrm etc/gconf/gconf.xml.defaults/apps/gmfsk/mfsk X@dirrm etc/gconf/gconf.xml.defaults/apps/gmfsk/macro X@dirrm etc/gconf/gconf.xml.defaults/apps/gmfsk/info X@dirrm etc/gconf/gconf.xml.defaults/apps/gmfsk/hell X@dirrm etc/gconf/gconf.xml.defaults/apps/gmfsk/fonts X@dirrm etc/gconf/gconf.xml.defaults/apps/gmfsk/colors X@dirrm etc/gconf/gconf.xml.defaults/apps/gmfsk END-of-gmfsk/pkg-plist echo x - gmfsk/pkg-message sed 's/^X//' >gmfsk/pkg-message << 'END-of-gmfsk/pkg-message' X X******************************************************************** XgMFSK by Tomi Manninen, OH2BNS, is now installed! X XStart it using the command "gmfsk". You may need to type "rehash" Xfirst. X XUpon first starting it, go to Settings->Preferences and fill out Xall your details. X XUnder Settings->Preferences->Devices->Sound set your sound device to X/dev/dspW0 XThis will use the 16bit sound device rather than /dev/dsp0 which is Xthe 8bit sound device. X XThen use the Gnome-volume-control or your favourite mixer program Xto set your receive and transmit levels. DO NOT OVERDRIVE YOUR RIG. XI recommend you head over to Xhttp://www.w5bbr.com/ Xwhich has links to useful info. X XEnjoy! XCarl, VK1KCM Xcarl@stagecraft.cx X******************************************************************** END-of-gmfsk/pkg-message echo x - gmfsk/pkg-descr sed 's/^X//' >gmfsk/pkg-descr << 'END-of-gmfsk/pkg-descr' XgMFSK v0.5 - The Gnome MFSK terminal program X============================================ X XgMFSK is a multi-mode soundcard terminal program for HF amateur Xcommunications. Originally the program was written for compatibility Xwith the IZ8BLY Stream program in MFSK16 mode. Currently the program Xsupports the following amateur digital communications modes: MFSK16, XMFSK8, RTTY, THROB, PSK31, PSK63, MT63 and FELDHELL. X XWWW: http://gmfsk.connect.fi/ X X- Carl Xcarl@stagecraft.cx END-of-gmfsk/pkg-descr echo x - gmfsk/distinfo sed 's/^X//' >gmfsk/distinfo << 'END-of-gmfsk/distinfo' XMD5 (gmfsk-0.6.tar.gz) = 184840b31b85f6c4f86cdbe27f0644c8 XSIZE (gmfsk-0.6.tar.gz) = 540765 END-of-gmfsk/distinfo echo x - gmfsk/Makefile sed 's/^X//' >gmfsk/Makefile << 'END-of-gmfsk/Makefile' X# New ports collection makefile for: gmfsk X# Date created: 29th May 2003 X# Whom: Carl Makin <carl@stagecraft.cx> X# X# $FreeBSD: ports/comms/gmfsk/Makefile,v 1.1 2003/06/30 17:18:48 marcus Exp $ X# X XPORTNAME= gmfsk XPORTVERSION= 0.6 XCATEGORIES= comms audio XMASTER_SITES= http://gmfsk.connect.fi/ X XMAINTAINER= carl@stagecraft.cx XCOMMENT= The Gnome MFSK terminal program X XLIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw X XGNU_CONFIGURE= yes X# This is pure evil but it looks like autoconf 2.53 has a bug in linking the X# preprocessor include tests. The following line is a work around. XCONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ X CPPFLAGS="-I${LOCALBASE}/include" XCONFIGURE_ARGS= --localstatedir=/var/db/scrollkeeper XUSE_GMAKE= yes XUSE_GNOME= libgnomeui XUSE_X_PREFIX= yes X XOPTIONS= HAMLIB "Enable HAMLIB Support" On X X.include <bsd.port.pre.mk> X X.if defined(WITH_HAMLIB) XLIB_DEPENDS+= hamlib:${PORTSDIR}/comms/hamlib XCONFIGURE_ARGS+= --enable-hamlib XCONFIGURE_ENV+= PKG_CONFIG_PATH=${LOCALBASE}/lib/pkgconfig X.endif X Xpost-install: X @${CAT} pkg-message X X.include <bsd.port.post.mk> END-of-gmfsk/Makefile exit --- gmfsk-0.6.shar ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200409250137.i8P1bttV032030>