summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sysutils/cdrecord/Makefile31
-rw-r--r--sysutils/cdrecord/files/md54
-rw-r--r--sysutils/cdrecord/files/patch-sum10
-rw-r--r--sysutils/cdrecord/patches/patch-aa30
-rw-r--r--sysutils/cdrecord/patches/patch-ab58
-rw-r--r--sysutils/cdrecord/patches/patch-ac18
-rw-r--r--sysutils/cdrecord/patches/patch-ae30
-rw-r--r--sysutils/cdrecord/patches/patch-af2
-rw-r--r--sysutils/cdrecord/pkg/PLIST8
9 files changed, 89 insertions, 102 deletions
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index 77285940fda..e10dbe18441 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,43 +1,40 @@
-# $NetBSD: Makefile,v 1.31 2000/07/06 00:05:22 dmcmahill Exp $
-# FreeBSD Id: Makefile,v 1.2 1997/11/05 23:55:31 asami Exp
-#
+# $NetBSD: Makefile,v 1.32 2000/07/22 16:14:48 rh Exp $
-DISTNAME= cdrecord-1.8
+DISTNAME= cdrecord-1.9
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/
MAINTAINER= hubertf@netbsd.org
-HOMEPAGE= http://www.fokus.gmd.de/nthp/employees/schilling/cdrecord.html
+HOMEPAGE= http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
CONFLICTS= mkisofs-*
-
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/${DISTNAME:C/a.*//}
TARGET_ARCH= ${MACHINE_ARCH}-netbsd-cc
TARGET_DIR= OBJ/${TARGET_ARCH}
#override ARCH to avoid picking up a bad ${ARCH} during the build
-MAKE_ENV+= ARCH=""
+MAKE_ENV+= ARCH=""
-post-configure:
+do-configure:
${MKDIR} ${WRKSRC}/include/sys
${LN} -fs /usr/include/soundcard.h ${WRKSRC}/include/sys
- cd ${WRKSRC}/RULES ; \
+ cd ${WRKSRC}/RULES; \
${TEST} -f netbsd-cc.rul || ${MV} i386-netbsd-cc.rul netbsd-cc.rul; \
${TEST} -f netbsd-gcc.rul || ${MV} i386-netbsd-gcc.rul netbsd-gcc.rul; \
${LN} -sf netbsd-gcc.rul ${MACHINE}-netbsd-gcc.rul; \
- ${LN} -sf netbsd-cc.rul ${TARGET_ARCH}.rul;
+ ${LN} -sf netbsd-cc.rul ${TARGET_ARCH}.rul
do-install:
cd ${WRKSRC}/cdda2wav; \
- ${INSTALL_PROGRAM} ${TARGET_DIR}/cdda2wav ${PREFIX}/bin; \
- ${INSTALL_MAN} cdda2wav.1 ${PREFIX}/man/man1
+ ${INSTALL_PROGRAM} ${TARGET_DIR}/cdda2wav ${PREFIX}/bin; \
+ ${INSTALL_MAN} cdda2wav.1 ${PREFIX}/man/man1
cd ${WRKSRC}/cdrecord; \
- ${INSTALL_PROGRAM} ${TARGET_DIR}/cdrecord ${PREFIX}/bin; \
- ${INSTALL_MAN} cdrecord.1 ${PREFIX}/man/man1
- ${INSTALL_PROGRAM} ${WRKSRC}/misc/${TARGET_DIR}/readcd ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${TARGET_DIR}/cdrecord ${PREFIX}/bin; \
+ ${INSTALL_MAN} cdrecord.1 ${PREFIX}/man/man1
cd ${WRKSRC}/mkisofs; \
- ${INSTALL_PROGRAM} ${TARGET_DIR}/mkisofs ${PREFIX}/bin; \
- ${INSTALL_MAN} mkisofs.8 ${PREFIX}/man/man8
+ ${INSTALL_PROGRAM} ${TARGET_DIR}/mkisofs ${PREFIX}/bin; \
+ ${INSTALL_MAN} mkisofs.8 ${PREFIX}/man/man8
+ ${INSTALL_PROGRAM} ${WRKSRC}/misc/${TARGET_DIR}/readcd ${PREFIX}/bin
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrecord/files/md5 b/sysutils/cdrecord/files/md5
index 8cdfcef1702..a8eaf9bad1f 100644
--- a/sysutils/cdrecord/files/md5
+++ b/sysutils/cdrecord/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 2000/03/03 15:22:19 scw Exp $
+$NetBSD: md5,v 1.6 2000/07/22 16:14:53 rh Exp $
-MD5 (cdrecord-1.8.tar.gz) = ec22b0b1d9a7da2976dee40d2f2cb9e7
+MD5 (cdrecord-1.9.tar.gz) = 0fa360d9280d16370d7738ec0b62affb
diff --git a/sysutils/cdrecord/files/patch-sum b/sysutils/cdrecord/files/patch-sum
index 05190ea77cc..a62abb35053 100644
--- a/sysutils/cdrecord/files/patch-sum
+++ b/sysutils/cdrecord/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.6 2000/05/22 02:00:57 hubertf Exp $
+$NetBSD: patch-sum,v 1.7 2000/07/22 16:14:53 rh Exp $
-MD5 (patch-aa) = 7490f9d7cc82b64927a630b8fb6683ca
-MD5 (patch-ab) = 39b1982d628e4b004c9d0e5901c156b3
-MD5 (patch-ac) = fbf28297f94c6609087ce37b936d98c8
-MD5 (patch-ae) = 5d9bcff9749c4c9378ea949d69bf4b02
+MD5 (patch-aa) = 215cf68dff1a2f803801ec715a5a871b
+MD5 (patch-ab) = 3a20ed15fd69037fc67d9d7172125c23
+MD5 (patch-ac) = ae67c9a36c6b7370ca040f8b86e3b5d0
+MD5 (patch-ae) = 4c3938baa5a03adc55193361aa43c697
MD5 (patch-af) = 82018d82a174d9d22e4f0f09d2a20276
diff --git a/sysutils/cdrecord/patches/patch-aa b/sysutils/cdrecord/patches/patch-aa
index 33f26c2cf06..3fcb47c3f80 100644
--- a/sysutils/cdrecord/patches/patch-aa
+++ b/sysutils/cdrecord/patches/patch-aa
@@ -1,21 +1,11 @@
-$NetBSD: patch-aa,v 1.4 2000/03/04 16:59:13 scw Exp $
+$NetBSD: patch-aa,v 1.5 2000/07/22 16:14:53 rh Exp $
---- include/btorder.h.orig Wed Jan 5 17:42:40 2000
-+++ include/btorder.h Sat Mar 4 16:28:55 2000
-@@ -25,6 +25,7 @@
- #define _BTORDER_H
-
- #include <sys/types.h> /* try to load isa_defs.h on Solaris */
-+#include <sys/endian.h>
-
- #ifndef _MCONFIG_H
- #include <mconfig.h>
-@@ -74,7 +75,7 @@
- # 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
+--- TARGETS/Targetdirs.orig Sun Apr 30 01:14:51 2000
++++ TARGETS/Targetdirs Mon May 22 04:14:51 2000
+@@ -1,5 +1,5 @@
+ #ident %W% %E% %Q%
+ ###########################################################################
+ DIRS= patches conf inc lib libdeflt libscg libhfs_iso libfile libunls \
+- cdrecord mkisofs mkisofs/diag cdda2wav misc man
++ cdrecord mkisofs mkisofs/diag cdda2wav misc
+ ###########################################################################
diff --git a/sysutils/cdrecord/patches/patch-ab b/sysutils/cdrecord/patches/patch-ab
index 091905af024..164b402e484 100644
--- a/sysutils/cdrecord/patches/patch-ab
+++ b/sysutils/cdrecord/patches/patch-ab
@@ -1,38 +1,22 @@
-$NetBSD: patch-ab,v 1.3 2000/03/03 15:22:19 scw Exp $
+$NetBSD: patch-ab,v 1.4 2000/07/22 16:14:53 rh Exp $
-*** DEFAULTS/Defaults.netbsd.orig Wed Nov 12 23:52:33 1997
---- DEFAULTS/Defaults.netbsd Wed Nov 12 23:55:30 1997
-***************
-*** 19,25 ****
- CWARNOPTS=
-
- DEFINCDIRS= $(SRCROOT)/include
-! LDPATH= -L/opt/schily/lib
- #RUNPATH= -R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR) Will probably not work
-
- ###########################################################################
---- 19,25 ----
- CWARNOPTS=
-
- DEFINCDIRS= $(SRCROOT)/include
-! LDPATH= -L$(SRCROOT)/lib
- #RUNPATH= -R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR) Will probably not work
-
- ###########################################################################
-***************
-*** 27,33 ****
- # Installation config stuff
- #
- ###########################################################################
-! INS_BASE= /opt/schily
- INS_KBASE= /
- #
- DEFUMASK= 002
---- 27,33 ----
- # Installation config stuff
- #
- ###########################################################################
-! INS_BASE= $(PREFIX)
- INS_KBASE= /
- #
- DEFUMASK= 002
+--- DEFAULTS/Defaults.netbsd.orig Tue Nov 2 12:41:03 1999
++++ DEFAULTS/Defaults.netbsd Mon Nov 15 20:29:31 1999
+@@ -19,7 +19,7 @@
+ CWARNOPTS=
+
+ DEFINCDIRS= $(SRCROOT)/include
+-LDPATH= -L/opt/schily/lib
++LDPATH= -L$(SRCROOT)/lib
+ #RUNPATH= -R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR) Will probably not work
+
+ ###########################################################################
+@@ -27,7 +27,7 @@
+ # Installation config stuff
+ #
+ ###########################################################################
+-INS_BASE= /opt/schily
++INS_BASE= $(PREFIX)
+ INS_KBASE= /
+ #
+ DEFUMASK= 002
diff --git a/sysutils/cdrecord/patches/patch-ac b/sysutils/cdrecord/patches/patch-ac
index 7c662ccd709..9f9f67c96b1 100644
--- a/sysutils/cdrecord/patches/patch-ac
+++ b/sysutils/cdrecord/patches/patch-ac
@@ -1,13 +1,21 @@
-$NetBSD: patch-ac,v 1.10 2000/03/15 00:09:07 hubertf Exp $
+$NetBSD: patch-ac,v 1.11 2000/07/22 16:14:53 rh Exp $
---- include/btorder.h.orig Wed Mar 15 00:22:54 2000
-+++ include/btorder.h Wed Mar 15 00:23:14 2000
-@@ -25,7 +25,7 @@
+--- include/btorder.h.orig Wed Jan 5 17:42:40 2000
++++ include/btorder.h Sat Mar 4 16:28:55 2000
+@@ -25,6 +25,7 @@
#define _BTORDER_H
#include <sys/types.h> /* try to load isa_defs.h on Solaris */
--#include <sys/endian.h>
+#include <machine/endian.h>
#ifndef _MCONFIG_H
#include <mconfig.h>
+@@ -74,7 +75,7 @@
+ # 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/patches/patch-ae b/sysutils/cdrecord/patches/patch-ae
index 78dc402c0fe..12830d2a632 100644
--- a/sysutils/cdrecord/patches/patch-ae
+++ b/sysutils/cdrecord/patches/patch-ae
@@ -1,13 +1,23 @@
-$NetBSD: patch-ae,v 1.2 2000/03/03 15:22:19 scw Exp $
+$NetBSD: patch-ae,v 1.3 2000/07/22 16:14:53 rh Exp $
---- include/vadefs.h.orig Sat Nov 27 19:25:44 1999
-+++ include/vadefs.h Fri Mar 3 14:41:00 2000
-@@ -51,7 +51,7 @@
- # endif
- #endif
+--- cdda2wav/Makefile.orig Tue Nov 16 00:48:52 1999
++++ cdda2wav/Makefile Tue Nov 16 00:49:23 1999
+@@ -7,7 +7,8 @@
--#if (defined(__linux__) || defined(__linux) || defined(sun)) && \
-+#if (defined(__linux__) || defined(__linux) || defined(sun) || defined(__NetBSD__)) && \
- (defined(__ppc) || defined(__PPC) || defined(powerpc) || defined(__powerpc__))
+ INSDIR= bin
+ TARGET= cdda2wav
+-CPPOPTS += -DFIFO -I../cdrecord $(CDDA2WAVDEFS)
++CPPOPTS += -DFIFO -I../cdrecord $(CDDA2WAVDEFS) \
++ -DECHO_TO_SOUNDCARD -DHAVE_OSS=1 -DHAVE_SYS_SOUNDCARD_H
+ CFILES= cdda2wav.c interface.c semshm.c resample.c \
+ toc.c wav.c sun.c raw.c md5c.c setuid.c ringbuff.c \
+ sndconfig.c scsi_cmds.c aiff.c aifc.c \
+@@ -17,7 +18,7 @@
+ config.h saveargs.h sndfile.h aiff.h aifc.h \
+ sndconfig.h scsi_cmds.h lowlevel.h byteorder.h mycdrom.h \
+ base64.h sha.h mmsystem.h
+-LIBS= -lscg -lschily $(SCSILIB) $(EXTRALIB)
++LIBS= -lscg -lschily $(SCSILIB) $(EXTRALIB) -lossaudio
+ XMK_FILE= Makefile.man
- # ifndef VA_LIST_IS_ARRAY
+ LCONFIG= local.cnf
diff --git a/sysutils/cdrecord/patches/patch-af b/sysutils/cdrecord/patches/patch-af
index 3311fa978aa..36c77e5fe93 100644
--- a/sysutils/cdrecord/patches/patch-af
+++ b/sysutils/cdrecord/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2000/05/22 02:00:57 hubertf Exp $
+$NetBSD: patch-af,v 1.2 2000/07/22 16:14:54 rh Exp $
--- RULES/mk-gmake.id.orig Thu Mar 9 22:36:18 2000
+++ RULES/mk-gmake.id Thu Mar 9 22:36:52 2000
diff --git a/sysutils/cdrecord/pkg/PLIST b/sysutils/cdrecord/pkg/PLIST
index 9ed5a859410..7eee5290843 100644
--- a/sysutils/cdrecord/pkg/PLIST
+++ b/sysutils/cdrecord/pkg/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2000/06/01 14:21:07 fvdl Exp $
-bin/cdrecord
+@comment $NetBSD: PLIST,v 1.8 2000/07/22 16:14:54 rh Exp $
bin/cdda2wav
-bin/readcd
+bin/cdrecord
bin/mkisofs
+bin/readcd
man/man1/cdda2wav.1
man/man1/cdrecord.1
man/man8/mkisofs.8
-@exec [ -e /dev/scgx ] || ln -s /dev/cd0d /dev/scgx
-@unexec /bin/rm -f /dev/scgx
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-13 02:04:32 +0000