From b5fb38eedb53123bdf6ad9eb0112aab8ba5f4e1d Mon Sep 17 00:00:00 2001 From: naddy Date: Mon, 13 May 2002 14:23:20 +0000 Subject: [PATCH] stub out cdrecord (superseded by cdrtools); ok niklas@ --- misc/Makefile | 3 +- misc/cdrecord/Makefile | 44 ++----------------- misc/cdrecord/distinfo | 3 -- .../patches/patch-DEFAULTS_Defaults_openbsd | 20 --------- misc/cdrecord/patches/patch-RULES_mk-gmake_id | 12 ----- misc/cdrecord/patches/patch-cdrecord_fifo_c | 12 ----- misc/cdrecord/patches/patch-conf_configure | 24 ---------- misc/cdrecord/patches/patch-include_btorder_h | 17 ------- misc/cdrecord/pkg/DESCR | 18 -------- misc/cdrecord/pkg/PLIST | 7 --- 10 files changed, 5 insertions(+), 155 deletions(-) delete mode 100644 misc/cdrecord/distinfo delete mode 100644 misc/cdrecord/patches/patch-DEFAULTS_Defaults_openbsd delete mode 100644 misc/cdrecord/patches/patch-RULES_mk-gmake_id delete mode 100644 misc/cdrecord/patches/patch-cdrecord_fifo_c delete mode 100644 misc/cdrecord/patches/patch-conf_configure delete mode 100644 misc/cdrecord/patches/patch-include_btorder_h delete mode 100644 misc/cdrecord/pkg/DESCR delete mode 100644 misc/cdrecord/pkg/PLIST diff --git a/misc/Makefile b/misc/Makefile index 4e19f00ecd2..150df8e5447 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.60 2002/03/30 20:55:28 drahn Exp $ +# $OpenBSD: Makefile,v 1.61 2002/05/13 14:23:20 naddy Exp $ # $FreeBSD: Makefile,v 1.121 1997/11/17 10:14:33 tg Exp $ # @@ -11,7 +11,6 @@ SUBDIR += cbb SUBDIR += cdrchive SUBDIR += cdrdao - SUBDIR += cdrecord # SUBDIR += chord # SUBDIR += colorls # SUBDIR += ctk diff --git a/misc/cdrecord/Makefile b/misc/cdrecord/Makefile index 2c7e5db054a..f7b06f93626 100644 --- a/misc/cdrecord/Makefile +++ b/misc/cdrecord/Makefile @@ -1,45 +1,9 @@ -# $OpenBSD: Makefile,v 1.21 2002/03/21 21:09:18 espie Exp $ +# $OpenBSD: Makefile,v 1.22 2002/05/13 14:23:20 naddy Exp $ -COMMENT= "creates CD's on a CD-Recorder" +COMMENT= "superseded by cdrtools" -# It's pretty easy to add other architectures, -# mail me if you miss a particular one. -ONLY_FOR_ARCHS= alpha amiga hp300 i386 mac68k macppc mvme68k sparc sun3 - -DISTNAME= cdrecord-1.9 +PKGNAME= cdrecord CATEGORIES= misc -NEED_VERSION= 1.515 -MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ - -MAINTAINER= Niklas Hallqvist - -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes - -MAKE_FLAGS= INS_BASE="${PREFIX}" - -USE_GMAKE= Yes -MAKE_ENV= MAKEPROG="${MAKE_PROGRAM}" - -# Cdrecord's standard install rule installs some unnecessary stuff, -# we instead explicitly install what we want. -OBJDIR= OBJ/${MACHINE}-openbsd-${CC} - -.if ${MACHINE} != i386 -post-extract: - @cd ${WRKSRC}/RULES && \ - ln -sf i386-openbsd-gcc.rul ${MACHINE}-openbsd-gcc.rul; \ - ln -sf i386-openbsd-cc.rul ${MACHINE}-openbsd-cc.rul -.endif - -do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cdrecord - ${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/${OBJDIR}/cdrecord ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/${OBJDIR}/cdda2wav ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2wav.1 ${PREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cdrecord +IGNORE= "superseded by cdrtools" .include diff --git a/misc/cdrecord/distinfo b/misc/cdrecord/distinfo deleted file mode 100644 index 82056adc31b..00000000000 --- a/misc/cdrecord/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (cdrecord-1.9.tar.gz) = 0fa360d9280d16370d7738ec0b62affb -RMD160 (cdrecord-1.9.tar.gz) = 97bd37fabd02dbb34126780e5819e212b33e3466 -SHA1 (cdrecord-1.9.tar.gz) = 3f77e9eda5cd0b20dd4e346d4d2f601bb1fbaf56 diff --git a/misc/cdrecord/patches/patch-DEFAULTS_Defaults_openbsd b/misc/cdrecord/patches/patch-DEFAULTS_Defaults_openbsd deleted file mode 100644 index 1ea7854136b..00000000000 --- a/misc/cdrecord/patches/patch-DEFAULTS_Defaults_openbsd +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-DEFAULTS_Defaults_openbsd,v 1.1 2001/09/26 18:21:53 brad Exp $ ---- DEFAULTS/Defaults.openbsd.orig Mon Mar 13 07:38:06 2000 -+++ DEFAULTS/Defaults.openbsd Wed Sep 26 11:40:08 2001 -@@ -19,15 +19,13 @@ DEFCCOM= cc - CWARNOPTS= - - DEFINCDIRS= $(SRCROOT)/include --LDPATH= -L/opt/schily/lib --#RUNPATH= -R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR) Will probably not work - - ########################################################################### - # - # Installation config stuff - # - ########################################################################### --INS_BASE= /opt/schily -+INS_BASE?= /usr/local - INS_KBASE= / - # - DEFUMASK= 002 diff --git a/misc/cdrecord/patches/patch-RULES_mk-gmake_id b/misc/cdrecord/patches/patch-RULES_mk-gmake_id deleted file mode 100644 index 2a9bc4cc7a3..00000000000 --- a/misc/cdrecord/patches/patch-RULES_mk-gmake_id +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-RULES_mk-gmake_id,v 1.1 2001/09/26 18:21:53 brad Exp $ ---- RULES/mk-gmake.id.orig Sun Dec 6 07:51:19 1998 -+++ RULES/mk-gmake.id Wed Sep 26 10:12:23 2001 -@@ -37,7 +37,7 @@ MAKEPROG= gmake - - ifndef ARCH_DONE - --_MACHCMD= (mach || uname -p || true) 2> /dev/null -+_MACHCMD= (mach || machine || uname -p || true) 2> /dev/null - _ARCHCMD= (arch || /usr/ucb/arch || true) 2> /dev/null - - XP_ARCH:= $(shell $(_MACHCMD) | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-') diff --git a/misc/cdrecord/patches/patch-cdrecord_fifo_c b/misc/cdrecord/patches/patch-cdrecord_fifo_c deleted file mode 100644 index b5268351593..00000000000 --- a/misc/cdrecord/patches/patch-cdrecord_fifo_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-cdrecord_fifo_c,v 1.1 2001/09/26 18:21:53 brad Exp $ ---- cdrecord/fifo.c.orig Sun May 7 08:49:38 2000 -+++ cdrecord/fifo.c Wed Sep 26 10:12:24 2001 -@@ -86,7 +86,7 @@ FILE *ef; - #define USDEBUG2 - #endif - --#define palign(x, a) (((char *)(x)) + ((a) - 1 - (((unsigned)((x)-1))%(a)))) -+#define palign(x, a) (((char *)(x)) + ((a) - 1 - (((unsigned long)((x)-1))%(a)))) - - typedef enum faio_owner { - owner_none, diff --git a/misc/cdrecord/patches/patch-conf_configure b/misc/cdrecord/patches/patch-conf_configure deleted file mode 100644 index 326198013f1..00000000000 --- a/misc/cdrecord/patches/patch-conf_configure +++ /dev/null @@ -1,24 +0,0 @@ ---- conf/configure.orig Sat Jun 3 23:37:43 2000 -+++ conf/configure Fri Mar 30 19:45:08 2001 -@@ -3940,6 +3940,12 @@ fi - - echo $ac_n "checking for mlockall""... $ac_c" 1>&6 - echo "configure:3943: checking for mlockall" >&5 -+case "$XARCH" in -+ i386-openbsd*) -+ # mlockall broken -+ ac_cv_func_mlockall=no -+ ;; -+ *) - if eval "test \"`echo '$''{'ac_cv_func_mlockall'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3978,6 +3984,8 @@ rm -fr conftest* - fi - - fi -+;; -+esac - - echo "$ac_t""$ac_cv_func_mlockall" 1>&6 - if test $ac_cv_func_mlockall = yes; then diff --git a/misc/cdrecord/patches/patch-include_btorder_h b/misc/cdrecord/patches/patch-include_btorder_h deleted file mode 100644 index b45ea797346..00000000000 --- a/misc/cdrecord/patches/patch-include_btorder_h +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-include_btorder_h,v 1.1 2001/09/26 18:21:53 brad Exp $ ---- include/btorder.h.orig Wed Jan 5 12:42:40 2000 -+++ include/btorder.h Wed Sep 26 10:12:24 2001 -@@ -20,6 +20,13 @@ - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#ifdef __OpenBSD__ -+#if BYTE_ORDER == LITTLE_ENDIAN -+#define _BIT_FIELDS_LTOH -+#elif BYTE_ORDER == BIG_ENDIAN -+#define _BIT_FIELDS_HTOL -+#endif -+#endif - - #ifndef _BTORDER_H - #define _BTORDER_H diff --git a/misc/cdrecord/pkg/DESCR b/misc/cdrecord/pkg/DESCR deleted file mode 100644 index 162d5906fe8..00000000000 --- a/misc/cdrecord/pkg/DESCR +++ /dev/null @@ -1,18 +0,0 @@ -Cdrecord allows you to create CD's on a CD-Recorder. - -Cdrecord has been implemented with a Philips CDD 521. -Cdrecord now is maintained with the following drives: - - COMPRO/Matsushita/Panasonic CW-7502 - Philips CDD-2000 - TEAC CD-R55S - Yamaha CDR-400 - -It should run also on: - - All SCSI-3/mmc compliant drives - All ATAPI/mmc compliant drives - -Actual information on cdrecord may be found on: - -http://www.fokus.gmd.de/nthp/employees/schilling/cdrecord.html diff --git a/misc/cdrecord/pkg/PLIST b/misc/cdrecord/pkg/PLIST deleted file mode 100644 index 56d03d1bb6f..00000000000 --- a/misc/cdrecord/pkg/PLIST +++ /dev/null @@ -1,7 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.4 2001/05/06 02:29:57 lebel Exp $ -bin/cdrecord -bin/cdda2wav -man/man1/cdrecord.1 -man/man1/cdda2wav.1 -share/doc/cdrecord/README -@dirrm share/doc/cdrecord