5 files changed, 58 insertions, 20 deletions

diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 0ce4072564ec..84fa2ddc3008 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	libao
-PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTVERSION=	0.7.0
 CATEGORIES=	audio
-MASTER_SITES=	http://www.vorbis.com/files/beta4/unix/ \
-		http://home.student.utwente.nl/t.vanklaveren/distfiles/
+MASTER_SITES=	http://www.vorbis.com/files/rc1/unix/
 
 MAINTAINER=	naddy@mips.inka.de
 
@@ -19,6 +17,12 @@ WANT_ESOUND=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
+.if defined(NOPORTDOCS)
+MAKE_ENV=	DOC=""
+.else
+MAKE_ENV=	DOC=doc
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if defined(HAVE_ESOUND)
diff --git a/audio/libao/distinfo b/audio/libao/distinfo
index 9ed5c20e399d..046c6eaf525c 100644
--- a/audio/libao/distinfo
+++ b/audio/libao/distinfo
@@ -1 +1 @@
-MD5 (libao-0.6.0.tar.gz) = bab8b209a9440c8426d340ee8d4238ec
+MD5 (libao-0.7.0.tar.gz) = f4708f76c18cadc781ecbe0b9131d050
diff --git a/audio/libao/files/patch-Makefile.in b/audio/libao/files/patch-Makefile.in
new file mode 100644
index 000000000000..6346c48cb12d
--- /dev/null
+++ b/audio/libao/files/patch-Makefile.in
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- Makefile.in.orig	Tue Jul 17 02:31:20 2001
++++ Makefile.in	Tue Jul 17 02:31:31 2001
+@@ -87,7 +87,7 @@ plugindir = @plugindir@
+ 
+ AUTOMAKE_OPTIONS = foreign dist-zip
+ 
+-SUBDIRS = src include doc debian
++SUBDIRS = src include $(DOC) debian
+ 
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = ao.m4
diff --git a/audio/libao/files/patch-configure b/audio/libao/files/patch-configure
index 2967f72fada6..782e7d6eaeea 100644
--- a/audio/libao/files/patch-configure
+++ b/audio/libao/files/patch-configure
@@ -1,29 +1,25 @@
 $FreeBSD$
---- configure.orig	Wed Mar 21 16:27:24 2001
-+++ configure	Wed Mar 21 16:28:57 2001
-@@ -1501,9 +1501,9 @@ if test -z "$GCC"; then
-                 CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+--- configure.orig	Mon Jun 18 18:05:25 2001
++++ configure	Tue Jul 17 12:38:04 2001
+@@ -1510,7 +1510,7 @@ if test -z "$GCC"; then
                  PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
          *)
--                DEBUG="-g"
+                 DEBUG="-g"
 -                CFLAGS="-O"
--                PROFILE="-g -p" ;;
-+                DEBUG="$CFLAGS -g"
-+                CFLAGS="$CFLAGS"
-+                PROFILE="$CFLAGS -g -p" ;;
++                CFLAGS=""
+                 PROFILE="-g -p" ;;
          esac
  else
- 
-@@ -1517,9 +1517,9 @@ else
+@@ -1525,9 +1525,9 @@ else
                  CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
                  PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
          *)
 -                DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
 -                CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
 -                PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
-+                DEBUG="$CFLAGS -g -Wall -fsigned-char"
-+                CFLAGS="$CFLAGS -fsigned-char"
-+                PROFILE="$CFLAGS -g -pg -fsigned-char" ;;
++                DEBUG="-g -Wall"
++                CFLAGS=""
++                PROFILE="-g -pg" ;;
          esac
  fi
- 
+ CFLAGS="$CFLAGS $cflags_save"
diff --git a/audio/libao/files/patch-src_plugins_arts_Makefile.in b/audio/libao/files/patch-src_plugins_arts_Makefile.in
new file mode 100644
index 000000000000..496b49a06519
--- /dev/null
+++ b/audio/libao/files/patch-src_plugins_arts_Makefile.in
@@ -0,0 +1,26 @@
+$FreeBSD$
+--- src/plugins/arts/Makefile.in.orig	Tue Jul 17 02:29:03 2001
++++ src/plugins/arts/Makefile.in	Tue Jul 17 02:29:34 2001
+@@ -93,13 +93,12 @@ AUTOMAKE_OPTIONS = foreign
+ @HAVE_ARTS_TRUE@artssources = ao_arts.c
+ @HAVE_ARTS_FALSE@artssources = 
+ 
+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include @ARTS_CFLAGS@
+ 
+ libdir = $(plugindir)
+ lib_LTLIBRARIES = $(artsltlibs)
+ 
+ libarts_la_LDFLAGS = $(artsldflags)
+-CFLAGS = @ARTS_CFLAGS@
+ libarts_la_LIBADD = @ARTS_LIBS@
+ libarts_la_SOURCES = $(artssources)
+ 
+@@ -116,6 +115,7 @@ LIBS = @LIBS@
+ libarts_la_DEPENDENCIES = 
+ @HAVE_ARTS_FALSE@libarts_la_OBJECTS = 
+ @HAVE_ARTS_TRUE@libarts_la_OBJECTS =  ao_arts.lo
++CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)