6 files changed, 17 insertions, 55 deletions

diff --git a/audio/ac3dec/Makefile b/audio/ac3dec/Makefile
index 6ccab6e43d30..15bca7647913 100644
--- a/audio/ac3dec/Makefile
+++ b/audio/ac3dec/Makefile
@@ -13,18 +13,28 @@ MASTER_SITES=	http://dara.notbsd.org/~aholtzma/ac3/tarballs/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Software for research in digital audio coding/decoding
 
-GNU_CONFIGURE=	yes
 ONLY_FOR_ARCHS=	i386 alpha
 
+USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+
+PORTDOCS=	README
+PLIST_FILES=	bin/ac3dec bin/extract_ac3
+
 post-patch:
-	@${SED} -e 's,machine/soundcard.h,sys/soundcard.h,' \
-	    < ${WRKSRC}/output.c > ${WRKSRC}/output.c.new
-	@${MV} ${WRKSRC}/output.c.new ${WRKSRC}/output.c
+.for file in Makefile.in libac3/Makefile.in tools/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|^CFLAGS =.*$$|CFLAGS = @CFLAGS@|g' ${WRKSRC}/${file}
+.endfor
+.for file in output.c output_linux.c
+	@${REINPLACE_CMD} -e \
+		's|machine/soundcard.h|sys/soundcard.h|g' ${WRKSRC}/${file}
+.endfor
 
-pre-install:
+post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ac3dec
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ac3dec/README
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/ac3dec/files/patch-ab b/audio/ac3dec/files/patch-ab
deleted file mode 100644
index aab13ac78d8a..000000000000
--- a/audio/ac3dec/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Mon Jun  3 02:33:10 2002
-+++ Makefile.in	Mon Jun  3 02:33:21 2002
-@@ -70,7 +70,7 @@
- 
- AUTOMAKE_OPTIONS = 1.3 foreign
- 
--CFLAGS = -Wall -Werror -O3 -g
-+CFLAGS += -Wall -Werror -g
- 
- bin_PROGRAMS = ac3dec 
- 
diff --git a/audio/ac3dec/files/patch-ac b/audio/ac3dec/files/patch-ac
deleted file mode 100644
index 193842ede623..000000000000
--- a/audio/ac3dec/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- libac3/Makefile.in.orig	Mon Jun  3 02:33:56 2002
-+++ libac3/Makefile.in	Mon Jun  3 02:34:04 2002
-@@ -70,7 +70,7 @@
- 
- AUTOMAKE_OPTIONS = 1.3 foreign
- 
--CFLAGS = -Wall -Werror -O1 -g
-+CFLAGS += -Wall -Werror -g
- 
- noinst_LIBRARIES = libac3.a
- 
diff --git a/audio/ac3dec/files/patch-ad b/audio/ac3dec/files/patch-ad
deleted file mode 100644
index afcaa74bc295..000000000000
--- a/audio/ac3dec/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/Makefile.in.orig	Mon Jun  3 02:34:41 2002
-+++ tools/Makefile.in	Mon Jun  3 02:34:53 2002
-@@ -70,7 +70,7 @@
- 
- AUTOMAKE_OPTIONS = 1.3 foreign
- 
--CFLAGS = -Wall -Werror -O3 -g 
-+CFLAGS += -Wall -Werror -g 
- 
- bin_PROGRAMS = extract_ac3 
- 
diff --git a/audio/ac3dec/files/patch-ae b/audio/ac3dec/files/patch-ae
deleted file mode 100644
index b810d08d563e..000000000000
--- a/audio/ac3dec/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- output_linux.c.orig	Wed Mar 29 16:51:24 2000
-+++ output_linux.c	Thu Aug 22 20:09:40 2002
-@@ -35,8 +35,6 @@
- #include <math.h>
- #if defined(__OpenBSD__)
- #include <soundcard.h>
--#elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
- #else
- #include <sys/soundcard.h>
- #endif
diff --git a/audio/ac3dec/pkg-plist b/audio/ac3dec/pkg-plist
deleted file mode 100644
index d6b4bf9073a0..000000000000
--- a/audio/ac3dec/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/ac3dec
-bin/extract_ac3
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%