From stijn@pcwin002.win.tue.nl  Fri Mar  5 07:18:14 2004
Return-Path: <stijn@pcwin002.win.tue.nl>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id A606B16A4CE; Fri,  5 Mar 2004 07:18:14 -0800 (PST)
Received: from pcwin002.win.tue.nl (pcwin002.win.tue.nl [131.155.71.72])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 2B5CB43D31; Fri,  5 Mar 2004 07:18:14 -0800 (PST)
	(envelope-from stijn@pcwin002.win.tue.nl)
Received: from pcwin002.win.tue.nl (orb_rules@localhost [127.0.0.1])
	by pcwin002.win.tue.nl (8.12.11/8.12.11) with ESMTP id i25FIK0b032867;
	Fri, 5 Mar 2004 16:18:20 +0100 (CET)
	(envelope-from stijn@pcwin002.win.tue.nl)
Received: (from stijn@localhost)
	by pcwin002.win.tue.nl (8.12.11/8.12.11/Submit) id i25FIKDD032866;
	Fri, 5 Mar 2004 16:18:20 +0100 (CET)
	(envelope-from stijn)
Message-Id: <200403051518.i25FIKDD032866@pcwin002.win.tue.nl>
Date: Fri, 5 Mar 2004 16:18:20 +0100 (CET)
From: Stijn Hoop <stijn@win.tue.nl>
Reply-To: Stijn Hoop <stijn@win.tue.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Joe Marcus Clarke <marcus@freebsd.org>
Subject: mplayer-plugin WITH_MOZILLA=firefox extension
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         63805
>Category:       ports
>Synopsis:       mplayer-plugin WITH_MOZILLA=firefox extension
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    marcus
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 05 07:20:09 PST 2004
>Closed-Date:    Fri Mar 05 23:33:40 PST 2004
>Last-Modified:  Fri Mar 05 23:33:40 PST 2004
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->marcus  
Responsible-Changed-By: krion 
Responsible-Changed-When: Fri Mar 5 07:20:55 PST 2004 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=63805 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Mar 5 23:33:25 PST 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=63805 
>Unformatted:
