ports/63805: mplayer-plugin WITH_MOZILLA=firefox extension

[Stijn Hoop]

>Number:         63805
>Category:       ports
>Synopsis:       mplayer-plugin WITH_MOZILLA=firefox extension
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 05 07:20:09 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Stijn Hoop
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:

System: FreeBSD 5.2-CURRENT #18: Thu Mar 4 11:18:52 CET 2004

>Description:

The www/mplayer-plugin has a WITH_MOZILLA knob to select the right mozilla
port but it lacks a setting of 'firefox'. Therefore one always needs to
have a mozilla port installed alongside a firefox installation, which should
not be needed.

>How-To-Repeat:

Install only www/firefox, then try to install www/mplayer-plugin and witness
it installing mozilla-1.6

>Fix:

Apply this patch to www/mplayer-plugin/Makefile.

--- /usr/ports/www/mplayer-plugin/Makefile	Thu Mar  4 10:15:58 2004
+++ Makefile	Fri Mar  5 16:11:52 2004
@@ -14,9 +14,14 @@
 MAINTAINER=	marcus at FreeBSD.org
 COMMENT=	A Mozilla plugin for the MPlayer media player
 
+.if defined(WITH_MOZILLA) && WITH_MOZILLA=="firefox"
+BUILD_DEPENDS=	${X11BASE}/lib/firefox/lib/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/firefox
+RUN_DEPENDS=	${X11BASE}/lib/firefox/lib/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/firefox
+.else
 BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer \
-		${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
+.endif
+RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 
 HEADERS_SUFX=
 
@@ -44,6 +49,9 @@
 CONFIGURE_ARGS+=	--disable-gtk2 \
 			--enable-gtk1
 .else
+.if ${WITH_MOZILLA}=="firefox"
+CONFIGURE_ENV+=		PKG_CONFIG_PATH=${X11BASE}/lib/firefox/lib/pkgconfig
+.else
 HEADERS_SUFX=	-gtk1
 CONFIGURE_ARGS+=	--disable-gtk2 \
 			--enable-gtk1
@@ -51,12 +59,14 @@
 .endif
 .endif
 .endif
+.endif
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} " By default this port uses www/mozilla for Gecko support, but you can"
 	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
 	@${ECHO_MSG}
+	@${ECHO_MSG} " firefox "
 	@${ECHO_MSG} " mozilla-devel "
 	@${ECHO_MSG} " mozilla-gtk1 "
 	@${ECHO_MSG} " mozilla-devel-gtk1 "
>Release-Note:
>Audit-Trail:
>Unformatted: