svn commit: r428854 - in head: . www www/flashplayer www/linux-c6-flashplugin24 www/linux-c7-flashplugin24 www/linux-flashplayer
Tijl Coosemans
tijl at FreeBSD.org
Sun Dec 18 15:03:06 UTC 2016
Author: tijl
Date: Sun Dec 18 15:03:04 2016
New Revision: 428854
URL: https://svnweb.freebsd.org/changeset/ports/428854
Log:
- Combine linux-c6-flashplugin24 and linux-c7-flashplugin24 into one distro
independent port like other Linux application ports.
- Rename flashplugin to flashplayer to match upstream.
- Tell users to mount linprocfs.
- Remove reference to special FreeBSD license. The official license is no
longer restricted to officially supported operating systems.
- Create www/flashplayer which runs nspluginwrapper on installation.
PR: 215345
Added:
head/www/flashplayer/
head/www/flashplayer/Makefile (contents, props changed)
head/www/flashplayer/pkg-descr (contents, props changed)
head/www/linux-flashplayer/
- copied from r428853, head/www/linux-c6-flashplugin24/
Deleted:
head/www/linux-c6-flashplugin24/
head/www/linux-c7-flashplugin24/
Modified:
head/MOVED
head/www/Makefile
head/www/linux-flashplayer/Makefile
head/www/linux-flashplayer/distinfo
head/www/linux-flashplayer/pkg-descr
head/www/linux-flashplayer/pkg-message
Modified: head/MOVED
==============================================================================
--- head/MOVED Sun Dec 18 14:22:49 2016 (r428853)
+++ head/MOVED Sun Dec 18 15:03:04 2016 (r428854)
@@ -8829,9 +8829,9 @@ graphics/ocrfeeder||2016-12-08|Has expir
devel/libcppformat|devel/libfmt|2016-12-08|Project was renamed
databases/py35-mysqlclient|databases/py3-mysqlclient|2016-12-10|Moved to match existing naming convention
databases/py35-psycopg2|databases/py3-psycopg2|2016-12-10|Moved to match existing naming convention
-www/linux-f10-flashplugin11||2016-12-13|Deprecated
-www/linux-c6-flashplugin11|www/linux-c6-flashplugin24|2016-12-13|Deprecated
-www/linux-c7-flashplugin11|www/linux-c7-flashplugin24|2016-12-13|Deprecated
+www/linux-f10-flashplugin11|www/linux-flashplayer|2016-12-13|Removed upstream
+www/linux-c6-flashplugin11|www/linux-flashplayer|2016-12-13|Removed upstream
+www/linux-c7-flashplugin11|www/linux-flashplayer|2016-12-13|Removed upstream
net/py-ceilometerclient|net/py-python-ceilometerclient|2016-12-17|Rename to match pypi name
net/py-cinderclient|net/py-python-cinderclient|2016-12-17|Rename to match pypi name
net/py-designateclient|net/py-python-designateclient|2016-12-17|Rename to match pypi name
@@ -8842,3 +8842,5 @@ net/py-neutronclient|net/py-python-neutr
net/py-novaclient|net/py-python-novaclient|2016-12-17|Rename to match pypi name
net/py-openstackclient|net/py-python-openstackclient|2016-12-17|Rename to match pypi name
www/py-django-openstack-auth|www/py-django_openstack_auth|2016-12-18|Rename to match pypi name
+www/linux-c6-flashplugin24|www/linux-flashplayer|2016-12-18|Renamed to match upstream
+www/linux-c7-flashplugin24|www/linux-flashplayer|2016-12-18|Renamed to match upstream
Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile Sun Dec 18 14:22:49 2016 (r428853)
+++ head/www/Makefile Sun Dec 18 15:03:04 2016 (r428854)
@@ -168,6 +168,7 @@
SUBDIR += firefox-esr
SUBDIR += firefox-esr-i18n
SUBDIR += firefox-i18n
+ SUBDIR += flashplayer
SUBDIR += flat-frog
SUBDIR += flickcurl
SUBDIR += flood
@@ -372,11 +373,10 @@
SUBDIR += links
SUBDIR += links-hacked
SUBDIR += links1
- SUBDIR += linux-c6-flashplugin24
SUBDIR += linux-c6-qt47-webkit
- SUBDIR += linux-c7-flashplugin24
SUBDIR += linux-c7-qtwebkit
SUBDIR += linux-firefox
+ SUBDIR += linux-flashplayer
SUBDIR += linux-opera
SUBDIR += linux-seamonkey
SUBDIR += lionwiki
Added: head/www/flashplayer/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/flashplayer/Makefile Sun Dec 18 15:03:04 2016 (r428854)
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+PORTNAME= flashplayer
+PORTVERSION= 24.0
+CATEGORIES= www multimedia
+DISTFILES=
+
+MAINTAINER= emulation at FreeBSD.org
+COMMENT= Native wrapper around Linux Flash Player
+
+RUN_DEPENDS= ${LOCALBASE}/lib/browser_plugins/linux-flashplayer/libflashplayer.so:www/linux-flashplayer \
+ nspluginwrapper:www/nspluginwrapper
+
+NO_ARCH= yes
+NO_BUILD= yes
+NO_INSTALL= yes
+NO_MTREE= yes
+
+PLIST_FILES= "@postexec ${LOCALBASE}/bin/nspluginwrapper -i ${LOCALBASE}/lib/browser_plugins/linux-flashplayer/libflashplayer.so" \
+ "@rmtry lib/browser_plugins/npwrapper.libflashplayer.so"
+
+.include <bsd.port.mk>
Added: head/www/flashplayer/pkg-descr
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/flashplayer/pkg-descr Sun Dec 18 15:03:04 2016 (r428854)
@@ -0,0 +1,4 @@
+Wrapper around Linux Flash Player that allows native browsers to display
+Flash content.
+
+WWW: https://www.adobe.com/
Modified: head/www/linux-flashplayer/Makefile
==============================================================================
--- head/www/linux-c6-flashplugin24/Makefile Sun Dec 18 14:22:49 2016 (r428853)
+++ head/www/linux-flashplayer/Makefile Sun Dec 18 15:03:04 2016 (r428854)
@@ -1,32 +1,29 @@
# Created by: Artyom Mirgorodskiy <artyom.mirgorodsky at gmail.com>
# $FreeBSD$
-PORTNAME= flashplugin
+PORTNAME= flashplayer
PORTVERSION= 24.0.0.186
CATEGORIES= www multimedia linux
MASTER_SITES= https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/
-PKGNAMEPREFIX?= linux-c6-
+PKGNAMEPREFIX= linux-
DISTFILES= flash_player_npapi_linux.i386.tar.gz
DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}
MAINTAINER= emulation at FreeBSD.org
-COMMENT= Adobe Flash Player NPAPI Plugin (beta)
+COMMENT= Adobe Flash Player NPAPI Plugin
ONLY_FOR_ARCHS= amd64 i386
-USES?= linux:c6
+USES= cpe linux webplugin:linux
+CPE_VENDOR= adobe
+CPE_PRODUCT= flash_player
USE_LINUX= alsalib alsa-plugins-oss curl dri gtk2 nspr nss
+WEBPLUGIN_FILES=libflashplayer.so
RESTRICTED= Redistribution not allowed
NO_BUILD= yes
NO_WRKSUBDIR= yes
STRIP=
-USES+= cpe webplugin:linux
-CPE_VENDOR= adobe
-CPE_PRODUCT= flash_player
-WEBPLUGIN_FILES=libflashplayer.so
-
-.include <bsd.port.options.mk>
post-patch:
@${REINPLACE_CMD} '/^NotShowIn=KDE/d' \
Modified: head/www/linux-flashplayer/distinfo
==============================================================================
--- head/www/linux-c6-flashplugin24/distinfo Sun Dec 18 14:22:49 2016 (r428853)
+++ head/www/linux-flashplayer/distinfo Sun Dec 18 15:03:04 2016 (r428854)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481650383
-SHA256 (flashplugin/24.0.0.186/flash_player_npapi_linux.i386.tar.gz) = 3b5803388f31940484c1020db4c5533aa48cfccab3880eb55a6f25610eb691fd
-SIZE (flashplugin/24.0.0.186/flash_player_npapi_linux.i386.tar.gz) = 9159537
+TIMESTAMP = 1482070603
+SHA256 (flashplayer/24.0.0.186/flash_player_npapi_linux.i386.tar.gz) = 3b5803388f31940484c1020db4c5533aa48cfccab3880eb55a6f25610eb691fd
+SIZE (flashplayer/24.0.0.186/flash_player_npapi_linux.i386.tar.gz) = 9159537
Modified: head/www/linux-flashplayer/pkg-descr
==============================================================================
--- head/www/linux-c6-flashplugin24/pkg-descr Sun Dec 18 14:22:49 2016 (r428853)
+++ head/www/linux-flashplayer/pkg-descr Sun Dec 18 15:03:04 2016 (r428854)
@@ -1,7 +1,5 @@
-This is the official Flash Player from Adobe. Together with nspluginwrapper
-this plugin allows you to see .swf and .spl files in Firefox.
-
-FreeBSD Flash License Agreement:
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=96374
+Adobe Flash Player is a lightweight browser plug-in and rich internet
+application runtime that delivers consistent and engaging user experiences,
+stunning audio/video playback, and exciting gameplay.
WWW: https://www.adobe.com/
Modified: head/www/linux-flashplayer/pkg-message
==============================================================================
--- head/www/linux-c6-flashplugin24/pkg-message Sun Dec 18 14:22:49 2016 (r428853)
+++ head/www/linux-flashplayer/pkg-message Sun Dec 18 15:03:04 2016 (r428854)
@@ -1,7 +1,6 @@
-If this is your first time installing flash each user must run:
+Flash Player needs linprocfs mounted on /compat/linux/proc. Add the
+following line to /etc/fstab:
- nspluginwrapper -v -a -i
+linprocfs /compat/linux/proc linprocfs rw 0 0
-If you are updating flash each user must run:
-
- nspluginwrapper -v -a -u
+Then run "mount /compat/linux/proc".
More information about the svn-ports-head
mailing list