2 files changed, 7 insertions, 13 deletions
diff --git a/audio/logitechmediaserver/Makefile b/audio/logitechmediaserver/Makefile
index 9d0e177fa3d0..3f45afeb6d3e 100644
--- a/audio/logitechmediaserver/Makefile
+++ b/audio/logitechmediaserver/Makefile
@@ -98,12 +98,6 @@ PLIST_SUB+=	AMD64_ONLY=""
 PLIST_SUB+=	AMD64_ONLY="@comment "
 .endif
 
-.if ${ARCH} == "i386" && ${OSREL:R:R} == "9"
-PLIST_SUB+=	NOT_9I386="@comment "
-.else
-PLIST_SUB+=	NOT_9I386=""
-.endif
-
 do-build:
 	cd ${WRKSRC_vendor}/CPAN && ./buildme.sh
 	cd ${WRKSRC}/CPAN/arch && ${CP} -R 5.22 5.24
diff --git a/audio/logitechmediaserver/pkg-plist b/audio/logitechmediaserver/pkg-plist
index 44d4d3e4b36a..5cd2000052d4 100644
--- a/audio/logitechmediaserver/pkg-plist
+++ b/audio/logitechmediaserver/pkg-plist
@@ -891,11 +891,11 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/Parser.pm
 %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/PullParser.pm
 %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/TokeParser.pm
-%%NOT_9I386%%%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/IO/Interface.pm
-%%NOT_9I386%%%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/IO/Interface/Simple.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/IO/Interface.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/IO/Interface/Simple.pm
 %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Image/Scale.pm
-%%NOT_9I386%%%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/JSON/XS.pm
-%%NOT_9I386%%%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/JSON/XS/Boolean.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/JSON/XS.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/JSON/XS/Boolean.pm
 %%AMD64_ONLY%%%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/MP3/Cut/Gapless.pm
 %%AMD64_ONLY%%%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/MP3/Cut/Gapless/Track.pm
 %%AMD64_ONLY%%%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Media/Scan.pm
@@ -1023,10 +1023,10 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/EV/EV.so
 %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Encode/Detect/Detector/Detector.so
 %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/HTML/Parser/Parser.so
-%%NOT_9I386%%%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/IO/Interface/Interface.so
-%%NOT_9I386%%%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/IO/Interface/autosplit.ix
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/IO/Interface/Interface.so
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/IO/Interface/autosplit.ix
 %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Image/Scale/Scale.so
-%%NOT_9I386%%%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/JSON/XS/XS.so
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/JSON/XS/XS.so
 %%AMD64_ONLY%%%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/MP3/Cut/Gapless/Gapless.so
 %%AMD64_ONLY%%%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Media/Scan/Scan.so
 %%AMD64_ONLY%%%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Sub/Name/Name.so