Make trm compile again (probably broke when the c++ compiler changed)

Change the install permissions to be 755, not 655.

Rather than patching configure and Makefile, use automake & autoconf to
rebuild them.

Bump pkg revision to 4.

5 files changed, 48 insertions, 16 deletions

diff --git a/audio/trm/Makefile b/audio/trm/Makefile
index 56f24c5434f..ea04de478c1 100644
--- a/audio/trm/Makefile
+++ b/audio/trm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2006/06/08 16:03:51 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/07/01 11:59:01 chris Exp $
 #
 
 DISTNAME=	trm-0.2.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/
 
@@ -17,6 +17,13 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
 
+AUTOMAKE_REQD=	1.6.3
+USE_TOOLS+=	automake aclocal autoheader autoconf
+
+pre-configure:
+	set -e; cd ${WRKSRC}; \
+	aclocal; autoheader; automake -a --foreign -i; autoconf
+
 .include "../../audio/id3lib/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
diff --git a/audio/trm/distinfo b/audio/trm/distinfo
index 11b4a82c098..ecd14981c1c 100644
--- a/audio/trm/distinfo
+++ b/audio/trm/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:53 agc Exp $
+$NetBSD: distinfo,v 1.3 2007/07/01 11:59:01 chris Exp $
 
 SHA1 (trm-0.2.1.tar.gz) = ea032c38ca83266026e0c10919749814282994e9
 RMD160 (trm-0.2.1.tar.gz) = fb74d692920af62a7fcbbacfb32cd0e277e56126
 Size (trm-0.2.1.tar.gz) = 131349 bytes
-SHA1 (patch-aa) = 1480923a665709778abd63af37cd85ff5f492e1e
+SHA1 (patch-aa) = 152a7b8503ca887c641aeedfdd78f2520b88763b
+SHA1 (patch-ab) = 909c55da818a72b687c88c69a4e8d682f5a02df5
+SHA1 (patch-ac) = 980651e3f8b196575c09aa99cf33e9ce008a708f
diff --git a/audio/trm/patches/patch-aa b/audio/trm/patches/patch-aa
index 59e6909ba42..5989870ee45 100644
--- a/audio/trm/patches/patch-aa
+++ b/audio/trm/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/09 00:17:06 chris Exp $
+$NetBSD: patch-aa,v 1.2 2007/07/01 11:59:01 chris Exp $
 
---- configure.orig	2004-02-07 22:39:42.000000000 +0000
-+++ configure	2004-02-07 22:39:57.000000000 +0000
-@@ -3192,7 +3192,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmusicbrainz -ldl $LIBS"
-+LIBS="-lmusicbrainz $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
+--- configure.in.orig	2007-07-01 12:45:08.000000000 +0100
++++ configure.in
+@@ -50,7 +50,7 @@ AC_CHECK_LIB(musicbrainz, mb_GetVersion,
+              echo "*  http://www.musicbrainz.org/download " 
+              echo "*"
+              AC_MSG_ERROR("Cannot build. Stop.")
+-             ,-ldl)
++             ,)
+ 
+ AC_TRY_RUN([
+ #include <musicbrainz/mb_c.h>
diff --git a/audio/trm/patches/patch-ab b/audio/trm/patches/patch-ab
new file mode 100644
index 00000000000..c6cba39e3e6
--- /dev/null
+++ b/audio/trm/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/07/01 11:59:01 chris Exp $
+
+--- ./defs.h.orig	2007-07-01 12:12:18.000000000 +0100
++++ ./defs.h
+@@ -16,7 +16,7 @@ struct Metadata
+     string fileName;
+     unsigned long duration;
+ 
+-    Metadata::Metadata(void) { trackNum = 0; };
++    Metadata(void) { trackNum = 0; };
+     Metadata &operator=(const Metadata &other)
+     {
+         artist = other.artist;
diff --git a/audio/trm/patches/patch-ac b/audio/trm/patches/patch-ac
new file mode 100644
index 00000000000..5e82f0b1795
--- /dev/null
+++ b/audio/trm/patches/patch-ac
@@ -0,0 +1,10 @@
+$NetBSD: patch-ac,v 1.1 2007/07/01 11:59:01 chris Exp $
+
+--- ./Makefile.am.orig	2007-07-01 12:27:37.000000000 +0100
++++ ./Makefile.am
+@@ -15,4 +15,4 @@ cvsclean: distclean
+ 	rm -f configure Makefile.in install-sh missing mkinstalldirs
+ 
+ install:
+-	$(INSTALL) -s -m 0655 trm $(prefix)/bin	
++	$(INSTALL) -s -m 0755 trm $(prefix)/bin