diff options
| author | db <db@FreeBSD.org> | 2007-10-06 05:25:23 +0800 |
|---|---|---|
| committer | db <db@FreeBSD.org> | 2007-10-06 05:25:23 +0800 |
| commit | 2e2d949d1ed151e5e53e1bdfe97342926edced5d (patch) | |
| tree | 6a178886a10f77a8b58e93b42f7207d07f1de3d4 /comms | |
| parent | c9bffa0b99f31fd9486c7aeaf1767a104deef73c (diff) | |
| download | freebsd-ports-gnome-2e2d949d1ed151e5e53e1bdfe97342926edced5d.tar.gz freebsd-ports-gnome-2e2d949d1ed151e5e53e1bdfe97342926edced5d.tar.zst freebsd-ports-gnome-2e2d949d1ed151e5e53e1bdfe97342926edced5d.zip | |
- Update to 0.7.4
- unbreak gcc4.2 build on amd64
- fix vendor bug (vendor notified)
PR: ports/116941
Submitted by: db
Approved by: maintainer
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/aldo/Makefile | 15 | ||||
| -rw-r--r-- | comms/aldo/distinfo | 6 | ||||
| -rw-r--r-- | comms/aldo/files/patch-configure.ac | 13 | ||||
| -rw-r--r-- | comms/aldo/files/patch-src_audioworkspace.cc | 21 |
4 files changed, 44 insertions, 11 deletions
diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile index 7dbb91321b3e..47579dbdb3e7 100644 --- a/comms/aldo/Makefile +++ b/comms/aldo/Makefile @@ -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,23 +14,22 @@ MASTER_SITE_SUBDIR= ${PORTNAME} 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}" PLIST_FILES= bin/aldo MAN1= aldo.1 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 700042 -BROKEN= Broken with gcc 4.2 -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/aldo ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/aldo.1 ${MANPREFIX}/man/man1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/comms/aldo/distinfo b/comms/aldo/distinfo index 49cb8b0c361e..074d32610d09 100644 --- a/comms/aldo/distinfo +++ b/comms/aldo/distinfo @@ -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 --git a/comms/aldo/files/patch-configure.ac b/comms/aldo/files/patch-configure.ac new file mode 100644 index 000000000000..79c145e1f7d7 --- /dev/null +++ b/comms/aldo/files/patch-configure.ac @@ -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 --git a/comms/aldo/files/patch-src_audioworkspace.cc b/comms/aldo/files/patch-src_audioworkspace.cc new file mode 100644 index 000000000000..a099a57daada --- /dev/null +++ b/comms/aldo/files/patch-src_audioworkspace.cc @@ -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<sample_number; i++) + { +- buffer[4*i] = buffer[4*i+2] = 0 & 0xff; +- buffer[4*i+1] = buffer[4*i+3] = (0 >> 8) & 0xff; ++ buffer[4*i] = buffer[4*i+2] = 0; ++ buffer[4*i+1] = buffer[4*i+3] = 0; + } + + Wave w(len, buffer); |