>Number: 101358
>Category: ports
>Synopsis: [UPDATE] multimedia/kmplayer: Update to 0.9.2a
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 04 13:20:12 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Shane Bell
>Release:
>Organization:
>Environment:
>Description:
Update to 0.9.2a and tidy up the port a little bit.
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/multimedia/kmplayer/Makefile kmplayer/Makefile
--- /usr/ports/multimedia/kmplayer/Makefile Thu May 11 12:27:45 2006
+++ kmplayer/Makefile Sat Aug 5 01:06:20 2006
@@ -6,42 +6,45 @@
#
PORTNAME= kmplayer
-DISTVERSION= 0.9.1b
-PORTREVISION= 1
+DISTVERSION= 0.9.2a
PORTEPOCH= 2
CATEGORIES= multimedia audio kde
MASTER_SITES= http://kmplayer.kde.org/pkgs/
-#DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.r/-rc/}
MAINTAINER= lioux at FreeBSD.org
COMMENT= KDE frontend to mplayer
RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
+INSTALLS_ICONS= yes
+USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
USE_KDEBASE_VER=3
USE_XLIB= yes
-USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--with-x=${X11BASE} --disable-debug
OPTIONS= GSTREAMER "Enable support for video playback using gstreamer" off \
XINE "Enable support for video playback using libxine" off
-WANT_GSTREAMER= yes
+.include <bsd.port.pre.mk>
-###
-## Lib Detection
-###
-# gstreamer
-.if exists(${X11BASE}/lib/libgstplay-0.8.so)
-WITH_GSTREAMER=yes
+.if defined(WITH_GSTREAMER)
+USE_GSTREAMER80+= yes
+CONFIGURE_ARGS+=--with-gstreamer
+PLIST_SUB+= GSTREAMER=""
+.else
+CONFIGURE_ARGS+=--without-gstreamer
+PLIST_SUB+= GSTREAMER="@comment "
.endif
-# xine
-.if exists(${X11BASE}/lib/libxine.so)
-WITH_XINE=yes
+
+.if defined(WITH_XINE)
+LIB_DEPENDS+= xine.15:${PORTSDIR}/multimedia/libxine
+CONFIGURE_ARGS+=--with-xine
+PLIST_SUB+= XINE=""
+.else
+CONFIGURE_ARGS+=--without-xine
+PLIST_SUB+= XINE="@comment "
.endif
post-patch:
@@ -54,26 +57,5 @@
@${REINPLACE_CMD} -E -e \
's|^(SUBDIRS.*)mimetypes|\1|' \
${WRKSRC}/Makefile.in
-
-.include <bsd.port.pre.mk>
-
-###
-## Support Activation
-###
-# gstreamer
-#.undef WITH_GSTREAMER
-.if defined(WITH_GSTREAMER)
-USE_GSTREAMER+= yes
-
-PLIST_FILES+= bin/kgstplayer
-.else
-CONFIGURE_ARGS+= --without-gstreamer
-.endif
-# xine
-.if defined(WITH_XINE)
-LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine
-
-PLIST_FILES+= bin/kxineplayer
-.endif
.include <bsd.port.post.mk>
diff -ruN /usr/ports/multimedia/kmplayer/Makefile~ kmplayer/Makefile~
--- /usr/ports/multimedia/kmplayer/Makefile~ Thu Jan 1 12:00:00 1970
+++ kmplayer/Makefile~ Sat Aug 5 00:50:50 2006
@@ -0,0 +1,61 @@
+# New ports collection makefile for: KMplayer
+# Date created: Jan 31, 2003
+# Whom: will
+#
+# $FreeBSD: ports/multimedia/kmplayer/Makefile,v 1.32 2006/05/10 22:37:30 edwin Exp $
+#
+
+PORTNAME= kmplayer
+DISTVERSION= 0.9.2a
+PORTEPOCH= 2
+CATEGORIES= multimedia audio kde
+MASTER_SITES= http://kmplayer.kde.org/pkgs/
+
+MAINTAINER= lioux at FreeBSD.org
+COMMENT= KDE frontend to mplayer
+
+RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
+
+INSTALLS_ICONS= yes
+USE_AUTOTOOLS= libtool:15
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_KDEBASE_VER=3
+USE_XLIB= yes
+
+OPTIONS= GSTREAMER "Enable support for video playback using gstreamer" off \
+ XINE "Enable support for video playback using libxine" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GSTREAMER)
+USE_GSTREAMER80+= yes
+CONFIGURE_ARGS+=--with-gstreamer
+PLIST_SUB+= GSTREAMER=""
+.else
+CONFIGURE_ARGS+=--without-gstreamer
+PLIST_SUB+= GSTREAMER="@comment "
+.endif
+
+.if defined(WITH_XINE)
+LIB_DEPENDS+= xine.15:${PORTSDIR}/multimedia/libxine
+CONFIGURE_ARGS+=--with-xine
+PLIST_SUB+= XINE=""
+.else
+CONFIGURE_ARGS+=--without-xine
+PLIST_SUB+= XINE="@comment "
+.endif
+
+post-patch:
+# remove -pedantic where possible to fix build errors on -CURRENT
+# remove optimizations
+ @${REINPLACE_CMD} -e \
+ 's|-O2||; s|-pedantic ||' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+# do not try to roll our own mimetypes
+ @${REINPLACE_CMD} -E -e \
+ 's|^(SUBDIRS.*)mimetypes|\1|' \
+ ${WRKSRC}/Makefile.in
+
+.include <bsd.port.post.mk>
diff -ruN /usr/ports/multimedia/kmplayer/distinfo kmplayer/distinfo
--- /usr/ports/multimedia/kmplayer/distinfo Fri Feb 10 12:26:17 2006
+++ kmplayer/distinfo Thu Aug 3 20:28:48 2006
@@ -1,3 +1,3 @@
-MD5 (kmplayer-0.9.1b.tar.bz2) = dd9930c64757b553ff32705b5218ba05
-SHA256 (kmplayer-0.9.1b.tar.bz2) = 3d5b17bd7ccc0324f9505c39c85fe9ff7238b0587749b89cab7aa370974201b4
-SIZE (kmplayer-0.9.1b.tar.bz2) = 906871
+MD5 (kmplayer-0.9.2a.tar.bz2) = 9e8ab1a03f80249c3ea9332a48817c32
+SHA256 (kmplayer-0.9.2a.tar.bz2) = ddd5f2afffc1a5458456f5a88e81691a106deee4f8a4ba5ac8edb3b3600dd51f
+SIZE (kmplayer-0.9.2a.tar.bz2) = 902210
diff -ruN /usr/ports/multimedia/kmplayer/pkg-plist kmplayer/pkg-plist
--- /usr/ports/multimedia/kmplayer/pkg-plist Mon Feb 27 14:50:42 2006
+++ kmplayer/pkg-plist Sat Aug 5 01:03:26 2006
@@ -1,4 +1,6 @@
+%%GSTREAMER%%bin/kgstreamer
bin/kmplayer
+%%XINE%%bin/kxineplayer
bin/kxvplayer
lib/kde3/kmplayer.a
lib/kde3/kmplayer.la
@@ -71,12 +73,14 @@
share/locale/fi/LC_MESSAGES/kmplayer.mo
share/locale/fr/LC_MESSAGES/kmplayer.mo
share/locale/ga/LC_MESSAGES/kmplayer.mo
+share/locale/gl/LC_MESSAGES/kmplayer.mo
share/locale/he/LC_MESSAGES/kmplayer.mo
share/locale/hi/LC_MESSAGES/kmplayer.mo
share/locale/hu/LC_MESSAGES/kmplayer.mo
share/locale/is/LC_MESSAGES/kmplayer.mo
share/locale/it/LC_MESSAGES/kmplayer.mo
share/locale/ja/LC_MESSAGES/kmplayer.mo
+share/locale/ka/LC_MESSAGES/kmplayer.mo
share/locale/lt/LC_MESSAGES/kmplayer.mo
share/locale/mt/LC_MESSAGES/kmplayer.mo
share/locale/nb/LC_MESSAGES/kmplayer.mo
@@ -97,71 +101,14 @@
share/locale/xx/LC_MESSAGES/kmplayer.mo
share/locale/zh_CN/LC_MESSAGES/kmplayer.mo
share/services/kmplayer_part.desktop
- at dirrmtry share/services
- at dirrmtry share/locale/zh_CN/LC_MESSAGES
- at dirrmtry share/locale/zh_CN
- at dirrmtry share/locale/xx/LC_MESSAGES
- at dirrmtry share/locale/xx
- at dirrmtry share/locale/sr/LC_MESSAGES
- at dirrmtry share/locale/sr
- at dirrmtry share/locale/sk/LC_MESSAGES
- at dirrmtry share/locale/sk
- at dirrmtry share/locale/rw/LC_MESSAGES
- at dirrmtry share/locale/rw
- at dirrmtry share/locale/ro/LC_MESSAGES
- at dirrmtry share/locale/ro
- at dirrmtry share/locale/pt/LC_MESSAGES
- at dirrmtry share/locale/pt
- at dirrmtry share/locale/pl/LC_MESSAGES
- at dirrmtry share/locale/pl
- at dirrmtry share/locale/fi/LC_MESSAGES
- at dirrmtry share/locale/fi
- at dirrmtry share/locale/el/LC_MESSAGES
- at dirrmtry share/locale/el
- at dirrmtry share/locale/cs/LC_MESSAGES
- at dirrmtry share/locale/cs
- at dirrmtry share/locale/ca/LC_MESSAGES
- at dirrmtry share/locale/ca
- at dirrmtry share/icons/hicolor/scalable/apps
- at dirrmtry share/icons/hicolor/scalable
- at dirrmtry share/icons/hicolor/64x64/apps
- at dirrmtry share/icons/hicolor/64x64
- at dirrmtry share/icons/hicolor/48x48/apps
- at dirrmtry share/icons/hicolor/48x48
- at dirrmtry share/icons/hicolor/32x32/apps
- at dirrmtry share/icons/hicolor/32x32
- at dirrmtry share/icons/hicolor/22x22/apps
- at dirrmtry share/icons/hicolor/22x22
- at dirrmtry share/icons/hicolor/16x16/apps
- at dirrmtry share/icons/hicolor/16x16
- at dirrmtry share/icons/hicolor/128x128/apps
- at dirrmtry share/icons/hicolor/128x128
- at dirrmtry share/icons/hicolor
- at dirrmtry share/icons
@dirrm share/doc/HTML/sv/kmplayer
- at dirrmtry share/doc/HTML/sv
@dirrm share/doc/HTML/ru/kmplayer
- at dirrmtry share/doc/HTML/ru
@dirrm share/doc/HTML/pt/kmplayer
- at dirrmtry share/doc/HTML/pt
@dirrm share/doc/HTML/it/kmplayer
- at dirrmtry share/doc/HTML/it
@dirrm share/doc/HTML/fr/kmplayer
- at dirrmtry share/doc/HTML/fr
@dirrm share/doc/HTML/et/kmplayer
- at dirrmtry share/doc/HTML/et
@dirrm share/doc/HTML/es/kmplayer
- at dirrmtry share/doc/HTML/es
@dirrm share/doc/HTML/en/kmplayer
- at dirrmtry share/doc/HTML/en
@dirrm share/doc/HTML/de/kmplayer
- at dirrmtry share/doc/HTML/de
@dirrm share/doc/HTML/da/kmplayer
- at dirrmtry share/doc/HTML/da
- at dirrmtry share/doc/HTML
- at dirrmtry share/config
@dirrm share/apps/kmplayer
- at dirrmtry share/apps
- at dirrmtry share/applications/kde
- at dirrmtry share/applications
- at dirrmtry lib/kde3
>Release-Note:
>Audit-Trail:
>Unformatted: