Update to 2.0.

From: Jacob Meuser <jakemsr@jakemsr.com>
This commit is contained in:
naddy 2003-02-17 15:32:58 +00:00
parent f98a36cca2
commit cd5442e847
12 changed files with 65 additions and 61 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.3 2002/12/29 20:19:10 fgsch Exp $
# $OpenBSD: Makefile,v 1.4 2003/02/17 15:32:58 naddy Exp $
COMMENT= "ISO 9660 filesystem and CD creation tools"
DISTNAME= cdrtools-1.10
PKGNAME= ${DISTNAME}p1
DISTNAME= cdrtools-2.0
CATEGORIES= sysutils
HOMEPAGE= http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
@ -15,7 +14,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/
MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/
USE_GMAKE= Yes
@ -39,6 +38,8 @@ do-configure:
.endif
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cdrtools
${INSTALL_DATA} ${WRKSRC}/README.OpenBSD ${PREFIX}/share/doc/cdrtools
@strip ${PREFIX}/bin/*
@cd ${PREFIX}/man/man1; \
for i in devdump.1 isovfy.1 ; do \

View File

@ -1,3 +1,3 @@
MD5 (cdrtools-1.10.tar.gz) = 3a7c452738eb9f58c738908d8146601d
RMD160 (cdrtools-1.10.tar.gz) = b7d240fd1737a851b3ac92c729a47404d0983635
SHA1 (cdrtools-1.10.tar.gz) = 0d61bd1331d69a579e6582719a119d94166fcf10
MD5 (cdrtools-2.0.tar.gz) = 2e94010d6f746c187352223b8ea50d64
RMD160 (cdrtools-2.0.tar.gz) = bb025a5f6b3b345b5fa292a052123335039532fc
SHA1 (cdrtools-2.0.tar.gz) = a6645d541a40a0374d6ebffae699555273e41cb0

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-RULES_i386-openbsd-cc_rul,v 1.1.1.1 2002/05/13 14:08:50 naddy Exp $
--- RULES/i386-openbsd-cc.rul.orig Sun Aug 29 16:09:56 1999
+++ RULES/i386-openbsd-cc.rul Mon Oct 1 01:47:43 2001
$OpenBSD: patch-RULES_i386-openbsd-cc_rul,v 1.2 2003/02/17 15:32:58 naddy Exp $
--- RULES/i386-openbsd-cc.rul.orig Tue Oct 15 13:43:40 2002
+++ RULES/i386-openbsd-cc.rul Sun Oct 27 16:12:12 2002
@@ -24,13 +24,13 @@ include $(SRCROOT)/$(RULESDIR)/rules.prg
###########################################################################
CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
+CFLAGS+= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
+CFLAGS+= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
COPTS=

View File

@ -1,12 +1,21 @@
$OpenBSD: patch-RULES_rules1_top,v 1.1.1.1 2002/05/13 14:08:50 naddy Exp $
--- RULES/rules1.top.orig Wed Nov 15 18:39:18 2000
+++ RULES/rules1.top Wed Nov 15 18:39:55 2000
@@ -186,7 +186,7 @@ __PARCH= $(_PARCH:$(_UNIQ)=$(PARCH_DEF))
PARCH= $(__PARCH:$(_UNIQ)%=%)
$OpenBSD: patch-RULES_rules1_top,v 1.2 2003/02/17 15:32:58 naddy Exp $
--- RULES/rules1.top.orig Sun Jan 27 22:59:10 2002
+++ RULES/rules1.top Fri May 24 16:57:34 2002
@@ -204,7 +204,7 @@ PARCH= $(__PARCH:$(_UNIQ)%=%)
# interested to fix the bug.
#
###########################################################################
-__DCC= $(SRCROOT)/incs/Dcc.$(PARCH)$(-O_ARCH)
+__DCC= $(SRCROOT)/incs/Dcc.$(K_ARCH)$(-O_ARCH)
_DCC= $(__DCC:./%=%)
$(_DCC):
@@ -228,7 +228,7 @@ include $(_DCC)
#
###########################################################################
#OARCH= $(MARCH)$(-O_ARCH)-$(C_ARCH)
-OARCH= $(PARCH)$(-O_ARCH)-$(C_ARCH)
+OARCH= $(K_ARCH)$(-O_ARCH)-$(C_ARCH)
XARCH= $(K_ARCH)$(-O_ARCH)-$(C_ARCH)
.print:
echo $(XP_ARCH) $(P_ARCH)
echo $(XP_ARCH) $(P_ARCH) $(OARCH) $(XARCH)

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-RULES_rules_cnf,v 1.1 2002/07/21 00:39:02 naddy Exp $
--- RULES/rules.cnf.orig Sun Jul 21 02:14:01 2002
+++ RULES/rules.cnf Sun Jul 21 02:14:34 2002
$OpenBSD: patch-RULES_rules_cnf,v 1.2 2003/02/17 15:32:58 naddy Exp $
--- RULES/rules.cnf.orig Sun Jul 21 01:50:27 2002
+++ RULES/rules.cnf Sun Jul 21 01:51:20 2002
@@ -33,8 +33,9 @@ $(OINCSDIR):
#
# Hack until the <mach>-<os>-*cc.rul files are updated

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-cdda2wav_local_cnf_in,v 1.1 2003/02/17 15:32:58 naddy Exp $
--- cdda2wav/local.cnf.in.orig Sun Nov 10 18:43:45 2002
+++ cdda2wav/local.cnf.in Sun Nov 10 18:45:59 2002
@@ -132,7 +132,7 @@ $(WANT_INFOFILES) $(WANT_MD5) -DAUX_DEVI
LIBS += @LIBS@
-VERSION_OS=@CDRTOOLS_VERSION@_$(O_ARCH)_$(OSREL)_$(K_ARCH)_$(P_ARCH)
+VERSION_OS=@CDRTOOLS_VERSION@_$(O_ARCH)_$(OSREL)_$(K_ARCH)
CUR_VERSION='"$(VERSION_OS)"'
GNU_CC_WARNINGS=-W -Wall -Wtraditional -Wshadow -Wpointer-arith -Wcast-qual \
-Wcast-align -Wwrite-strings -Wstrict-prototypes -Wnested-externs -Wbad-function-cast \

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-cdrecord_fifo_c,v 1.1.1.1 2002/05/13 14:08:50 naddy Exp $
--- cdrecord/fifo.c.orig Sun Sep 23 10:55:33 2001
+++ cdrecord/fifo.c Sun Sep 23 10:56:21 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, /* Unused in real life */

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libschily_printf_c,v 1.1 2003/02/17 15:32:58 naddy Exp $
--- libschily/printf.c.orig Sun Nov 10 23:19:50 2002
+++ libschily/printf.c Sun Nov 10 23:20:22 2002
@@ -23,7 +23,7 @@
#ifdef printf
# define __no_undef__
#else
-# define printf __nothing__
+# define printf __printf__
#endif
#ifdef fprintf
# define __no_undef2__

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-misc_readcd_1,v 1.1.1.1 2002/05/13 14:08:50 naddy Exp $
--- misc/readcd.1.orig Wed Apr 24 19:57:39 2002
+++ misc/readcd.1 Wed Apr 24 19:59:20 2002
@@ -272,8 +272,6 @@ to a DVD-RAM, call:
.SH SEE ALSO
.BR cdrecord (1),
.BR mkisofs (1),
-.BR scg (7),
-.BR fbk (7).
.SH NOTES
.PP

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-mkisofs_mkisofs_8,v 1.1.1.1 2002/05/13 14:08:50 naddy Exp $
--- mkisofs/mkisofs.8.orig Mon Apr 16 14:57:33 2001
+++ mkisofs/mkisofs.8 Mon Apr 22 00:32:40 2002
@@ -2739,7 +2739,6 @@ options.
.SH "SEE ALSO
.BR cdrecord(1)
.BR magic (5),
-.BR apple_driver (8)
.SH "FUTURE IMPROVEMENTS
Some sort of gui interface.

View File

@ -5,7 +5,9 @@ disc.
This package contains the following software:
cdda2wav (digital CD audio extraction program)
cdrecord (CD recording program)
devdup (dump a device or file in hex)
devdump (dump a device or file in hex)
isodebug (analyze or list an ISO-9660 image)
isodump (analyze or list an ISO-9660 image)
isoinfo (analyze or list an ISO-9660 image)
isovrfy (verify an ISO-9660 image)
mkisofs (ISO-9660 filesystem image creator)

View File

@ -1,9 +1,10 @@
@comment $OpenBSD: PLIST,v 1.2 2002/06/05 21:41:07 naddy Exp $
@comment $OpenBSD: PLIST,v 1.3 2003/02/17 15:32:58 naddy Exp $
@pkgcfl cdrecord-*
bin/cdda2wav
bin/cdrecord
bin/devdump
@comment bin/isodump
bin/isodebug
bin/isodump
bin/isoinfo
bin/isovfy
@comment bin/mkhybrid
@ -13,8 +14,10 @@ bin/readcd
@comment include/align.h
@comment include/avoffset.h
@comment lib/libdeflt.a
@comment lib/libedc_ecc.a
@comment lib/libfile.a
@comment lib/libhfs.a
@comment lib/libparanoia.a
@comment lib/librscg.a
@comment lib/libscg.a
@comment lib/libschily.a
@ -24,10 +27,10 @@ man/man1/cdrecord.1
man/man1/devdump.1
man/man1/isoinfo.1
man/man1/isovfy.1
@comment man/man1/makefiles.1
@comment man/man1/makerules.1
@comment man/man1/mkhybrid.1
man/man1/mkisofs.1
man/man1/readcd.1
@comment man/man1/scgcheck.1
@comment sbin/rscsi
share/doc/cdrtools/README.OpenBSD
@dirrm share/doc/cdrtools