aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/eclair/Makefile26
-rw-r--r--multimedia/eclair/distinfo6
-rw-r--r--multimedia/eclair/pkg-plist12
-rw-r--r--multimedia/emotion/Makefile21
-rw-r--r--multimedia/emotion/distinfo6
-rw-r--r--multimedia/emotion/files/patch-configure10
-rw-r--r--multimedia/emotion/pkg-plist6
7 files changed, 41 insertions, 46 deletions
diff --git a/multimedia/eclair/Makefile b/multimedia/eclair/Makefile
index 00faf3e32891..c4f62a12d0e6 100644
--- a/multimedia/eclair/Makefile
+++ b/multimedia/eclair/Makefile
@@ -7,27 +7,23 @@
#
PORTNAME= eclair
-PORTVERSION= 20060719
+PORTVERSION= 20060926
CATEGORIES= multimedia
-MASTER_SITES= http://mbsd.msk.ru/dist/
+MASTER_SITES= http://sunner.elcomnet.ru/~stas/
-MAINTAINER= ssedov@mbsd.msk.ru
+MAINTAINER= stas@FreeBSD.org
COMMENT= An EFL powered media player
-LIB_DEPENDS= ecore.1:${PORTSDIR}/x11/ecore \
- edje.5:${PORTSDIR}/graphics/edje \
- emotion.0:${PORTSDIR}/multimedia/emotion \
- esmart_trans_x11.0:${PORTSDIR}/graphics/esmart \
- evas.1:${PORTSDIR}/graphics/evas \
- tag.5:${PORTSDIR}/audio/taglib
+LIB_DEPENDS= tag.5:${PORTSDIR}/audio/taglib
+GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
-USE_GNOME= pkgconfig libxml2
+USE_GNOME= gnometarget pkgconfig libxml2
+USE_EFL= ecore edje evas emotion
+USE_EFL_ESMART= trans_x11
USE_SQLITE= 3
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/multimedia/eclair/distinfo b/multimedia/eclair/distinfo
index 8c263cb5157c..f9e7657641de 100644
--- a/multimedia/eclair/distinfo
+++ b/multimedia/eclair/distinfo
@@ -1,3 +1,3 @@
-MD5 (eclair-20060719.tar.bz2) = bffffd12d303bcd87e6cb581962d2378
-SHA256 (eclair-20060719.tar.bz2) = 5cd78965239fff3f527d59a97c58ec35a6ca2d4f0cda4bb6f778c9a02eba4201
-SIZE (eclair-20060719.tar.bz2) = 630780
+MD5 (eclair-20060926.tar.bz2) = 41ae9ab91f36e1fc98230903f64d0848
+SHA256 (eclair-20060926.tar.bz2) = 7b68e45df6ebfd66c009c76c0f522f6a84a6a3c06c103f6cd350cad626f41afc
+SIZE (eclair-20060926.tar.bz2) = 628890
diff --git a/multimedia/eclair/pkg-plist b/multimedia/eclair/pkg-plist
index 0d8b4944c8d6..766ef707545c 100644
--- a/multimedia/eclair/pkg-plist
+++ b/multimedia/eclair/pkg-plist
@@ -22,9 +22,9 @@ bin/eclair_wsz2edj
%%DATADIR%%/themes/swallow_me.edj
%%DATADIR%%/widget_themes/default.edj
%%DATADIR%%/wsz2edj/wsz2edj_edc.tar.gz
-@dirrmtry %%DATADIR%%/wsz2edj
-@dirrmtry %%DATADIR%%/widget_themes
-@dirrmtry %%DATADIR%%/themes
-@dirrmtry %%DATADIR%%/icons
-@dirrmtry %%DATADIR%%/fonts
-@dirrmtry %%DATADIR%%
+@dirrm %%DATADIR%%/wsz2edj
+@dirrm %%DATADIR%%/widget_themes
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%
diff --git a/multimedia/emotion/Makefile b/multimedia/emotion/Makefile
index 5b92ee78f15b..3887cd6ca4f8 100644
--- a/multimedia/emotion/Makefile
+++ b/multimedia/emotion/Makefile
@@ -7,31 +7,25 @@
#
PORTNAME= emotion
-PORTVERSION= 20060719
+PORTVERSION= 20060926
CATEGORIES= multimedia
-MASTER_SITES= http://mbsd.msk.ru/dist/
+MASTER_SITES= http://sunner.elcomnet.ru/~stas/
-MAINTAINER= ssedov@mbsd.msk.ru
+MAINTAINER= stas@FreeBSD.org
COMMENT= Video playback wrapper library for e17
-LIB_DEPENDS= ecore.1:${PORTSDIR}/x11/ecore \
- edje.5:${PORTSDIR}/graphics/edje \
- eet.9:${PORTSDIR}/devel/eet \
- embryo.9:${PORTSDIR}/lang/embryo \
- evas.1:${PORTSDIR}/graphics/evas
-
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig gnometarget
+USE_EFL= ecore edje eet embryo evas
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
OPTIONS= XINE "Build Xine module" on \
GST "Build GStreamer module" on
.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
.if defined(WITHOUT_XINE) && defined(WITHOUT_GST)
IGNORE= is useless without playback library. Please run 'make config' and choose one of XINE and GST
@@ -39,14 +33,19 @@ IGNORE= is useless without playback library. Please run 'make config' and choose
.if defined(WITH_XINE)
LIB_DEPENDS+= xine.15:${PORTSDIR}/multimedia/libxine
+CONFIGURE_ARGS+=--enable-xine
PLIST_SUB+= XINE=""
.else
+CONFIGURE_ARGS+=--disable-xine
PLIST_SUB+= XINE="@comment "
.endif
+
.if defined(WITH_GST)
USE_GSTREAMER= ffmpeg good
+CONFIGURE_ARGS+=--enable-gstreamer
PLIST_SUB+= GST=""
.else
+CONFIGURE_ARGS+=--disable-gstreamer
PLIST_SUB+= GST="@comment "
.endif
diff --git a/multimedia/emotion/distinfo b/multimedia/emotion/distinfo
index dcc2f9a24be8..b601eba58e91 100644
--- a/multimedia/emotion/distinfo
+++ b/multimedia/emotion/distinfo
@@ -1,3 +1,3 @@
-MD5 (emotion-20060719.tar.bz2) = e5536468ace9cd02c31ae7994eca7c1d
-SHA256 (emotion-20060719.tar.bz2) = 6ec5c3e8e07df8358ef34117eeb90a278d0cab12ffdae0e06c6171c81f439668
-SIZE (emotion-20060719.tar.bz2) = 1425051
+MD5 (emotion-20060926.tar.bz2) = 20b25be2a8ae59b704dbb6b3e37100df
+SHA256 (emotion-20060926.tar.bz2) = 4e007b703cb7c2f2d52336e661968d647df9f40dcc54f5694a0e59f51b1c5886
+SIZE (emotion-20060926.tar.bz2) = 1434266
diff --git a/multimedia/emotion/files/patch-configure b/multimedia/emotion/files/patch-configure
index e032d84c6ce1..ce8584392d2d 100644
--- a/multimedia/emotion/files/patch-configure
+++ b/multimedia/emotion/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Tue Jul 18 17:40:53 2006
-+++ configure Tue Jul 18 17:41:01 2006
-@@ -21861,27 +21861,6 @@
+--- configure.orig Wed Sep 27 19:06:08 2006
++++ configure Wed Sep 27 19:08:36 2006
+@@ -22241,27 +22241,6 @@
_ACEOF
@@ -25,6 +25,6 @@
-
-
-
- # Check whether --with-eet-prefix or --without-eet-prefix was given.
+ # Check whether --with-eet-prefix was given.
if test "${with_eet_prefix+set}" = set; then
- withval="$with_eet_prefix"
+ withval=$with_eet_prefix; eet_config_prefix="$withval"
diff --git a/multimedia/emotion/pkg-plist b/multimedia/emotion/pkg-plist
index 405cc4bd2aab..da6dcdb15dea 100644
--- a/multimedia/emotion/pkg-plist
+++ b/multimedia/emotion/pkg-plist
@@ -13,6 +13,6 @@ lib/libemotion.so
lib/libemotion.so.0
libdata/pkgconfig/emotion.pc
%%DATADIR%%/data/theme.edj
-@dirrmtry share/emotion/data
-@dirrmtry share/emotion
-@dirrmtry lib/emotion
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%
+@dirrm lib/emotion