Complete move of dvdview and dvdbackup from graphics to multimedia.

14 files changed, 4 insertions, 189 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 26f7412aea3..be62d5f47d7 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.415 2006/04/08 22:56:56 minskim Exp $
+# $NetBSD: Makefile,v 1.416 2006/04/13 20:19:16 wiz Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -55,8 +55,6 @@ SUBDIR+=	dia-python
 SUBDIR+=	digikam
 SUBDIR+=	digikam-doc
 SUBDIR+=	digikamimageplugins
-SUBDIR+=	dvdbackup
-SUBDIR+=	dvdview
 SUBDIR+=	dx
 SUBDIR+=	dxsamples
 SUBDIR+=	eog2
diff --git a/graphics/dvdbackup/DESCR b/graphics/dvdbackup/DESCR
deleted file mode 100644
index e7c31bea3f6..00000000000
--- a/graphics/dvdbackup/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-DVDBACKUP enables users to create backups from DVDs they own.
-It requires the libdvdread library and is hence capable of reading encrypted
-DVDs on systems that have the libdvdcss library installed.
diff --git a/graphics/dvdbackup/Makefile b/graphics/dvdbackup/Makefile
deleted file mode 100644
index 4aaa2e295db..00000000000
--- a/graphics/dvdbackup/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:09:29 joerg Exp $
-
-DISTNAME=	dvdbackup-0.1.1
-PKGREVISION=	3
-CATEGORIES=	graphics
-MASTER_SITES=	http://dvd-create.sourceforge.net/
-
-MAINTAINER=	wulf@NetBSD.org
-HOMEPAGE=	http://dvd-create.sourceforge.net/
-COMMENT=	DVD backup utility
-
-WRKSRC=		${WRKDIR}/dvdbackup/src
-
-INSTALLATION_DIRS=	bin
-
-do-build:
-	cd ${WRKSRC}; \
-	${CC} -o dvdbackup dvdbackup.c ${CFLAGS} ${LDFLAGS} -ldvdread
-
-do-install:
-	cd ${WRKSRC}; \
-	${INSTALL_PROGRAM} dvdbackup ${PREFIX}/bin;
-
-.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/dvdbackup/PLIST b/graphics/dvdbackup/PLIST
deleted file mode 100644
index c6107ea747d..00000000000
--- a/graphics/dvdbackup/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/02 14:49:31 wulf Exp $
-bin/dvdbackup
diff --git a/graphics/dvdbackup/distinfo b/graphics/dvdbackup/distinfo
deleted file mode 100644
index 2ca5fd8bc66..00000000000
--- a/graphics/dvdbackup/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/04/12 06:03:27 wiz Exp $
-
-SHA1 (dvdbackup-0.1.1.tar.gz) = 11bbbd0182f80bff1974b86bb989e9a2ab89f717
-RMD160 (dvdbackup-0.1.1.tar.gz) = bd0d1824df92b493e4ea5ab4f24740c41ca826ef
-Size (dvdbackup-0.1.1.tar.gz) = 24806 bytes
-SHA1 (patch-aa) = 4c3a6ef36cb3422899ca9ea66a3a5b64a374c85b
diff --git a/graphics/dvdbackup/patches/patch-aa b/graphics/dvdbackup/patches/patch-aa
deleted file mode 100644
index 2a66adeae1e..00000000000
--- a/graphics/dvdbackup/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/04/12 06:03:27 wiz Exp $
-
---- dvdbackup.c.orig	2002-08-05 06:08:39.000000000 +0000
-+++ dvdbackup.c
-@@ -20,6 +20,7 @@
- 
- 
- #include <stdio.h>
-+#include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/errno.h>
-@@ -782,7 +783,7 @@ titles_info_t * DVDGetInfo(dvd_reader_t 
- 	 to consider the second one a feature title we are doing two checks (biggest  + biggest - second) /second == 1
- 	 and biggest%second * 3 < biggest */
- 
--	if ( CheckSizeArray(size_size_array, 0, 1)  == 1 ) {
-+	if ( title_sets > 1 && CheckSizeArray(size_size_array, 0, 1)  == 1 ) {
- 		/* We have a dual DVD with two feature films - now lets see if they have the same amount of chapters*/
- 
- 		chapters_1 = 0;
diff --git a/graphics/dvdview/DESCR b/graphics/dvdview/DESCR
deleted file mode 100644
index 21dd677877d..00000000000
--- a/graphics/dvdview/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-DVDview is a software only MPEG-1/2 video decoder. A special feature of the
-decoder is its ability to superimpose additional information to the video
-sequence like motion vectors or quantizer scales. It runs on any UNIX system.
diff --git a/graphics/dvdview/Makefile b/graphics/dvdview/Makefile
deleted file mode 100644
index 20b0eefddd3..00000000000
--- a/graphics/dvdview/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:09:29 joerg Exp $
-
-DISTNAME=	dvdview-1.2.2
-PKGREVISION=	3
-CATEGORIES=	graphics
-MASTER_SITES=	http://rachmaninoff.informatik.uni-mannheim.de/dvdview/data/
-
-MAINTAINER=	tron@NetBSD.org
-HOMEPAGE=	http://rachmaninoff.informatik.uni-mannheim.de/dvdview/
-COMMENT=	Software only MPEG-1/2 video decoder
-
-GNU_CONFIGURE=	YES
-USE_TOOLS+=	gmake
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == SunOS)
-MAKE_ENV+=	RTLIB=-lrt
-.else
-MAKE_ENV+=	RTLIB=
-.endif
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dvdview
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dvdview
-
-.include "../../graphics/libvideogfx/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/dvdview/PLIST b/graphics/dvdview/PLIST
deleted file mode 100644
index 07577ec9459..00000000000
--- a/graphics/dvdview/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:28 zuntum Exp $
-bin/dvdview
-share/doc/dvdview/README
-@dirrm share/doc/dvdview
diff --git a/graphics/dvdview/distinfo b/graphics/dvdview/distinfo
deleted file mode 100644
index 25096523431..00000000000
--- a/graphics/dvdview/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.10 2006/01/23 13:22:34 tron Exp $
-
-SHA1 (dvdview-1.2.2.tar.gz) = d7d00aee0a5553f97b5a7673d7fa7174d173c12e
-RMD160 (dvdview-1.2.2.tar.gz) = 6563a006ecb788d5c9554016c97fbecb69814dab
-Size (dvdview-1.2.2.tar.gz) = 209143 bytes
-SHA1 (patch-aa) = b691e2988b1394002a1e57512216cdf55a592665
-SHA1 (patch-ab) = 6509989ade7aff868c15436b859679ddd6b35a36
-SHA1 (patch-ac) = 68773260cfc04b8fd1ac8ac3a33ad685fecabc38
diff --git a/graphics/dvdview/patches/patch-aa b/graphics/dvdview/patches/patch-aa
deleted file mode 100644
index 67d532e16bd..00000000000
--- a/graphics/dvdview/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/02/13 19:04:48 drochner Exp $
-
---- src/guis/shell/main_shell.cc.orig	Tue Feb  4 13:01:17 2003
-+++ src/guis/shell/main_shell.cc	Tue Feb  4 13:07:30 2003
-@@ -463,8 +463,10 @@
- #if HAVE_X11
-   outputobject = &videosink_x11;
- 
-+#if 0
-   if (!default_x11server.AskDisplay())
-     { cerr << "Cannot open display.\n"; throw "no display"; }
-+#endif
- #endif
-   resizer = &pp_resize;
- #endif
diff --git a/graphics/dvdview/patches/patch-ab b/graphics/dvdview/patches/patch-ab
deleted file mode 100644
index 6e0907f3154..00000000000
--- a/graphics/dvdview/patches/patch-ab
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2003/02/13 19:04:48 drochner Exp $
-
---- configure.orig	Wed Feb  5 23:06:22 2003
-+++ configure	Wed Feb  5 23:10:08 2003
-@@ -3406,41 +3406,6 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking for MMX support" >&5
--echo $ECHO_N "checking for MMX support... $ECHO_C" >&6
--case $target_cpu in
--  i?86) echo "$as_me:$LINENO: result: found, using MMX optimized code" >&5
--echo "${ECHO_T}found, using MMX optimized code" >&6
--        cat >>confdefs.h <<\_ACEOF
--#define ENABLE_MMX 1
--_ACEOF
--
--	cat >>confdefs.h <<\_ACEOF
--#define UNALIGNED_MEMORYACCESS 1
--_ACEOF
--
--
--
--if true; then
--  ENABLE_MMX_TRUE=
--  ENABLE_MMX_FALSE='#'
--else
--  ENABLE_MMX_TRUE='#'
--  ENABLE_MMX_FALSE=
--fi
--
--
--
--if true; then
--  ENABLE_CPU_X86_TRUE=
--  ENABLE_CPU_X86_FALSE='#'
--else
--  ENABLE_CPU_X86_TRUE='#'
--  ENABLE_CPU_X86_FALSE=
--fi
-- ;;
--  *)  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
- 
- 
- if false; then
-@@ -3460,8 +3425,6 @@
-   ENABLE_CPU_X86_TRUE='#'
-   ENABLE_CPU_X86_FALSE=
- fi
-- ;;
--esac
- 
- echo "$as_me:$LINENO: checking for Linux" >&5
- echo $ECHO_N "checking for Linux... $ECHO_C" >&6
diff --git a/graphics/dvdview/patches/patch-ac b/graphics/dvdview/patches/patch-ac
deleted file mode 100644
index 2f014dcb4e2..00000000000
--- a/graphics/dvdview/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/01/23 13:22:34 tron Exp $
-
---- src/Makefile.in.orig	2002-11-11 15:46:54.000000000 +0000
-+++ src/Makefile.in	2006-01-23 13:18:02.000000000 +0000
-@@ -117,7 +117,7 @@
- dvdview_LDADD = \
- 	$(dvdview_common_ldadd)		\
- 	@LIBVIDEOGFX_LIBS@		\
--	-lstdc++ -lpthread
-+	-lstdc++ $(PTHREAD_LIBS) $(PTHREAD_LDFLAGS)
- 
- subdir = src
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/multimedia/Makefile b/multimedia/Makefile
index fa5f15ed372..afdcf82a406 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2006/04/12 21:40:37 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2006/04/13 20:19:16 wiz Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -11,8 +11,10 @@ SUBDIR+=	dirac
 SUBDIR+=	divxplayer
 SUBDIR+=	dumpmpeg
 SUBDIR+=	dvdauthor
+SUBDIR+=	dvdbackup
 SUBDIR+=	dvdrip
 SUBDIR+=	dvdstyler
+SUBDIR+=	dvdview
 SUBDIR+=	ffmpeg
 SUBDIR+=	flashplayer
 SUBDIR+=	fxtv