6 files changed, 50 insertions, 28 deletions

diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 30506c3f99f2..da3f83e8ee83 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -9,18 +9,14 @@ PORTNAME=	libao
 PORTVERSION=	0.6.0
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://home.student.utwente.nl/t.vanklaveren/distfiles/ \
-		http://www.vorbis.com/files/beta4/unix/
+MASTER_SITES=	http://www.vorbis.com/files/beta4/unix/ \
+		http://home.student.utwente.nl/t.vanklaveren/distfiles/
 
-MAINTAINER=	t.vanklaveren@student.utwente.nl
+MAINTAINER=	Christian Weisgerber <naddy@mips.inka.de>
 
 WANT_ESOUND=	yes
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_AUTOMAKE=	yes
-
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/audio/libao/files/patch-ac b/audio/libao/files/patch-ac
deleted file mode 100644
index cdac7830f87a..000000000000
--- a/audio/libao/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Sat Feb 24 10:31:45 2001
-+++ configure.in	Fri Mar  2 13:03:53 2001
-@@ -60,7 +60,7 @@
-                 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"
-+                CFLAGS="-D__NO_MATH_INLINES -fsigned-char $CFLAGS"
-                 PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
-         esac
- fi
diff --git a/audio/libao/files/patch-configure b/audio/libao/files/patch-configure
new file mode 100644
index 000000000000..2967f72fada6
--- /dev/null
+++ b/audio/libao/files/patch-configure
@@ -0,0 +1,29 @@
+$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"
+                 PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
+         *)
+-                DEBUG="-g"
+-                CFLAGS="-O"
+-                PROFILE="-g -p" ;;
++                DEBUG="$CFLAGS -g"
++                CFLAGS="$CFLAGS"
++                PROFILE="$CFLAGS -g -p" ;;
+         esac
+ else
+ 
+@@ -1517,9 +1517,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" ;;
+         esac
+ fi
+ 
diff --git a/audio/libao/files/patch-doc_Makefile.in b/audio/libao/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..b0ba162f53f6
--- /dev/null
+++ b/audio/libao/files/patch-doc_Makefile.in
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- doc/Makefile.in.orig	Wed Mar 21 16:29:06 2001
++++ doc/Makefile.in	Wed Mar 21 16:29:15 2001
+@@ -87,7 +87,7 @@ plugindir = @plugindir@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
+ 
+ doc_DATA = API USAGE DRIVERS WANTED
+ 
diff --git a/audio/libao/pkg-descr b/audio/libao/pkg-descr
index 6be152b63306..9b346137f023 100644
--- a/audio/libao/pkg-descr
+++ b/audio/libao/pkg-descr
@@ -4,9 +4,4 @@ supports:
    * Open Sound System (Linux, *BSD)
    * ESounD
    * Advanced Linux Sound Architecture
-   * Solaris (untested)
-   * IRIX (untested)
    * WAV files
-
-- Theo van Klaveren
-t.vanklaveren@student.utwente.nl
diff --git a/audio/libao/pkg-plist b/audio/libao/pkg-plist
index 56f7007a2cc3..26f7a1f28e47 100644
--- a/audio/libao/pkg-plist
+++ b/audio/libao/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 include/ao/ao.h
 include/ao/os_types.h
 lib/libao.so
@@ -6,10 +7,10 @@ lib/libao.so.1
 lib/ao/liboss.so
 %%ESOUND%%lib/ao/libesd.so
 share/aclocal/ao.m4
-share/doc/libao-0.6.0/API
-share/doc/libao-0.6.0/DRIVERS
-share/doc/libao-0.6.0/USAGE
-share/doc/libao-0.6.0/WANTED
+%%NOPORTDOCS%%share/doc/libao/API
+%%NOPORTDOCS%%share/doc/libao/DRIVERS
+%%NOPORTDOCS%%share/doc/libao/USAGE
+%%NOPORTDOCS%%share/doc/libao/WANTED
 @dirrm include/ao
 @dirrm lib/ao
-@dirrm share/doc/libao-0.6.0
+%%NOPORTDOCS%%@dirrm share/doc/libao