From d2fa65ef2ec7108ceaa44fb4070504babad223fc Mon Sep 17 00:00:00 2001
From: amdmi3 <amdmi3@FreeBSD.org>
Date: Thu, 12 Jan 2017 11:30:50 +0000
Subject: - Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL

Approved by:	portmgr blanket
---
 www/opera/Makefile  | 14 ++------------
 www/opera/pkg-plist |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'www')

diff --git a/www/opera/Makefile b/www/opera/Makefile
index 3959591eedd3..4d0fe33236e0 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -18,7 +18,8 @@ COMMENT=	Blazingly fast, full-featured, standards-compliant browser
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
-BUILD_DEPENDS=	${LOCALBASE}/bin/update-mime-database:misc/shared-mime-info
+BUILD_DEPENDS=	${LOCALBASE}/bin/update-mime-database:misc/shared-mime-info \
+		${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x
 RUN_DEPENDS=	${LOCALBASE}/bin/update-mime-database:misc/shared-mime-info
 
 BUNDLE_LIBS=	yes
@@ -68,20 +69,11 @@ INSTALLS_ICONS=	yes
 
 OPERA_ARCH=	${ARCH:S,i386,intel,}
 
-.if ${OSVERSION} >= 1000054
-BUILD_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x
-PLIST_SUB+=	LIBSTDC=""
-.else
-PLIST_SUB+=	LIBSTDC="@comment "
-.endif
-
 post-extract:
 	${GUNZIP_CMD} ${WRKSRC}/share/man/man1/opera.1.gz
 
 do-build:
-.if ${OSVERSION} >= 1000054
 	${CP} ${LOCALBASE}/lib/compat/libstdc++.so.6 ${WRKSRC}
-.endif
 
 do-configure:
 	@${MV} ${WRKSRC}/share/man ${WRKSRC}/man
@@ -100,9 +92,7 @@ do-configure:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/opera ${STAGEDIR}${PREFIX}/bin/
 	${TAR} -C ${WRKSRC} -cf - lib man share | ${TAR} -C ${STAGEDIR}${PREFIX} -xf -
-.if ${OSVERSION} >= 1000054
 	${INSTALL_LIB} ${WRKSRC}/libstdc++.so.6 ${STAGEDIR}${PREFIX}/lib/opera
-.endif
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d
 	${INSTALL_DATA} ${FILESDIR}/libmap.conf \
 		${STAGEDIR}${PREFIX}/etc/libmap.d/opera.conf
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index aa2cc981af1f..74893e1635e1 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -4,7 +4,7 @@ lib/opera/gstreamer/plugins/libgstoperamatroska.so
 lib/opera/gstreamer/plugins/libgstoperavp8.so
 lib/opera/liboperagtk2.so
 lib/opera/liboperakde4.so
-%%LIBSTDC%%lib/opera/libstdc++.so.6
+lib/opera/libstdc++.so.6
 lib/opera/opera
 lib/opera/plugins/README
 lib/opera/pluginwrapper/operapluginwrapper
-- 
cgit