Page MenuHomeFreeBSD

www/linux-*-flashplugin11: set -c6 port as master port
ClosedPublic

Authored by xmj on Mar 24 2015, 8:28 PM.

Details

Summary

Our flashplugin doesn't particularly care whether it's installed in a f10 or a
c6 environment. What changes are the linux apps it uses and whether to use
openssl (f10) or openssl-compat (c6) via USE_LINUX_APPS, and the ALSA option's
RUN_DEPENDS.

www/linux-*-flashplugin11: set -c6 port as master port

- Make www/linux-c6-flashplugin11 master port
- Make www/linux-f10-flashplugin11 slave port
- Reduce future maintenance turnaround.

Approved by:	swills (mentor)
Test Plan

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

xmj updated this revision to Diff 4381.Mar 24 2015, 8:28 PM
xmj retitled this revision from to www/linux-*-flashplugin11: set -c6 port as master port.
xmj updated this object.
xmj edited the test plan for this revision. (Show Details)
xmj added reviewers: swills, koobs.
eadler added a subscriber: eadler.Mar 24 2015, 10:56 PM

this LGTM from a flashplugin and emulation@ POV

koobs requested changes to this revision.Mar 25 2015, 12:06 AM
koobs edited edge metadata.

I would try to remove the need for a conditional (.if ${USE_LINUX} == "f10") and instead try adding an OPTION (or similar mechanism) from the slave port, thereby allowing use of options helpers in the master.

Failing that, see inline comment

www/linux-c6-flashplugin11/Makefile
53 ↗(On Diff #4381)

Why can't this be:

USE_LINUX_APPS?= <deps list> openssl - in the master, and
USE_LINUX_APP= <deps list> openssl-compat - in the slave?

This revision now requires changes to proceed.Mar 25 2015, 12:06 AM
xmj added a comment.Mar 25 2015, 10:26 AM

thereby allowing use of options helpers in the master.

The OPTIONS helpers of the master are usable anyway.

Either ALSA is on, and the slave port will set the correct dependency on the linux-f10 ALSA port,
or alsa is off, and the master port will set the correct dependency on either openssl (linux-f10) or openssl-compat (linux-c6).

www/linux-c6-flashplugin11/Makefile
53 ↗(On Diff #4381)

Because you only need OpenSSL if you're not using ALSA. See conditional around it.

koobs accepted this revision.Mar 25 2015, 11:37 AM
koobs edited edge metadata.
This revision is now accepted and ready to land.Mar 25 2015, 11:37 AM
xmj closed this revision.Mar 25 2015, 6:21 PM
xmj updated this revision to Diff 4415.

Closed by commit rP382257 (authored by @xmj).