cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update pacpl to 4.0.5, also:

Browse Source 
- patch to fix the annoying warnings on systems without LANG or
PWD set in the environment

- roll subpackages into the main package; no point having an entire
package that just installs some scripts/data files (which are harmless
if the corresponding package is not installed) and adds run deps.
This commit is contained in:
sthen 2013-04-27 11:39:47 +00:00
parent 0b37488866
commit c6273ab52f
12 changed files with 67 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
audio/pacpl/Makefile
View File

@ -1,21 +1,12 @@
# $OpenBSD: Makefile,v 1.16 2013/03/10 22:55:05 espie Exp $
# $OpenBSD: Makefile,v 1.17 2013/04/27 11:39:47 sthen Exp $
PKG_ARCH= *
COMMENT-main= PAC (Perl Audio Converter)
COMMENT-konqueror= PAC Konqueror service menu & mime types
COMMENT-amarok= PAC Amarok plugin
COMMENT= PAC (Perl Audio Converter)
V= 4.0.4
DISTNAME= pacpl-${V}
PKGNAME-main= pacpl-${V}
PKGNAME-konqueror= pacpl-konqueror-${V}
PKGNAME-amarok= pacpl-amarok-${V}
DISTNAME= pacpl-4.0.5
CATEGORIES= audio converters perl5
REVISION-main = 2
REVISION = 0
HOMEPAGE= http://pacpl.sourceforge.net/
# GPLv3
@ -26,8 +17,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pacpl/}
NO_BUILD= Yes
NO_TEST= Yes
MULTI_PACKAGES= -main -konqueror -amarok
RUN_DEPENDS= audio/bonk \
audio/lame \
audio/musepack \
@ -49,11 +38,6 @@ RUN_DEPENDS= audio/bonk \
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS-konqueror= ${BUILD_PKGPATH} \
x11/kde/base3
RUN_DEPENDS-amarok= ${BUILD_PKGPATH} \
audio/amarok
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-konq \

7
audio/pacpl/distinfo
View File

@ -1,5 +1,2 @@
MD5 (pacpl-4.0.4.tar.gz) = dD0rW3GRnIfQ7yPXmlV2zg==
RMD160 (pacpl-4.0.4.tar.gz) = T6EzHSScolZa6XEhd7KMFpLUqxQ=
SHA1 (pacpl-4.0.4.tar.gz) = RrsZqpJXKEwThDucjBsk4EEBBaw=
SHA256 (pacpl-4.0.4.tar.gz) = rEL0FKwh7ImsGtPPWu5TQaZn9w4IeUFvYrwUf2YzPcQ=
SIZE (pacpl-4.0.4.tar.gz) = 114225
SHA256 (pacpl-4.0.5.tar.gz) = 5rP/iKzeC918tEaQZK/VjM5/1kY7YVcT/zbKrbxmjec=
SIZE (pacpl-4.0.5.tar.gz) = 110384

25
audio/pacpl/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1 2008/12/23 15:52:42 ajacoutot Exp $
--- 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 \
$OpenBSD: patch-Makefile_in,v 1.2 2013/04/27 11:39:47 sthen Exp $
--- Makefile.in.orig Fri Mar 20 03:24:18 2009
+++ Makefile.in Sat Apr 27 11:40:26 2013
@@ -64,7 +64,7 @@ KONQDIR = plugins/konqueror
#
DESTDIR =
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2008/12/23 15:52:42 ajacoutot Exp $
#
# Target KDE directories
@@ -112,8 +112,8 @@ docdir = @docdir@
@@ -105,8 +105,8 @@ docdir = @docdir@
#
# Configuration files directories and other
#
@ -21,7 +21,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2008/12/23 15:52:42 ajacoutot Exp $
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
@@ -115,10 +115,10 @@ DOC_EXTRA_DIR = $(DOC_DIR)/extra
# Explicit rules
.PHONY: all install uninstall clean distclean
@ -35,7 +35,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2008/12/23 15:52:42 ajacoutot Exp $
touch $@
install: all main install-pacpl-plugins
@@ -139,40 +139,40 @@ main:
@@ -132,33 +132,33 @@ main:
$(INSTALL) -d $(DOC_DIR)
$(INSTALL) -d $(DOC_EXTRA_DIR)
@ -57,12 +57,8 @@ $OpenBSD: patch-Makefile_in,v 1.1 2008/12/23 15:52:42 ajacoutot Exp $
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'
@ -84,12 +80,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2008/12/23 15:52:42 ajacoutot Exp $
endif
clean:
- $(RM) pacpl.1.gz
+ $(RM) pacpl.1
distclean: clean
$(RM) config.log
@@ -182,7 +182,7 @@ distclean: clean
@@ -172,7 +172,7 @@ distclean: clean
uninstall: uninstall-pacpl-plugins
$(RM) $(DESTDIR)$(bindir)/pacpl

8
audio/pacpl/patches/patch-codecs_conf
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-codecs_conf,v 1.1 2012/06/13 11:43:12 jasper Exp $
--- codecs.conf.orig Fri May 25 05:45:56 2012
+++ codecs.conf Fri May 25 05:48:04 2012
$OpenBSD: patch-codecs_conf,v 1.2 2013/04/27 11:39:47 sthen Exp $
--- codecs.conf.orig Sat Mar 7 18:39:37 2009
+++ codecs.conf Sat Apr 27 11:35:23 2013
@@ -5,12 +5,12 @@
# encoders: faac, ffmpeg
# decoders: faad, ffmpeg, mplayer
@ -14,7 +14,7 @@ $OpenBSD: patch-codecs_conf,v 1.1 2012/06/13 11:43:12 jasper Exp $
-FLAC = flac,flac
+FLAC = ffmpeg,ffmpeg
# encoders: flac
# encoders: flac, flake
# decoders: flac, mplayer
@@ -21,8 +21,8 @@ FLA = flac,flac
# encoders: faac, ffmpeg

38
audio/pacpl/patches/patch-pacpl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-pacpl,v 1.5 2012/06/13 11:43:12 jasper Exp $
--- pacpl.orig Sat Feb 14 12:04:50 2009
+++ pacpl Fri May 25 05:43:14 2012
$OpenBSD: patch-pacpl,v 1.6 2013/04/27 11:39:47 sthen Exp $
--- pacpl.orig Fri Mar 20 02:19:03 2009
+++ pacpl Sat Apr 27 12:34:15 2013
@@ -130,8 +130,8 @@ my %config = (
);
@ -12,6 +12,24 @@ $OpenBSD: patch-pacpl,v 1.5 2012/06/13 11:43:12 jasper Exp $
my $mod_dir = "$conf_path/modules";
my $conf_file;
@@ -143,7 +143,6 @@ load_lang();
my @conf_locations = (
"$ENV{HOME}/.pacplrc", # Local
"$conf_path/pacpl.conf", # Global
- "$ENV{PWD}/pacpl.conf", # Current Directory
);
# try to load conf file from one of the above locations
@@ -203,7 +202,8 @@ sub load_codecs {
# load po file and store in %lang hash
sub load_lang {
- my $po = "$po_dir/$ENV{LANG}.po";
+ my $po = "";
+ $po = "$po_dir/$ENV{LANG}.po" if ($ENV{'LANG'});
$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;
@@ -708,8 +708,8 @@ my $opts;
flac => {
@ -168,7 +186,7 @@ $OpenBSD: patch-pacpl,v 1.5 2012/06/13 11:43:12 jasper Exp $
ENCODER => {
wavpack => {
@@ -2050,11 +2050,11 @@ sub format_tags {
@@ -2050,7 +2050,7 @@ sub format_tags {
$tag_name{track} = 0 if not $tag_name{track};
$tag_name{year} = 0 if not $tag_name{year};
@ -177,11 +195,15 @@ $OpenBSD: patch-pacpl,v 1.5 2012/06/13 11:43:12 jasper Exp $
} else {
- return "--title \"$tag_name{title}\" --track \"$tag_name{track}\" --artist \"$tag_name{artist}\" --ablum \"$tag_name{album}\" --comment \"$tag_name{comment}\" --year \"$tag_name{year}\" --genre \"$tag_name{genre}\"";
+ return "--title \"$tag_name{title}\" --track \"$tag_name{track}\" --artist \"$tag_name{artist}\" --album \"$tag_name{album}\" --comment \"$tag_name{comment}\" --year \"$tag_name{year}\" --genre \"$tag_name{genre}\"";
@@ -2878,7 +2878,7 @@ to turn off default encoder options use --defopts 0. t
more control when using the --eopts command.
defopts is set to 1 by default. you can also toggle this option in
-/etc/pacpl/pacpl.conf.
+${SYSCONFDIR}/pacpl/pacpl.conf.
B<--eopts> I<options>
}
}
@@ -3217,9 +3217,9 @@ show cddb information for current disc.
=item B<sox>(1) B<ffmpeg>(1) B<lame>(1) B<oggenc>(1) B<oggdec>(1)

3
audio/pacpl/pkg/DESCR-main → audio/pacpl/pkg/DESCR
View File

@ -11,3 +11,6 @@ A CD ripping function with CDDB support, batch and playlist conversion,
daemon mode for converting files on the fly, tag preservation for most
supported formats, independent tag reading/writing, and extensions for
konqueror and amarok are also provided.
To enable the PAC plugin in Amarok:
Tools -> Script Manager: General -> pacx -> Run

1
audio/pacpl/pkg/DESCR-amarok
View File

@ -1 +0,0 @@
PAC amarok plugin to convert between audio formats within amarok.

1
audio/pacpl/pkg/DESCR-konqueror
View File

@ -1 +0,0 @@
PAC extensions for konqueror.

2
audio/pacpl/pkg/MESSAGE-amarok
View File

@ -1,2 +0,0 @@
To enable the PAC plugin:
Tools -> Script Manager: General -> pacx -> Run

19
audio/pacpl/pkg/PLIST-main → audio/pacpl/pkg/PLIST
View File

@ -1,7 +1,16 @@
@comment $OpenBSD: PLIST-main,v 1.4 2009/01/03 14:50:24 ajacoutot Exp $
@conflict pacpl-konqueror-<4.0.3p0
@comment $OpenBSD: PLIST,v 1.1 2013/04/27 11:39:47 sthen Exp $
@conflict pacpl-amarok-*
@conflict pacpl-konqueror-*
@pkgpath audio/pacpl,-amarok
@pkgpath audio/pacpl,-konqueror
@pkgpath audio/pacpl,-main
bin/pacpl
@man man/man1/pacpl.1
share/apps/
share/apps/amarok/
share/apps/amarok/scripts/
share/apps/amarok/scripts/pacx/
share/apps/amarok/scripts/pacx/pacx
share/doc/pacpl/
share/doc/pacpl/AUTHORS
share/doc/pacpl/README
@ -21,6 +30,9 @@ share/examples/pacpl/modules/sample.m
@sample ${SYSCONFDIR}/pacpl/modules/sample.m
share/examples/pacpl/pacpl.conf
@sample ${SYSCONFDIR}/pacpl/pacpl.conf
share/kde4/
share/kde4/services/
share/kde4/services/pacpl.desktop
share/pacpl/
share/pacpl/locale/
share/pacpl/locale/ca.po
@ -29,8 +41,11 @@ 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/it_IT.po
share/pacpl/locale/nl_NL.po
share/pacpl/locale/pl.po
share/pacpl/locale/pt.po
share/pacpl/locale/ro.po
share/pacpl/locale/ru_RU.po
share/pacpl/locale/tr.po
share/pacpl/locale/zh_CN.po

6
audio/pacpl/pkg/PLIST-amarok
View File

@ -1,6 +0,0 @@
@comment $OpenBSD: PLIST-amarok,v 1.2 2008/12/23 15:52:42 ajacoutot Exp $
share/apps/
share/apps/amarok/
share/apps/amarok/scripts/
share/apps/amarok/scripts/pacx/
share/apps/amarok/scripts/pacx/pacx

17
audio/pacpl/pkg/PLIST-konqueror
View File

@ -1,17 +0,0 @@
@comment $OpenBSD: PLIST-konqueror,v 1.3 2009/01/03 14:50:24 ajacoutot Exp $
@conflict pacpl-<4.0.3p0
share/apps/
share/apps/konqueror/
share/apps/konqueror/servicemenus/
share/apps/konqueror/servicemenus/pacpl.desktop
share/mimelnk/audio/
share/mimelnk/audio/x-ape.desktop
share/mimelnk/audio/x-bonk.desktop
share/mimelnk/audio/x-la.desktop
share/mimelnk/audio/x-lpac.desktop
share/mimelnk/audio/x-ofr.desktop
share/mimelnk/audio/x-ofs.desktop
share/mimelnk/audio/x-rm.desktop
share/mimelnk/audio/x-shn.desktop
share/mimelnk/audio/x-tta.desktop
share/mimelnk/audio/x-wavpack.desktop