From 197ea72eda4752c470624d3e80e86555c2140cbb Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme@pkgsrc.org>
Date: Tue, 31 Jan 2006 19:01:28 +0000
Subject: Looks like growisofs core dumped because it couldn't run the
 pthread_attr_setscope() function (which is not implemented on NetBSD).

Also now it uses sem_* functions for semaphores, so link it to librt on
NetBSD.

This closes PR pkg/32675 by hira@.

Bump PKGREVISION.
---
 sysutils/dvd+rw-tools/Makefile         |  6 +++++-
 sysutils/dvd+rw-tools/distinfo         |  5 +++--
 sysutils/dvd+rw-tools/patches/patch-ab |  6 +++---
 sysutils/dvd+rw-tools/patches/patch-ad | 14 ++++++++++++++
 4 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 sysutils/dvd+rw-tools/patches/patch-ad

(limited to 'sysutils/dvd+rw-tools')

diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile
index f28d0aaed31..258412fe262 100644
--- a/sysutils/dvd+rw-tools/Makefile
+++ b/sysutils/dvd+rw-tools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2006/01/16 23:03:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.18 2006/01/31 19:01:28 xtraeme Exp $
 #
 
 DISTNAME=	dvd+rw-tools-6.0
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://fy.chalmers.se/~appro/linux/DVD+RW/tools/
 
@@ -19,6 +20,8 @@ INSTALLATION_DIRS=	bin man/man1
 ONLY_FOR_PLATFORM=Linux-*-* OpenBSD-*-* NetBSD-*-* FreeBSD-*-* \
 	DragonFly-*-* SunOS-*-* HP-UX-*-* IRIX-*-*
 
+LIBS.NetBSD+=		-lrt # sem_* functions
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/growisofs ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/growisofs.1 ${PREFIX}/man/man1
@@ -28,4 +31,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dvd+rw-tools
 	${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/doc/dvd+rw-tools
 
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dvd+rw-tools/distinfo b/sysutils/dvd+rw-tools/distinfo
index 45431c28e7f..920e6cc745b 100644
--- a/sysutils/dvd+rw-tools/distinfo
+++ b/sysutils/dvd+rw-tools/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.11 2006/01/16 23:03:20 xtraeme Exp $
+$NetBSD: distinfo,v 1.12 2006/01/31 19:01:28 xtraeme Exp $
 
 SHA1 (dvd+rw-tools-6.0.tar.gz) = 964bae317a047cb8a7f311333b3cec5266f417e6
 RMD160 (dvd+rw-tools-6.0.tar.gz) = f4762e342b910867655f20858be8945ae7054f0b
 Size (dvd+rw-tools-6.0.tar.gz) = 118804 bytes
 SHA1 (patch-aa) = 36de21da2761352c6cf60498a4165ee7040bac2e
-SHA1 (patch-ab) = be12126876c90a9b72a2c0720b07b3c20f10fb35
+SHA1 (patch-ab) = ec61b538213ca8b441593d5edcee1da8aa0e79ff
 SHA1 (patch-ac) = 58dd1273d655fbe97e3cc878e921c47b8e412cad
+SHA1 (patch-ad) = 2f585dbdb9dd657d34e92e77f3347c00c742a32e
diff --git a/sysutils/dvd+rw-tools/patches/patch-ab b/sysutils/dvd+rw-tools/patches/patch-ab
index d944254405a..c00fd72ca2a 100644
--- a/sysutils/dvd+rw-tools/patches/patch-ab
+++ b/sysutils/dvd+rw-tools/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2006/01/16 23:03:20 xtraeme Exp $
+$NetBSD: patch-ab,v 1.3 2006/01/31 19:01:28 xtraeme Exp $
 
---- Makefile.m4.orig	2006-01-16 23:49:16.000000000 +0100
-+++ Makefile.m4	2006-01-16 23:49:53.000000000 +0100
+--- Makefile.m4.orig	2006-01-16 11:23:53.000000000 +0100
++++ Makefile.m4	2006-01-31 19:12:25.000000000 +0100
 @@ -14,6 +14,7 @@
  ifelse(OS,NetBSD,[define([OS],[BSD])CXXFLAGS+=-D__unix])
  ifelse(OS,OpenBSD,[define([OS],[BSD])])
diff --git a/sysutils/dvd+rw-tools/patches/patch-ad b/sysutils/dvd+rw-tools/patches/patch-ad
new file mode 100644
index 00000000000..d5bcc7ad8a8
--- /dev/null
+++ b/sysutils/dvd+rw-tools/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2006/01/31 19:01:28 xtraeme Exp $
+
+--- mp.h.orig	2006-01-31 19:44:51.000000000 +0100
++++ mp.h	2006-01-31 19:47:56.000000000 +0100
+@@ -39,7 +39,9 @@
+   pthread_attr_t attr;
+ 
+     if (pthread_attr_init(&attr)==0 &&
++#ifndef __NetBSD__
+ 	pthread_attr_setscope(&attr,PTHREAD_SCOPE_SYSTEM)==0 &&
++#endif
+ 	pthread_create(&h,&attr,(void *(*)(void *))func,arg)==0 )
+ 	return (void *)h;
+ 
-- 
cgit v1.2.3