Date: Thu, 14 Jun 2012 20:19:08 +1000 (EST) From: Carl Makin <carl@stagecraft.cx> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/169173: Maintainer Update - ports comms/gmfsk - fix log2 build problem Message-ID: <201206141019.q5EAJ8te064682@ferb.stagecraft.cx> Resent-Message-ID: <201206170540.q5H5e9uQ081671@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 169173 >Category: ports >Synopsis: Maintainer Update - ports comms/gmfsk - fix log2 build problem >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: Sun Jun 17 05:40:09 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Carl Makin >Release: FreeBSD 9.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD ferb 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: This update fixes the log2 build error. >How-To-Repeat: >Fix: Apple the below patches and files. --- gmfsk-log2fix 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: # # ./files/extra-patch-misc_misc.c # ./files/extra-patch-misc_misc.h # ./Makefile.diff # ./pkg-message.diff # echo x - ./files/extra-patch-misc_misc.c sed 's/^X//' >./files/extra-patch-misc_misc.c << 'a5c5aaff89310f2d53c0ecbd6094cdbd' X--- src/misc/misc.c.orig 2011-11-13 09:57:36.000000000 +0100 X+++ src/misc/misc.c 2011-11-13 09:58:06.000000000 +0100 X@@ -103,25 +103,6 @@ X /* ---------------------------------------------------------------------- */ X X /* X- * Integer base-2 logarithm X- */ X-int log2(unsigned int x) X-{ X- int y = 0; X- X- x >>= 1; X- X- while (x) { X- x >>= 1; X- y++; X- } X- X- return y; X-} X- X-/* ---------------------------------------------------------------------- */ X- X-/* X * Gray encoding and decoding (8 bit) X */ X unsigned char grayencode(unsigned char data) a5c5aaff89310f2d53c0ecbd6094cdbd echo x - ./files/extra-patch-misc_misc.h sed 's/^X//' >./files/extra-patch-misc_misc.h << 'a98a6ea86da9a034de6048fa6ce5b91b' X--- src/misc/misc.h.orig 2011-11-13 09:59:46.000000000 +0100 X+++ src/misc/misc.h 2011-11-13 10:01:09.000000000 +0100 X@@ -104,25 +104,6 @@ X /* ---------------------------------------------------------------------- */ X X /* X- * Integer base-2 logarithm X- */ X-extern inline int log2(unsigned int x) X-{ X- int y = 0; X- X- x >>= 1; X- X- while (x) { X- x >>= 1; X- y++; X- } X- X- return y; X-} X- X-/* ---------------------------------------------------------------------- */ X- X-/* X * Gray encoding and decoding (8 bit) X */ X extern inline unsigned char grayencode(unsigned char data) a98a6ea86da9a034de6048fa6ce5b91b echo x - ./Makefile.diff sed 's/^X//' >./Makefile.diff << '52a75af8009414ea5f10694a854e1038' X--- /usr/ports/comms/gmfsk/Makefile 2012-06-14 18:36:17.000000000 +1000 X+++ Makefile 2012-06-14 20:03:39.000000000 +1000 X@@ -7,7 +7,7 @@ X X PORTNAME= gmfsk X PORTVERSION= 0.6 X-PORTREVISION= 10 X+PORTREVISION= 11 X CATEGORIES= comms audio hamradio X MASTER_SITES= http://gmfsk.connect.fi/ X X@@ -37,9 +37,11 @@ X CONFIGURE_ENV+= PKG_CONFIG_PATH=${LOCALBASE}/lib/pkgconfig X .endif X X-#.if ( ${OSVERSION} >= 802502 && ${OSVERSION} < 900000 ) || ${OSVERSION} >= 900027 X-#BROKEN= does not build after log2 addition X-#.endif X+.if ( ${OSVERSION} >= 802502 && ${OSVERSION} < 900000 ) || ${OSVERSION} >= 900027 X+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-misc_misc.c X+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-misc_misc.h X+ X+.endif X X post-patch: X @${REINPLACE_CMD} -e 's|[$$][(]localstatedir[)]/lib/scrollkeeper|${SCROLLKEEPER_DIR}|g' \ 52a75af8009414ea5f10694a854e1038 echo x - ./pkg-message.diff sed 's/^X//' >./pkg-message.diff << '8eb62b4631f03619a9d813944a6561e7' X--- /usr/ports/comms/gmfsk/pkg-message 2004-10-12 08:28:24.000000000 +1000 X+++ pkg-message 2012-06-14 20:02:57.000000000 +1000 X@@ -5,19 +5,8 @@ X Start it using the command "gmfsk". You may need to type "rehash" X first. X X-Upon first starting it, go to Settings->Preferences and fill out X-all your details. X- X-Under Settings->Preferences->Devices->Sound set your sound device to X-/dev/dspW0 X-This will use the 16bit sound device rather than /dev/dsp0 which is X-the 8bit sound device. X- X-Then use the Gnome-volume-control or your favourite mixer program X+Use the Gnome-volume-control or your favourite mixer program X to set your receive and transmit levels. DO NOT OVERDRIVE YOUR RIG. X-I recommend you head over to X-http://www.w5bbr.com/ X-which has links to useful info. X X Enjoy! X Carl, VK1KCM 8eb62b4631f03619a9d813944a6561e7 exit --- gmfsk-log2fix ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206141019.q5EAJ8te064682>