Update to 2.23, from MAINTAINER

- better multiple device handling
- CDDB protocol v5 support
- fixes 64bit issues

audio/p5-CDDB_get/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2002/11/10 12:14:44 wilfried Exp $
+# $OpenBSD: Makefile,v 1.5 2003/09/23 05:09:06 jolan Exp $
 
 COMMENT=		"perl interface to query for cddb-information"
 
-DISTNAME=		CDDB_get-2.11
+DISTNAME=		CDDB_get-2.23
 PKGNAME=		p5-${DISTNAME}
 CATEGORIES=		audio perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=../by-authors/id/F/FO/FONKIE/}
@@ -19,4 +19,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 CONFIGURE_STYLE=	perl
 
+post-patch:
+	@cp ${WRKSRC}/cddb.pl ${WRKSRC}/cddb
+
 .include <bsd.port.mk>

audio/p5-CDDB_get/distinfo

@@ -1,3 +1,3 @@
-MD5 (CDDB_get-2.11.tar.gz) = a1d236877be28a4200411de3afa41814
+MD5 (CDDB_get-2.23.tar.gz) = 6230c08a91ac819fceada544730623be
-RMD160 (CDDB_get-2.11.tar.gz) = bfe5b2fb67b0cee0efa85d17c6a4ec5f89a3dff6
+RMD160 (CDDB_get-2.23.tar.gz) = 0cd7fe681b3f0de44b53a08d022a30a569461dc1
-SHA1 (CDDB_get-2.11.tar.gz) = 71bd9698bcd49a491715c4b8473b4e49d01f83a5
+SHA1 (CDDB_get-2.23.tar.gz) = efc1ce7b602d6ffdf0da11b8eb02fbb7d43d33b9

audio/p5-CDDB_get/patches/patch-CDDB_get_pm

@@ -1,13 +0,0 @@
-$OpenBSD: patch-CDDB_get_pm,v 1.2 2002/11/10 12:14:44 wilfried Exp $
-
---- CDDB_get.pm.orig	Sat Nov  9 08:57:53 2002
-+++ CDDB_get.pm	Sat Nov  9 08:59:05 2002
-@@ -66,7 +66,7 @@ my $CDROM_MSF=0x02;
- my $CDDB_HOST = "freedb.freedb.org";
- my $CDDB_PORT = 888;
- my $CDDB_MODE = "cddb";
--my $CD_DEVICE = "/dev/cdrom";
-+my $CD_DEVICE = "/dev/cd0c";
- 
- my $HELLO_ID  = "root nowhere.com fastrip 0.77";
- 

audio/p5-CDDB_get/patches/patch-MANIFEST

@@ -0,0 +1,12 @@
+$OpenBSD: patch-MANIFEST,v 1.1 2003/09/23 05:09:06 jolan Exp $
+--- MANIFEST.orig	2003-09-15 21:20:15.000000000 -0700
++++ MANIFEST	2003-09-15 21:20:23.000000000 -0700
+@@ -1,7 +1,7 @@
+ Artistic
+ Copying
+ CDDB_get.pm
+-cddb.pl
++cddb
+ Changes
+ MANIFEST
+ README

audio/p5-CDDB_get/patches/patch-Makefile_PL

@@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_PL,v 1.1 2003/09/23 05:09:06 jolan Exp $
+--- Makefile.PL.orig	2003-09-15 21:16:20.000000000 -0700
++++ Makefile.PL	2003-09-15 21:16:35.000000000 -0700
+@@ -4,7 +4,7 @@ use ExtUtils::MakeMaker;
+ WriteMakefile(
+   'NAME'	   => 'CDDB_get',
+   'VERSION_FROM' => 'CDDB_get.pm', # finds $VERSION
+-  'EXE_FILES'    => ['cddb.pl'],
++  'EXE_FILES'    => ['cddb'],
+   'ABSTRACT'	   => "This module/script gets the CDDB info for an audio cd.",
+   'AUTHOR'       => "Armin Obersteiner <armin at xos dot net>",
+ #  'PREREQ_PM'    => {

audio/p5-CDDB_get/patches/patch-cddb_pl

@@ -1,17 +1,16 @@
-$OpenBSD: patch-cddb_pl,v 1.2 2002/11/10 12:14:44 wilfried Exp $
+$OpenBSD: patch-cddb_pl,v 1.3 2003/09/23 05:09:06 jolan Exp $
-
+--- cddb.pl.orig	2003-08-23 12:00:32.000000000 -0700
---- cddb.pl.orig	Thu Oct 10 02:55:24 2002
++++ cddb.pl	2003-08-23 12:02:49.000000000 -0700
-+++ cddb.pl	Sat Nov  9 09:37:21 2002
+@@ -27,7 +27,7 @@ use Getopt::Std;
-@@ -26,7 +26,7 @@ use strict;
+ use strict;
  
- use Getopt::Std;
  my %option = ();
--getopts("oghdtsiSfDlO", \%option);
+-getopts("oghdtsiSfDlOFc:", \%option); 
-+getopts("oghdtsSfDlO", \%option);
++getopts("oghdtsSfDlOFc:", \%option); 
  
  if($option{h}) {
    print "$0: gets CDDB info of a CD\n";
-@@ -34,8 +34,7 @@ if($option{h}) {
+@@ -36,8 +36,7 @@ if($option{h}) {
    print "  -o  offline mode - just stores CD info\n";
    print "  -d  output in xmcd format\n";
    print "  -s  save in xmcd format\n";
@@ -21,16 +20,7 @@ $OpenBSD: patch-cddb_pl,v 1.2 2002/11/10 12:14:44 wilfried Exp $
    print "  -t  output toc\n";
    print "  -l  output lame command\n";
    print "  -f  http mode (e.g. through firewalls)\n";
-@@ -58,7 +57,7 @@ my $xmcddir="/tmp/xmcd";
+@@ -87,19 +86,6 @@ $config{input}=1;   # 1: ask user if mor
- # $config{CDDB_HOST}="freedb.freedb.org";	# set cddb host
- # $config{CDDB_PORT}=888; 			# set cddb port
- # $config{CDDB_MODE}="cddb";			# set cddb mode: cddb or http, this is switched with -f
--# $config{CD_DEVICE}="/dev/cdrom";		# set cd device
-+# $config{CD_DEVICE}="/dev/cd0c";		# set cd device
- 
- # $config{HELLO_ID} ="root nowhere.com fastrip 0.77"; # hello string: username hostname clientname version
- 
-@@ -77,19 +76,6 @@ $config{input}=1;   # 1: ask user if mor
  $config{multi}=0;   # 1: do not ask user and get all of them
                      # 0: just the first one
  
@@ -50,7 +40,7 @@ $OpenBSD: patch-cddb_pl,v 1.2 2002/11/10 12:14:44 wilfried Exp $
  if($option{o}) {
    my $ids=get_discids($config{CD_DEVICE});
  
-@@ -150,8 +136,6 @@ if($option{g}) {
+@@ -160,8 +146,6 @@ if($option{g}) {
  
      if($option{d} || $option{s}) {
        print_xmcd(\%cd,$option{s});
@@ -59,7 +49,7 @@ $OpenBSD: patch-cddb_pl,v 1.2 2002/11/10 12:14:44 wilfried Exp $
      } elsif($option{l}) {
        print_lame(\%cd);
      } else {
-@@ -186,8 +170,6 @@ unless($config{multi}) {
+@@ -196,8 +180,6 @@ unless($config{multi}) {
  
    if($option{d} || $option{s}) {
      print_xmcd(\%cd,$option{s});
@@ -68,7 +58,7 @@ $OpenBSD: patch-cddb_pl,v 1.2 2002/11/10 12:14:44 wilfried Exp $
    } elsif($option{l}) {
      print_lame(\%cd);
    } else {
-@@ -216,8 +198,6 @@ unless($config{multi}) {
+@@ -226,8 +208,6 @@ unless($config{multi}) {
  
      if($option{d} || $option{s}) {
        print_xmcd($c,$option{s});
@@ -77,11 +67,10 @@ $OpenBSD: patch-cddb_pl,v 1.2 2002/11/10 12:14:44 wilfried Exp $
      } elsif($option{l}) {
        print_lame($c);
        print "\n";
-@@ -291,67 +271,6 @@ sub print_xmcd {
+@@ -304,67 +284,6 @@ sub print_xmcd {
-     close OUT;
    }
  }  
--
+ 
 -sub insert_db {
 -  my $cd=shift;
 -  my $db=shift;
@@ -142,6 +131,7 @@ $OpenBSD: patch-cddb_pl,v 1.2 2002/11/10 12:14:44 wilfried Exp $
 -
 -  $dbh->disconnect();
 -} 
- 
+-
  sub print_lame {
    my $cd=shift;
+ 

audio/p5-CDDB_get/pkg/DESCR

@@ -1,3 +1 @@
 Read the CDDB entry for an audio CD in your drive.
-
-WWW: ${HOMEPAGE}

audio/p5-CDDB_get/pkg/PLIST

@@ -1,4 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/11/10 12:14:44 wilfried Exp $
+@comment $OpenBSD: PLIST,v 1.4 2003/09/23 05:09:06 jolan Exp $
-bin/cddb.pl
+bin/cddb
 ${P5SITE}/CDDB_get.pm
+${P5SITE}/auto/CDDB_get/autosplit.ix
+${P5ARCH}/auto/CDDB_get/.packlist
 man/man3p/CDDB_get.3p
+@dirrm ${P5ARCH}/auto/CDDB_get
+@dirrm ${P5SITE}/auto/CDDB_get