From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 5 01:00:05 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 56A8416A468 for ; Fri, 5 Oct 2007 01:00:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3937713C4EB for ; Fri, 5 Oct 2007 01:00:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l95104pe097510 for ; Fri, 5 Oct 2007 01:00:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l95104o4097508; Fri, 5 Oct 2007 01:00:04 GMT (envelope-from gnats) Resent-Date: Fri, 5 Oct 2007 01:00:04 GMT Resent-Message-Id: <200710050100.l95104o4097508@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Diane Bruce Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0CB5016A41A for ; Fri, 5 Oct 2007 00:54:33 +0000 (UTC) (envelope-from db@db.net) Received: from diana.db.net (diana.db.net [204.228.229.66]) by mx1.freebsd.org (Postfix) with ESMTP id ECDDC13C455 for ; Fri, 5 Oct 2007 00:54:32 +0000 (UTC) (envelope-from db@db.net) Received: from diana.db.net ([204.228.229.66] helo=localhost ident=mailnull) by diana.db.net with esmtp (Exim 4.66 (FreeBSD)) (envelope-from ) id 1Idb7p-000BMZ-LX; Thu, 04 Oct 2007 18:33:05 -0600 Received: from diana.db.net ([127.0.0.1] helo=localhost) (envelope-from ) id 1Idb7o-0004xF-Ia; Thu, 04 Oct 2007 20:33:04 -0400 Message-Id: Date: Thu, 04 Oct 2007 20:33:04 -0400 From: Diane Bruce To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: lambert@lambertfam.org Subject: ports/116941: [PATCH] comms/aldo: update to 0.7.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Oct 2007 01:00:05 -0000 >Number: 116941 >Category: ports >Synopsis: [PATCH] comms/aldo: update to 0.7.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Oct 05 01:00:04 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Diane Bruce >Release: FreeBSD 6.2-RELEASE i386 >Organization: >Environment: System: FreeBSD night.db.net 6.2-RELEASE FreeBSD 6.2-RELEASE #1: Tue Feb 6 15:07:07 EST >Description: - Update to 0.7.4 - unbreak gcc4.2 build on amd64 Added file(s): - files/patch-configure.ac - files/patch-src_audioworkspace.cc Port maintainer (lambert@lambertfam.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- aldo-0.7.4.patch begins here --- diff -ruN --exclude=CVS /usr/ports/comms/aldo/Makefile /usr/home/db/ports/aldo/Makefile --- /usr/ports/comms/aldo/Makefile Mon Jun 11 04:41:21 2007 +++ /usr/home/db/ports/aldo/Makefile Thu Oct 4 18:42:14 2007 @@ -6,7 +6,7 @@ # PORTNAME= aldo -PORTVERSION= 0.6.11 +PORTVERSION= 0.7.4 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,9 +14,14 @@ MAINTAINER= lambert@lambertfam.org COMMENT= Morse code training program +LIB_DEPENDS= ao:${PORTSDIR}/audio/libao + USE_BZIP2= yes GNU_CONFIGURE= yes +USE_AUTOTOOLS= autoconf:261 automake:110 libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \ + --libdir="${LOCALBASE}/lib" USE_GMAKE= yes MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" @@ -24,10 +29,6 @@ MAN1= aldo.1 .include - -.if ${OSVERSION} >= 700042 -BROKEN= Broken with gcc 4.2 -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/aldo ${PREFIX}/bin diff -ruN --exclude=CVS /usr/ports/comms/aldo/distinfo /usr/home/db/ports/aldo/distinfo --- /usr/ports/comms/aldo/distinfo Sun Jan 22 03:21:56 2006 +++ /usr/home/db/ports/aldo/distinfo Mon Jul 2 14:06:01 2007 @@ -1,3 +1,3 @@ -MD5 (aldo-0.6.11.tar.bz2) = dca6ffb12ff1bf16197593448dcc74aa -SHA256 (aldo-0.6.11.tar.bz2) = 6d647f07389ef4bda51376f0a491d993579c6e893872454fcdeb3b40e85ff6f9 -SIZE (aldo-0.6.11.tar.bz2) = 87273 +MD5 (aldo-0.7.4.tar.bz2) = 7eca56b41dd01fe9ebb7eb1a1e26b42b +SHA256 (aldo-0.7.4.tar.bz2) = 01bf2335e0e49168e543ee2d09aba2a8d26dbe5f15aaf2be0413fe20a78799bf +SIZE (aldo-0.7.4.tar.bz2) = 98287 diff -ruN --exclude=CVS /usr/ports/comms/aldo/files/patch-configure.ac /usr/home/db/ports/aldo/files/patch-configure.ac --- /usr/ports/comms/aldo/files/patch-configure.ac Wed Dec 31 19:00:00 1969 +++ /usr/home/db/ports/aldo/files/patch-configure.ac Mon Jul 2 19:13:53 2007 @@ -0,0 +1,13 @@ +--- configure.ac.orig 2007-05-16 05:52:24.000000000 -0400 ++++ configure.ac 2007-07-02 19:13:39.000000000 -0400 +@@ -7,6 +7,10 @@ + AM_CONFIG_HEADER(config.h) + AM_INIT_AUTOMAKE([dist-bzip2]) + ++CPPFLAGS="-I${includedir}" ++LDFLAGS="-L${libdir}" ++LIBS="-L${libdir} ${LIBS}" ++ + # Checks for programs. + AC_PROG_CXX + AC_PROG_INSTALL diff -ruN --exclude=CVS /usr/ports/comms/aldo/files/patch-src_audioworkspace.cc /usr/home/db/ports/aldo/files/patch-src_audioworkspace.cc --- /usr/ports/comms/aldo/files/patch-src_audioworkspace.cc Wed Dec 31 19:00:00 1969 +++ /usr/home/db/ports/aldo/files/patch-src_audioworkspace.cc Wed Oct 3 12:22:11 2007 @@ -0,0 +1,21 @@ +--- src/audioworkspace.cc.orig Wed Oct 3 12:19:50 2007 ++++ src/audioworkspace.cc Wed Oct 3 12:21:41 2007 +@@ -56,15 +56,14 @@ + Wave AudioWorkSpace::gen_pause(size_type millisecond) + { + size_type sample_number = millisecond * m_sample_rate/1000; +- +- size_type len = millisecond * m_bits/8 * m_channels * m_sample_rate/1000; ++ size_type len = m_bits/8 * m_channels * sample_number; + + char* buffer = new char[len]; + + for(unsigned int i = 0; i> 8) & 0xff; ++ buffer[4*i] = buffer[4*i+2] = 0; ++ buffer[4*i+1] = buffer[4*i+3] = 0; + } + + Wave w(len, buffer); --- aldo-0.7.4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: