diff --git a/audio/mac/Makefile b/audio/mac/Makefile
index 0aa34ded20f7..ebb00b020cb0 100644
--- a/audio/mac/Makefile
+++ b/audio/mac/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://supermmx.org/resources/linux/mac/ CENKES
 DISTNAME=	${PORTNAME}-3.99-u4-b5
 
-MAINTAINER=	danfe@FreeBSD.org
+MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Monkey's Audio lossless codec
 
 USE_AUTOTOOLS=	libtool
@@ -27,6 +27,8 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
 
 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 \
diff --git a/audio/mac/files/patch-src__MACLib__APEDecompress.cpp b/audio/mac/files/patch-src__MACLib__APEDecompress.cpp
deleted file mode 100644
index 5f3d5f9f0f64..000000000000
--- a/audio/mac/files/patch-src__MACLib__APEDecompress.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/MACLib/APEDecompress.cpp.orig	Tue Jan  9 01:08:49 2007
-+++ ./src/MACLib/APEDecompress.cpp	Tue Jan  9 01:09:55 2007
-@@ -369,7 +369,7 @@
- *****************************************************************************************/
- intptr_t CAPEDecompress::GetInfo(APE_DECOMPRESS_FIELDS Field, intptr_t nParam1, intptr_t nParam2)
- {
--    int nRetVal = 0;
-+    intptr_t nRetVal = 0;
-     BOOL bHandled = TRUE;
- 
-     switch (Field)