Import of pkgsrc-2016Q3

sysutils/cdrdao/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2012/10/23 19:50:54 asau Exp $
+# $NetBSD: Makefile,v 1.36 2015/12/29 05:06:06 dholland Exp $
 
 .include "../../sysutils/cdrdao/Makefile.common"
 
@@ -14,18 +14,17 @@ CONFIGURE_ARGS+=	--without-xdao
 CONFIGURE_ARGS+=	--without-posix-threads
 .endif
 
+INSTALLATION_DIRS+=	share/doc/cdrdao/testtocs \
+			share/examples/cdrdao/psxcopy
+
 post-install:
-		${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/doc/cdrdao
 		${INSTALL_MAN} ${WRKSRC}/README \
 			${WRKSRC}/README.PlexDAE \
 			${DESTDIR}${PREFIX}/share/doc/cdrdao
-		${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/doc/cdrdao/testtocs
 		${INSTALL_MAN} ${WRKSRC}/testtocs/*.toc \
 			${DESTDIR}${PREFIX}/share/doc/cdrdao/testtocs
-		${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/examples/cdrdao
 		${INSTALL_MAN} ${WRKSRC}/contrib/mp32dao/mp32dao.pl \
 			${DESTDIR}${PREFIX}/share/examples/cdrdao
-		${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/examples/cdrdao/psxcopy
 		${INSTALL_MAN} ${WRKSRC}/contrib/psxcopy-0.2/Makefile \
 			${WRKSRC}/contrib/psxcopy-0.2/README \
 			${WRKSRC}/contrib/psxcopy-0.2/cdjob.c \

sysutils/cdrdao/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2014/10/09 14:06:57 wiz Exp $
+# $NetBSD: Makefile.common,v 1.15 2016/06/16 12:58:07 wiz Exp $
 #
 # used by sysutils/cdrdao/Makefile
 # used by sysutils/gcdmaster/Makefile
@@ -12,9 +12,8 @@ MAINTAINER=		david@maxwell.net
 HOMEPAGE=		http://cdrdao.sourceforge.net/
 COMMENT=		Records audio or data CD-Rs in disk-at-once (DAO) mode
 
-CDRDAODIR=		${.CURDIR}/../../sysutils/cdrdao
-PATCHDIR=		${CDRDAODIR}/patches
-DISTINFO_FILE=		${CDRDAODIR}/distinfo
+PATCHDIR=		${.CURDIR}/../../sysutils/cdrdao/patches
+DISTINFO_FILE=		${.CURDIR}/../../sysutils/cdrdao/distinfo
 
 CDRDAO_VER=		1.2.3
 GNU_CONFIGURE=		YES
@@ -27,10 +26,9 @@ CONFIGURE_ARGS+=	--with-gtkmm-exec-prefix=/dev/null
 LDFLAGS+=		-L../paranoia
 LDFLAGS.SunOS=		-lvolmgt -lnsl
 
+CONFIGURE_ARGS.SunOS+=	--with-scglib
+
 .include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=--with-scglib
-.endif
 
 .if !empty(CC:M*gcc*)
 MAKE_ENV+=	CCOM=gcc
@@ -43,7 +41,7 @@ post-extract:
 	${CP} ${WRKSRC}/scsilib/RULES/os-freebsd.id ${WRKSRC}/scsilib/RULES/os-dragonfly.id
 
 post-configure:
-	cd ${WRKSRC}/scsilib/RULES ; \
+	set -e; cd ${WRKSRC}/scsilib/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; \

sysutils/cdrdao/distinfo

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.26 2013/05/03 16:14:47 drochner Exp $
+$NetBSD: distinfo,v 1.28 2015/11/04 01:32:08 agc Exp $
 
 SHA1 (cdrdao-1.2.3.tar.bz2) = 70d6547795a1342631c7ab56709fd1940c2aff9f
 RMD160 (cdrdao-1.2.3.tar.bz2) = a162bdf2bc4d65581816d3a9e3c0d3ba66bb6523
+SHA512 (cdrdao-1.2.3.tar.bz2) = 36b14180acf476de062f5f31e2b9dece39e3cc7a84552e80a6714931fa35d6090ec90ddfcdbd2651d690be8ce3fc78d483aa13856c3c311bcc2f571f0040adf6
 Size (cdrdao-1.2.3.tar.bz2) = 1428695 bytes
 SHA1 (patch-aa) = 9606723ae593981c6b98083990c2b17c1ace5dc2
 SHA1 (patch-ac) = 4608827f9202ef5aed35ddda426dc7a9574bc18f
@@ -23,3 +24,7 @@ SHA1 (patch-au) = dd8d9d6b73ea662ef3e936580082f9b733c6596c
 SHA1 (patch-av) = 1053b438744ce9e64e0ab093679ed71fbce9a533
 SHA1 (patch-aw) = 152cc7d2f58b97ecbb766b9f3682884515a170a1
 SHA1 (patch-ba) = b6b7ccae9edf1e816aac76a7d94b7bf67fc1671a
+SHA1 (patch-dao_CdrDriver.cc) = b618b4521d010f4153f73a9fab33d5ed56dfb651
+SHA1 (patch-dao_CdrDriver.h) = 71113a5d536aa8eba74e141e612c91e958dadda3
+SHA1 (patch-xdao_CdDevice.cc) = fb83427cef2fc0b7afdb526664f61863cd6bc715
+SHA1 (patch-xdao_CdDevice.h) = 11b9868cc54d2b926e5e588eb467f0941deb1208

sysutils/cdrdao/patches/patch-dao_CdrDriver.cc

@@ -0,0 +1,13 @@
+$NetBSD: patch-dao_CdrDriver.cc,v 1.1 2015/11/03 19:08:45 joerg Exp $
+
+--- dao/CdrDriver.cc.orig	2015-11-03 11:23:52.000000000 +0000
++++ dao/CdrDriver.cc
+@@ -495,7 +495,7 @@ unsigned char CdrDriver::syncPattern[12]
+   0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0
+ };
+ 
+-char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 };
++unsigned char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 };
+ 
+ 
+ /* Maps a string to the corresponding driver option value 

sysutils/cdrdao/patches/patch-dao_CdrDriver.h

@@ -0,0 +1,13 @@
+$NetBSD: patch-dao_CdrDriver.h,v 1.1 2015/11/03 19:08:45 joerg Exp $
+
+--- dao/CdrDriver.h.orig	2015-11-03 11:24:08.000000000 +0000
++++ dao/CdrDriver.h
+@@ -440,7 +440,7 @@ protected:
+   bool fullBurn_;
+ 
+   static unsigned char syncPattern[12];
+-  static char REMOTE_MSG_SYNC_[4];
++  static unsigned char REMOTE_MSG_SYNC_[4];
+ 
+   static int speed2Mult(int);
+   static int mult2Speed(int);

sysutils/cdrdao/patches/patch-xdao_CdDevice.cc

@@ -0,0 +1,13 @@
+$NetBSD: patch-xdao_CdDevice.cc,v 1.1 2015/11/03 19:08:45 joerg Exp $
+
+--- xdao/CdDevice.cc.orig	2015-11-03 11:26:42.000000000 +0000
++++ xdao/CdDevice.cc
+@@ -255,7 +255,7 @@ int CdDevice::updateStatus()
+ 
+ bool CdDevice::updateProgress(Glib::IOCondition cond, int fd)
+ {
+-  static char msgSync[4] = { 0xff, 0x00, 0xff, 0x00 };
++  static unsigned char msgSync[4] = { 0xff, 0x00, 0xff, 0x00 };
+   fd_set fds;
+   int state = 0;
+   char buf[10];

sysutils/cdrdao/patches/patch-xdao_CdDevice.h

@@ -0,0 +1,12 @@
+$NetBSD: patch-xdao_CdDevice.h,v 1.1 2015/11/03 19:08:45 joerg Exp $
+
+--- xdao/CdDevice.h.orig	2015-11-03 11:23:29.000000000 +0000
++++ xdao/CdDevice.h
+@@ -20,7 +20,6 @@
+ #ifndef __CD_DEVICE_H__
+ #define __CD_DEVICE_H__
+ 
+-#include <sigc++/object.h>
+ #include <gdk/gdk.h>
+ #include <string>
+