13 files changed, 164 insertions, 56 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index e6865a03220..ecacf329ef2 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.10284 2005/06/02 23:33:33 tron Exp $
+$NetBSD: CHANGES,v 1.10285 2005/06/03 15:40:30 jmmv Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 	
@@ -2772,3 +2772,5 @@ Changes to the packages collection and infrastructure in 2005:
 	Added sysutils/afbinit version 1.0 [martin 2005-06-02]
 	Updated parallel/clusterit to 2.3.1 [garbled 2005-06-02]
 	Updated chat/xchat2 to 2.4.3 [tron 2005-06-02]
+	Updated multimedia/libdv to 0.104nb1 [jmmv 2005-06-03]
+	Added multimedia/libdv-tools version 0.104 [jmmv 2005-06-03]
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 2eae445d3b8..70e74a9d191 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2005/05/18 22:02:17 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2005/06/03 15:40:30 jmmv Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -31,6 +31,7 @@ SUBDIR+=	kdemultimedia3
 SUBDIR+=	kmplayer
 SUBDIR+=	libassetml
 SUBDIR+=	libdv
+SUBDIR+=	libdv-tools
 SUBDIR+=	libdvbpsi
 SUBDIR+=	libdvdcss
 SUBDIR+=	libdvdnav
diff --git a/multimedia/libdv-tools/DESCR b/multimedia/libdv-tools/DESCR
new file mode 100644
index 00000000000..6ded05ac3a1
--- /dev/null
+++ b/multimedia/libdv-tools/DESCR
@@ -0,0 +1,11 @@
+The Quasar DV codec (libdv) is a software codec for DV video, the encoding
+format used by most digital camcorders, typically those that support
+the IEEE 1394 (a.k.a. FireWire or i.Link) interface. libdv was developed
+according to the official standards for DV video: IEC 61834 and SMPTE
+314M.
+
+This package provides playdv for displaying DV-encoded video data,
+dubdv for inserting audio into a digital video stream, encodedv for
+encoding a series of images to a digital video stream, and dvconnect
+for capturing and sending raw DV streams using the Linux IEEE 1394
+video1394 device.
diff --git a/multimedia/libdv-tools/Makefile b/multimedia/libdv-tools/Makefile
new file mode 100644
index 00000000000..252ca5e01e3
--- /dev/null
+++ b/multimedia/libdv-tools/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2005/06/03 15:40:31 jmmv Exp $
+
+.include "../../multimedia/libdv/Makefile.common"
+
+PKGNAME=		${DISTNAME:S/-/-tools-/}
+
+COMMENT+=		(standalone tools)
+
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-gtk/--enable-gtk/g}
+
+BUILD_DIRS=		${WRKSRC}/encodedv ${WRKSRC}/playdv
+INSTALL_DIRS=		${WRKSRC}/encodedv ${WRKSRC}/playdv
+
+BUILDLINK_DEPENDS.libdv+=	libdv>=0.104nb1
+
+.include "../../devel/glib/buildlink3.mk"
+.include "../../multimedia/libdv/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdv-tools/PLIST b/multimedia/libdv-tools/PLIST
new file mode 100644
index 00000000000..7ff812dd16b
--- /dev/null
+++ b/multimedia/libdv-tools/PLIST
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.1 2005/06/03 15:40:31 jmmv Exp $
+bin/dubdv
+bin/dvconnect
+bin/encodedv
+bin/playdv
+man/man1/dubdv.1
+man/man1/dvconnect.1
+man/man1/encodedv.1
+man/man1/playdv.1
diff --git a/multimedia/libdv/DESCR b/multimedia/libdv/DESCR
index 19eee8a3785..56e4e689b55 100644
--- a/multimedia/libdv/DESCR
+++ b/multimedia/libdv/DESCR
@@ -3,9 +3,3 @@ format used by most digital camcorders, typically those that support
 the IEEE 1394 (a.k.a. FireWire or i.Link) interface. libdv was developed
 according to the official standards for DV video: IEC 61834 and SMPTE
 314M.
-
-This package also includes playdv for displaying DV-encoded video data,
-dubdv for inserting audio into a digital video stream, encodedv for
-encoding a series of images to a digital video stream, and dvconnect
-for capturing and sending raw DV streams using the Linux IEEE 1394
-video1394 device.
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index 4426a9942f9..e0ce692a2dc 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -1,36 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/03 15:40:30 jmmv Exp $
 
-DISTNAME=	libdv-0.104
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libdv/}
+.include "Makefile.common"
 
-MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
-HOMEPAGE=	http://libdv.sourceforge.net/
-COMMENT=	DV video codec library
+PKGREVISION=	1
 
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-PKGCONFIG_OVERRIDE=	${WRKSRC}/libdv.pc.in
-PTHREAD_AUTO_VARS=	yes
+MAKE_FLAGS+=	SUBDIRS=libdv
 
-LIBS+=			${LIBOSSAUDIO}
-
-.include "../../mk/bsd.prefs.mk"
-.if empty(MACHINE_PLATFORM:M*-*-i386)
-CONFIGURE_ARGS+=	--disable-asm
-.endif
-
-.if !exists(${X11BASE}/include/X11/extensions/Xvlib.h)
-CONFIGURE_ARGS+=--disable-xv
-.endif
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdv/Makefile.common b/multimedia/libdv/Makefile.common
new file mode 100644
index 00000000000..3261e051a5d
--- /dev/null
+++ b/multimedia/libdv/Makefile.common
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile.common,v 1.1 2005/06/03 15:40:31 jmmv Exp $
+
+DISTNAME=	libdv-0.104
+CATEGORIES=	multimedia
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libdv/}
+
+MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
+HOMEPAGE=	http://libdv.sourceforge.net/
+COMMENT=	DV video codec library
+
+DISTINFO_FILE=		${.CURDIR}/../../multimedia/libdv/distinfo
+PATCHDIR=		${.CURDIR}/../../multimedia/libdv/patches
+
+GNU_CONFIGURE=		yes
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+PKGCONFIG_OVERRIDE=	${WRKSRC}/libdv.pc.in
+PTHREAD_AUTO_VARS=	yes
+
+CONFIGURE_ARGS+=	--disable-gtk
+
+.include "../../mk/bsd.prefs.mk"
+.if empty(MACHINE_PLATFORM:M*-*-i386)
+CONFIGURE_ARGS+=	--disable-asm
+.endif
+
+.if !exists(${X11BASE}/include/X11/extensions/Xvlib.h)
+CONFIGURE_ARGS+=	--disable-xv
+.endif
+
+LIBS+=		${LIBOSSAUDIO}
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/libdv/PLIST b/multimedia/libdv/PLIST
index 0611978c8e1..578ddc0e469 100644
--- a/multimedia/libdv/PLIST
+++ b/multimedia/libdv/PLIST
@@ -1,14 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/11/25 14:52:20 adam Exp $
-bin/dubdv
-bin/dvconnect
-bin/encodedv
-bin/playdv
+@comment $NetBSD: PLIST,v 1.4 2005/06/03 15:40:31 jmmv Exp $
 include/libdv/dv.h
 include/libdv/dv_types.h
 lib/libdv.la
 lib/pkgconfig/libdv.pc
-man/man1/dubdv.1
-man/man1/dvconnect.1
-man/man1/encodedv.1
-man/man1/playdv.1
 @dirrm include/libdv
diff --git a/multimedia/libdv/buildlink3.mk b/multimedia/libdv/buildlink3.mk
index a2d4974fb0d..c0eff97697c 100644
--- a/multimedia/libdv/buildlink3.mk
+++ b/multimedia/libdv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/06/03 15:40:31 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBDV_BUILDLINK3_MK:=	${LIBDV_BUILDLINK3_MK}+
@@ -16,10 +16,4 @@ BUILDLINK_RECOMMENDED.libdv+=	libdv>=0.102nb1
 BUILDLINK_PKGSRCDIR.libdv?=	../../multimedia/libdv
 .endif	# LIBDV_BUILDLINK3_MK
 
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libdv/distinfo b/multimedia/libdv/distinfo
index a005a0fc191..6e65971b939 100644
--- a/multimedia/libdv/distinfo
+++ b/multimedia/libdv/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 11:24:03 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/06/03 15:40:31 jmmv Exp $
 
 SHA1 (libdv-0.104.tar.gz) = 521a079193f4ae8f9995091b0590c87fde130650
 RMD160 (libdv-0.104.tar.gz) = a91708ecb75533caf2b9038ca68064c7707dcfdf
 Size (libdv-0.104.tar.gz) = 554691 bytes
 SHA1 (patch-aa) = 6910450f2c93ac4989e8c132368d208ddd65cf0d
+SHA1 (patch-ab) = f204ba8b80f48a5965397beb2239b44b45ca8920
+SHA1 (patch-ac) = a8d1fd55c9bf3ee59f34613e285314def3add60b
diff --git a/multimedia/libdv/patches/patch-ab b/multimedia/libdv/patches/patch-ab
new file mode 100644
index 00000000000..d49568f602f
--- /dev/null
+++ b/multimedia/libdv/patches/patch-ab
@@ -0,0 +1,51 @@
+$NetBSD: patch-ab,v 1.1 2005/06/03 15:40:31 jmmv Exp $
+
+--- encodedv/Makefile.in.orig	2004-11-30 03:23:42.000000000 +0000
++++ encodedv/Makefile.in
+@@ -57,19 +57,19 @@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROG
+ am_dubdv_OBJECTS = insert_audio.$(OBJEXT)
+ dubdv_OBJECTS = $(am_dubdv_OBJECTS)
+ am__DEPENDENCIES_1 =
+-dubdv_DEPENDENCIES = ../libdv/libdv.la $(am__DEPENDENCIES_1)
++dubdv_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_dvavi_OBJECTS = dvavi.$(OBJEXT)
+ dvavi_OBJECTS = $(am_dvavi_OBJECTS)
+-dvavi_DEPENDENCIES = ../libdv/libdv.la
++dvavi_DEPENDENCIES = 
+ am_dvconnect_OBJECTS = dvconnect.$(OBJEXT)
+ dvconnect_OBJECTS = $(am_dvconnect_OBJECTS)
+ dvconnect_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_encodedv_OBJECTS = encodedv.$(OBJEXT)
+ encodedv_OBJECTS = $(am_encodedv_OBJECTS)
+-encodedv_DEPENDENCIES = ../libdv/libdv.la $(am__DEPENDENCIES_1)
++encodedv_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_fix_headers_OBJECTS = fix_headers.$(OBJEXT)
+ fix_headers_OBJECTS = $(am_fix_headers_OBJECTS)
+-fix_headers_DEPENDENCIES = ../libdv/libdv.la
++fix_headers_DEPENDENCIES = 
+ am_ppmqscale_OBJECTS = ppmqscale.$(OBJEXT)
+ ppmqscale_OBJECTS = $(am_ppmqscale_OBJECTS)
+ ppmqscale_LDADD = $(LDADD)
+@@ -232,18 +232,18 @@ EXTRA_DIST = $(man_MANS)
+ MAINTAINERCLEANFILES = Makefile.in $(AUX_DIST)
+ CLEANFILES = 
+ encodedv_SOURCES = encodedv.c 
+-encodedv_LDADD = ../libdv/libdv.la $(POPT_LIB)
++encodedv_LDADD = `pkg-config --libs libdv` $(POPT_LIB)
+ dubdv_SOURCES = insert_audio.c 
+-dubdv_LDADD = ../libdv/libdv.la $(POPT_LIB)
++dubdv_LDADD = `pkg-config --libs libdv` $(POPT_LIB)
+ fix_headers_SOURCES = fix_headers.c 
+-fix_headers_LDADD = ../libdv/libdv.la
++fix_headers_LDADD = `pkg-config --libs libdv`
+ scan_packet_headers_SOURCES = scan_packet_headers.c
+ steal_header_SOURCES = steal_header.c
+ ppmqscale_SOURCES = ppmqscale.c
+ dvconnect_SOURCES = dvconnect.c
+ dvconnect_LDADD = $(PTHREAD_LIBS) $(POPT_LIB)
+ dvavi_SOURCES = dvavi.c
+-dvavi_LDADD = ../libdv/libdv.la
++dvavi_LDADD = `pkg-config --libs libdv`
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/multimedia/libdv/patches/patch-ac b/multimedia/libdv/patches/patch-ac
new file mode 100644
index 00000000000..f83f6a11aab
--- /dev/null
+++ b/multimedia/libdv/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2005/06/03 15:40:31 jmmv Exp $
+
+--- playdv/Makefile.in.orig	2004-11-30 03:23:43.000000000 +0000
++++ playdv/Makefile.in
+@@ -58,7 +58,7 @@ am_playdv_OBJECTS = playdv.$(OBJEXT) dis
+ playdv_OBJECTS = $(am_playdv_OBJECTS)
+ am__DEPENDENCIES_1 =
+ playdv_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) ../libdv/libdv.la $(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -209,7 +209,7 @@ CLEANFILES = 
+ AM_CFLAGS = $(SDL_CFLAGS) $(GTK_CFLAGS)
+ noinst_HEADERS = display.h oss.h
+ playdv_SOURCES = playdv.c display.c display.h oss.c
+-playdv_LDADD = $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB)
++playdv_LDADD = $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) `pkg-config --libs libdv` $(POPT_LIB)
+ all: all-am
+ 
+ .SUFFIXES: