diff options
author | scw <scw@pkgsrc.org> | 2000-03-03 15:22:15 +0000 |
---|---|---|
committer | scw <scw@pkgsrc.org> | 2000-03-03 15:22:15 +0000 |
commit | 2654a4e7530659aac1fcb8fdc4c1e15b227ed04c (patch) | |
tree | 218173b6fb03dc34875077b2926aefbe66a22032 /sysutils/cdrecord | |
parent | e9ebf82a6a41b501ad1564b01b3fa6a960b78424 (diff) | |
download | pkgsrc-2654a4e7530659aac1fcb8fdc4c1e15b227ed04c.tar.gz |
Updated to cdrecord-1.8.
The deleted patches have been incorporated into the master source tree.
Diffstat (limited to 'sysutils/cdrecord')
-rw-r--r-- | sysutils/cdrecord/Makefile | 33 | ||||
-rw-r--r-- | sysutils/cdrecord/files/md5 | 4 | ||||
-rw-r--r-- | sysutils/cdrecord/files/patch-sum | 8 | ||||
-rw-r--r-- | sysutils/cdrecord/patches/patch-ab | 6 | ||||
-rw-r--r-- | sysutils/cdrecord/patches/patch-ac | 19 | ||||
-rw-r--r-- | sysutils/cdrecord/patches/patch-ad | 15 | ||||
-rw-r--r-- | sysutils/cdrecord/patches/patch-ae | 27 |
7 files changed, 34 insertions, 78 deletions
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile index b5498c46588..10b6674d2a9 100644 --- a/sysutils/cdrecord/Makefile +++ b/sysutils/cdrecord/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.26 1999/11/20 20:45:43 hubertf Exp $ +# $NetBSD: Makefile,v 1.27 2000/03/03 15:22:15 scw Exp $ # FreeBSD Id: Makefile,v 1.2 1997/11/05 23:55:31 asami Exp # -DISTNAME= cdrecord-1.6.1 +DISTNAME= cdrecord-1.8 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ @@ -11,19 +11,26 @@ HOMEPAGE= http://www.fokus.gmd.de/nthp/employees/schilling/cdrecord.html USE_GMAKE= yes -post-configure: - cd ${WRKSRC}/RULES ; [ -f netbsd-cc.rul ] || ${MV} i386-netbsd-cc.rul netbsd-cc.rul - cd ${WRKSRC}/RULES ; [ -f netbsd-gcc.rul ] || ${MV} i386-netbsd-gcc.rul netbsd-gcc.rul - cd ${WRKSRC}/RULES ; ${LN} -sf netbsd-gcc.rul ${MACHINE}-netbsd-gcc.rul - cd ${WRKSRC}/RULES ; ${LN} -sf netbsd-cc.rul ${MACHINE}-netbsd-cc.rul +WRKSRC= ${WRKDIR}/${DISTNAME:C/a.*//} +TARGET_ARCH= ${MACHINE}-netbsd-cc +TARGET_DIR= OBJ/${TARGET_ARCH} -do-build: - @cd ${WRKSRC}/lib && ../Gmake PREFIX=${PREFIX} - @cd ${WRKSRC}/cdrecord && ../Gmake PREFIX=${PREFIX} +post-configure: + ${MKDIR} ${WRKSRC}/include/sys + ${LN} -fs /usr/include/soundcard.h ${WRKSRC}/include/sys + 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; do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/OBJ/${MACHINE_ARCH}-netbsd-cc/cdrecord \ - ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 ${PREFIX}/man/man1 + cd ${WRKSRC}/cdda2wav; \ + ${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 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/cdrecord/files/md5 b/sysutils/cdrecord/files/md5 index 485e684274a..8cdfcef1702 100644 --- a/sysutils/cdrecord/files/md5 +++ b/sysutils/cdrecord/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.4 1998/10/22 07:01:48 hubertf Exp $ +$NetBSD: md5,v 1.5 2000/03/03 15:22:19 scw Exp $ -MD5 (cdrecord-1.6.1.tar.gz) = c0abc4741f1477515c2e8286686e0fc9 +MD5 (cdrecord-1.8.tar.gz) = ec22b0b1d9a7da2976dee40d2f2cb9e7 diff --git a/sysutils/cdrecord/files/patch-sum b/sysutils/cdrecord/files/patch-sum index a0743e726ef..802118cf370 100644 --- a/sysutils/cdrecord/files/patch-sum +++ b/sysutils/cdrecord/files/patch-sum @@ -1,6 +1,4 @@ -$NetBSD: patch-sum,v 1.2 1999/10/09 20:51:56 mycroft Exp $ +$NetBSD: patch-sum,v 1.3 2000/03/03 15:22:19 scw Exp $ -MD5 (patch-ab) = c9c1df507748e61533ddf34a26aba433 -MD5 (patch-ac) = 26af7d53cc48ec52ce9f2b966b73d060 -MD5 (patch-ad) = ec8aadadf88df2db7e4dfb5dd091498a -MD5 (patch-ae) = fa4bbd7517a0d231fbdc5c12555cde81 +MD5 (patch-ab) = 39b1982d628e4b004c9d0e5901c156b3 +MD5 (patch-ae) = 5d9bcff9749c4c9378ea949d69bf4b02 diff --git a/sysutils/cdrecord/patches/patch-ab b/sysutils/cdrecord/patches/patch-ab index a941a83b0e5..091905af024 100644 --- a/sysutils/cdrecord/patches/patch-ab +++ b/sysutils/cdrecord/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 1998/08/07 11:14:03 agc Exp $ +$NetBSD: patch-ab,v 1.3 2000/03/03 15:22:19 scw Exp $ *** DEFAULTS/Defaults.netbsd.orig Wed Nov 12 23:52:33 1997 --- DEFAULTS/Defaults.netbsd Wed Nov 12 23:55:30 1997 @@ -8,7 +8,7 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 11:14:03 agc Exp $ DEFINCDIRS= $(SRCROOT)/include ! LDPATH= -L/opt/schily/lib - #RUNPATH= -R /opt/schily/lib -R $(OLIBSDIR) Will probably not work + #RUNPATH= -R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR) Will probably not work ########################################################################### --- 19,25 ---- @@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 11:14:03 agc Exp $ DEFINCDIRS= $(SRCROOT)/include ! LDPATH= -L$(SRCROOT)/lib - #RUNPATH= -R /opt/schily/lib -R $(OLIBSDIR) Will probably not work + #RUNPATH= -R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR) Will probably not work ########################################################################### *************** diff --git a/sysutils/cdrecord/patches/patch-ac b/sysutils/cdrecord/patches/patch-ac deleted file mode 100644 index c81b7ac4485..00000000000 --- a/sysutils/cdrecord/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ac,v 1.8 1999/10/09 20:51:41 mycroft Exp $ - ---- include/btorder.h.orig Sun Jul 19 16:28:10 1998 -+++ include/btorder.h Sat Oct 9 13:33:43 1999 -@@ -46,12 +46,12 @@ - # endif - - # if defined(__i386) || defined(i386) || \ -- defined(__alpha) || defined(alpha) -+ defined(__alpha) || defined(alpha) || defined(__arm6__) || defined(__arm__) - # define _BIT_FIELDS_LTOH - # endif - - # if defined(__ppc__) || defined(ppc) || defined(__ppc) || \ -- defined(__PPC) || defined(powerpc) -+ defined(__PPC) || defined(powerpc) || defined(__powerpc__) - - # if defined(__BIG_ENDIAN__) - # define _BIT_FIELDS_HTOL diff --git a/sysutils/cdrecord/patches/patch-ad b/sysutils/cdrecord/patches/patch-ad deleted file mode 100644 index 9c4dba9d80f..00000000000 --- a/sysutils/cdrecord/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.1 1998/12/28 09:35:42 tron Exp $ - ---- include/mconfig.h.orig Fri Oct 9 15:31:45 1998 -+++ include/mconfig.h Mon Dec 28 10:33:08 1998 -@@ -35,9 +35,7 @@ - extern "C" { - #endif - --#if defined(unix) || defined(__unix) || defined(__unix__) --# define IS_UNIX --#endif -+#define IS_UNIX - - #ifdef __MSDOS__ - # define IS_MSDOS diff --git a/sysutils/cdrecord/patches/patch-ae b/sysutils/cdrecord/patches/patch-ae index 1a4aafdaab2..78dc402c0fe 100644 --- a/sysutils/cdrecord/patches/patch-ae +++ b/sysutils/cdrecord/patches/patch-ae @@ -1,28 +1,13 @@ -$NetBSD: patch-ae,v 1.1 1999/10/09 20:51:41 mycroft Exp $ +$NetBSD: patch-ae,v 1.2 2000/03/03 15:22:19 scw Exp $ ---- include/vadefs.h.orig Sun Mar 1 15:38:45 1998 -+++ include/vadefs.h Sat Oct 9 13:47:40 1999 -@@ -37,8 +37,8 @@ - # include <varargs.h> +--- 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 -#if (defined(__linux__) || defined(__linux) || defined(sun)) && \ -- (defined(__ppc) || defined(__PPC) || defined(powerpc)) +#if (defined(__linux__) || defined(__linux) || defined(sun) || defined(__NetBSD__)) && \ -+ (defined(__ppc) || defined(__PPC) || defined(powerpc) || defined(__powerpc__)) + (defined(__ppc) || defined(__PPC) || defined(powerpc) || defined(__powerpc__)) # ifndef VA_LIST_IS_ARRAY - # define VA_LIST_IS_ARRAY -@@ -63,7 +63,11 @@ - * compatibility. - */ - #if !defined(va_copy) && !defined(HAVE_VA_COPY) --# define va_copy(to, from) ((to) = (from)) -+# ifdef VA_LIST_IS_ARRAY -+# define va_copy(to, from) ((to)[0] = (from)[0]) -+# else -+# define va_copy(to, from) ((to) = (from)) -+# endif - #endif - - /* |