diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/dvd+rw-tools/Makefile | 10 | ||||
| -rw-r--r-- | sysutils/dvd+rw-tools/distinfo | 8 | ||||
| -rw-r--r-- | sysutils/dvd+rw-tools/patches/patch-aa | 49 |
3 files changed, 44 insertions, 23 deletions
diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile index e16b70f79dd..34f74d99e6b 100644 --- a/sysutils/dvd+rw-tools/Makefile +++ b/sysutils/dvd+rw-tools/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2004/06/26 15:56:33 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2004/06/30 00:11:23 wiz Exp $ # -DISTNAME= dvd+rw-tools-5.17.4.8.6 -PKGREVISION= 1 +DISTNAME= dvd+rw-tools-5.19-1.4.9.7 +PKGNAME= dvd+rw-tools-5.19.4.9.7 CATEGORIES= sysutils MASTER_SITES= http://fy.chalmers.se/~appro/linux/DVD+RW/tools/ @@ -12,9 +12,11 @@ COMMENT= Tools for writing DVD+R[W] disks DEPENDS+= {cdrecord-[1-9]*,cdrtools-ossdvd-[0-9]*}:../../sysutils/cdrecord +WRKSRC= ${WRKDIR}/${PKGNAME} + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/growisofs ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/growisofs.1 ${PREFIX}/man/man1/growisofs.1 + ${INSTALL_MAN} ${WRKSRC}/growisofs.1 ${PREFIX}/man/man1 ${INSTALL_PROGRAM} ${WRKSRC}/dvd+rw-booktype ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/dvd+rw-format ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/dvd+rw-mediainfo ${PREFIX}/bin diff --git a/sysutils/dvd+rw-tools/distinfo b/sysutils/dvd+rw-tools/distinfo index df5e9edae36..5a8da888cce 100644 --- a/sysutils/dvd+rw-tools/distinfo +++ b/sysutils/dvd+rw-tools/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2004/05/30 17:57:52 tron Exp $ +$NetBSD: distinfo,v 1.6 2004/06/30 00:11:23 wiz Exp $ -SHA1 (dvd+rw-tools-5.17.4.8.6.tar.gz) = 635b76e3d2b8b5702b179a57bd51086fce065c59 -Size (dvd+rw-tools-5.17.4.8.6.tar.gz) = 91908 bytes -SHA1 (patch-aa) = 49e05d0bbc8e8efba8e53d6b53dd391dddfb2310 +SHA1 (dvd+rw-tools-5.19-1.4.9.7.tar.gz) = bb891ded04afbf058170466c18401b069851923c +Size (dvd+rw-tools-5.19-1.4.9.7.tar.gz) = 97678 bytes +SHA1 (patch-aa) = 33096512b0bd21f62415885a3a8bac9fdba19eca diff --git a/sysutils/dvd+rw-tools/patches/patch-aa b/sysutils/dvd+rw-tools/patches/patch-aa index 5d87a7c442d..2abbc85b3a0 100644 --- a/sysutils/dvd+rw-tools/patches/patch-aa +++ b/sysutils/dvd+rw-tools/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2004/05/30 17:57:52 tron Exp $ +$NetBSD: patch-aa,v 1.3 2004/06/30 00:11:23 wiz Exp $ ---- transport.hxx.orig 2004-01-20 16:55:16.000000000 +0100 -+++ transport.hxx 2004-05-30 19:55:42.000000000 +0200 -@@ -6,17 +6,22 @@ +--- transport.hxx.orig 2004-04-19 18:25:06.000000000 +0200 ++++ transport.hxx +@@ -6,7 +6,7 @@ // For further details see http://fy.chalmers.se/~appro/linux/DVD+RW/ // @@ -11,18 +11,37 @@ $NetBSD: patch-aa,v 1.2 2004/05/30 17:57:52 tron Exp $ #include <stdio.h> #include <stdlib.h> #include <unistd.h> - #include <string.h> - #include <sys/types.h> -+#include <sys/param.h> - #include <sys/stat.h> +@@ -16,6 +16,9 @@ #include <fcntl.h> + #include <poll.h> + #include <sys/time.h> ++#if __NetBSD_Version__ >= 200040000 ++#include <sys/statvfs.h> ++#endif - #include <errno.h> + inline long getmsecs() + { struct timeval tv; +@@ -407,7 +410,11 @@ public: + // mounted, so that it could as well just return 0; + int umount(int f=-1) + { struct stat fsb,msb; ++#if __NetBSD_Version__ >= 200040000 ++ struct statvfs *mntbuf; ++#else + struct statfs *mntbuf; ++#endif + int ret=0,mntsize,i; -+#if defined(__NetBSD__) && (__NetBSD_Version__ > 200030000) -+#define statfs statvfs + if (f==-1) f=fd; +@@ -603,7 +610,11 @@ public: + } + int umount(int f=-1) + { struct stat fsb,msb; ++#if __NetBSD_Version__ >= 200040000 ++ struct statvfs *mntbuf; ++#else + struct statfs *mntbuf; +#endif -+ - #ifndef EMEDIUMTYPE - #define EMEDIUMTYPE EINVAL - #endif + int ret=0,mntsize,i; + + if (f==-1) f=fd; |