aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2009-05-09 17:19:24 +0800
committermiwi <miwi@FreeBSD.org>2009-05-09 17:19:24 +0800
commit3ed898948a0caac0165e2f736329c5dc4c09f717 (patch)
tree6b28bd890eb930613c4a80863ed8e4b1d5f8924c
parenta67d306bf1c26c7418e9f84a64fe63e89f5581a8 (diff)
downloadfreebsd-ports-gnome-3ed898948a0caac0165e2f736329c5dc4c09f717.tar.gz
freebsd-ports-gnome-3ed898948a0caac0165e2f736329c5dc4c09f717.tar.zst
freebsd-ports-gnome-3ed898948a0caac0165e2f736329c5dc4c09f717.zip
- Update to 2.0.4
PR: 134290 Submitted by: Ports Fury
-rw-r--r--multimedia/miro/Makefile18
-rw-r--r--multimedia/miro/distinfo6
-rw-r--r--multimedia/miro/files/patch-platform_gtk-x11_setup.py10
-rw-r--r--multimedia/miro/pkg-plist2
4 files changed, 24 insertions, 12 deletions
diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile
index 8eff5eb3bec4..46f1a27c8404 100644
--- a/multimedia/miro/Makefile
+++ b/multimedia/miro/Makefile
@@ -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 @@ INSTALL_WRKSRC= ${WRKSRC}/platform/gtk-x11
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 @@ DATADIR= ${PREFIX}/share/${PORTNAME:L}
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 --git a/multimedia/miro/distinfo b/multimedia/miro/distinfo
index 6a1cd9b78d77..0915cc9d9ac5 100644
--- a/multimedia/miro/distinfo
+++ b/multimedia/miro/distinfo
@@ -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 --git a/multimedia/miro/files/patch-platform_gtk-x11_setup.py b/multimedia/miro/files/patch-platform_gtk-x11_setup.py
index 890df31755cb..84b2b82f8e39 100644
--- a/multimedia/miro/files/patch-platform_gtk-x11_setup.py
+++ b/multimedia/miro/files/patch-platform_gtk-x11_setup.py
@@ -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 --git a/multimedia/miro/pkg-plist b/multimedia/miro/pkg-plist
index d09b9c07c7ab..718c40e1f8de 100644
--- a/multimedia/miro/pkg-plist
+++ b/multimedia/miro/pkg-plist
@@ -793,7 +793,7 @@ share/mime/packages/miro.xml
%%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