Remove tunepimp, dependencies have been switched to libtunepimp.

10 files changed, 1 insertions, 154 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 48799850b6e..0086a5cba6c 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.308 2006/04/12 21:43:26 wiz Exp $
+# $NetBSD: Makefile,v 1.309 2006/04/13 18:56:13 wiz Exp $
 #
 
 COMMENT=	Audio tools
@@ -253,7 +253,6 @@ SUBDIR+=	tracker
 SUBDIR+=	tremor
 SUBDIR+=	tremor-tools
 SUBDIR+=	trm
-SUBDIR+=	tunepimp
 SUBDIR+=	tunesbrowser
 SUBDIR+=	ubs
 SUBDIR+=	vorbis-tools
diff --git a/audio/tunepimp/DESCR b/audio/tunepimp/DESCR
deleted file mode 100644
index 5941e266cba..00000000000
--- a/audio/tunepimp/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-The TunePimp library (also referred to as libtunepimp) is a development library
-geared towards developers who wish to create MusicBrainz enabled tagging
-applications.
diff --git a/audio/tunepimp/Makefile b/audio/tunepimp/Makefile
deleted file mode 100644
index 3e2c7c13982..00000000000
--- a/audio/tunepimp/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2006/04/13 06:04:04 wiz Exp $
-
-DISTNAME=	libtunepimp-0.3.0
-PKGNAME=	${DISTNAME:S/lib//}
-PKGREVISION=	4
-CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/
-
-MAINTAINER=	markd@NetBSD.org
-HOMEPAGE=	http://www.musicbrainz.org/
-COMMENT=	Create MusicBrainz enabled tagging applications
-
-CONFLICTS=	trm-[0-9]* libtunepimp-[0-9]*
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-USE_LANGUAGES=		c c++
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-pre-configure:
-	${ECHO} "#define HAVE_STATVFS 1" >> ${WRKSRC}/config.h.in
-.endif
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/musicbrainz/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tunepimp/PLIST b/audio/tunepimp/PLIST
deleted file mode 100644
index 14cd2d29c4e..00000000000
--- a/audio/tunepimp/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:17 jlam Exp $
-bin/tp_tagger
-bin/trm
-include/tunepimp/context.h
-include/tunepimp/defs.h
-include/tunepimp/tp_c.h
-include/tunepimp/track.h
-include/tunepimp/tunepimp.h
-lib/libtunepimp.la
-@dirrm include/tunepimp
diff --git a/audio/tunepimp/buildlink3.mk b/audio/tunepimp/buildlink3.mk
deleted file mode 100644
index 8d063024332..00000000000
--- a/audio/tunepimp/buildlink3.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:02 rillig Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-TUNEPIMP_BUILDLINK3_MK:=	${TUNEPIMP_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	tunepimp
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntunepimp}
-BUILDLINK_PACKAGES+=	tunepimp
-
-.if !empty(TUNEPIMP_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.tunepimp+=	tunepimp>=0.3.0
-BUILDLINK_ABI_DEPENDS.tunepimp+=	tunepimp>=0.3.0nb4
-BUILDLINK_PKGSRCDIR.tunepimp?=	../../audio/tunepimp
-.endif	# TUNEPIMP_BUILDLINK3_MK
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/musicbrainz/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/tunepimp/distinfo b/audio/tunepimp/distinfo
deleted file mode 100644
index f811e0f8d14..00000000000
--- a/audio/tunepimp/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/11/14 08:56:07 markd Exp $
-
-SHA1 (libtunepimp-0.3.0.tar.gz) = 54c60232f3b06f2316e2b1130eb981352995dfc8
-RMD160 (libtunepimp-0.3.0.tar.gz) = f471f96185aa79eff8a83fd5366904d009791628
-Size (libtunepimp-0.3.0.tar.gz) = 524889 bytes
-SHA1 (patch-aa) = 5dc5f48d01b7b1cdc1462f0bf07d0eb917fdb3c7
-SHA1 (patch-ab) = 1f5c3ea550800edac66ee8c7365cf436811233a9
-SHA1 (patch-ac) = d117d9df0b0811b1ef046920c2f1c32ce3378c5f
-SHA1 (patch-ad) = 0d6ca1a3778fe5a87bb5578a3b668ff0c39063d1
diff --git a/audio/tunepimp/patches/patch-aa b/audio/tunepimp/patches/patch-aa
deleted file mode 100644
index 8a0791f055a..00000000000
--- a/audio/tunepimp/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/08/21 11:17:55 markd Exp $
-
---- lib/threads/posix/thread.h.orig	2004-03-25 21:20:15.000000000 +1200
-+++ lib/threads/posix/thread.h
-@@ -28,6 +28,7 @@
- #define __THREAD_H_
- 
- #include <pthread.h>
-+#include <signal.h>
- #include "semaphore.h"
- 
- #include "defs.h"
diff --git a/audio/tunepimp/patches/patch-ab b/audio/tunepimp/patches/patch-ab
deleted file mode 100644
index f39af5eee0c..00000000000
--- a/audio/tunepimp/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/11/11 16:04:29 joerg Exp $
-
---- lib/write.cpp.orig	2004-03-25 10:12:43.000000000 +0000
-+++ lib/write.cpp
-@@ -40,7 +40,7 @@ extern "C"
- #  include <sys/stat.h>
- #  include <sys/types.h>
- #  include <fcntl.h>
--#  if defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__)
-+#  if defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
- #    include <sys/param.h>
- #    include <sys/mount.h>
- #  else
-@@ -896,8 +896,17 @@ bool WriteThread::diskSpaceTest(const st
- #else
- //---------------------------------------------------------------------------
- 
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */
-+#define HAVE_STATVFS 1
-+#endif
-+
- bool WriteThread::diskSpaceTest(const string &fileName, unsigned long fileSize)
- {
-+#if defined(HAVE_STATVFS)
-+#define statfs statvfs
-+#define f_bsize f_frsize
-+#endif
-+
-     struct statfs stat;
- 
-     string path = extractFilePath(fileName);
diff --git a/audio/tunepimp/patches/patch-ac b/audio/tunepimp/patches/patch-ac
deleted file mode 100644
index 78652a034ef..00000000000
--- a/audio/tunepimp/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/11/11 16:04:29 joerg Exp $
-
---- lib/threads/posix/Makefile.in.orig	2005-11-11 15:54:34.000000000 +0000
-+++ lib/threads/posix/Makefile.in
-@@ -204,7 +204,7 @@ target_alias = @target_alias@
- INCLUDES = -I$(top_srcdir)/include/tunepimp
- noinst_LTLIBRARIES = libtpthread.la
- libtpthread_la_SOURCES = mutex.cpp mutex.h thread.cpp thread.h semaphore.cpp semaphore.h
--@FREEBSD_FALSE@libtpthread_la_LIBADD = -lpthread
-+@FREEBSD_FALSE@libtpthread_la_LIBADD = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- @FREEBSD_TRUE@libtpthread_la_LIBADD = -lthr
- all: all-am
- 
diff --git a/audio/tunepimp/patches/patch-ad b/audio/tunepimp/patches/patch-ad
deleted file mode 100644
index 7ea82cc4ee9..00000000000
--- a/audio/tunepimp/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/11/14 08:56:08 markd Exp $
-
---- lib/Makefile.in.orig	2005-11-14 21:34:21.000000000 +1300
-+++ lib/Makefile.in
-@@ -250,7 +250,7 @@ libtunepimp_la_SOURCES = tunepimp.cpp fi
- #     increment age.
- #  6. If any interfaces have been removed since the last public release, then 
- #     set age to 0. 
--libtunepimp_la_LDFLAGS = -version-info 2:0:0
-+libtunepimp_la_LDFLAGS = -version-info 2:0:0 ${PTHREAD_LDFLAGS}
- libtunepimp_la_LIBADD = threads/posix/libtpthread.la utf8/libutf8.la id3tag/libid3tag.la @TP_LIBS@
- noinst_HEADERS = analyzer.h dirsearch.h fstrcmp.h i18n.h id3_meta.h lookup.h mp3_trm.h flac_trm.h flac_meta.h ov_trm.h submit.h trm.h vcedit.h vorbis_meta.h wav_trm.h ape_meta.h ape_trm.h filecache.h filelookup.h file_meta.h fstrcmp.h lookuptools.h write.h metadata.h watchdog.h
- all: all-recursive