On Fri, Dec 05, 2008 at 09:36:28AM +0100, Giovanni Bechis wrote:
> Andreas Bihlmaier ha scritto:
>> +post-patch:
>> + @perl -pi -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/pacpl
>>
> I think you should use ${SUBST_CMD} instead of this.
> Cheers
> Giovanni
Thanks took me a little help from #openbsd, but after I found out that I
have to put ${LOCALBASE} into the file, not LOCALBASE. It works.
Updated patch, btw. could somebody commit this if there are no other
issues :)
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/pacpl/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- Makefile 20 Sep 2007 09:14:18 -0000 1.4
+++ Makefile 12 Dec 2008 15:07:24 -0000
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2007/09/20 09:14:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.2 2006/12/21 22:15:11 steven Exp $
PKG_ARCH= *
@@ -6,12 +6,11 @@
COMMENT-konqueror= PAC Konqueror service menu & mime types
COMMENT-amarok= PAC Amarok plugin
-V= 3.2.5
-DISTNAME= pacpl-$V
-PKGNAME= pacpl-$Vp0
-PKGNAME-main= ${PKGNAME}
-PKGNAME-konqueror= pacpl-konqueror-$V
-PKGNAME-amarok= pacpl-amarok-$V
+V= 4.0.3
+DISTNAME= pacpl-${V}
+PKGNAME-main= pacpl-${V}
+PKGNAME-konqueror= pacpl-konqueror-${V}
+PKGNAME-amarok= pacpl-amarok-${V}
CATEGORIES= audio converters perl5
HOMEPAGE= http://pacpl.sourceforge.net/
@@ -26,6 +25,7 @@
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pacpl/}
+USE_GMAKE = Yes
NO_BUILD= Yes
NO_REGRESS= Yes
@@ -48,33 +48,21 @@
::graphics/ffmpeg \
::x11/mplayer
+BUILD_DEPENDS= ${RUN_DEPENDS}
+
RUN_DEPENDS-konqueror= ::${BUILD_PKGPATH} \
::x11/kde/base3
RUN_DEPENDS-amarok= ::${BUILD_PKGPATH} \
::audio/amarok
-INSTALL_FLAGS= "base kde"
-NEW_DIRS= share/mimelnk/audio \
- share/apps/konqueror/servicemenus \
- share/apps/amarok/scripts
-
-post-extract:
- @cd ${WRKSRC}/man && gunzip *.1.gz
-
-do-configure:
- @perl -pi -e '/nice/ || s,/usr/bin,${LOCALBASE}/bin,;' \
- -e 's,mpg123,mpg321,;' -e 's,/dev/cdrom,/dev/rcd0c,;' \
- -e 's,MPCPLAYER\s*=.*$$,MPCPLAYER = ${LOCALBASE}/bin/mplayer,' \
- ${WRKSRC}/pacpl.conf
-
-do-install:
- @perl -pi -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/pacpl-install
-.for d in ${NEW_DIRS}
- ${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
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS += --with-konq \
+ --with-amarok
+CONFIGURE_ENV += KDEDIR="${LOCALBASE}" \
+ AMAROK="yes" \
+ KONQ="yes"
+
+post-patch:
+ ${SUBST_CMD} ${WRKSRC}/pacpl
.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 12 Dec 2008 15:07:24 -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-4.0.3.tar.gz) = i+jSPWn5msnMEXTRZjR6RA==
+RMD160 (pacpl-4.0.3.tar.gz) = 97sxvOo4fyMPnM/XYJspqYLp+Mw=
+SHA1 (pacpl-4.0.3.tar.gz) = 8EMUW6zThAvuwHfgfDItHEKvgEI=
+SHA256 (pacpl-4.0.3.tar.gz) = qSVAECv5t9Kcr69fxf2/xAWOqaVTp8o75dN3R9yLBvQ=
+SIZE (pacpl-4.0.3.tar.gz) = 108043
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 12 Dec 2008 15:07:24 -0000
@@ -0,0 +1,100 @@
+$OpenBSD$
+--- Makefile.in.orig Sat Aug 23 17:13:47 2008
++++ Makefile.in Thu Nov 13 14:52:56 2008
+@@ -70,7 +70,7 @@ MIMELNK = $(MIMEDIR)/x-ape.desktop \
+ #
+
+ DESTDIR =
+-KDEDIR = /usr
++KDEDIR = /usr/local
+
+ #
+ # Target KDE directories
+@@ -112,8 +112,8 @@ docdir = @docdir@
+ #
+ # Configuration files directories and other
+ #
+-CONF_DIR = $(DESTDIR)/etc/$(PACKAGE_NAME)
+-PO_DIR = $(DESTDIR)/usr/share/pacpl/locale
++CONF_DIR = $(DESTDIR)$(LOCALBASE)/share/examples/$(PACKAGE_NAME)
++PO_DIR = $(DESTDIR)$(LOCALBASE)/share/pacpl/locale
+ MOD_DIR = $(CONF_DIR)/modules
+ DOC_DIR = $(DESTDIR)$(docdir)$(PACKAGE_NAME)
+ MAN_DIR = $(DESTDIR)$(mandir)/man1
+@@ -122,10 +122,10 @@ DOC_EXTRA_DIR = $(DOC_DIR)/extra
+ # Explicit rules
+ .PHONY: all install uninstall clean distclean
+
+-all: pacpl.1.gz
++all: pacpl.1
+
+-pacpl.1.gz: pacpl
+- $(POD2MAN) $< | $(GZIP) -9 > $@
++pacpl.1: pacpl
++ $(POD2MAN) $< > $@
+ touch $@
+
+ install: all main install-pacpl-plugins
+@@ -139,40 +139,40 @@ main:
+ $(INSTALL) -d $(DOC_DIR)
+ $(INSTALL) -d $(DOC_EXTRA_DIR)
+
+- $(INSTALL) pacpl -t $(DESTDIR)$(bindir)
+- $(INSTALL_DATA) pacpl.conf codecs.conf -t $(CONF_DIR)
+- $(INSTALL_DATA) $(LANG_MODS) -t $(PO_DIR)
+- $(INSTALL_DATA) extra/sample.m -t $(MOD_DIR)
+- $(INSTALL_DATA) pacpl.1.gz -t $(MAN_DIR)
+- $(INSTALL_DATA) $(DOCS) -t $(DOC_DIR)
+- $(INSTALL_DATA) $(EXTRAS) -t $(DOC_EXTRA_DIR)
++ $(INSTALL) pacpl $(DESTDIR)$(bindir)
++ $(INSTALL_DATA) pacpl.conf codecs.conf $(CONF_DIR)
++ $(INSTALL_DATA) $(LANG_MODS) $(PO_DIR)
++ $(INSTALL_DATA) extra/sample.m $(MOD_DIR)
++ $(INSTALL_DATA) pacpl.1 $(MAN_DIR)
++ $(INSTALL_DATA) $(DOCS) $(DOC_DIR)
++ $(INSTALL_DATA) $(EXTRAS) $(DOC_EXTRA_DIR)
+
+ install-pacpl-plugins:
+ ifeq '$(INSTALL_KONQ)' 'yes'
+ $(INSTALL) -d $(KONQ_PLUGDIR)
+ $(INSTALL) -d $(KONQ_MIMEDIR)
+
+- $(INSTALL_DATA) $(KONQDIR)/pacpl.desktop -t $(KONQ_PLUGDIR)
+- $(INSTALL_DATA) $(MIMELNK) -t $(KONQ_MIMEDIR)
++ $(INSTALL_DATA) $(KONQDIR)/pacpl.desktop $(KONQ_PLUGDIR)
++ $(INSTALL_DATA) $(MIMELNK) $(KONQ_MIMEDIR)
+ endif
+
+ ifeq '$(INSTALL_DOLP)' 'yes'
+ $(INSTALL) -d $(DOLP_PLUGDIR)
+- $(INSTALL_DATA) $(DOLPDIR)/pacpl.desktop -t $(DOLP_PLUGDIR)
++ $(INSTALL_DATA) $(DOLPDIR)/pacpl.desktop $(DOLP_PLUGDIR)
+ endif
+
+ ifeq '$(INSTALL_D3LP)' 'yes'
+ $(INSTALL) -d $(D3LP_PLUGDIR)
+- $(INSTALL_DATA) $(D3LPDIR)/pacpl.desktop -t $(D3LP_PLUGDIR)
++ $(INSTALL_DATA) $(D3LPDIR)/pacpl.desktop $(D3LP_PLUGDIR)
+ endif
+
+ ifeq '$(INSTALL_AMAROK)' 'yes'
+ $(INSTALL) -d $(AMAROK_PLUGDIR)
+- $(INSTALL) $(AMAROKDIR)/pacx -t $(AMAROK_PLUGDIR)
++ $(INSTALL) $(AMAROKDIR)/pacx $(AMAROK_PLUGDIR)
+ endif
+
+ clean:
+- $(RM) pacpl.1.gz
++ $(RM) pacpl.1
+
+ distclean: clean
+ $(RM) config.log
+@@ -182,7 +182,7 @@ distclean: clean
+
+ uninstall: uninstall-pacpl-plugins
+ $(RM) $(DESTDIR)$(bindir)/pacpl
+- $(RM) $(MAN_DIR)/pacpl.1.gz
++ $(RM) $(MAN_DIR)/pacpl.1
+ $(RM) -r $(CONF_DIR)
+ $(RM) -r $(DOC_DIR)
+ $(RM) -r $(DESTDIR)/usr/share/pacpl
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 12 Dec 2008 15:07:24 -0000
@@ -1,52 +1,26 @@
-$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;
- use File::Basename;
- use Ogg::Vorbis::Header;
-
--use Cwd 'abs_path';
-+use Cwd qw(abs_path getcwd);
-
- # 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) {
- }
-
- 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 = `$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) {
-
-@@ -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'}`;
-+ my $cmd = "$kdialog --title \"PAC $version -
$lang{$mylang}{file_destination}\" --getexistingdirectory ".getcwd();
-+ $out_dir = `$cmd`;
- chomp($out_dir);
-
- $get_out_directory = 1;
+$OpenBSD$
+--- pacpl.orig Sun Aug 17 05:31:57 2008
++++ pacpl Fri Nov 14 09:25:49 2008
+@@ -131,8 +131,12 @@ my %config = (
+
+ # location of configuration file
+ my $conf_path = "/etc/pacpl";
+-my $po_dir = "/usr/share/pacpl/locale";
++my $po_dir = "${LOCALBASE}/share/pacpl/locale";
+ my $mod_dir = "$conf_path/modules";
++my $language = "en";
++if ($ENV{LANG}) {
++ $language = "$ENV{LANG}";
++}
+
+ my $conf_file;
+
+@@ -203,7 +207,7 @@ sub load_codecs {
+ # load po file and store in %lang hash
+ sub load_lang {
+
+- my $po = "$po_dir/$ENV{LANG}.po";
++ my $po = "$po_dir/$language.po";
+ $po =~ s/\.UTF-8//i if $po =~ /UTF-8/i;
+ $po =~ s/\.utf8//i if $po =~ /utf8/i;
+ $po =~ s/_\w+// if not -e $po;
Index: patches/patch-pacpl-install
===================================================================
RCS file: patches/patch-pacpl-install
diff -N patches/patch-pacpl-install
--- patches/patch-pacpl-install 12 Dec 2006 06:21:34 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,65 +0,0 @@
---- 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:
- my ($install, $uninstall, $checkinstall, $help);
- my ($all, $base, $kde, $tags, $lang);
-
--my $prefix = "/usr/local";
--my $kde_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";
-
--my $conf_path = "/etc/pacpl";
--my $doc_path = "$prefix/doc/pacpl-$version";
--
- GetOptions('i|install=s' => \$install,
- 'u|uninstall=s' => \$uninstall,
- 'c|checkinstall' => \$checkinstall,
-@@ -68,9 +65,8 @@ my @MIMES = qw(x-shn.desktop x-ape
- x-lpac.desktop x-kxs.desktop x-la.desktop
- x-bonk.desktop);
-
--my @BASE = qw(pacpl pacpl.conf pacpl-install pacpl.1.gz
-- README ChangeLog GPL
-- INSTALL TODO FAQ);
-+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") }
-
- mkdir("$doc_path");
-
-@@ -383,6 +378,8 @@ sub checkinstall {
- print "-------------------------------------------------\n";
-
- foreach my $app (sort(keys(%program))) {
-+ $program{$app} = "%%LOCALBASE%%/bin/$app";
-+ next;
-
- if (`which $app 2>/dev/null`) {
-
-@@ -443,12 +440,12 @@ sub checkinstall {
- print "\nSee $doc_path/README for application URLs\n";
- print "\nPress enter to continue";
-
-- my $enter = <STDIN>;
-
- my @TAG_MODS = qw(MP3::Tag Ogg::Vorbis::Header Audio::FLAC::Header
- MP4::Info Audio::Musepack Audio::WMA
-
- CDDB_get);
-+ @TAG_MODS = ();
-
- print "\n$name - $version: Audio Tagging Modules\n\n";
-
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 12 Dec 2008 15:07:24 -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 12 Dec 2008 15:07:24 -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
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 12 Dec 2008 15:07:24 -0000
@@ -3,7 +3,6 @@
share/mimelnk/audio/
share/mimelnk/audio/x-ape.desktop
share/mimelnk/audio/x-bonk.desktop
-share/mimelnk/audio/x-kxs.desktop
share/mimelnk/audio/x-la.desktop
share/mimelnk/audio/x-lpac.desktop
share/mimelnk/audio/x-ofr.desktop
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/audio/pacpl/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -u -r1.2 PLIST-main
--- pkg/PLIST-main 20 Sep 2007 09:14:19 -0000 1.2
+++ pkg/PLIST-main 12 Dec 2008 15:07:24 -0000
@@ -1,11 +1,42 @@
-...@comment $OpenBSD: PLIST-main,v 1.2 2007/09/20 09:14:19 sthen Exp $
+...@comment $OpenBSD: PLIST-main,v 1.1.1.1 2006/12/12 06:21:34 steven Exp $
bin/pacpl
@man man/man1/pacpl.1
+share/apps/
+share/apps/amarok/
+share/apps/amarok/scripts/
+share/apps/konqueror/
+share/apps/konqueror/servicemenus/
share/doc/pacpl/
-share/doc/pacpl/FAQ
+share/doc/pacpl/AUTHORS
share/doc/pacpl/README
+share/doc/pacpl/TODO
+share/doc/pacpl/extra/
+share/doc/pacpl/extra/README.extra
+share/doc/pacpl/extra/README.module
+share/doc/pacpl/extra/pacpl-gui.kmdr
+share/doc/pacpl/extra/sample.m
share/examples/pacpl/
@sample ${SYSCONFDIR}/pacpl/
-...@group wheel
+share/examples/pacpl/codecs.conf
+...@sample ${SYSCONFDIR}/pacpl/codecs.conf
+share/examples/pacpl/modules/
+...@sample ${SYSCONFDIR}/pacpl/modules/
+share/examples/pacpl/modules/sample.m
+...@sample ${SYSCONFDIR}/pacpl/modules/sample.m
share/examples/pacpl/pacpl.conf
@sample ${SYSCONFDIR}/pacpl/pacpl.conf
+share/mimelnk/
+share/mimelnk/audio/x-rm.desktop
+share/pacpl/
+share/pacpl/locale/
+share/pacpl/locale/ca.po
+share/pacpl/locale/de.po
+share/pacpl/locale/en_US.po
+share/pacpl/locale/es.po
+share/pacpl/locale/et.po
+share/pacpl/locale/fr_FR.po
+share/pacpl/locale/pl.po
+share/pacpl/locale/pt.po
+share/pacpl/locale/ru_RU.po
+share/pacpl/locale/tr.po
+share/pacpl/locale/zh_CN.po
Regards
ahb
