diff options
| -rw-r--r-- | sysutils/cdrdao/Makefile | 15 | ||||
| -rw-r--r-- | sysutils/cdrdao/PLIST | 8 | ||||
| -rw-r--r-- | sysutils/cdrdao/distinfo | 8 | ||||
| -rw-r--r-- | sysutils/cdrdao/patches/patch-ac | 37 |
4 files changed, 46 insertions, 22 deletions
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile index a8db017b3a7..2f35881cfe4 100644 --- a/sysutils/cdrdao/Makefile +++ b/sysutils/cdrdao/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2002/05/12 10:56:04 abs Exp $ +# $NetBSD: Makefile,v 1.9 2002/10/29 16:47:52 drochner Exp $ # DISTNAME= ${PKGNAME}.src -PKGNAME= cdrdao-1.1.5 +PKGNAME= cdrdao-1.1.7 WRKSRC= ${WRKDIR}/${PKGNAME} CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrdao/} @@ -11,8 +11,6 @@ MAINTAINER= David Maxwell <david@maxwell.net> HOMEPAGE= http://cdrdao.sourceforge.net/ COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode -BUILD_DEPENDS+= pccts-1.33.22:../../devel/pccts - GNU_CONFIGURE= YES USE_GMAKE= YES CONFIGURE_ARGS+= --with-pcctsbin=${PREFIX}/bin @@ -25,6 +23,8 @@ LDFLAGS+= -L../paranoia #override ARCH to avoid picking up a bad ${ARCH} during the build MAKE_ENV+= ARCH="" +USE_BUILDLINK2= yes + post-configure: cd ${WRKSRC}/scsilib/RULES ; \ ${TEST} -f netbsd-cc.rul || ${MV} i386-netbsd-cc.rul netbsd-cc.rul; \ @@ -43,18 +43,12 @@ post-install: ${WRKSRC}/INSTALL \ ${WRKSRC}/README.PlexDAE \ ${PREFIX}/share/doc/cdrdao - ${INSTALL_MAN} ${WRKSRC}/edc_ecc/README \ - ${PREFIX}/share/doc/cdrdao/README.edc_ecc - ${INSTALL_MAN} ${WRKSRC}/edc_ecc/crc.txt \ - ${PREFIX}/share/doc/cdrdao/crc.txt ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/cdrdao/testtocs ${INSTALL_MAN} ${WRKSRC}/testtocs/*.toc \ ${PREFIX}/share/doc/cdrdao/testtocs ${INSTALL_MAN_DIR} ${PREFIX}/share/examples/cdrdao ${INSTALL_MAN} ${WRKSRC}/contrib/mp32dao/mp32dao.pl \ ${PREFIX}/share/examples/cdrdao - ${INSTALL_MAN} ${WRKSRC}/contrib/mp32dao/README \ - ${PREFIX}/share/examples/cdrdao/README.mp32dao ${INSTALL_MAN_DIR} ${PREFIX}/share/examples/cdrdao/psxcopy ${INSTALL_MAN} ${WRKSRC}/contrib/psxcopy-0.2/Makefile \ ${WRKSRC}/contrib/psxcopy-0.2/README \ @@ -67,4 +61,5 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/contrib/wav2dao/wav2dao.pl \ ${PREFIX}/share/examples/cdrdao +.include "../../devel/pccts/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/cdrdao/PLIST b/sysutils/cdrdao/PLIST index f65779a78ee..b785b6be68d 100644 --- a/sysutils/cdrdao/PLIST +++ b/sysutils/cdrdao/PLIST @@ -1,17 +1,16 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:57 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/10/29 16:47:52 drochner Exp $ bin/cdrdao +bin/toc2cue man/man1/cdrdao.1 share/cdrdao/drivers share/doc/cdrdao/COPYING share/doc/cdrdao/CREDITS share/doc/cdrdao/INSTALL share/doc/cdrdao/README -share/doc/cdrdao/README.edc_ecc share/doc/cdrdao/README.FreeBSD share/doc/cdrdao/README.PlexDAE share/doc/cdrdao/Release-1.1.2 share/doc/cdrdao/Release-1.1.3 -share/doc/cdrdao/crc.txt share/doc/cdrdao/testtocs/cdtext.toc share/doc/cdrdao/testtocs/data1.toc share/doc/cdrdao/testtocs/data2.toc @@ -20,6 +19,8 @@ share/doc/cdrdao/testtocs/data4.toc share/doc/cdrdao/testtocs/data5.toc share/doc/cdrdao/testtocs/data6.toc share/doc/cdrdao/testtocs/data7.toc +share/doc/cdrdao/testtocs/mode1_rw.toc +share/doc/cdrdao/testtocs/mode1_rw_raw.toc share/doc/cdrdao/testtocs/t1.toc share/doc/cdrdao/testtocs/t2.toc share/doc/cdrdao/testtocs/t3.toc @@ -30,7 +31,6 @@ share/doc/cdrdao/testtocs/t7.toc share/doc/cdrdao/testtocs/t8.toc share/doc/cdrdao/testtocs/t9.toc share/examples/cdrdao/mp32dao.pl -share/examples/cdrdao/README.mp32dao share/examples/cdrdao/psxcopy/Makefile share/examples/cdrdao/psxcopy/README share/examples/cdrdao/psxcopy/cdjob.c diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo index c3647de06ee..ff81bb6d031 100644 --- a/sysutils/cdrdao/distinfo +++ b/sysutils/cdrdao/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2002/08/30 08:19:11 drochner Exp $ +$NetBSD: distinfo,v 1.6 2002/10/29 16:47:52 drochner Exp $ -SHA1 (cdrdao-1.1.5.src.tar.gz) = f766277957b8d4eeaa7ec1162ded9b0bf04c4c79 -Size (cdrdao-1.1.5.src.tar.gz) = 868001 bytes +SHA1 (cdrdao-1.1.7.src.tar.gz) = d688f8b117de367841958f1ca977100fc4e8484b +Size (cdrdao-1.1.7.src.tar.gz) = 1433366 bytes SHA1 (patch-aa) = 1856f36a9dd0a5d248e94a079a63fafcff045554 SHA1 (patch-ab) = 071fedfbc598400d9d41e050aa01c5902e97caaa -SHA1 (patch-ac) = 92e971a906662feea0311c4f274743bbf9667b47 +SHA1 (patch-ac) = 7392aad2b18b670023396b47715b292d8046b495 SHA1 (patch-ad) = e10ec407f4c4200e443364077ab6d56e1d3cd2d3 diff --git a/sysutils/cdrdao/patches/patch-ac b/sysutils/cdrdao/patches/patch-ac index 5880954098e..b2efa4f0c55 100644 --- a/sysutils/cdrdao/patches/patch-ac +++ b/sysutils/cdrdao/patches/patch-ac @@ -1,8 +1,37 @@ -$NetBSD: patch-ac,v 1.2 2001/05/19 12:47:05 drochner Exp $ +$NetBSD: patch-ac,v 1.3 2002/10/29 16:47:53 drochner Exp $ ---- scsilib/include/btorder.h.orig Sun Apr 29 11:28:21 2001 -+++ scsilib/include/btorder.h Fri May 18 19:04:13 2001 -@@ -54,6 +54,15 @@ +--- ./scsilib/include/btorder.h.orig Sun Nov 25 16:35:10 2001 ++++ ./scsilib/include/btorder.h Tue Oct 29 09:33:02 2002 +@@ -63,35 +63,21 @@ + #endif + + +-/* +- * Convert byte-order definitions from xconfig.h into our values +- * and verify them. +- */ +-#if defined(HAVE_C_BIGENDIAN) && \ +- !defined(WORDS_BIGENDIAN) +-#define WORDS_LITTLEENDIAN +-#define _LITTLE_ENDIAN +-#endif +- +-#if defined(HAVE_C_BIGENDIAN) && \ +- defined(WORDS_BIGENDIAN) +-#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) /* * Bitorder is already known. */ |