Hello ports@,
this is a more or less trivial update to audio/pacpl.
I tested on i386 and everything seems to work.
Please test and commit (for 4.1 -current), uses new sha256 stuff.
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 16 Feb 2007 15:13:55 -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.0
DISTNAME= pacpl-${V}
PKGNAME-main= pacpl-${V}
PKGNAME-konqueror= pacpl-konqueror-${V}
@@ -73,7 +73,5 @@
.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.1.1.1
diff -u -u -r1.1.1.1 distinfo
--- distinfo 12 Dec 2006 06:21:34 -0000 1.1.1.1
+++ distinfo 16 Feb 2007 15:13:55 -0000
@@ -1,4 +1,5 @@
-MD5 (pacpl-3.2.5.tar.gz) = 99a01e373875639c44c2bcc4ef748449
-RMD160 (pacpl-3.2.5.tar.gz) = f486c2baeb6527a40d7f60cd2a6bc91a1c4d1d72
-SHA1 (pacpl-3.2.5.tar.gz) = 23e35dee75f05dfdf9ab7b4d28e9a9030f92f5e0
-SIZE (pacpl-3.2.5.tar.gz) = 118612
+MD5 (pacpl-3.3.0.tar.gz) = b127407d00f8d3d34d996799fbbfae03
+RMD160 (pacpl-3.3.0.tar.gz) = 3e37b9fda48b6c6ebb3fe79c9cd903f7fcda2b28
+SHA1 (pacpl-3.3.0.tar.gz) = 63640159ad60e679f5a35a5e783a3a593ff3ae23
+SHA256 (pacpl-3.3.0.tar.gz) =
8bff65308c10ffe4cf9fdf82df5ad3e317d06274a6f4ad9692bb1f4838dd0d78
+SIZE (pacpl-3.3.0.tar.gz) = 120365
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 16 Feb 2007 15:13:55 -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 Feb 16 14:45:42 2007
++++ pacpl Fri Feb 16 14:48:34 2007
+@@ -30,7 +30,7 @@ use File::Copy;
use File::Basename;
use Ogg::Vorbis::Header;
@@ -10,41 +10,39 @@
# Current Name & Version
my $name = "Perl Audio Converter";
-@@ -224,7 +224,7 @@ my @conf_opts;
+@@ -230,7 +230,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 = "$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) {
- }
-
+@@ -2342,7 +2342,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
-
+@@ -2435,7 +2436,7 @@ if ($recursive and not $conv_to and not
+
} else {
-
+
- my $pwd = $ENV{PWD};
-+ my $pwd = getcwd();
++ my $pwd = getcwd();
foreach my $audio_dir (@dir) {
-@@ -2273,7 +2274,8 @@ if ($recursive and not $conv_to and not
-
+@@ -2467,7 +2468,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);
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 16 Feb 2007 15:13:55 -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 Feb 16 04:18:26 2007
++++ pacpl-install Fri Feb 16 14:59:23 2007
+@@ -34,12 +34,12 @@ my $uninstall_msg = "$name - $version:
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
x-lpac.desktop x-kxs.desktop x-la.desktop
x-bonk.desktop);
@@ -30,26 +27,27 @@
+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
- # Install base program
- if ($install =~ /base|all/i) {
-
-- if (!-e "$prefix/doc") { mkdir("$prefix/doc") }
+ my @MODULES = qw(Parse::RecDescent Carp Inline
+ Inline::C Devel::Symdump
Pod::Coverage
+@@ -144,7 +143,7 @@ if ($install =~ /base|all/i and -e ".ins
+ 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 +419,8 @@ sub checkinstall {
print "-------------------------------------------------\n";
foreach my $app (sort(keys(%program))) {
-+ $program{$app} = "%%LOCALBASE%%/bin/$app";
++ $program{$app} = "/usr/local/bin/$app";
+ next;
if (`which $app 2>/dev/null`) {
-@@ -443,12 +440,12 @@ sub checkinstall {
+@@ -480,12 +481,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 16 Feb 2007 15:13:55 -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 16 Feb 2007 15:13:55 -0000
@@ -1,4 +1,3 @@
@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/scripts/pacx/
+share/apps/amarok/scripts/pacx/pacx
Regards,
ahb
