ports/134290: Update port: multimedia/miro to 2.0.4

[KATO Tsuguru]

>Number:         134290
>Category:       ports
>Synopsis:       Update port: multimedia/miro to 2.0.4
>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:   Wed May 06 18:10:05 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.1-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update to version 2.0.4

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/multimedia/miro/Makefile multimedia/miro/Makefile
--- /usr/ports/multimedia/miro/Makefile	2009-04-08 02:21:36.000000000 +0900
+++ multimedia/miro/Makefile	2009-04-15 01:59:28.000000000 +0900
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Miro
-PORTVERSION=	2.0.3
+PORTVERSION=	2.0.4
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.osuosl.org/pub/pculture.org/miro/src/	\
 		http://ftp.osuosl.org/pub/pculture.org/miro/src/
@@ -28,7 +28,7 @@
 
 USE_GCC=	4.3+
 USE_GNOME=	gtk20 pygnomeextras
-USE_GECKO=	firefox seamonkey xulrunner mozilla
+USE_GECKO=	firefox libxul seamonkey xulrunner mozilla
 USE_OPENSSL=	yes
 USE_PYTHON=	yes
 WANT_GSTREAMER=	yes
@@ -50,11 +50,23 @@
 USE_GSTREAMER+=	python
 .endif
 
+.if defined(GECKO) && ${GECKO:Mlibxul}!=""
+XPCOM_LIB=	${GECKO}
+GTKMOZEMBED_LIB=${GECKO}
+XULRUNNER_19=	True
+.else
+XPCOM_LIB=	${GECKO}-xpcom
+GTKMOZEMBED_LIB=${GECKO}-gtkmozembed
+XULRUNNER_19=	False
+.endif
+
 .SILENT:
 
 post-patch:
 .for file in setup.py plat/resources.py
-	${REINPLACE_CMD} -e 's|%%GECKO%%|${GECKO}|g ; \
+	${REINPLACE_CMD} -e 's|%%XPCOM_LIB%%|${XPCOM_LIB}|g ; \
+		 s|%%GTKMOZEMBED_LIB%%|${GTKMOZEMBED_LIB}|g ; \
+		 s|%%XULRUNNER_19%%|${XULRUNNER_19}|g ; \
 		 s|%%LOCALBASE%%|${LOCALBASE}|g ; \
 		 s|%%CC%%|${CC}|g ; \
 		 s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g ; \
diff -urN /usr/ports/multimedia/miro/distinfo multimedia/miro/distinfo
--- /usr/ports/multimedia/miro/distinfo	2009-03-21 16:10:36.000000000 +0900
+++ multimedia/miro/distinfo	2009-04-07 15:39:16.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (Miro-2.0.3.tar.gz) = d2defd8a689f9ea2d8852127f92201ca
-SHA256 (Miro-2.0.3.tar.gz) = 4c3b94e58c026eb44423c9cc2c5737ec7e9de407ec342523bfe0a759b0e2c95a
-SIZE (Miro-2.0.3.tar.gz) = 7505026
+MD5 (Miro-2.0.4.tar.gz) = e6cf48252496b2bddd290f375fc0ca33
+SHA256 (Miro-2.0.4.tar.gz) = 8369fdde6e5939923a97fe7704f4bd238fef9d07d0ea5cda7ffde34b45d765a0
+SIZE (Miro-2.0.4.tar.gz) = 7514648
diff -urN /usr/ports/multimedia/miro/files/patch-platform_gtk-x11_setup.py multimedia/miro/files/patch-platform_gtk-x11_setup.py
--- /usr/ports/multimedia/miro/files/patch-platform_gtk-x11_setup.py	2009-03-15 01:19:25.000000000 +0900
+++ multimedia/miro/files/patch-platform_gtk-x11_setup.py	2009-04-14 06:31:00.000000000 +0900
@@ -1,5 +1,5 @@
---- platform/gtk-x11/setup.py.orig	2009-03-08 04:21:24.000000000 +0900
-+++ platform/gtk-x11/setup.py	2009-03-09 15:35:56.000000000 +0900
+--- platform/gtk-x11/setup.py.orig	2009-03-31 05:04:54.000000000 +0900
++++ platform/gtk-x11/setup.py	2009-04-14 06:30:46.000000000 +0900
 @@ -111,12 +111,13 @@
  # XPCOM_LIB = "firefox-xpcom"
  # GTKMOZEMBED_LIB = "firefox-gtkmozembed"
@@ -7,9 +7,9 @@
 -XPCOM_LIB = None
 -GTKMOZEMBED_LIB = None
 -XULRUNNER_19 = None
-+XPCOM_LIB = "%%GECKO%%-xpcom"
-+GTKMOZEMBED_LIB = "%%GECKO%%-gtkmozembed"
-+XULRUNNER_19 = False
++XPCOM_LIB = "%%XPCOM_LIB%%"
++GTKMOZEMBED_LIB = "%%GTKMOZEMBED_LIB%%"
++XULRUNNER_19 = %%XULRUNNER_19%%
  
  # The name of the boost library.  Used for building extensions.
  BOOST_LIB = 'boost_python'
diff -urN /usr/ports/multimedia/miro/pkg-plist multimedia/miro/pkg-plist
--- /usr/ports/multimedia/miro/pkg-plist	2009-03-15 01:19:25.000000000 +0900
+++ multimedia/miro/pkg-plist	2009-04-15 01:57:44.000000000 +0900
@@ -793,7 +793,7 @@
 %%DATADIR%%/resources/searchengines/google.xml
 %%DATADIR%%/resources/searchengines/metavid.xml
 %%DATADIR%%/resources/searchengines/revver.xml
-%%DATADIR%%/resources/searchengines/veoh.xml
+%%DATADIR%%/resources/searchengines/veoh.xml.disabled
 %%DATADIR%%/resources/searchengines/yahoosearch.xml
 %%DATADIR%%/resources/searchengines/yahoovideo.xml
 %%DATADIR%%/resources/searchengines/youtube.xml
>Release-Note:
>Audit-Trail:
>Unformatted: