diff -dpruN /usr/ports/audio/faac/Makefile ./Makefile
--- /usr/ports/audio/faac/Makefile	2016-04-01 13:29:15.000000000 +0000
+++ ./Makefile	2016-06-02 07:46:35.000000000 +0000
@@ -10,11 +10,19 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	MPEG-2 and MPEG-4 AAC audio encoder
 
+LICENSE=	GPLv2 LGPL21+ ISO
+LICENSE_COMB=	multi
+LICENSE_NAME_ISO=	ISO/IEC14496
+LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_FILE_ISO=	${LICENSE_FILE}
+LICENSE_PERMS_ISO=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 LIB_DEPENDS=	libmp4v2.so:multimedia/mp4v2
 
 RESTRICTED=	Distribution in binary form is prohibited
+NO_PACKAGE=	${RESTRICTED}
 
-USES=		autoreconf dos2unix gmake libtool tar:bzip2
+USES=		autoreconf gmake libtool tar:bzip2
 INSTALL_TARGET=	install-strip
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-mp4v2
@@ -23,8 +31,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 post-patch:
-	@${ECHO_CMD} "" >> ${WRKSRC}/libfaac/psych.h
 	@${REINPLACE_CMD} -e 's|<mp4\.h>|<mp4v2/mp4v2.h>|g' \
-		${WRKSRC}/frontend/main.c \
+		${WRKSRC}/frontend/main.c
 
 .include <bsd.port.mk>
diff -dpruN /usr/ports/audio/faac/distinfo ./distinfo
--- /usr/ports/audio/faac/distinfo	2014-01-22 15:30:13.000000000 +0000
+++ ./distinfo	2016-06-02 07:47:36.000000000 +0000
@@ -1,2 +1,3 @@
+TIMESTAMP = 1464853656
 SHA256 (faac-1.28.tar.bz2) = aac475e59d38ae9e29bff760e26bf72b507ccec037a6837cc33e3ac1db3ef352
 SIZE (faac-1.28.tar.bz2) = 531256
diff -dpruN /usr/ports/audio/faac/files/patch-configure.in ./files/patch-configure.in
--- /usr/ports/audio/faac/files/patch-configure.in	2014-01-22 17:40:44.000000000 +0000
+++ ./files/patch-configure.in	2015-09-01 07:21:24.000000000 +0000
@@ -1,5 +1,5 @@
---- configure.in.orig	2010-08-18 15:41:30.584845747 +0300
-+++ configure.in	2010-08-18 15:42:51.184443581 +0300
+--- configure.in.orig	2009-02-05 00:55:38 UTC
++++ configure.in
 @@ -1,7 +1,7 @@
  AC_PREREQ(2.50)
  AC_INIT(FAAC, 1.28, faac-dev@lists.sourceforge.net)
diff -dpruN /usr/ports/audio/faac/files/patch-frontend_Makefile.am ./files/patch-frontend_Makefile.am
--- /usr/ports/audio/faac/files/patch-frontend_Makefile.am	2014-01-22 17:40:44.000000000 +0000
+++ ./files/patch-frontend_Makefile.am	2015-09-01 07:21:24.000000000 +0000
@@ -1,5 +1,5 @@
---- frontend/Makefile.am.orig	2010-08-18 15:43:04.246728673 +0300
-+++ frontend/Makefile.am	2010-08-18 15:45:44.922966543 +0300
+--- frontend/Makefile.am.orig	2008-12-16 00:56:00 UTC
++++ frontend/Makefile.am
 @@ -7,6 +7,11 @@ if WITH_MP4V2
  INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
  LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++