From owner-svn-ports-branches@freebsd.org Fri Feb 17 06:51:52 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73B3FCE20C0; Fri, 17 Feb 2017 06:51:52 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2ABC01EF1; Fri, 17 Feb 2017 06:51:52 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1H6ppfS062820; Fri, 17 Feb 2017 06:51:51 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1H6pplS062818; Fri, 17 Feb 2017 06:51:51 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201702170651.v1H6pplS062818@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Fri, 17 Feb 2017 06:51:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r434272 - in branches/2017Q1/www/nspluginwrapper: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2017 06:51:52 -0000 Author: jkim Date: Fri Feb 17 06:51:50 2017 New Revision: 434272 URL: https://svnweb.freebsd.org/changeset/ports/434272 Log: MFH: r434241 Do not look for symlinks. We may find duplicate plugins. Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/www/nspluginwrapper/Makefile branches/2017Q1/www/nspluginwrapper/files/patch-src__npw-config.c Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/nspluginwrapper/Makefile ============================================================================== --- branches/2017Q1/www/nspluginwrapper/Makefile Fri Feb 17 06:49:42 2017 (r434271) +++ branches/2017Q1/www/nspluginwrapper/Makefile Fri Feb 17 06:51:50 2017 (r434272) @@ -3,7 +3,7 @@ PORTNAME= nspluginwrapper PORTVERSION= 1.4.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www linux emulators MASTER_SITES= http://nspluginwrapper.org/download/ \ LOCAL/jkim \ Modified: branches/2017Q1/www/nspluginwrapper/files/patch-src__npw-config.c ============================================================================== --- branches/2017Q1/www/nspluginwrapper/files/patch-src__npw-config.c Fri Feb 17 06:49:42 2017 (r434271) +++ branches/2017Q1/www/nspluginwrapper/files/patch-src__npw-config.c Fri Feb 17 06:51:50 2017 (r434272) @@ -12,7 +12,7 @@ }; dirs = freebsd_dirs; } -@@ -232,11 +233,13 @@ static const char **get_mozilla_plugin_d +@@ -232,11 +233,12 @@ static const char **get_mozilla_plugin_d "/usr/lib32/nsbrowser/plugins", // XXX how unfortunate "/usr/lib64/nsbrowser/plugins", #if defined(__FreeBSD__) @@ -25,7 +25,6 @@ + "%%LOCALBASE%%/lib/firefox/plugins", + "%%LOCALBASE%%/lib/seamonkey/plugins", + "%%LOCALBASE%%/lib/browser_plugins/linux-flashplayer", -+ "%%LOCALBASE%%/lib/browser_plugins/symlinks/linux-firefox", + "%%LOCALBASE%%/Adobe/Reader8/ENU/Adobe/Reader8/Browser/intellinux", + "%%LOCALBASE%%/Adobe/Reader9/ENU/Adobe/Reader9/Browser/intellinux", #endif