5 files changed, 47 insertions, 47 deletions
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 507a2bdb0e3..08d95aeb581 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2004/03/26 02:27:34 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2004/03/30 22:21:31 xtraeme Exp $
 #
 
-DISTNAME=	streamtuner-${DIST_VER}
-PKGREVISION=	3
+DISTNAME=	streamtuner-0.12.1
 CATEGORIES=	audio www
-MASTER_SITES=	http://savannah.nongnu.org/download/streamtuner/streamtuner.pkg/${DIST_VER}/
+MASTER_SITES=	http://savannah.nongnu.org/download/streamtuner/
 
 MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/streamtuner/
@@ -13,7 +12,7 @@ COMMENT=	Stream directory browser
 DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
@@ -22,9 +21,9 @@ GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE=	extras/streamtuner.pc.in
 
-DIST_VER=		0.10.2
-
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../www/curl/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/streamtuner/PLIST b/audio/streamtuner/PLIST
index 63640aae162..8f4878b163a 100644
--- a/audio/streamtuner/PLIST
+++ b/audio/streamtuner/PLIST
@@ -1,14 +1,17 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/13 11:19:01 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/30 22:21:31 xtraeme Exp $
 bin/streamtuner
-bin/streamtuner-theme-convert
+include/streamtuner/st-action-api.h
 include/streamtuner/st-category-api.h
 include/streamtuner/st-dialog-api.h
 include/streamtuner/st-handler-api.h
 include/streamtuner/st-handler-field-api.h
 include/streamtuner/st-handlers-api.h
+include/streamtuner/st-m3u-api.h
+include/streamtuner/st-pls-api.h
 include/streamtuner/st-programs-api.h
 include/streamtuner/st-re-api.h
 include/streamtuner/st-settings-api.h
+include/streamtuner/st-sgml-ref-api.h
 include/streamtuner/st-state-api.h
 include/streamtuner/st-stream-api.h
 include/streamtuner/st-transfer-api.h
@@ -18,13 +21,19 @@ lib/pkgconfig/streamtuner.pc
 lib/streamtuner/plugins/shoutcast.a
 lib/streamtuner/plugins/shoutcast.la
 lib/streamtuner/plugins/shoutcast.so
-man/man1/streamtuner-theme-convert.1
-man/man1/streamtuner.1
 share/applications/streamtuner.desktop
+share/doc/streamtuner/C/documentation-license.xml
+share/doc/streamtuner/C/figures/main-window.png
+share/doc/streamtuner/C/figures/search-category.png
+share/doc/streamtuner/C/figures/search-dialog.png
+share/doc/streamtuner/C/software-license.xml
+share/doc/streamtuner/C/streamtuner.xml
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/streamtuner.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/streamtuner.mo
+share/omf/streamtuner/streamtuner-C.omf
 share/pixmaps/streamtuner.png
-@comment in gnome2-dirs: @dirrm share/applications
+@dirrm share/omf/streamtuner
+@dirrm share/doc/streamtuner/C/figures
 @dirrm lib/streamtuner/plugins
 @dirrm lib/streamtuner
 @dirrm include/streamtuner
diff --git a/audio/streamtuner/buildlink2.mk b/audio/streamtuner/buildlink2.mk
deleted file mode 100644
index e82ef02d786..00000000000
--- a/audio/streamtuner/buildlink2.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.8 2004/03/26 02:27:34 wiz Exp $
-#
-# This Makefile fragment is included by packages that use streamtuner.
-#
-# This file was created automatically using createbuildlink 2.4.
-#
-
-.if !defined(STREAMTUNER_BUILDLINK2_MK)
-STREAMTUNER_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			streamtuner
-BUILDLINK_DEPENDS.streamtuner?=		streamtuner>=0.10.2nb1
-BUILDLINK_RECOMMENDED.streamtuner?=	streamtuner>=0.10.2nb3
-BUILDLINK_PKGSRCDIR.streamtuner?=	../../audio/streamtuner
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.streamtuner=streamtuner
-BUILDLINK_PREFIX.streamtuner_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.streamtuner+=	include/streamtuner/*.h
-BUILDLINK_FILES.streamtuner+=	lib/pkgconfig/streamtuner.pc
-BUILDLINK_FILES.streamtuner+=	lib/streamtuner/plugins/shoutcast.*
-
-.include "../../www/curl/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	streamtuner-buildlink
-
-streamtuner-buildlink: _BUILDLINK_USE
-
-.endif	# STREAMTUNER_BUILDLINK2_MK
diff --git a/audio/streamtuner/buildlink3.mk b/audio/streamtuner/buildlink3.mk
new file mode 100644
index 00000000000..7a68d1892c7
--- /dev/null
+++ b/audio/streamtuner/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/30 22:21:31 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+STREAMTUNER_BUILDLINK3_MK:=	${STREAMTUNER_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	streamtuner
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nstreamtuner}
+BUILDLINK_PACKAGES+=	streamtuner
+
+.if !empty(STREAMTUNER_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.streamtuner+=		streamtuner>=0.12.1
+BUILDLINK_PKGSRCDIR.streamtuner?=	../../audio/streamtuner
+.endif	# STREAMTUNER_BUILDLINK3_MK
+
+.include "../../www/curl/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/streamtuner/distinfo b/audio/streamtuner/distinfo
index a43fb52ca04..c3aa8b1d313 100644
--- a/audio/streamtuner/distinfo
+++ b/audio/streamtuner/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2003/12/13 11:19:01 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2004/03/30 22:21:31 xtraeme Exp $
 
-SHA1 (streamtuner-0.10.2.tar.gz) = 0f5101775d7d37b1285089248b6d9894c8ee417c
-Size (streamtuner-0.10.2.tar.gz) = 509772 bytes
+SHA1 (streamtuner-0.12.1.tar.gz) = 17a891cfaee6b54313142b208ad6ab3d2fd3672b
+Size (streamtuner-0.12.1.tar.gz) = 664551 bytes