o Do not install libao library files since both there already is a

  port libao and this library is intended only for internal to this
  port use
o Solution based on the latest liba52 CVS

Submitted by:	nobutaka
Reviewed by:	naddy

8 files changed, 50 insertions, 12 deletions

diff --git a/audio/liba52-devel/Makefile b/audio/liba52-devel/Makefile
index f3f42ed65a4e..d1018169f9ba 100644
--- a/audio/liba52-devel/Makefile
+++ b/audio/liba52-devel/Makefile
@@ -14,6 +14,8 @@ DISTNAME=	a52dec-${PORTVERSION:S/.b/b/}
 
 MAINTAINER=	lioux@FreeBSD.org
 
+USE_AUTOMAKE=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-oss --enable-shared
 USE_LIBTOOL=	yes
@@ -23,8 +25,6 @@ MAN1=	a52dec.1 extract_a52.1
 HEADER_FILES=	liba52/a52_internal.h
 
 .ifndef(WITH_OPTIMIZED_CFLAGS)
-USE_AUTOCONF=	yes
-
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-configure.in
 .endif
 
diff --git a/audio/liba52-devel/files/patch-libao:Makefile.am b/audio/liba52-devel/files/patch-libao:Makefile.am
new file mode 100644
index 000000000000..fdd4352c7c6b
--- /dev/null
+++ b/audio/liba52-devel/files/patch-libao:Makefile.am
@@ -0,0 +1,12 @@
+--- libao/Makefile.am.orig	Thu Aug 16 03:36:56 2001
++++ libao/Makefile.am	Sat Dec  1 06:44:16 2001
+@@ -1,7 +1,5 @@
+-lib_LTLIBRARIES = libao.la
+-libao_la_SOURCES = audio_out.c audio_out_oss.c audio_out_solaris.c \
++noinst_LIBRARIES = libao.a
++libao_a_SOURCES = audio_out.c audio_out_oss.c audio_out_solaris.c \
+ 		   audio_out_null.c audio_out_float.c
+-libao_la_LIBADD = @LIBAO_LIBS@
+-libao_la_LDFLAGS = -no-undefined
+ 
+ EXTRA_DIST = configure.incl
diff --git a/audio/liba52-devel/files/patch-src:Makefile.am b/audio/liba52-devel/files/patch-src:Makefile.am
new file mode 100644
index 000000000000..3d02513203d6
--- /dev/null
+++ b/audio/liba52-devel/files/patch-src:Makefile.am
@@ -0,0 +1,11 @@
+--- src/Makefile.am.orig	Thu Aug 30 19:18:37 2001
++++ src/Makefile.am	Sat Dec  1 06:31:19 2001
+@@ -2,7 +2,7 @@
+ 
+ bin_PROGRAMS = a52dec extract_a52
+ a52dec_SOURCES = a52dec.c getopt.c
+-a52dec_LDADD = $(top_builddir)/liba52/liba52.la $(top_builddir)/libao/libao.la
++a52dec_LDADD = $(top_builddir)/liba52/liba52.la $(top_builddir)/libao/libao.a @LIBAO_LIBS@
+ extract_a52_SOURCES = extract_a52.c getopt.c
+ 
+ man_MANS = a52dec.1 extract_a52.1
diff --git a/audio/liba52-devel/pkg-plist b/audio/liba52-devel/pkg-plist
index 509e24ef5ee8..643a9ac8bcc9 100644
--- a/audio/liba52-devel/pkg-plist
+++ b/audio/liba52-devel/pkg-plist
@@ -8,10 +8,6 @@ lib/liba52.so.0
 lib/liba52.so
 lib/liba52.la
 lib/liba52.a
-lib/libao.so.0
-lib/libao.so
-lib/libao.la
-lib/libao.a
 %%PORTDOCS%%share/doc/liba52/liba52.txt
 %%PORTDOCS%%@dirrm share/doc/liba52
 @dirrm include/a52dec
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
index f3f42ed65a4e..d1018169f9ba 100644
--- a/audio/liba52/Makefile
+++ b/audio/liba52/Makefile
@@ -14,6 +14,8 @@ DISTNAME=	a52dec-${PORTVERSION:S/.b/b/}
 
 MAINTAINER=	lioux@FreeBSD.org
 
+USE_AUTOMAKE=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-oss --enable-shared
 USE_LIBTOOL=	yes
@@ -23,8 +25,6 @@ MAN1=	a52dec.1 extract_a52.1
 HEADER_FILES=	liba52/a52_internal.h
 
 .ifndef(WITH_OPTIMIZED_CFLAGS)
-USE_AUTOCONF=	yes
-
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-configure.in
 .endif
 
diff --git a/audio/liba52/files/patch-libao:Makefile.am b/audio/liba52/files/patch-libao:Makefile.am
new file mode 100644
index 000000000000..fdd4352c7c6b
--- /dev/null
+++ b/audio/liba52/files/patch-libao:Makefile.am
@@ -0,0 +1,12 @@
+--- libao/Makefile.am.orig	Thu Aug 16 03:36:56 2001
++++ libao/Makefile.am	Sat Dec  1 06:44:16 2001
+@@ -1,7 +1,5 @@
+-lib_LTLIBRARIES = libao.la
+-libao_la_SOURCES = audio_out.c audio_out_oss.c audio_out_solaris.c \
++noinst_LIBRARIES = libao.a
++libao_a_SOURCES = audio_out.c audio_out_oss.c audio_out_solaris.c \
+ 		   audio_out_null.c audio_out_float.c
+-libao_la_LIBADD = @LIBAO_LIBS@
+-libao_la_LDFLAGS = -no-undefined
+ 
+ EXTRA_DIST = configure.incl
diff --git a/audio/liba52/files/patch-src:Makefile.am b/audio/liba52/files/patch-src:Makefile.am
new file mode 100644
index 000000000000..3d02513203d6
--- /dev/null
+++ b/audio/liba52/files/patch-src:Makefile.am
@@ -0,0 +1,11 @@
+--- src/Makefile.am.orig	Thu Aug 30 19:18:37 2001
++++ src/Makefile.am	Sat Dec  1 06:31:19 2001
+@@ -2,7 +2,7 @@
+ 
+ bin_PROGRAMS = a52dec extract_a52
+ a52dec_SOURCES = a52dec.c getopt.c
+-a52dec_LDADD = $(top_builddir)/liba52/liba52.la $(top_builddir)/libao/libao.la
++a52dec_LDADD = $(top_builddir)/liba52/liba52.la $(top_builddir)/libao/libao.a @LIBAO_LIBS@
+ extract_a52_SOURCES = extract_a52.c getopt.c
+ 
+ man_MANS = a52dec.1 extract_a52.1
diff --git a/audio/liba52/pkg-plist b/audio/liba52/pkg-plist
index 509e24ef5ee8..643a9ac8bcc9 100644
--- a/audio/liba52/pkg-plist
+++ b/audio/liba52/pkg-plist
@@ -8,10 +8,6 @@ lib/liba52.so.0
 lib/liba52.so
 lib/liba52.la
 lib/liba52.a
-lib/libao.so.0
-lib/libao.so
-lib/libao.la
-lib/libao.a
 %%PORTDOCS%%share/doc/liba52/liba52.txt
 %%PORTDOCS%%@dirrm share/doc/liba52
 @dirrm include/a52dec