5 files changed, 21 insertions, 62 deletions

diff --git a/audio/Maaate/Makefile b/audio/Maaate/Makefile
index c82c571b3013..3c73439034f5 100644
--- a/audio/Maaate/Makefile
+++ b/audio/Maaate/Makefile
@@ -7,19 +7,19 @@
 #
 
 PORTNAME=	Maaate
-PORTVERSION=	0.1.0
+PORTVERSION=	0.2.1
 CATEGORIES=	audio
-MASTER_SITES=	http://www.cmis.csiro.au/dmis/maaate/
+MASTER_SITES=	http://www.cmis.csiro.au/maaate/packages/
 
-MAINTAINER=	ijliao@FreeBSD.org
-
-USE_AUTOCONF=	yes
-USE_LIBTOOL=	yes
+MAINTAINER=	ports@FreeBSD.org
 
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-
 INSTALLS_SHLIB=	yes
 
+post-patch:
+	@${PERL} -pi -e "s,-ldl,,g ; s,\(CCLD,(CXXLD,g" ${WRKSRC}/demos/Makefile.in
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/Maaate
diff --git a/audio/Maaate/distinfo b/audio/Maaate/distinfo
index f0fd6a697754..ca06b54c5847 100644
--- a/audio/Maaate/distinfo
+++ b/audio/Maaate/distinfo
@@ -1 +1 @@
-MD5 (Maaate-0.1.0.tar.gz) = 110047ecdcd0de3732f25a768ad09f03
+MD5 (Maaate-0.2.1.tar.gz) = 7a862963aae9335dc138205ea7a7cf7c
diff --git a/audio/Maaate/files/patch-configure.in b/audio/Maaate/files/patch-configure.in
deleted file mode 100644
index 67efc4a5a127..000000000000
--- a/audio/Maaate/files/patch-configure.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in.orig	Mon Feb 12 16:04:53 2001
-+++ configure.in	Mon Feb 12 16:04:59 2001
-@@ -14,7 +14,6 @@
- 
- dnl Checks for libraries.
- AC_CHECK_LIB(m,cos)
--AC_CHECK_LIB(xml,xmlParseFile)
- 
- dnl Checks for header files.
- AC_HEADER_STDC
diff --git a/audio/Maaate/files/patch-test::Makefile.in b/audio/Maaate/files/patch-test::Makefile.in
deleted file mode 100644
index 97bf8eea7bcb..000000000000
--- a/audio/Maaate/files/patch-test::Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- test/Makefile.in.orig	Tue Jan 23 22:12:01 2001
-+++ test/Makefile.in	Mon Feb 12 16:02:38 2001
-@@ -110,13 +110,13 @@
- MaaatePlay_LDADD = $(top_builddir)/src/tier1/libMaaateP.la
- 
- analyseMPaudio_SOURCES = analyseMPaudio.cc
--analyseMPaudio_LDADD = $(top_builddir)/src/tier1/libMaaateP.la $(top_builddir)/src/tier2/libMaaateA.la -ldl
-+analyseMPaudio_LDADD = $(top_builddir)/src/tier1/libMaaateP.la $(top_builddir)/src/tier2/libMaaateA.la
- 
- cMaaatePlay_SOURCES = cMaaatePlay.c
- cMaaatePlay_LDADD = $(top_builddir)/src/tier1/libMaaateP.la
- 
- canalyseMPaudio_SOURCES = canalyseMPaudio.c
--canalyseMPaudio_LDADD = $(top_builddir)/src/tier1/libMaaateP.la $(top_builddir)/src/tier2/libMaaateA.la -ldl
-+canalyseMPaudio_LDADD = $(top_builddir)/src/tier1/libMaaateP.la $(top_builddir)/src/tier2/libMaaateA.la
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
-@@ -259,11 +259,11 @@
- 
- cMaaatePlay: $(cMaaatePlay_OBJECTS) $(cMaaatePlay_DEPENDENCIES)
- 	@rm -f cMaaatePlay
--	$(LINK) $(cMaaatePlay_LDFLAGS) $(cMaaatePlay_OBJECTS) $(cMaaatePlay_LDADD) $(LIBS)
-+	$(CXXLINK) $(cMaaatePlay_LDFLAGS) $(cMaaatePlay_OBJECTS) $(cMaaatePlay_LDADD) $(LIBS)
- 
- canalyseMPaudio: $(canalyseMPaudio_OBJECTS) $(canalyseMPaudio_DEPENDENCIES)
- 	@rm -f canalyseMPaudio
--	$(LINK) $(canalyseMPaudio_LDFLAGS) $(canalyseMPaudio_OBJECTS) $(canalyseMPaudio_LDADD) $(LIBS)
-+	$(CXXLINK) $(canalyseMPaudio_LDFLAGS) $(canalyseMPaudio_OBJECTS) $(canalyseMPaudio_LDADD) $(LIBS)
- .cc.o:
- 	$(CXXCOMPILE) -c $<
- .cc.lo:
diff --git a/audio/Maaate/pkg-plist b/audio/Maaate/pkg-plist
index d38a7d2ec95e..7d22547c5f89 100644
--- a/audio/Maaate/pkg-plist
+++ b/audio/Maaate/pkg-plist
@@ -1,41 +1,42 @@
 bin/MaaatePlay
-bin/analyseMPaudio
+bin/analyseSDaudio
 bin/inspectMPaudio
-include/Maaate/Decoder.H
 include/Maaate/MPEGfile.H
+include/Maaate/SOUNDfile.H
+include/Maaate/allFormat.H
 include/Maaate/allLayers.H
 include/Maaate/byteOrder.h
 include/Maaate/header.H
 include/Maaate/layer1.H
 include/Maaate/layer2.H
 include/Maaate/layer3.H
+include/Maaate/maaateM_brief.H
 include/Maaate/module.H
 include/Maaate/plugins.H
 include/Maaate/segmentData.H
 include/Maaate/segmentTable.H
+include/Maaate/tools.H
 include/MaaateA.h
+include/MaaateMPEG.h
 include/MaaateP.h
 lib/Maaate/libMaaateM.a
+lib/Maaate/libMaaateM.la
 lib/Maaate/libMaaateM.so
 lib/Maaate/libMaaateM.so.1
 lib/libMaaateA.a
 lib/libMaaateA.so
 lib/libMaaateA.so.1
+lib/libMaaateMPEG.a
+lib/libMaaateMPEG.so
+lib/libMaaateMPEG.so.1
 lib/libMaaateP.a
 lib/libMaaateP.so
 lib/libMaaateP.so.1
 @dirrm include/Maaate
 @dirrm lib/Maaate
+%%PORTDOCS%%share/doc/Maaate/API.html
 %%PORTDOCS%%share/doc/Maaate/COPYING
-%%PORTDOCS%%share/doc/Maaate/CSIROlogo.gif
+%%PORTDOCS%%share/doc/Maaate/ChangeLog
 %%PORTDOCS%%share/doc/Maaate/THANKS
-%%PORTDOCS%%share/doc/Maaate/download.html
-%%PORTDOCS%%share/doc/Maaate/header.txt
-%%PORTDOCS%%share/doc/Maaate/index.html
-%%PORTDOCS%%share/doc/Maaate/layer1.txt
-%%PORTDOCS%%share/doc/Maaate/layer2.txt
-%%PORTDOCS%%share/doc/Maaate/layer3.txt
-%%PORTDOCS%%share/doc/Maaate/maaate-faq.txt
-%%PORTDOCS%%share/doc/Maaate/maaate.gif
-%%PORTDOCS%%share/doc/Maaate/module_guide.txt
+%%PORTDOCS%%share/doc/Maaate/applications.html
 %%PORTDOCS%%@dirrm share/doc/Maaate