Index: head/audio/mac/Makefile =================================================================== --- head/audio/mac/Makefile (revision 458676) +++ head/audio/mac/Makefile (revision 458677) @@ -1,45 +1,46 @@ # Created by: Martin Dieringer # $FreeBSD$ PORTNAME= mac PORTVERSION= 3.99.4.5.7 +PORTREVISION= 1 CATEGORIES= audio 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-s7 MAINTAINER= multimedia@FreeBSD.org COMMENT= Monkey's Audio lossless codec USES= iconv:build libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip CPPFLAGS+= -DSHNTOOL PORTDOCS= Credits.txt History.txt OPTIONS_DEFINE= DOCS .include .if ${OPSYS} == FreeBSD .if ${ARCH} == "i386" || ${ARCH} == "amd64" BUILD_DEPENDS+= yasm:devel/yasm .endif .endif 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 Index: head/audio/mac/files/patch-src_Console_Console.cpp =================================================================== --- head/audio/mac/files/patch-src_Console_Console.cpp (nonexistent) +++ head/audio/mac/files/patch-src_Console_Console.cpp (revision 458677) @@ -0,0 +1,40 @@ +Console.cpp:36:3: error: cannot initialize a member subobject of type 'int' with an rvalue of type 'nullptr_t' + NULL + ^~~~ +/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL' +#define NULL nullptr + ^~~~~~~ +Console.cpp:36:3: warning: suggest braces around initialization of subobject [-Wmissing-braces] + NULL + ^~~~ + { } +/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL' +#define NULL nullptr + ^~~~~~~ +Console.cpp:36:3: warning: suggest braces around initialization of subobject [-Wmissing-braces] + NULL + ^~~~ + { } +/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL' +#define NULL nullptr + ^~~~~~~ + +--- src/Console/Console.cpp.orig 2010-02-28 19:42:04 UTC ++++ src/Console/Console.cpp +@@ -33,7 +33,6 @@ typedef struct + + _ErrorDesc ErrorList[][2] = { + ERROR_EXPLANATION +- NULL + }; + #endif + +@@ -91,7 +90,7 @@ char *ErrorToString(int nErrNo) + { + int i = 0; + +- while (ErrorList[i]) ++ while (i < sizeof(ErrorList)/sizeof(ErrorList[0])) + { + if (ErrorList[i]->nErrorNum == nErrNo) + return ErrorList[i]->sErrorString; Property changes on: head/audio/mac/files/patch-src_Console_Console.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property