Sync w/ FreeBSD ports.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9415 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 29 insertions, 15 deletions

diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 65f23eddc..e9539e076 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -16,8 +16,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gmencoder is Gnome2 front-end to mplayer/mencoder
 
-BUILD_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mplayer
-RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mplayer
+BUILD_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder
+RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/multimedia/gnome-subtitles/Makefile b/multimedia/gnome-subtitles/Makefile
index d496f0896..5a8f411ef 100644
--- a/multimedia/gnome-subtitles/Makefile
+++ b/multimedia/gnome-subtitles/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome-subtitles
-PORTVERSION=	0.5.1
+PORTVERSION=	0.6
 PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -20,7 +20,10 @@ RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
 
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gtksharp20 gnomesharp20 gnomedocutils
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 GCONF_SCHEMAS=	gnome-subtitles.schemas
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
diff --git a/multimedia/gnome-subtitles/distinfo b/multimedia/gnome-subtitles/distinfo
index e78d5814c..a38ee3a3a 100644
--- a/multimedia/gnome-subtitles/distinfo
+++ b/multimedia/gnome-subtitles/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-subtitles-0.5.1.tar.gz) = 313fabeb42f4bf117c851d2af9eda437
-SHA256 (gnome-subtitles-0.5.1.tar.gz) = 1aa0d521eebced2e5288cb1fd2762dc36267a84681388016ead6cb48fe7c9692
-SIZE (gnome-subtitles-0.5.1.tar.gz) = 445167
+MD5 (gnome-subtitles-0.6.tar.gz) = a4d605feef7ba6a614dfd1e054c1139a
+SHA256 (gnome-subtitles-0.6.tar.gz) = b0c41c9111b0d9615f77dff1d5166c3c15adf2f4822090e72e3b9eb2e7b59c62
+SIZE (gnome-subtitles-0.6.tar.gz) = 502874
diff --git a/multimedia/gnome-subtitles/pkg-descr b/multimedia/gnome-subtitles/pkg-descr
index 62eb1537b..19b176b3a 100644
--- a/multimedia/gnome-subtitles/pkg-descr
+++ b/multimedia/gnome-subtitles/pkg-descr
@@ -1,5 +1,5 @@
-Gnome Subtitles is a subtitle editor for the GNOME desktop. It supports
-the most common text-based subtitle formats and allows for subtitle
-editing, conversion and synchronization.
+Gnome Subtitles is a subtitle editor for the GNOME desktop. It supports the
+most common text-based subtitle formats and allows for subtitle editing,
+translation and synchronization.
 
 WWW: http://gnome-subtitles.sourceforge.net
diff --git a/multimedia/gnome-subtitles/pkg-plist b/multimedia/gnome-subtitles/pkg-plist
index 4ada75621..cd2271379 100644
--- a/multimedia/gnome-subtitles/pkg-plist
+++ b/multimedia/gnome-subtitles/pkg-plist
@@ -4,10 +4,20 @@ lib/gnome-subtitles/sublib.dll
 share/applications/gnome-subtitles.desktop
 share/gnome/help/gnome-subtitles/C/legal.xml
 share/gnome/help/gnome-subtitles/C/gnome-subtitles.xml
+share/gnome/help/gnome-subtitles/ca/gnome-subtitles.xml
+share/gnome/help/gnome-subtitles/sv/gnome-subtitles.xml
 share/omf/gnome-subtitles/gnome-subtitles-C.omf
+share/omf/gnome-subtitles/gnome-subtitles-ca.omf
+share/omf/gnome-subtitles/gnome-subtitles-sv.omf
 share/pixmaps/gnome-subtitles.png
+share/locale/ca/LC_MESSAGES/gnome-subtitles.mo
+share/locale/es/LC_MESSAGES/gnome-subtitles.mo
+share/locale/sv/LC_MESSAGES/gnome-subtitles.mo
+share/locale/dz/LC_MESSAGES/gnome-subtitles.mo
 @dirrmtry lib/gnome-subtitles
 @dirrmtry share/omf/gnome-subtitles
 @dirrmtry share/gnome/help/gnome-subtitles/C
+@dirrmtry share/gnome/help/gnome-subtitles/sv
+@dirrmtry share/gnome/help/gnome-subtitles/ca
 @dirrmtry share/gnome/help/gnome-subtitles
 @dirrmtry locale
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index d1a62f2ed..ceb076a36 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kino
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -18,7 +18,7 @@ COMMENT=	A DV non-linear video editor
 LIB_DEPENDS=	dv.4:${PORTSDIR}/multimedia/libdv	\
 		Magick.10:${PORTSDIR}/graphics/ImageMagick	\
 		samplerate.1:${PORTSDIR}/audio/libsamplerate
-RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mplayer	\
+RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder	\
 		mplex:${PORTSDIR}/multimedia/mjpegtools
 
 OPTIONS=	QUICKTIME "With Quicktime support" off	\
diff --git a/multimedia/kino/distinfo b/multimedia/kino/distinfo
index 49c0982c9..11aa25ec2 100644
--- a/multimedia/kino/distinfo
+++ b/multimedia/kino/distinfo
@@ -1,3 +1,3 @@
-MD5 (kino-1.1.0.tar.gz) = c0b238d361b191c487c2e25ff2cc4acf
-SHA256 (kino-1.1.0.tar.gz) = 40caa7b9c4efa1fefc01a1770abbf9170a90720fff269fb7a96fc2f553cf2506
-SIZE (kino-1.1.0.tar.gz) = 10623140
+MD5 (kino-1.1.1.tar.gz) = 9aebc3ab965fba24021ba522c031e5ef
+SHA256 (kino-1.1.1.tar.gz) = 396b963436f8845d42981da9762d932186f09572980f3381fb246084a5236a89
+SIZE (kino-1.1.1.tar.gz) = 10623154
diff --git a/multimedia/kino/pkg-plist b/multimedia/kino/pkg-plist
index 361e899b3..6551fcc72 100644
--- a/multimedia/kino/pkg-plist
+++ b/multimedia/kino/pkg-plist
@@ -382,6 +382,7 @@ share/kino/lumas/matrix_snake_toplefthorizontal.png
 share/kino/lumas/none.png
 share/kino/lumas/symmetric_clock.png
 share/pixmaps/kino.png
+share/locale/ca/LC_MESSAGES/kino.mo
 share/locale/cs/LC_MESSAGES/kino.mo
 share/locale/da/LC_MESSAGES/kino.mo
 share/locale/de/LC_MESSAGES/kino.mo
diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index bb7dd9a29..16fa13fe9 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	xmps
+# New ports collection makefile for:	XMPS
 # Date created:				15 June 2000
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #