From 980846e8f73ef34a1b9bb5b346ea6458328b9229 Mon Sep 17 00:00:00 2001 From: lukem Date: Sun, 29 Sep 2002 07:59:09 +0000 Subject: Package of the development version of sysutils/cdrecord The stable version is currently 1.10, this is 1.11a34 --- sysutils/cdrecord-devel/DESCR | 9 +++++ sysutils/cdrecord-devel/Makefile | 60 ++++++++++++++++++++++++++++++++ sysutils/cdrecord-devel/distinfo | 10 ++++++ sysutils/cdrecord-devel/patches/patch-ac | 21 +++++++++++ sysutils/cdrecord-devel/patches/patch-ah | 40 +++++++++++++++++++++ sysutils/cdrecord-devel/patches/patch-aj | 25 +++++++++++++ sysutils/cdrecord-devel/patches/patch-ba | 19 ++++++++++ 7 files changed, 184 insertions(+) create mode 100644 sysutils/cdrecord-devel/DESCR create mode 100644 sysutils/cdrecord-devel/Makefile create mode 100644 sysutils/cdrecord-devel/distinfo create mode 100644 sysutils/cdrecord-devel/patches/patch-ac create mode 100644 sysutils/cdrecord-devel/patches/patch-ah create mode 100644 sysutils/cdrecord-devel/patches/patch-aj create mode 100644 sysutils/cdrecord-devel/patches/patch-ba (limited to 'sysutils') diff --git a/sysutils/cdrecord-devel/DESCR b/sysutils/cdrecord-devel/DESCR new file mode 100644 index 00000000000..48cbdc9893a --- /dev/null +++ b/sysutils/cdrecord-devel/DESCR @@ -0,0 +1,9 @@ +Cdrecord allows you to burn CDs with a CD-R/CD-RW recorder. It +works as a burn engine for several applications. Cdrecord supports +CD recorders from many different vendors; all SCSI-3/mmc and +ATAPI/mmc compliant drives should also work. Supported features +include: IDE/ATAPI, parallel-port, and SCSI drives; audio CDs, data +CDs, and mixed CDs; full multi-session support, CD-RWs (rewritable), +TAO, DAO and human-readable error messages. + +This is a development release of the software. diff --git a/sysutils/cdrecord-devel/Makefile b/sysutils/cdrecord-devel/Makefile new file mode 100644 index 00000000000..734bbcdc3f4 --- /dev/null +++ b/sysutils/cdrecord-devel/Makefile @@ -0,0 +1,60 @@ +# $NetBSD: Makefile,v 1.1.1.1 2002/09/29 08:26:54 lukem Exp $ + +DISTNAME= cdrtools-1.11a34 +PKGNAME= cdrecord-devel-1.11a34 +WRKSRC= ${WRKDIR}/${DISTNAME:C/a.*//} +CATEGORIES= sysutils +MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/ + +MAINTAINER= lukem@netbsd.org +HOMEPAGE= http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html +COMMENT= This program allows you to create CD's on a CD-Recorder + +CONFLICTS= mkisofs-[0-9]* + +.include "../../mk/bsd.prefs.mk" + +USE_BUILDLINK2= # defined +USE_GMAKE= # defined +TBL?= tbl + +.if ${LOCALBASE} != "/opt/schily" +BUILDLINK_TRANSFORM= r:-I/opt/schily +BUILDLINK_TRANSFORM+= r:-L/opt/schily +.endif + +# avoid picking up a bad ${ARCH} during the build +MAKE_ENV+= ARCH="" +MAKE_ENV+= MAKEPROG="gmake" + +do-configure: + cd ${WRKSRC}/RULES; \ + for suffix in netbsd-cc.rul netbsd-gcc.rul; do \ + if [ ! -f ${MACHINE}-$$suffix ]; then \ + ${LN} -sf i386-$$suffix ${MACHINE}-$$suffix; \ + fi; \ + done + +post-build: + cd ${WRKSRC}; \ + for f in cdda2wav/cdda2wav.1 mkisofs/mkisofs.8; do \ + ${TBL} $${f} > $${f}.tmp; \ + ${MV} -f $${f}.tmp $${f}; \ + done + +do-install: + cd ${WRKSRC}/cdda2wav; \ + ${INSTALL_PROGRAM} OBJ/*/cdda2wav ${PREFIX}/bin; \ + ${INSTALL_MAN} cdda2wav.1 ${PREFIX}/man/man1 + cd ${WRKSRC}/cdrecord; \ + ${INSTALL_PROGRAM} OBJ/*/cdrecord ${PREFIX}/bin; \ + ${INSTALL_MAN} cdrecord.1 ${PREFIX}/man/man1 + cd ${WRKSRC}/mkisofs; \ + ${INSTALL_PROGRAM} OBJ/*/mkisofs ${PREFIX}/bin; \ + ${INSTALL_MAN} mkisofs.8 ${PREFIX}/man/man8 + cd ${WRKSRC}/readcd; \ + ${INSTALL_PROGRAM} OBJ/*/readcd ${PREFIX}/bin; \ + ${INSTALL_MAN} readcd.1 ${PREFIX}/man/man1 + +.include "../../mk/ossaudio.buildlink2.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/cdrecord-devel/distinfo b/sysutils/cdrecord-devel/distinfo new file mode 100644 index 00000000000..aa096c229c9 --- /dev/null +++ b/sysutils/cdrecord-devel/distinfo @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1.1.1 2002/09/29 08:04:10 lukem Exp $ + +SHA1 (cdrtools-1.11a34.tar.gz) = 13fba1355b834785f847ec697d6912f648a4a02c +Size (cdrtools-1.11a34.tar.gz) = 1512523 bytes +SHA1 (patch-ac) = 52622d8fc4170a9c0310c810badc74bb3b9c9df8 +SHA1 (patch-ah) = cb1ee6bc32602735b81e339345194b49f225e94c +SHA1 (patch-ai) = 3dd98fc56a3304b980797f9a898bec2bd3dd484c +SHA1 (patch-aj) = 7e8328ad3478a43cc9311158c30b0acfe48fbb7b +SHA1 (patch-ba) = 8d7038282ba5a6b133544cc8e440f6e12a475990 +SHA1 (patch-bb) = c5ee1e00e1f8723fe28d4d360bcede7680a7e4b9 diff --git a/sysutils/cdrecord-devel/patches/patch-ac b/sysutils/cdrecord-devel/patches/patch-ac new file mode 100644 index 00000000000..755e816e29a --- /dev/null +++ b/sysutils/cdrecord-devel/patches/patch-ac @@ -0,0 +1,21 @@ +$NetBSD: patch-ac,v 1.1.1.1 2002/09/29 07:59:09 lukem Exp $ + +--- include/btorder.h.orig Mon Dec 10 10:54:27 2001 ++++ include/btorder.h +@@ -28,6 +28,7 @@ + #include /* try to load isa_defs.h on Solaris */ + #define _INCL_SYS_TYPES_H + #endif ++#include + + #ifndef _MCONFIG_H + #include /* load bit/byte-oder from xmconfig.h*/ +@@ -108,7 +109,7 @@ error Only one of _BIT_FIELDS_LTOH or _ + # if defined(__ppc__) || defined(ppc) || defined(__ppc) || \ + defined(__PPC) || defined(powerpc) || defined(__powerpc__) + +-# if defined(__BIG_ENDIAN__) ++# if defined(__BIG_ENDIAN__) || BYTE_ORDER == BIG_ENDIAN + # define _BIT_FIELDS_HTOL + # else + # define _BIT_FIELDS_LTOH diff --git a/sysutils/cdrecord-devel/patches/patch-ah b/sysutils/cdrecord-devel/patches/patch-ah new file mode 100644 index 00000000000..11949e0b27a --- /dev/null +++ b/sysutils/cdrecord-devel/patches/patch-ah @@ -0,0 +1,40 @@ +$NetBSD: patch-ah,v 1.1.1.1 2002/09/29 08:01:02 lukem Exp $ + +--- cdda2wav/setuid.c.orig Thu Mar 21 08:29:21 2002 ++++ cdda2wav/setuid.c +@@ -91,7 +91,7 @@ void needroot(necessary) + + if (geteuid() == 0) return; /* nothing to do */ + +-#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEUID) ++#if defined (HAVE_SETEUID) + if (seteuid(effective_uid)) { + perror("seteuid in needroot()"); + exit(1); +@@ -125,7 +125,7 @@ void dontneedroot() + return; + if (geteuid() != 0) return; /* nothing to do */ + +-#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEUID) ++#if defined (HAVE_SETEUID) + if (seteuid(real_uid)) { + perror("seteuid in dontneedroot()"); + exit(1); +@@ -185,7 +185,7 @@ void needgroup(necessary) + + if (getegid() == effective_gid) return; /* nothing to do */ + +-#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEGID) ++#if defined (HAVE_SETEGID) + if (setegid(effective_gid)) { + perror("setegid in needgroup()"); + exit(1); +@@ -216,7 +216,7 @@ void dontneedgroup() + exit(1); + } + if (getegid() != effective_gid) return; /* nothing to do */ +-#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEGID) ++#if defined (HAVE_SETEGID) + if (setegid(real_gid)) { + perror("setegid in dontneedgroup()"); + exit(1); diff --git a/sysutils/cdrecord-devel/patches/patch-aj b/sysutils/cdrecord-devel/patches/patch-aj new file mode 100644 index 00000000000..4e225469310 --- /dev/null +++ b/sysutils/cdrecord-devel/patches/patch-aj @@ -0,0 +1,25 @@ +$NetBSD: patch-aj,v 1.1.1.1 2002/09/29 08:02:17 lukem Exp $ + +--- cdrecord/scsi_cdr.c.orig Thu Sep 12 22:39:35 2002 ++++ cdrecord/scsi_cdr.c +@@ -282,6 +282,12 @@ EXPORT int + request_sense(scgp) + SCSI *scgp; + { ++ ++#ifdef __NetBSD__ ++ /* request sense already done by kernel */ ++ scg_prsense((Uchar *)scgp->scmd->u_sense.cmd_sense, ++ scgp->scmd->sense_count); ++#else + char sensebuf[CCS_SENSE_LEN]; + register struct scg_cmd *scmd = scgp->scmd; + +@@ -301,6 +307,7 @@ request_sense(scgp) + if (scg_cmd(scgp) < 0) + return (-1); + scg_prsense((Uchar *)sensebuf, CCS_SENSE_LEN - scg_getresid(scgp)); ++#endif + return (0); + } + diff --git a/sysutils/cdrecord-devel/patches/patch-ba b/sysutils/cdrecord-devel/patches/patch-ba new file mode 100644 index 00000000000..5e5336e2bb6 --- /dev/null +++ b/sysutils/cdrecord-devel/patches/patch-ba @@ -0,0 +1,19 @@ +$NetBSD: patch-ba,v 1.1.1.1 2002/09/29 08:04:00 lukem Exp $ + +--- readcd/readcd.c.orig Fri Sep 20 09:00:12 2002 ++++ readcd/readcd.c +@@ -341,11 +341,11 @@ main(ac, av) + /* + * We don't need root privilleges anymore. + */ +-#ifdef HAVE_SETREUID +- if (setreuid(-1, getuid()) < 0) +-#else + #ifdef HAVE_SETEUID + if (seteuid(getuid()) < 0) ++#else ++#ifdef HAVE_SETREUID ++ if (setreuid(-1, getuid()) < 0) + #else + if (setuid(getuid()) < 0) + #endif -- cgit v1.2.3