update to 7.0

This commit is contained in:
jakemsr 2008-01-26 02:21:28 +00:00
parent 9f76eb9a17
commit 7aad732bc8
4 changed files with 35 additions and 41 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.4 2007/09/15 21:14:01 merdely Exp $
# $OpenBSD: Makefile,v 1.5 2008/01/26 02:21:28 jakemsr Exp $
COMMENT= mastering tools for DVD+RW/+R/-R/-RW
DISTNAME= dvd+rw-tools-5.21.4.10.8
PKGNAME= ${DISTNAME}p0
DISTNAME= dvd+rw-tools-7.0
CATEGORIES= sysutils
HOMEPAGE= http://fy.chalmers.se/~appro/linux/DVD+RW/
@ -16,7 +15,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}tools/
RUN_DEPENDS= :cdrtools->=1.10:sysutils/cdrtools
WANTLIB= c m stdc++
WANTLIB= c m pthread stdc++
# allow growisofs to work under sudo(8)
CFLAGS+= -DI_KNOW_ALL_ABOUT_SUDO

View File

@ -1,5 +1,5 @@
MD5 (dvd+rw-tools-5.21.4.10.8.tar.gz) = uTHALisjNC9mQnbvJtFQLA==
RMD160 (dvd+rw-tools-5.21.4.10.8.tar.gz) = Y49n3fwk+JpMK8KrztZS5nn0QA8=
SHA1 (dvd+rw-tools-5.21.4.10.8.tar.gz) = MZpFKds3SPWVqp3I8uVFZLsyoOM=
SHA256 (dvd+rw-tools-5.21.4.10.8.tar.gz) = bSM99EKVg8WjbfMyjNdOceOa7Wu5BYaZj+ao3NO6UUs=
SIZE (dvd+rw-tools-5.21.4.10.8.tar.gz) = 107045
MD5 (dvd+rw-tools-7.0.tar.gz) = LrnCprHmvHxNctO17ONM6w==
RMD160 (dvd+rw-tools-7.0.tar.gz) = 1SK6U0XrdHBebjlwMoA0o9Ad514=
SHA1 (dvd+rw-tools-7.0.tar.gz) = Yj/RwiZKXfqnIUScyMx75KwoJLo=
SHA256 (dvd+rw-tools-7.0.tar.gz) = yf/EasTpcVPxdS8CMqE1665WiKjjXpddI+lYt4WVFCI=
SIZE (dvd+rw-tools-7.0.tar.gz) = 131259

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Makefile_m4,v 1.1 2008/01/26 02:21:28 jakemsr Exp $
--- Makefile.m4.orig Thu Jan 17 22:21:13 2008
+++ Makefile.m4 Thu Jan 17 22:21:13 2008
@@ -12,7 +12,7 @@ WARN=#-Wall # developers are welcomed to build with `m
ifelse(substr(OS,0,7),[CYGWIN_],[define([OS],[MINGW32])])
ifelse(substr(OS,0,7),[MINGW32],[define([OS],[MINGW32])])
ifelse(OS,NetBSD,[define([OS],[BSD])CXXFLAGS+=-D__unix])
-ifelse(OS,OpenBSD,[define([OS],[BSD])])
+ifelse(OS,OpenBSD,[define([OS],[BSD])LDLIBS=-pthread])
ifelse(OS,FreeBSD,[define([OS],[BSD])LDLIBS=-lcam])
ifelse(OS,IRIX64,[define([OS],[IRIX])])

View File

@ -1,38 +1,21 @@
--- growisofs.c.orig Tue Aug 24 16:02:29 2004
+++ growisofs.c Wed Jan 26 19:16:28 2005
@@ -1334,7 +1334,7 @@ int builtin_dd (int infd,int outfd,off64
close (fd);
if (progress == MAP_FAILED)
fprintf (stderr,":-( unable to anonymously mmap %lu?\n",
- sizeof(*progress)),
+ (unsigned long)sizeof(*progress)),
perror (NULL), exit(FATAL_START(errno));
if (fstat64 (infd,&sb))
@@ -1684,7 +1684,7 @@ int main (int argc, char *argv[])
mkisofs_argv = malloc ((argc+3)*sizeof(char *));
if (mkisofs_argv == NULL)
fprintf (stderr,":-( unable to allocate %lu bytes: ",
- (argc+3)*sizeof(char *)),
+ (unsigned long) ((argc+3)*sizeof(char *))),
perror (NULL), exit (FATAL_START(errno));
env = getenv ("MKISOFS");
@@ -1837,7 +1837,7 @@ int main (int argc, char *argv[])
printf (" front-ending to %s: ",mkisofs_argv[0]);
fflush (stdout);
setuid(getuid());
- execlp (mkisofs_argv[0],mkisofs_argv[0],"-version",NULL);
+ execlp (mkisofs_argv[0],mkisofs_argv[0],"-version",(char *)0);
fprintf (stderr,"\n- %s: unable to execute %s: ",
argv[0],mkisofs_argv[0]),
perror (NULL), exit (FATAL_START(errno));
@@ -2061,7 +2061,7 @@ int main (int argc, char *argv[])
$OpenBSD: patch-growisofs_c,v 1.3 2008/01/26 02:21:28 jakemsr Exp $
--- growisofs.c.orig Thu Jan 17 22:18:18 2008
+++ growisofs.c Thu Jan 17 22:18:18 2008
@@ -2296,7 +2296,7 @@ int builtin_dd (int infd,int outfd,off64_t outoff)
fcntl (in_fd,F_SETFD,rval&~FD_CLOEXEC);
sprintf (str,"%d",in_fd);
- execlp (argv[0],"-umount",str,in_device,NULL);
+ execlp (argv[0],"-umount",str,in_device,(char *)0);
- execlp (argv0,"-umount",str,in_device,NULL);
+ execlp (argv0,"-umount",str,in_device,(char *)NULL);
exit (FATAL_START(errno));
}
while (1)
@@ -2908,7 +2908,7 @@ int main (int argc, char *argv[])
fflush (stdout);
#if defined(__unix) || defined(__unix__)
setuid(getuid());
- execlp (mkisofs_argv[0],mkisofs_argv[0],"-version",NULL);
+ execlp (mkisofs_argv[0],mkisofs_argv[0],"-version",(char *)NULL);
#elif defined(_WIN32)
if (_spawnl (_P_WAIT,mkisofs_argv[0],
"mkisofs.exe","-version",NULL) != -1)