- Mark as IGNORE on FreeBSD 6.x.

- Add support for firefox 3.x, using libxul.
- Remove firefox 2.x support.

Approved by:	portmgr (self)

2 files changed, 17 insertions, 45 deletions

diff --git a/multimedia/moonlight/Makefile b/multimedia/moonlight/Makefile
index bc133a4ed1e..d2e3005001f 100644
--- a/multimedia/moonlight/Makefile
+++ b/multimedia/moonlight/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	moonlight
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	multimedia www
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/moon/
 DISTNAME=	moon-${PORTVERSION}
@@ -17,67 +18,44 @@ COMMENT=	OpenSource Implementation of Silverlight
 LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
 		execinfo.1:${PORTSDIR}/devel/libexecinfo
 
-OPTIONS=	FF2 "Install Firefox 2.x support" on
-#		FF3 "Install Firefox 3.x support" on
-
+USE_GECKO=	libxul
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-cairo=system \
-		--with-debug=yes
+		--with-debug=yes \
+		--with-ff2=no \
+		--with-ff3=yes
 
+USE_WEBPLUGINS=		gecko19
 WEBPLUGINS_DIR=		${PREFIX}/lib/moon/plugin
 WEBPLUGINS_FILES=	libmoonloader.so \
-			libmoonplugin.so
+			libmoonplugin.so \
+			libmoonplugin-ff3bridge.so
 
 .include <bsd.port.pre.mk>
+.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
 
 .if ${ARCH} == "sparc64"
 IGNORE=		does not build: not yet ported to sparc64
 .endif
 
-.if !defined(WITHOUT_FF2) || exists(${LOCALBASE}/bin/firefox)
-BUILD_DEPENDS+=		${LOCALBASE}/bin/firefox:${PORTSDIR}/www/firefox
-RUN_DEPENDS+=		${LOCALBASE}/bin/firefox:${PORTSDIR}/www/firefox
-
-USE_WEBPLUGINS+=	gecko18
-WEBPLUGINS_FILES+=	libmoonplugin-ff2bridge.so
-
-PLIST_SUB+=		FF2=""
-CONFIGURE_ARGS+=	--with-ff2=yes
-.else
-PLIST_SUB+=		FF2="@comment "
-CONFIGURE_ARGS+=	--with-ff2=no
+.if ${OSVERSION} < 700000
+IGNORE=		does not build: requires posix_memalign(3)
 .endif
 
-#.if !defined(WITHOUT_FF3) || exists(${LOCALBASE}/bin/firefox3)
-#BUILD_DEPENDS+=		${LOCALBASE}/bin/firefox3:${PORTSDIR}/www/firefox3
-#RUN_DEPENDS+=		${LOCALBASE}/bin/firefox3:${PORTSDIR}/www/firefox3
-#
-#USE_WEBPLUGINS+=		gecko19
-#WEBPLUGINS_FILES+=	libmoonplugin-ff3bridge.so
-#
-#PLIST_SUB+=		FF3=""
-#CONFIGURE_ARGS+=	--with-ff3=yes
-#CONFIGURE_ENV+=		FF3_CFLAGS="-I${LOCALBASE}/include/firefox3/unstable -I${LOCALBASE}/include/nspr" \
-#			FF3_LIBS="-pthread -L${LOCALBASE}/lib/firefox3"
-#.else
-PLIST_SUB+=		FF3="@comment "
-CONFIGURE_ARGS+=	--with-ff3=no
-#.endif
-
-.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
-
 # Building the .xpi doesn't actually require embedded cairo, but it's a safer option
 # as there's no way for firefox to detect if cairo is already installed apparently.
-.if defined(WITH_XPI_PLUGIN)
+.if defined(WITH_XPI_PLUGIN_ONLY)
 CONFIGURE_ARGS+=--enable-user-plugin --with-cairo=embedded
 PLIST=		${NONEXISTENT}
 PLIST_FILES=	${WEBPLUGINS_DIR}/${PKGNAME}-freebsd-${OSREL}.xpi
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e '/^TEST_SUBDIR/d' \
+			${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/<malloc.h>/d' \
 			${WRKSRC}/src/animation.cpp \
 			${WRKSRC}/src/runtime.cpp \
@@ -91,12 +69,8 @@ post-patch:
 			${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|-ldl||' \
 			${WRKSRC}/plugin/Makefile.in
-#	@${REINPLACE_CMD} -e 's|\(FF3_MODULES\)=.*|\1="libavutil"|1' \
-#			${WRKSRC}/configure
-#	@${REINPLACE_CMD} -e 's|\(FF3_MODULES\)=.*|\1="firefox-js firefox-plugin"|1' \
-#			${WRKSRC}/configure
 
-.if defined(WITH_XPI_PLUGIN)
+.if defined(WITH_XPI_PLUGIN_ONLY)
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/plugin/install/novell-moonlight.xpi \
 		${WEBPLUGINS_DIR}/${PKGNAME}-freebsd-${OSREL}.xpi
diff --git a/multimedia/moonlight/pkg-plist b/multimedia/moonlight/pkg-plist
index dcedad39796..5f0e4b4bddc 100644
--- a/multimedia/moonlight/pkg-plist
+++ b/multimedia/moonlight/pkg-plist
@@ -5,10 +5,8 @@ lib/libmoon.so.0
 lib/moon/plugin/README
 lib/moon/plugin/libmoonloader.la
 lib/moon/plugin/libmoonloader.so
-%%FF2%%lib/moon/plugin/libmoonplugin-ff2bridge.la
-%%FF2%%lib/moon/plugin/libmoonplugin-ff2bridge.so
-%%FF3%%lib/moon/plugin/libmoonplugin-ff3bridge.la
-%%FF3%%lib/moon/plugin/libmoonplugin-ff3bridge.so
+lib/moon/plugin/libmoonplugin-ff3bridge.la
+lib/moon/plugin/libmoonplugin-ff3bridge.so
 lib/moon/plugin/libmoonplugin.la
 lib/moon/plugin/libmoonplugin.so
 @dirrm lib/moon/plugin