Hello ports@, here is the newest version of pacpl. Update was pretty trivial.
Changelog: =================== >From 3.3.1 to 3.3.2 =================== Added: MP4::Info dependency IO::String to pacpl-install Updated: License GPLv3 Bug Fix: Directory conversions. pacpl was claiming the directory was empty and prompting to use the --recursive option. Thanks to John Meyer for the report. ================= >From 3.3.0 to 3.3.1 ================= Added: FR translations to the Amarok/Konqueror notices/messages. Added: A few missing French translations. Fixed: Typo in PT/tag_help.PT Bug Fix: When ripping a CD and using the --outdir option, output file names no longer include the output directory. =============== >From 3.2.5 to 3.3.0 =============== Added: Support for Audio Visual Research (AVR) audio format. Added: Support for CDR audio format. Added: PT translations to the Amarok/Konqueror notices/messages. Added: --device option to replace old --cdrom option (now works) Added: --outstring to the CD ripping options: This will allow you change the naming scheme of the output files %art = Artist %tit = Song Title %alb = Album %tno = Track Number Default is (%art - %tit) pacpl --cdtoflac --all --outstring="(%tno)-%tit" Added: Devel::Symdump, Pod::Coverage, Test::Pod::Coverage, & MP3::Info to pacpl-install. All of these modules are now required to compile/install the Audio::Musepack module. Updated: Amarok script is now automatically installed. Updated: Re-wrote tagging options. See pacpl --taghelp. Updated: --play option (added more formats, & re-wrote to be more efficient) Update: Index: Makefile =================================================================== RCS file: /cvs/ports/audio/pacpl/Makefile,v retrieving revision 1.2 diff -u -u -r1.2 Makefile --- Makefile 21 Dec 2006 22:15:11 -0000 1.2 +++ Makefile 11 Jul 2007 08:00:28 -0000 @@ -6,7 +6,7 @@ COMMENT-konqueror= "PAC Konqueror service menu & mime types" COMMENT-amarok= "PAC Amarok plugin" -V= 3.2.5 +V= 3.3.2 DISTNAME= pacpl-${V} PKGNAME-main= pacpl-${V} PKGNAME-konqueror= pacpl-konqueror-${V} @@ -72,8 +72,5 @@ ${INSTALL_DATA_DIR} ${PREFIX}/$d .endfor cd ${WRKSRC} && ./pacpl-install --install=${INSTALL_FLAGS} - ${INSTALL_MAN} ${WRKSRC}/man/pacpl.1 ${PREFIX}/man/man1 - tar -C ${PREFIX}/share/apps/amarok/scripts -xzf \ - ${WRKSRC}/kde/amarok/pacx.amarokscript.tar.gz .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/audio/pacpl/distinfo,v retrieving revision 1.2 diff -u -u -r1.2 distinfo --- distinfo 5 Apr 2007 15:37:44 -0000 1.2 +++ distinfo 11 Jul 2007 08:00:28 -0000 @@ -1,5 +1,5 @@ -MD5 (pacpl-3.2.5.tar.gz) = maAeNzh1Y5xEwrzE73SESQ== -RMD160 (pacpl-3.2.5.tar.gz) = 9IbCuutlJ6QNf2DNKmvJGhxNHXI= -SHA1 (pacpl-3.2.5.tar.gz) = I+Nd7nXwXf35q3tNKOmpAw+S9eA= -SHA256 (pacpl-3.2.5.tar.gz) = jisyWN3Ko3UTiQ+7+WPU92e0TCAg61e290ZpchSdPrc= -SIZE (pacpl-3.2.5.tar.gz) = 118612 +MD5 (pacpl-3.3.2.tar.gz) = Q9WiU2C3rY7Ff2Of7PZGMw== +RMD160 (pacpl-3.3.2.tar.gz) = SAHX3Nz2UmGeIuYLT2+33yx79qg= +SHA1 (pacpl-3.3.2.tar.gz) = JTjbRtdP9Kuo8298sre65Kp2zE8= +SHA256 (pacpl-3.3.2.tar.gz) = 4V+Bnx4LnmIP/LteGUDl+SK137XR3a7xyfTtq1+wveo= +SIZE (pacpl-3.3.2.tar.gz) = 126493 Index: patches/patch-pacpl =================================================================== RCS file: /cvs/ports/audio/pacpl/patches/patch-pacpl,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 patch-pacpl --- patches/patch-pacpl 12 Dec 2006 06:21:34 -0000 1.1.1.1 +++ patches/patch-pacpl 11 Jul 2007 08:00:28 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-pacpl,v 1.1.1.1 2006/12/12 06:21:34 steven Exp $ ---- pacpl.orig Sun Oct 29 17:04:27 2006 -+++ pacpl Sun Dec 10 22:13:32 2006 -@@ -29,7 +29,7 @@ use File::Copy; +--- pacpl.orig Fri Jul 6 18:48:23 2007 ++++ pacpl Wed Jul 11 09:16:21 2007 +@@ -30,7 +30,7 @@ use File::Copy; use File::Basename; use Ogg::Vorbis::Header; @@ -10,43 +10,30 @@ # Current Name & Version my $name = "Perl Audio Converter"; -@@ -224,7 +224,7 @@ my @conf_opts; - # Location of configuration file (Check Global, and then Current Directory) - my $conf_path = "/etc/pacpl"; - my $conf_global = "$conf_path/pacpl.conf"; --my $conf_pwd = "$ENV{'PWD'}/pacpl.conf"; -+my $conf_pwd = getcwd()."/pacpl.conf"; - - my $conf_file = $conf_global; - $conf_file = $conf_pwd if not -e $conf_global; -@@ -2147,8 +2147,9 @@ if (@file) { - } - +@@ -2361,7 +2361,8 @@ if (@file) { + if ($koutdir eq '1' and $gui and not $get_out_directory and not $out_dir) { -- -- $out_dir = `$kdialog --title \"$name - $version - $lang{$mylang}{file_destination}\" --getexistingdirectory $ENV{'PWD'}`; -+ -+ my $cmd = "$kdialog --title \"$name - $version - $lang{$mylang}{file_destination}\" --getexistingdirectory ".getcwd(); + +- $out_dir = `$kdialog --title \"$name - $version - $lang{$mylang}{file_destination}\" --getexistingdirectory $ENV{PWD}`; ++ my $cmd = "$kdialog --title \"$name - $version - $lang{$mylang}{file_destination}\" --getexistingdirectory ".getcwd(); + $out_dir = `$cmd`; chomp($out_dir); - - $get_out_directory = 1; -@@ -2241,7 +2242,7 @@ if ($recursive and not $conv_to and not - - } else { - -- my $pwd = $ENV{PWD}; -+ my $pwd = getcwd(); - foreach my $audio_dir (@dir) { + $get_out_directory = 1; +@@ -2488,7 +2489,8 @@ if ($recursive and not $conv_to and not $presdir) { -@@ -2273,7 +2274,8 @@ if ($recursive and not $conv_to and not - if ($gui and not $get_out_directory and $koutdir eq 1 and not $out_dir) { -- $out_dir = `$kdialog --title \"PAC $version - $lang{$mylang}{file_destination}\" --getexistingdirectory $ENV{'PWD'}`; +- $out_dir = `$kdialog --title \"PAC $version - $lang{$mylang}{file_destination}\" --getexistingdirectory $ENV{PWD}`; + my $cmd = "$kdialog --title \"PAC $version - $lang{$mylang}{file_destination}\" --getexistingdirectory ".getcwd(); + $out_dir = `$cmd`; chomp($out_dir); $get_out_directory = 1; +@@ -10896,4 +10898,4 @@ Copyright (C) 2005-2007 Philip Lyons ([EMAIL PROTECTED] + + =back + +-=cut +\ No newline at end of file ++=cut Index: patches/patch-pacpl-install =================================================================== RCS file: /cvs/ports/audio/pacpl/patches/patch-pacpl-install,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 patch-pacpl-install --- patches/patch-pacpl-install 12 Dec 2006 06:21:34 -0000 1.1.1.1 +++ patches/patch-pacpl-install 11 Jul 2007 08:00:28 -0000 @@ -1,26 +1,23 @@ ---- pacpl-install.orig Sun Sep 17 17:47:14 2006 -+++ pacpl-install Mon Dec 11 16:13:40 2006 -@@ -38,15 +38,12 @@ my $uninstall_msg = "$name - $version: +--- pacpl-install.orig Fri Jul 6 18:49:47 2007 ++++ pacpl-install Wed Jul 11 09:25:29 2007 +@@ -34,12 +34,12 @@ my $uninstall_msg = "$name - $version: Uninstalling"; my ($install, $uninstall, $checkinstall, $help); - my ($all, $base, $kde, $tags, $lang); + my ($all, $base, $kde, $tags, $lang, $nowarn); -my $prefix = "/usr/local"; --my $kde_prefix; +-my $kde_prefix = `kde-config --prefix`; +my $prefix = $ENV{'PREFIX'}; +my $kde_prefix = $prefix; - -- $kde_prefix = "$ENV{'KDEDIR'}" if $ENV{'KDEDIR'}; -- $kde_prefix = "/usr" if not $ENV{'KDEDIR'}; -+my $conf_path = "$prefix/share/examples/pacpl"; -+my $doc_path = "$prefix/share/doc/pacpl"; + chomp($kde_prefix); -my $conf_path = "/etc/pacpl"; -my $doc_path = "$prefix/doc/pacpl-$version"; -- ++my $conf_path = "$prefix/share/examples/pacpl"; ++my $doc_path = "$prefix/share/doc/pacpl"; + GetOptions('i|install=s' => \$install, 'u|uninstall=s' => \$uninstall, - 'c|checkinstall' => \$checkinstall, -@@ -68,9 +65,8 @@ my @MIMES = qw(x-shn.desktop x-ape +@@ -65,9 +65,8 @@ my @MIMES = qw(x-shn.desktop x-ape.desktop x-w x-lpac.desktop x-kxs.desktop x-la.desktop x-bonk.desktop); @@ -30,17 +27,26 @@ +my @BASE = qw(pacpl pacpl.conf pacpl.1 + README FAQ); - my @MODULES = qw(Parse::RecDescent Carp Inline - Inline::C Audio::Musepack Audio::WMA -@@ -94,7 +90,6 @@ if (!grep(/base|all|tags|kde|lang/, $ins + my @MODULES = qw(Parse::RecDescent Carp Inline + Inline::C Devel::Symdump Pod::Coverage +@@ -112,7 +111,6 @@ if (!grep(/base|all|tags|kde|lang/, $install)) { # Install base program - if ($install =~ /base|all/i) { + if ($install =~ /base|all/i and -e ".install-dir") { -- if (!-e "$prefix/doc") { mkdir("$prefix/doc") } +- if (not -e "$prefix/doc") { mkdir("$prefix/doc") or inst_error("dir","$prefix/doc"); } + + mkdir("$doc_path") or inst_error("dir","$doc_path"); + +@@ -144,7 +142,7 @@ if ($install =~ /base|all/i and -e ".install-dir") { + copy("$i","$conf_path/$i") or inst_error("file","$i","$conf_path/"); + } - mkdir("$doc_path"); +- elsif ($i eq "pacpl.1.gz") { ++ elsif ($i eq "pacpl.1") { -@@ -383,6 +378,8 @@ sub checkinstall { + print "$install_msg man/$i -> $prefix/man/man1\n"; + copy("man/$i", "$prefix/man/man1") or inst_error("file","$i","$prefix/man/man1"); +@@ -420,6 +418,8 @@ sub checkinstall { print "-------------------------------------------------\n"; foreach my $app (sort(keys(%program))) { @@ -49,7 +55,7 @@ if (`which $app 2>/dev/null`) { -@@ -443,12 +440,12 @@ sub checkinstall { +@@ -480,12 +480,12 @@ sub checkinstall { print "\nSee $doc_path/README for application URLs\n"; print "\nPress enter to continue"; Index: pkg/MESSAGE-amarok =================================================================== RCS file: /cvs/ports/audio/pacpl/pkg/MESSAGE-amarok,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 MESSAGE-amarok --- pkg/MESSAGE-amarok 12 Dec 2006 06:21:34 -0000 1.1.1.1 +++ pkg/MESSAGE-amarok 11 Jul 2007 08:00:28 -0000 @@ -1,2 +1,2 @@ To enable the PAC plugin: -Tools -> Script Manager: General -> pacx.pl -> Run +Tools -> Script Manager: General -> pacx -> Run Index: pkg/PLIST-amarok =================================================================== RCS file: /cvs/ports/audio/pacpl/pkg/PLIST-amarok,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 PLIST-amarok --- pkg/PLIST-amarok 12 Dec 2006 06:21:34 -0000 1.1.1.1 +++ pkg/PLIST-amarok 11 Jul 2007 08:00:28 -0000 @@ -1,4 +1,5 @@ @comment $OpenBSD: PLIST-amarok,v 1.1.1.1 2006/12/12 06:21:34 steven Exp $ -share/apps/amarok/scripts/pacx.amarokscript/ -share/apps/amarok/scripts/pacx.amarokscript/README -share/apps/amarok/scripts/pacx.amarokscript/pacx.pl +share/apps/amarok/ +share/apps/amarok/scripts/ +share/apps/amarok/scripts/pacx/ +share/apps/amarok/scripts/pacx/pacx Index: pkg/PLIST-konqueror =================================================================== RCS file: /cvs/ports/audio/pacpl/pkg/PLIST-konqueror,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 PLIST-konqueror --- pkg/PLIST-konqueror 12 Dec 2006 06:21:34 -0000 1.1.1.1 +++ pkg/PLIST-konqueror 11 Jul 2007 08:00:28 -0000 @@ -1,4 +1,6 @@ @comment $OpenBSD: PLIST-konqueror,v 1.1.1.1 2006/12/12 06:21:34 steven Exp $ +share/apps/konqueror/ +share/apps/konqueror/servicemenus/ share/apps/konqueror/servicemenus/pacpl.desktop share/mimelnk/audio/ share/mimelnk/audio/x-ape.desktop One question left, look at pkg/PLIST-amarok, should all the directories share/apps/amarok/ share/apps/amarok/scripts/ share/apps/amarok/scripts/pacx/ be there, or only the last one? Please test and commit. Regards, ahb