Move cdrdao from audio to sysutils.

Requested by:	maintainer

14 files changed, 2 insertions, 272 deletions

diff --git a/MOVED b/MOVED
index 7a53c7a78157..3e11d34ab8e5 100644
--- a/MOVED
+++ b/MOVED
@@ -49,3 +49,4 @@ www/netscape47-communicator||2002-11-17|security vulnerability
 www/netscape47-navigator||2002-11-17|security vulnerability
 japanese/mhonarc||2002-11-17|current www/mhonarc could use Japanese
 graphics/linux_mesa||2002-11-17|Port was broken and out of date
+audio/cdrdao|sysutils/cdrdao|2002-11-18|misfiled, burns data CDs too
diff --git a/audio/Makefile b/audio/Makefile
index ad5070aa3b44..28c2db9ad79c 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -32,7 +32,6 @@
     SUBDIR += cd2mp3
     SUBDIR += cdplay
     SUBDIR += cdplayer.app
-    SUBDIR += cdrdao
     SUBDIR += cheesetracker
     SUBDIR += chordpack
     SUBDIR += cmp3
diff --git a/audio/cdrdao/Makefile b/audio/cdrdao/Makefile
deleted file mode 100644
index 4ce1362a4b47..000000000000
--- a/audio/cdrdao/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-# New ports collection makefile for:    cdrdao
-# Date created:         7 April 1999
-# Whom:                 futatuki
-#
-# $FreeBSD$
-#
-
-PORTNAME=	cdrdao
-PORTVERSION=	1.1.7
-PORTREVISION=	1
-CATEGORIES=	sysutils audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-EXTRACT_SUFX=	.src.tar.gz
-
-MAINTAINER=	marius@alchemy.franken.de
-
-.if defined(WITH_TOC2MP3)
-LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame
-.endif
-
-USE_REINPLACE=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-
-MAN1=		cdrdao.1
-
-.include <bsd.port.pre.mk>
-
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=		--with-gtkmm-prefix=${NONEXISTENT}
-
-.if exists(${LOCALBASE}/bin/antlr) && exists(${LOCALBASE}/bin/dlg)
-CONFIGURE_ARGS+=	--with-pcctsbin=${LOCALBASE}/bin \
-			--with-pcctsinc=${LOCALBASE}/include/pccts
-.endif
-
-.if defined(WITHOUT_SCGLIB) && ${OSVERSION} > 300000
-CONFIGURE_ARGS+=	--without-scglib
-.endif
-
-.if ${OSVERSION} <= 320000 || ${MACHINE_ARCH} == "sparc64" || \
-	!defined(WITH_PTHREADS)
-CONFIGURE_ARGS+=	--without-posix-threads
-.endif
-
-.if defined(WITH_TOC2MP3)
-CONFIGURE_ARGS+=	--with-lame-include=${LOCALBASE}/include \
-			--with-lame-lib=${LOCALBASE}/lib
-PLIST_SUB=		TOC2MP3=""
-.else
-CONFIGURE_ARGS+=	--without-lame
-PLIST_SUB=		TOC2MP3="@comment "
-.endif
-
-pre-everything:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following build options:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "WITHOUT_SCGLIB=yes	builds without Joerg Schilling's SCSI library"
-	@${ECHO_MSG} "WITH_PTHREADS=yes	enables usage of POSIX threads for the ring buffers"
-	@${ECHO_MSG} "WITH_TOC2MP3=yes	builds toc2mp3 (requires audio/lame)"
-	@${ECHO_MSG} ""
-
-post-extract:
-.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
-	@(cd ${WRKSRC}/scsilib/RULES; \
-	  ${LN} -sf i386-freebsd-cc.rul ${MACHINE_ARCH}-freebsd-cc.rul)
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g; \
-		s|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/dao/cdrdao ${PREFIX}/bin/cdrdao
-	@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cue ${PREFIX}/bin/toc2cue
-.if defined(WITH_TOC2MP3)
-	@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2mp3 ${PREFIX}/bin/toc2mp3
-.endif
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/dao/cdrdao.drivers ${DATADIR}/drivers
-	@${INSTALL_MAN} ${WRKSRC}/dao/cdrdao.man ${PREFIX}/man/man1/cdrdao.1
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in CREDITS INSTALL README README.PlexDAE \
-	Release-1.1.0 Release-1.1.2 Release-1.1.3 Release-1.1.4 \
-	Release-1.1.5 Release-1.1.6 Release-1.1.7
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/audio/cdrdao/distinfo b/audio/cdrdao/distinfo
deleted file mode 100644
index 78550ab17ca1..000000000000
--- a/audio/cdrdao/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (cdrdao-1.1.7.src.tar.gz) = 766a534137f2c6e99ab771e3178793f8
diff --git a/audio/cdrdao/files/patch-configure b/audio/cdrdao/files/patch-configure
deleted file mode 100644
index 15c0ed85a1af..000000000000
--- a/audio/cdrdao/files/patch-configure
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.orig	Mon Oct  7 03:53:55 2002
-+++ configure	Sat Oct 12 18:06:18 2002
-@@ -6107,7 +6107,7 @@
-   scsi_if_src=ScsiIf-lib.cc
- 
-   case "$host" in
--    *-freebsd3* | *-freebsd4*)
-+    *-freebsd3* | *-freebsd4* | *-freebsd5* )
- 			       scsilib_libs="$scsilib_libs -lcam"
- 			       ;;
-   esac
-@@ -6123,7 +6123,7 @@
- 	       scsi_if_src="ScsiIf-linux.cc sg_err.cc"
- 	       ;;
- 
--    *-freebsd3* | *-freebsd4*)
-+    *-freebsd3* | *-freebsd4* | *-freebsd5* )
- 			       scsi_if_src="ScsiIf-freebsd-cam.cc"
- 			       scsilib_libs="-lcam"
- 			       ;;
-@@ -6149,7 +6149,6 @@
- case "$host" in
-   *-freebsd*)
- 	      if test "$use_pthreads" = yes; then
--		mydefs="-pthread $mydefs"
- 		LDFLAGS="-pthread $LDFLAGS"
- 		thread_libs=""
- 	      fi
-@@ -6164,7 +6163,7 @@
- esac
- 
- case "$host" in
--  *-linux-*)
-+  *-linux-* | *-freebsd* )
- 	     sound_if_src=SoundIF-linux.cc
- 	     ;;
- 
diff --git a/audio/cdrdao/files/patch-dao::ScsiIf-lib.cc b/audio/cdrdao/files/patch-dao::ScsiIf-lib.cc
deleted file mode 100644
index 99922ca57a51..000000000000
--- a/audio/cdrdao/files/patch-dao::ScsiIf-lib.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- dao/ScsiIf-lib.cc.orig	Tue Oct 29 19:40:39 2002
-+++ dao/ScsiIf-lib.cc	Tue Oct 29 20:14:24 2002
-@@ -204,7 +204,7 @@
-   scmd->cdb_len = cmdLen;
- 
-   if (dataOutLen > 0) {
--    if (((unsigned)dataOut % impl_->pageSize_) != 0) {
-+    if (((size_t)dataOut % impl_->pageSize_) != 0) {
-       //message(0, "Use SCSI buffer for data out.");
-       memcpy(impl_->pageAlignedBuffer_, dataOut, dataOutLen);
-       scmd->addr = impl_->pageAlignedBuffer_;
-@@ -217,7 +217,7 @@
-     scmd->size = dataOutLen;
-   }
-   else if (dataInLen > 0) {
--    if (((unsigned)dataIn % impl_->pageSize_) != 0) {
-+    if (((size_t)dataIn % impl_->pageSize_) != 0) {
-       //message(0, "Use SCSI buffer for data in.");
-       scmd->addr = impl_->pageAlignedBuffer_;
-       usedPageAlignedBuffer = 1;
diff --git a/audio/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul b/audio/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul
deleted file mode 100644
index 22d48301343d..000000000000
--- a/audio/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul
+++ /dev/null
@@ -1,31 +0,0 @@
---- scsilib/RULES/i386-freebsd-cc.rul.orig	Tue Oct 15 22:43:39 2002
-+++ scsilib/RULES/i386-freebsd-cc.rul	Sun Oct 27 19:59:00 2002
-@@ -24,7 +24,8 @@
- ###########################################################################
- 
- CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
--CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
-+XCFLAGS:=	$(CFLAGS)
-+CFLAGS=		$(COPTS) $(CWARNOPTS) $(XCFLAGS) $(COPTX)
- 
- CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
- COPTS=
-@@ -57,14 +58,13 @@
- 
- FLOAT_OPTIONS=	
- 
--CC=		@echo "	==> COMPILING \"$@\""; gcc
--LDCC=		@echo "	==> LINKING \"$@\""; gcc
--DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
--RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib
-+LDCC=		$(CC)
-+DYNLD=		$(CC)
-+RANLIB=		ranlib
- ARFLAGS=	cr
- LORDER=		lorder
- TSORT=		tsort
- 
- RMDEP=		:
--MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
-+MKDEP=		$(CC) -M
- MKDEP_OUT=
diff --git a/audio/cdrdao/files/patch-scsilib::TARGETS::Targetdirs b/audio/cdrdao/files/patch-scsilib::TARGETS::Targetdirs
deleted file mode 100644
index db8f407f14b1..000000000000
--- a/audio/cdrdao/files/patch-scsilib::TARGETS::Targetdirs
+++ /dev/null
@@ -1,8 +0,0 @@
---- scsilib/TARGETS/Targetdirs.orig	Tue Oct 29 00:45:24 2002
-+++ scsilib/TARGETS/Targetdirs	Tue Oct 29 00:45:59 2002
-@@ -1,4 +1,4 @@
- #ident %W% %E% %Q%
- ###########################################################################
--DIRS=		conf inc lib libscg libschily librscg libdeflt rscsi export
-+DIRS=		conf inc lib libscg libschily export
- ###########################################################################
diff --git a/audio/cdrdao/files/patch-scsilib::include::btorder.h b/audio/cdrdao/files/patch-scsilib::include::btorder.h
deleted file mode 100644
index 6a364364c719..000000000000
--- a/audio/cdrdao/files/patch-scsilib::include::btorder.h
+++ /dev/null
@@ -1,41 +0,0 @@
---- scsilib/include/btorder.h.orig	Mon Oct 28 10:15:12 2002
-+++ scsilib/include/btorder.h	Mon Oct 28 10:15:29 2002
-@@ -1,4 +1,4 @@
--/* @(#)btorder.h	1.14 01/10/09 Copyright 1996 J. Schilling */
-+/* @(#)btorder.h	1.15 01/12/09 Copyright 1996 J. Schilling */
- /*
-  *	Definitions for Bit and Byte ordering
-  *
-@@ -66,27 +66,20 @@
- /*
-  * Convert byte-order definitions from xconfig.h into our values
-  * and verify them.
-+ * Note that we cannot use the definitions _LITTLE_ENDIAN and _BIG_ENDIAN
-+ * because they are used on IRIX-6.5 with different meaning.
-  */
- #if defined(HAVE_C_BIGENDIAN)	&& \
-    !defined(WORDS_BIGENDIAN)
- #define	WORDS_LITTLEENDIAN
--#define	_LITTLE_ENDIAN
-+/*#define	_LITTLE_ENDIAN*/
- #endif
- 
- #if defined(HAVE_C_BIGENDIAN)	&& \
-     defined(WORDS_BIGENDIAN)
--#define	_BIG_ENDIAN
-+#undef	WORDS_LITTLEENDIAN
-+/*#define	_BIG_ENDIAN*/
- #endif
--
--#if	defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN)
--/*
-- * #error will not work for all compilers (e.g. sunos4)
-- * The following line will abort compilation on all compilers
-- * if none of the above is defines. And that's  what we want.
-- */
--error  Only one of _LITTLE_ENDIAN or _BIG_ENDIAN may be defined
--#endif
--
- 
- #if	defined(_BIT_FIELDS_LTOH) || defined(_BIT_FIELDS_HTOL)
- /*
diff --git a/audio/cdrdao/files/patch-xdao::SoundIF-linux.cc b/audio/cdrdao/files/patch-xdao::SoundIF-linux.cc
deleted file mode 100644
index ab7b04f65292..000000000000
--- a/audio/cdrdao/files/patch-xdao::SoundIF-linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- xdao/SoundIF-linux.cc.orig	Mon Oct  7 03:53:56 2002
-+++ xdao/SoundIF-linux.cc	Sat Oct 12 17:32:10 2002
-@@ -34,7 +34,14 @@
-  *
-  */
- 
-+# if defined(__FreeBSD__)
-+#include <sys/soundcard.h>
-+# if !defined(SNDCTL_DSP_CHANNELS)
-+#   define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO
-+# endif
-+# else 
- #include <linux/soundcard.h>
-+# endif
- 
- #include <stdio.h>
- #include <assert.h>
diff --git a/audio/cdrdao/pkg-comment b/audio/cdrdao/pkg-comment
deleted file mode 100644
index 51cf4944ed0c..000000000000
--- a/audio/cdrdao/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Record CD-R[W]s in disk-at-once mode
diff --git a/audio/cdrdao/pkg-descr b/audio/cdrdao/pkg-descr
deleted file mode 100644
index 7da1f0fe4578..000000000000
--- a/audio/cdrdao/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Cdrdao records audio or data CD-R[W]s in disc-at-once (DAO) mode based on
-textual description of the CD contents (toc-file).
-
-WWW: http://cdrdao.sourceforge.net/
diff --git a/audio/cdrdao/pkg-plist b/audio/cdrdao/pkg-plist
deleted file mode 100644
index 69186bdd7b62..000000000000
--- a/audio/cdrdao/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-bin/cdrdao
-bin/toc2cue
-%%TOC2MP3%%bin/toc2mp3
-share/cdrdao/drivers
-%%PORTDOCS%%share/doc/cdrdao/CREDITS
-%%PORTDOCS%%share/doc/cdrdao/INSTALL 
-%%PORTDOCS%%share/doc/cdrdao/README 
-%%PORTDOCS%%share/doc/cdrdao/README.PlexDAE 
-%%PORTDOCS%%share/doc/cdrdao/Release-1.1.0
-%%PORTDOCS%%share/doc/cdrdao/Release-1.1.2
-%%PORTDOCS%%share/doc/cdrdao/Release-1.1.3
-%%PORTDOCS%%share/doc/cdrdao/Release-1.1.4
-%%PORTDOCS%%share/doc/cdrdao/Release-1.1.5
-%%PORTDOCS%%share/doc/cdrdao/Release-1.1.6
-%%PORTDOCS%%share/doc/cdrdao/Release-1.1.7
-%%PORTDOCS%%@dirrm share/doc/cdrdao
-@dirrm share/cdrdao
diff --git a/sysutils/Makefile b/sysutils/Makefile
index d58ec080c9fa..06a12eb47cd4 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -27,6 +27,7 @@
     SUBDIR += cd-write
     SUBDIR += cd9660_unicode
     SUBDIR += cdbakeoven
+    SUBDIR += cdrdao
     SUBDIR += cdroot
     SUBDIR += cdrtools
     SUBDIR += cfengine