diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2009-12-03 01:28:10 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2009-12-03 01:28:10 +0000 |
| commit | d9eb3d9f858ad4c88600d9e1095b8d7ed6e87975 (patch) | |
| tree | 09c1cd26915a165255fc269d1dcd1fbec3f0509b | |
| parent | 81a7d0d7fd821b1ae9040d988a5504eb2dc5902b (diff) | |
| download | ports-d9eb3d9f858ad4c88600d9e1095b8d7ed6e87975.tar.gz ports-d9eb3d9f858ad4c88600d9e1095b8d7ed6e87975.zip | |
p5-Class-XSAccessor-Array has been merged into p5-Class-XSAccessor.
Remove a dependency on the former package so it can be removed and patch
the use of an internal function which broke in the latest version.
PR: ports/140662, ports/141106
Submitted by: Cezary Morga <cm at therek net>
Christopher Key <cjk32 at cam ac uk>
Prodded by: many :)
Pointy hat to: brooks
Notes
Notes:
svn path=/head/; revision=245140
| -rw-r--r-- | audio/squeezeboxserver/Makefile | 4 | ||||
| -rw-r--r-- | audio/squeezeboxserver/files/patch-Slim_Utils_Accessor.pm | 43 |
2 files changed, 45 insertions, 2 deletions
diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile index 927967323f06..7f93d5da8418 100644 --- a/audio/squeezeboxserver/Makefile +++ b/audio/squeezeboxserver/Makefile @@ -7,6 +7,7 @@ PORTNAME= squeezeboxserver PORTVERSION= 7.4.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://downloads.slimdevices.com/SqueezeboxServer_v${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-noCPAN @@ -48,8 +49,7 @@ RUN_DEPENDS+= ${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zl ${SITE_PERL}/${PERL_ARCH}/YAML/Syck.pm:${PORTSDIR}/textproc/p5-YAML-Syck \ ${SITE_PERL}/${PERL_ARCH}/EV.pm:${PORTSDIR}/devel/p5-EV \ ${SITE_PERL}/${PERL_ARCH}/Audio/Scan.pm:${PORTSDIR}/audio/p5-Audio-Scan \ - ${SITE_PERL}/${PERL_ARCH}/Class/XSAccessor.pm:${PORTSDIR}/devel/p5-Class-XSAccessor \ - ${SITE_PERL}/${PERL_ARCH}/Class/XSAccessor/Array.pm:${PORTSDIR}/devel/p5-Class-XSAccessor-Array + ${SITE_PERL}/${PERL_ARCH}/Class/XSAccessor.pm:${PORTSDIR}/devel/p5-Class-XSAccessor PKGINSTALL= ${WRKDIR}/pkg-install diff --git a/audio/squeezeboxserver/files/patch-Slim_Utils_Accessor.pm b/audio/squeezeboxserver/files/patch-Slim_Utils_Accessor.pm new file mode 100644 index 000000000000..5c246e9b15ef --- /dev/null +++ b/audio/squeezeboxserver/files/patch-Slim_Utils_Accessor.pm @@ -0,0 +1,43 @@ + +$FreeBSD$ + +--- Slim/Utils/Accessor.pm.orig ++++ Slim/Utils/Accessor.pm +@@ -98,9 +98,15 @@ + if ($type eq 'rw') { + + if ( hasXS() ) { +- Class::XSAccessor::Array::_generate_method( +- $class, $field, $n, 0, 0, 'accessor', +- ); ++ if ($Class::XSAccessor::Array::VERSION ge '1.05') { ++ Class::XSAccessor::Array::_generate_method( ++ $class, $field, $n, {}, 'accessor', ++ ); ++ } else { ++ Class::XSAccessor::Array::_generate_method( ++ $class, $field, $n, 0, 0, 'accessor', ++ ); ++ } + } + else { + $accessor = sub { +@@ -112,9 +118,15 @@ + } elsif ($type eq 'ro') { + + if ( hasXS() ) { +- Class::XSAccessor::Array::_generate_method( +- $class, $field, $n, 0, 0, 'getter', +- ); ++ if ($Class::XSAccessor::Array::VERSION ge '1.05') { ++ Class::XSAccessor::Array::_generate_method( ++ $class, $field, $n, {}, 'getter', ++ ); ++ } else { ++ Class::XSAccessor::Array::_generate_method( ++ $class, $field, $n, 0, 0, 'getter', ++ ); ++ } + } + else { + $accessor = sub { |