Date: Wed, 8 Apr 2015 08:29:09 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383558 - in head/audio/mac: . files Message-ID: <201504080829.t388T9ug076357@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Apr 8 08:29:08 2015 New Revision: 383558 URL: https://svnweb.freebsd.org/changeset/ports/383558 Log: - Update to the most recent version maintained by Jason Jordan as part of his 3.99-u4-b5-sX series. Unfortunately we cannot assign it directly to DISTVERSION without having to bump PORTEPOCH, so stick to 3.99.4.5.7 for the time being (note that upstream Monkey's Audio SDK is at version 4.16 right now; but seems that no one ported it to Linux/Unix -- folks prefer to maintain old 3.xx port instead; mention this in the port description) - Build in "shntool-enabled" mode by default (-DSHNTOOL); this is also in line with how most GNU/Linux distributions package it - Install couple of useful documentation files, but first beautify them a bit: convert to UTF-8 and append missing newline at EOF; sed(1) command might look unnatural, but it is compatible with both GNU and BSD sed(1) implementations (cf.: '-nep' is GNU-only, and '$G' is new BSD-only); we prefer ${SED} over ${ECHO_CMD} >> because it is shorter and allows for linear piping (no subshell and stream joining required) - Convert in-place configure script editing to a patch as we also have to teach it that elftoolchain's strip(1) can strip libraries; staying with REINPLACE_CMD would make it harder to read compared to normal patchfile - Remove duplicate GNU_CONFIGURE line, bogusly added by bapt@ in r353071 Added: head/audio/mac/files/ head/audio/mac/files/patch-configure (contents, props changed) Modified: head/audio/mac/Makefile head/audio/mac/distinfo head/audio/mac/pkg-descr Modified: head/audio/mac/Makefile ============================================================================== --- head/audio/mac/Makefile Wed Apr 8 07:58:20 2015 (r383557) +++ head/audio/mac/Makefile Wed Apr 8 08:29:08 2015 (r383558) @@ -2,35 +2,42 @@ # $FreeBSD$ PORTNAME= mac -PORTVERSION= 3.99.4.5 -PORTREVISION= 2 +PORTVERSION= 3.99.4.5.7 CATEGORIES= audio -MASTER_SITES= http://etree.org/shnutils/shntool/support/formats/ape/unix/3.99-u4-b5/ \ +MASTER_SITES= http://etree.org/shnutils/shntool/support/formats/ape/unix/3.99-u4-b5-s7/ \ http://freebsd.nsu.ru/distfiles/ -DISTNAME= ${PORTNAME}-3.99-u4-b5 +DISTNAME= ${PORTNAME}-3.99-u4-b5-s7 MAINTAINER= multimedia@FreeBSD.org COMMENT= Monkey's Audio lossless codec -USES= libtool +USES= iconv:build libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes -GNU_CONFIGURE= yes INSTALL_TARGET= install-strip +CPPFLAGS+= -DSHNTOOL + +PORTDOCS= Credits.txt History.txt + +OPTIONS_DEFINE= DOCS + .include <bsd.port.pre.mk> .if ${ARCH} == "i386" || ${ARCH} == "amd64" BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm .endif -post-patch: - @${REINPLACE_CMD} -e 's|-O3||' ${WRKSRC}/configure - @${REINPLACE_CMD} -e '/nRetVal = 0/s|int|intptr_t|' \ - ${WRKSRC}/src/MACLib/APEDecompress.cpp - post-install: cd ${WRKSRC}/src/MACLib && ${INSTALL_DATA} BitArray.h \ Prepare.h UnBitArrayBase.h ${STAGEDIR}${PREFIX}/include/mac + @${MKDIR} ${STAGEDIR}${DOCSDIR} +# Install couple of useful docfiles, but first beautify them a bit; cryptic +# sed(1) construct is to append missing newline at EOF, in a way compatible +# with both GNU and BSD sed(1) implementations. + ${ICONV_CMD} -f latin1 -t utf-8 ${WRKSRC}/src/Credits.txt | \ + ${SED} -ne '$$G;P' > ${STAGEDIR}${DOCSDIR}/Credits.txt + ${SED} -ne '$$G;P' ${WRKSRC}/src/History.txt > \ + ${STAGEDIR}${DOCSDIR}/History.txt .include <bsd.port.post.mk> Modified: head/audio/mac/distinfo ============================================================================== --- head/audio/mac/distinfo Wed Apr 8 07:58:20 2015 (r383557) +++ head/audio/mac/distinfo Wed Apr 8 08:29:08 2015 (r383558) @@ -1,2 +1,2 @@ -SHA256 (mac-3.99-u4-b5.tar.gz) = d59ac5b1fa375a78eadbd5d9bb638ad0229185b42b562dbb04b0dab6475b6651 -SIZE (mac-3.99-u4-b5.tar.gz) = 421234 +SHA256 (mac-3.99-u4-b5-s7.tar.gz) = 9a735af2c56f05ee06b6e2ff719e902271299adf9e25cd3c9e4b28e8df3e30c5 +SIZE (mac-3.99-u4-b5-s7.tar.gz) = 450981 Added: head/audio/mac/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/mac/files/patch-configure Wed Apr 8 08:29:08 2015 (r383558) @@ -0,0 +1,20 @@ +--- configure.orig 2010-07-22 17:51:17 UTC ++++ configure +@@ -3075,7 +3075,7 @@ fi + + + # Checks for programs. +-CXXFLAGS="$CXXFLAGS -O3 -Wall -pedantic -Wno-long-long" ++CXXFLAGS="$CXXFLAGS -Wall -pedantic -Wno-long-long" + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -11215,7 +11215,7 @@ striplib= + old_striplib= + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 + $as_echo_n "checking whether stripping libraries is possible... " >&6; } +-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then ++if test -n "$STRIP" && $STRIP -V 2>&1 | $EGREP "GNU|elftoolchain" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 Modified: head/audio/mac/pkg-descr ============================================================================== --- head/audio/mac/pkg-descr Wed Apr 8 07:58:20 2015 (r383557) +++ head/audio/mac/pkg-descr Wed Apr 8 08:29:08 2015 (r383558) @@ -3,4 +3,7 @@ compression (and decompression) ratio an be used for personal, educational and non-commercial purposes. Commercial usage requires prior written permission from Monkey's Audio author. +This is community-maintained Unix port of earlier Monkey's Audio sources; +it does not correspond to current official SDK releases (4.x). + WWW: http://www.monkeysaudio.com/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504080829.t388T9ug076357>