 @@ -1,144 +1,115 @@
-$NetBSD: patch-cf,v 1.9 2009/05/17 21:29:34 dholland Exp $
+$NetBSD: patch-cf,v 1.10 2009/05/19 00:36:06 dholland Exp $
 --- interface/scan_devices.c.orig	2001-03-26 00:44:01.000000000 -0500
-+++ interface/scan_devices.c	2009-05-17 16:47:49.000000000 -0400
++++ interface/scan_devices.c	2009-05-18 20:11:24.000000000 -0400
 @@ -1,6 +1,8 @@
  /******************************************************************
   * CopyPolicy: GNU Public License 2 applies
   * Copyright (C) 1998 Monty xiphmont@mit.edu
 + * FreeBSD porting (c) 2003
 + *	Simon 'corecode' Schubert <corecode@corecode.ath.cx>
+  *
   * Autoscan for or verify presence of a cdrom device
+  *
-@@ -14,11 +16,18 @@
+@@ -19,6 +21,8 @@
  #include <pwd.h>
  #include <sys/stat.h>
  #include <sys/types.h>
 +#ifdef HAVE_GETRAWPARTITION
 +#include <util.h>
 +#endif
  #include "cdda_interface.h"
  #include "low_interface.h"
  #include "common_interface.h"
  #include "utils.h"
 +#ifdef __linux__
++
  #define MAX_DEV_LEN 20 /* Safe because strings only come from below */
  /* must be absolute paths! */
  static char *scsi_cdrom_prefixes[]={
-@@ -49,15 +58,43 @@ static char *cdrom_devices[]={
+@@ -49,11 +53,30 @@ static char *cdrom_devices[]={
    "/dev/cm206cd",
    "/dev/gscd",
    "/dev/optcd",NULL};
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +static char *cdrom_devices[] = {
 +	"/dev/cd?c",
 +	"/dev/acd?c",
 +	"/dev/wcd?c",
 +	"/dev/mcd?c", NULL};
 +#elif defined(__NetBSD__)
 +static char *cdrom_devices[] = {
 +	"/dev/rcd?c",
-+	"/dev/cd?c", NULL};
++	"/dev/rcd?d",
 +	"/dev/cd?c",
 +	"/dev/cd?d", NULL};
 +#endif
  /* Functions here look for a cdrom drive; full init of a drive type
     happens in interface.c */
 +#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__))
  cdrom_drive *cdda_find_a_cdrom(int messagedest,char **messages){
 +#if defined(__APPLE__) && defined(__MACH__)
 +  cdrom_drive *d = calloc(1, sizeof(cdrom_drive));
 +  d->interface = OSX_IOKIT;
 +  return d;
 +#else
    /* Brute force... */
    int i=0;
-   cdrom_drive *d;
+@@ -75,10 +98,12 @@ cdrom_drive *cdda_find_a_cdrom(int messa
 +#ifdef __NetBSD__
 +  int rawpartition;
 +#endif
 +#ifdef __NetBSD__
 +#ifdef HAVE_GETRAWPARTITION
 +    rawpartition = getrawpartition();
 +#else
 +    rawpartition = 'c' - 'a';
 +#endif
 +#endif
    while(cdrom_devices[i]!=NULL){
@@ -72,13 +109,18 @@ cdrom_drive *cdda_find_a_cdrom(int messa
  	/* number, then letter */
  	buffer[pos-(cdrom_devices[i])]=j+48;
 +#ifdef __NetBSD__
 +	buffer[(pos+1)-(cdrom_devices[i])]='a'+rawpartition;
 +#endif
  	if((d=cdda_identify(buffer,messagedest,messages)))
  	  return(d);
  	idmessage(messagedest,messages,"",NULL);
 +#ifdef __linux__
  	buffer[pos-(cdrom_devices[i])]=j+97;
  	if((d=cdda_identify(buffer,messagedest,messages)))
  	  return(d);
  	idmessage(messagedest,messages,"",NULL);
 +#endif
+       }
      }else{
        /* Name.  Go for it. */
-@@ -97,8 +139,11 @@ cdrom_drive *cdda_find_a_cdrom(int messa
+@@ -97,8 +122,11 @@ cdrom_drive *cdda_find_a_cdrom(int messa
  	      temp->pw_name);
+   }
    return(NULL);
 +#endif
+ }
 +#endif	/* __linux__ */
 +#if !(defined(__APPLE__) && defined(__MACH__))
  cdrom_drive *cdda_identify(const char *device, int messagedest,char **messages){
    struct stat st;
    cdrom_drive *d=NULL;
-@@ -117,8 +162,14 @@ cdrom_drive *cdda_identify(const char *d
+@@ -117,8 +145,14 @@ cdrom_drive *cdda_identify(const char *d
+   }
  #endif
 +#if defined(__linux__) || defined(__NetBSD__)
    d=cdda_identify_cooked(device,messagedest,messages);
    if(!d)d=cdda_identify_scsi(device,NULL,messagedest,messages);
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +  d = cdda_identify_scsi(device, NULL, messagedest, messages);
 +  if (d == NULL)
 +	d = cdda_identify_cooked(device, messagedest, messages);
 +#endif
  #ifdef CDDA_TEST
    if(!d)d=cdda_identify_test(device,messagedest,messages);
-@@ -146,6 +197,7 @@ char *test_resolve_symlink(const char *f
+@@ -146,6 +180,7 @@ char *test_resolve_symlink(const char *f
  cdrom_drive *cdda_identify_cooked(const char *dev, int messagedest,
  				  char **messages){
 +#ifdef __linux__
    cdrom_drive *d=NULL;
    struct stat st;
    int fd=-1;
-@@ -273,8 +325,60 @@ cdrom_drive *cdda_identify_cooked(const
+@@ -273,8 +308,60 @@ cdrom_drive *cdda_identify_cooked(const
    idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
    return(d);
 +#elif defined(__NetBSD__)
 +  /* no kernel support for CD-DA */
 +  return NULL;
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +	cdrom_drive *d;
 +	struct stat st;
++
 +	if (stat(dev, &st)) {
 +		idperror(messagedest, messages, "\t\tCould not stat %s", dev);
 +		return NULL;
 @@ -179,202 +150,202 @@ $NetBSD: patch-cf,v 1.9 2009/05/17 21:29
 +	if (d != NULL) {
 +		if (d->ioctl_fd != -1)
 +			close(d->ioctl_fd);
 +		free(d);
 +	}
 +	return NULL;
 +#endif
+ }
 +#if !defined(__FreeBSD__) || defined(__DragonFly__)
  struct  sg_id {
    long    l1; /* target | lun << 8 | channel << 16 | low_ino << 24 */
    long    l2; /* Unique id */
-@@ -289,12 +393,18 @@ typedef struct scsiid{
+@@ -289,12 +376,18 @@ typedef struct scsiid{
  /* Even *this* isn't as simple as it bloody well should be :-P */
  /* SG has an easy interface, but SCSI overall does not */
  static int get_scsi_id(int fd, scsiid *id){
 +#ifdef __linux__
    struct sg_id argid;
 +#endif
 +#ifdef __NetBSD__
 +  struct scsi_addr argid;
 +#endif
    int busarg;
    /* get the host/id/lun */
    if(fd==-1)return(-1);
 +#ifdef __linux__
    if(ioctl(fd,SCSI_IOCTL_GET_IDLUN,&argid))return(-1);
    id->bus=argid.l2; /* for now */
    id->id=argid.l1&0xff;
-@@ -302,6 +412,13 @@ static int get_scsi_id(int fd, scsiid *i
+@@ -302,6 +395,13 @@ static int get_scsi_id(int fd, scsiid *i
    if(ioctl(fd,SCSI_IOCTL_GET_BUS_NUMBER,&busarg)==0)
      id->bus=busarg;
 +#endif
 +#ifdef __NetBSD__
 +  if(ioctl(fd,SCIOCIDENTIFY,&argid))return(-1);
 +  id->bus=argid.addr.scsi.scbus;
 +  id->id=argid.addr.scsi.target;
 +  id->lun=argid.addr.scsi.lun;
 +#endif
    return(0);
+ }
-@@ -390,6 +507,7 @@ matchfail:
+@@ -390,6 +490,7 @@ matchfail:
    if(dev!=-1)close(dev);
    return(NULL);
+ }
 +#endif
  void strscat(char *a,char *b,int n){
    int i;
-@@ -401,6 +519,7 @@ void strscat(char *a,char *b,int n){
+@@ -401,6 +502,7 @@ void strscat(char *a,char *b,int n){
    strcat(a," ");
+ }
 +#ifdef __linux__
  /* At this point, we're going to punt compatability before SG2, and
     allow only SG2 and SG3 */
  static int verify_SG_version(cdrom_drive *d,int messagedest,
-@@ -430,7 +549,9 @@ static int verify_SG_version(cdrom_drive
+@@ -430,7 +532,9 @@ static int verify_SG_version(cdrom_drive
    idmessage(messagedest,messages,buffer,"");
    return(major);
+ }
 +#endif
 +#if defined(__linux__) || defined(__NetBSD__)
  cdrom_drive *cdda_identify_scsi(const char *generic_device,
  				const char *ioctl_device, int messagedest,
  				char **messages){
-@@ -460,6 +581,7 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -460,6 +564,7 @@ cdrom_drive *cdda_identify_scsi(const ch
  	       generic_device);
        return(NULL);
+     }
 +#ifdef __linux__
      if((int)(g_st.st_rdev>>8)!=SCSI_GENERIC_MAJOR){
        if((int)(g_st.st_rdev>>8)!=SCSI_CDROM_MAJOR){
  	idmessage(messagedest,messages,"\t\t%s is not a SCSI device",
-@@ -471,6 +593,7 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -471,6 +576,7 @@ cdrom_drive *cdda_identify_scsi(const ch
  	ioctl_device=temp;
+       }
+     }
 +#endif
+   }
    if(ioctl_device){
      if(stat(ioctl_device,&i_st)){
-@@ -478,6 +601,7 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -478,6 +584,7 @@ cdrom_drive *cdda_identify_scsi(const ch
  	       ioctl_device);
        return(NULL);
+     }
 +#ifdef __linux__
      if((int)(i_st.st_rdev>>8)!=SCSI_CDROM_MAJOR){
        if((int)(i_st.st_rdev>>8)!=SCSI_GENERIC_MAJOR){
  	idmessage(messagedest,messages,"\t\t%s is not a SCSI device",
-@@ -489,6 +613,7 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -489,6 +596,7 @@ cdrom_drive *cdda_identify_scsi(const ch
  	ioctl_device=temp;
+       }
+     }
 +#endif
+   }
    /* we need to resolve any symlinks for the lookup code to work */
-@@ -505,6 +630,7 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -505,6 +613,7 @@ cdrom_drive *cdda_identify_scsi(const ch
+   }
    if(!generic_device || !ioctl_device){
 +#ifdef __linux__
      if(generic_device){
        ioctl_device=
  	scsi_match(generic_device,scsi_cdrom_prefixes,
-@@ -520,6 +646,12 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -520,6 +629,12 @@ cdrom_drive *cdda_identify_scsi(const ch
        if(!generic_device)
  	goto cdda_identify_scsi_fail;
+     }
 +#else
 +    if(!generic_device)
 +      generic_device = strdup(ioctl_device);
 +    else
 +      ioctl_device = strdup(generic_device);
 +#endif
+   }
    idmessage(messagedest,messages,"\t\tgeneric device: %s",generic_device);
-@@ -556,6 +688,7 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -556,6 +671,7 @@ cdrom_drive *cdda_identify_scsi(const ch
      type=(int)(i_st.st_rdev>>8);
 +#ifdef __linux__
      if(type==SCSI_CDROM_MAJOR){
        if (!S_ISBLK(i_st.st_mode)) {
  	idmessage(messagedest,messages,"\t\tSCSI CDROM device %s not a "
-@@ -567,8 +700,10 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -567,8 +683,10 @@ cdrom_drive *cdda_identify_scsi(const ch
  		"major number",ioctl_device);
        goto cdda_identify_scsi_fail;
+     }
 +#endif
+   }
 +#ifdef __linux__
    if((int)(g_st.st_rdev>>8)==SCSI_GENERIC_MAJOR){
      if (!S_ISCHR(g_st.st_mode)) {
        idmessage(messagedest,messages,"\t\tGeneric SCSI device %s not a "
-@@ -580,6 +715,7 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -580,6 +698,7 @@ cdrom_drive *cdda_identify_scsi(const ch
  	      "major number",generic_device);
      goto cdda_identify_scsi_fail;
+   }
 +#endif
    d=calloc(1,sizeof(cdrom_drive));
-@@ -590,6 +726,7 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -590,6 +709,7 @@ cdrom_drive *cdda_identify_scsi(const ch
    d->bigendianp=-1; /* We don't know yet... */
    d->nsectors=-1;
 +#ifdef __linux__
    version=verify_SG_version(d,messagedest,messages);
    switch(version){
    case -1:case 0:case 1:
-@@ -599,6 +736,9 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -599,6 +719,9 @@ cdrom_drive *cdda_identify_scsi(const ch
      d->interface=GENERIC_SCSI;
      break;
+   }
 +#else
 +  d->interface=GENERIC_SCSI;
 +#endif
    /* malloc our big buffer for scsi commands */
    d->sg=malloc(MAX_BIG_BUFF_SIZE);
-@@ -617,7 +757,16 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -617,7 +740,16 @@ cdrom_drive *cdda_identify_scsi(const ch
    /* It would seem some TOSHIBA CDROMs gets things wrong */
 -  if (!strncmp (p + 8, "TOSHIBA", 7) &&
 +#ifndef TYPE_DISK
 +#define TYPE_DISK	0	/* direct */
 +#endif
 +#ifndef TYPE_WORM
 +#define TYPE_WORM	4	/* write once, read many */
 +#endif
 +#ifndef TYPE_ROM
 +#define TYPE_ROM	5	/* CD-ROM */
 +#endif
 +  if (p && !strncmp (p + 8, "TOSHIBA", 7) &&
        !strncmp (p + 16, "CD-ROM", 6) &&
        p[0] == TYPE_DISK) {
      p[0] = TYPE_ROM;
-@@ -653,6 +802,88 @@ cdda_identify_scsi_fail:
+@@ -653,6 +785,88 @@ cdda_identify_scsi_fail:
    if(g_fd!=-1)close(g_fd);
    return(NULL);
+ }
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +cdrom_drive *cdda_identify_scsi(const char *device,
 +    const char *dummy,
 +    int messagedest,
 +    char **messages)
 +{
 +	char *devname;
 +	cdrom_drive *d = NULL;
++
 +	if (device == NULL) {
 @@ -443,18 +414,18 @@ $NetBSD: patch-cf,v 1.9 2009/05/17 21:29
 +	if (d) {
 +		if (d->ccb)
 +			cam_freeccb(d->ccb);
 +		if (d->dev)
 +			cam_close_device(d->dev);
 +		free(d);
 +	}
 +	return NULL;
 +}
 +#endif
  #ifdef CDDA_TEST
-@@ -702,3 +933,4 @@ cdrom_drive *cdda_identify_test(const ch
+@@ -702,3 +916,4 @@ cdrom_drive *cdda_identify_test(const ch
+ }
  #endif
 +#endif  /* __APPLE__ && __MACH__ */

 @@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.26 2009/05/17 21:29:33 dholland Exp $
+# $NetBSD: Makefile,v 1.27 2009/05/19 00:36:06 dholland Exp $
+#
 DISTNAME=	cdparanoia-III-alpha9.8
 PKGNAME=	cdparanoia-3.0.9.8
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	http://www.xiph.org/paranoia/download/
 EXTRACT_SUFX=	.src.tgz
 MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.xiph.org/paranoia/
 COMMENT=	CDDA reading utility with extra data verification features
 ONLY_FOR_PLATFORM=	FreeBSD-*-* NetBSD-*-* Linux-*-* DragonFly-*-* Darwin-*-*
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir

 @@ -1,25 +1,25 @@
-$NetBSD: distinfo,v 1.21 2009/05/17 21:29:33 dholland Exp $
+$NetBSD: distinfo,v 1.22 2009/05/19 00:36:06 dholland Exp $
 SHA1 (cdparanoia-III-alpha9.8.src.tgz) = 04cc33a7d22d6255f6239e3e74195506b3bdde06
 RMD160 (cdparanoia-III-alpha9.8.src.tgz) = d9225165f83b5386c58db263d6918a7006df1481
 Size (cdparanoia-III-alpha9.8.src.tgz) = 116591 bytes
 SHA1 (patch-aa) = 29fd5767b37360fe804013bb171fc7e5f4d8311f
-SHA1 (patch-ab) = fcbeaf7f3e1318ef8bcc8742adec3a3a7efc937e
+SHA1 (patch-ab) = d02dd70c45ec97e859c024d11d7bc74c79d96f62
 SHA1 (patch-ac) = 6bd7ad7a0e8bcd1f8354c73706cafb0e789b8252
 SHA1 (patch-ad) = 9a1ea1b98b5f3810e1ccae57beb8c68b5e189716
 SHA1 (patch-ae) = 59d74c0392d5bcc37299326efa8ba700722d5cf4
 SHA1 (patch-ba) = 51151796493c946e5bdafbd22005136ea7f27a09
-SHA1 (patch-ca) = 433b7ddd7d1cf0123dadfdff8e550381eaf51f22
+SHA1 (patch-ca) = 9c35254c09a96b622cac44198443f66f7bc0e428
 SHA1 (patch-cb) = c19ee04017b836842bb0f2d2c77e8f35aad0f9bb
 SHA1 (patch-cc) = adea4fd9682c0543e5749c6f3fe73697d8663c6c
 SHA1 (patch-cd) = 81d31fb55db0f982959395cdecc3da826bf23bfb
 SHA1 (patch-ce) = 3a4e9a83753e2eb6595bcb4e7a47c42b72ef5702
-SHA1 (patch-cf) = ae8c19f7df5dbb97c258ea808834c3e13809b185
+SHA1 (patch-cf) = 6236318d39f9d3d1e5f93a91048ec2777291dc63
 SHA1 (patch-cg) = c962cbc84f021e399b6f210d0e7a140fd7004222
 SHA1 (patch-ch) = 8d16dd8c80e8f1ee35ccc299ba927d685adde01c
 SHA1 (patch-ci) = 60db1d1d2e8ec9c6d446543762218b22c597d986
 SHA1 (patch-cj) = e2420e2ccadd2d6ea30d6bf48af9c141dc395afc
 SHA1 (patch-ck) = 0232f8f42d98b49043f55cd6aaf1f50ab38fadfb
 SHA1 (patch-cl) = f511570233524feac434db160e51099316618058
 SHA1 (patch-cm) = 18001a6cf96dd6bfde8e1208be56a40fac9aa0d5
 SHA1 (patch-cn) = b79db0b24a042a5801b47e6db5e20cbf07a53475

 @@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.8 2009/05/17 21:29:34 dholland Exp $
+$NetBSD: patch-ab,v 1.9 2009/05/19 00:36:06 dholland Exp $
 --- Makefile.in.orig	2001-03-27 17:46:58.000000000 -0500
 +++ Makefile.in	2009-05-17 17:21:32.000000000 -0400
 @@ -3,12 +3,12 @@
  # DO NOT EDIT BELOW! ##########################################################
  # (unless, of course, you know what you are doing :) ##########################
 -VERSION=9.8
 +VERSION=98
  VPATH=@srcdir@
  srcdir=@srcdir@
  @SET_MAKE@
 @@ -22,31 +22,31 @@ $NetBSD: patch-ab,v 1.8 2009/05/17 21:29
  OFILES = main.o report.o header.o buffering_write.o
 -export STATIC
  export VERSION
 -ifeq ($(STATIC),TRUE)
 -	LIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a \
 -		-static -lm
 -	LIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
 -else
 -	LIBS = -lcdda_interface -lcdda_paranoia -lm
 -	LIBDEP = interface/libcdda_interface.so paranoia/libcdda_paranoia.so
 -endif
-+STLIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a @LIBUTIL@ -lm
++STLIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a -lm
 +STLIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
 +SHLIBDEP = interface/libcdda_interface.la paranoia/libcdda_paranoia.la
-+SHLIBS = $(SHLIBDEP) @LIBUTIL@ @EXTRA_LIBS@ -lm
++SHLIBS = $(SHLIBDEP) @EXTRA_LIBS@ -lm
 -all:
++
 +all:
  	cd interface && $(MAKE) all
  	cd paranoia && $(MAKE) all
 -	$(MAKE) cdparanoia CFLAGS="$(OPT)"
 -	strip cdparanoia
 +	$(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(SHLIBS)" LIBDEP="$(SHLIBDEP)"
++
 +static:
 +	cd interface && $(MAKE) lib
 +	cd paranoia && $(MAKE) lib

 @@ -1,26 +1,17 @@
-$NetBSD: patch-ca,v 1.6 2009/05/17 21:29:34 dholland Exp $
+$NetBSD: patch-ca,v 1.7 2009/05/19 00:36:06 dholland Exp $
---- interface/Makefile.in.orig	1999-12-13 23:27:59.000000000 -0500
+--- interface/Makefile.in.orig	1999-12-13 20:27:59.000000000 -0800
-+++ interface/Makefile.in	2009-05-17 17:16:52.000000000 -0400
++++ interface/Makefile.in
@@ -7,7 +7,7 @@ VPATH=@srcdir@
  srcdir=@srcdir@
  @SET_MAKE@
 -FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@
 +FLAGS=@SBPCD_H@ @UCDROM_H@ @RAWPART@ @TYPESIZES@ @CFLAGS@
  OPT=@OPT@ $(FLAGS)
  DEBUG=@DEBUG@ $(FLAGS) -DCDDA_TEST
  CC=@CC@
 @@ -18,12 +18,10 @@ RANLIB=@RANLIB@
  LIBS = -lm
  CPPFLAGS+=-D_REENTRANT
 -OFILES = scan_devices.o	common_interface.o cooked_interface.o interface.o\
 -	scsi_interface.o smallft.o toc.o test_interface.o
 +OFILES = scan_devices.o	common_interface.o interface.o\
 +	smallft.o toc.o test_interface.o @EXTRA_OBJS@
 -export VERSION
+-
 -all: lib slib
 +all: slib