- Update to 10.1

- Fix lirc dependency
- Convert libXtst dependency to the correct USE_XORG value
- Remove useless LICENSE_FILE

PR:		ports/155466
Submitted by:	Mickael Maillot <mickael.maillot@gmail.com>
Approved by:	ehaupt (mentor)

5 files changed, 15 insertions, 17 deletions

diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index 3152a7e443b3..06ddfc614a31 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xbmc
-PORTVERSION=	10.0
-PORTREVISION=	5
+PORTVERSION=	10.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://mirrors.xbmc.org/releases/source/
 
@@ -15,7 +14,6 @@ MAINTAINER=	mickael.maillot@gmail.com
 COMMENT=	XBMC is an award winning media center application
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE.GPL
 
 BUILD_DEPENDS=	enca:${PORTSDIR}/converters/enca \
 		gawk:${PORTSDIR}/lang/gawk \
@@ -51,8 +49,7 @@ LIB_DEPENDS=	asound.2:${PORTSDIR}/audio/alsa-lib	\
 		smbclient.0:${PORTSDIR}/net/samba-libsmbclient	\
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
-		wavpack.2:${PORTSDIR}/audio/wavpack \
-		Xtst:${PORTSDIR}/x11/libXtst
+		wavpack.2:${PORTSDIR}/audio/wavpack
 
 RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
@@ -65,7 +62,7 @@ USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_AUTOTOOLS=	autoconf libtool automake libltdl
 GNU_CONFIGURE=	yes
-USE_XORG=	xinerama xt xmu xrandr
+USE_XORG=	xinerama xt xmu xrandr xtst
 USE_GL=		glu
 USE_SDL=	image mixer sdl
 USE_MYSQL=	yes
@@ -149,7 +146,7 @@ CONFIGURE_ARGS+=	--disable-hal
 .endif
 
 .if defined(WITH_LIRC)
-RUN_DEPENDS+=	lirc_client.2:${PORTSDIR}/comms/lirc
+RUN_DEPENDS+=	lircd:${PORTSDIR}/comms/lirc
 .endif
 
 .if !defined(WITHOUT_MMS)
diff --git a/multimedia/xbmc/distinfo b/multimedia/xbmc/distinfo
index 8ce6ab767dc3..72cb1630ab9f 100644
--- a/multimedia/xbmc/distinfo
+++ b/multimedia/xbmc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xbmc-10.0.tar.gz) = 06fa5332f4f448f4f68bf705e0e159591a866b1cace52840c78ea4f5925a404a
-SIZE (xbmc-10.0.tar.gz) = 130239951
+SHA256 (xbmc-10.1.tar.gz) = 3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a
+SIZE (xbmc-10.1.tar.gz) = 130187822
diff --git a/multimedia/xbmc/files/patch-xbmc__Application.cpp b/multimedia/xbmc/files/patch-xbmc__Application.cpp
index 1bd10ec76af1..2af15ef00955 100644
--- a/multimedia/xbmc/files/patch-xbmc__Application.cpp
+++ b/multimedia/xbmc/files/patch-xbmc__Application.cpp
@@ -1,15 +1,15 @@
---- ./xbmc/Application.cpp.orig	2010-10-31 14:58:11.000000000 +0100
-+++ ./xbmc/Application.cpp	2010-12-01 12:17:34.231763652 +0100
-@@ -494,6 +494,8 @@
+--- ./xbmc/Application.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/Application.cpp	2011-03-11 08:27:38.000000000 +0100
+@@ -495,6 +495,8 @@
    CLog::Log(LOGNOTICE, "-----------------------------------------------------------------------");
  #if defined(__APPLE__)
-   CLog::Log(LOGNOTICE, "Starting XBMC, Platform: Mac OS X (%s). Built on %s (SVN:%s)", g_sysinfo.GetUnameVersion().c_str(), __DATE__, SVN_REV);
+   CLog::Log(LOGNOTICE, "Starting XBMC, Platform: Mac OS X (%s). Built on %s (Git:%s)", g_sysinfo.GetUnameVersion().c_str(), __DATE__, GIT_REV);
 +#elif defined(__FreeBSD__)
-+  CLog::Log(LOGNOTICE, "Starting XBMC, Platform: FreeBSD (%s). Built on %s (SVN:%s)", g_sysinfo.GetUnameVersion().c_str(), __DATE__, SVN_REV);
++  CLog::Log(LOGNOTICE, "Starting XBMC, Platform: FreeBSD (%s). Built on %s (Git:%s)", g_sysinfo.GetUnameVersion().c_str(), __DATE__, GIT_REV);
  #elif defined(_LINUX)
-   CLog::Log(LOGNOTICE, "Starting XBMC, Platform: Linux (%s, %s). Built on %s (SVN:%s)", g_sysinfo.GetLinuxDistro().c_str(), g_sysinfo.GetUnameVersion().c_str(), __DATE__, SVN_REV);
+   CLog::Log(LOGNOTICE, "Starting XBMC, Platform: Linux (%s, %s). Built on %s (Git:%s)", g_sysinfo.GetLinuxDistro().c_str(), g_sysinfo.GetUnameVersion().c_str(), __DATE__, GIT_REV);
  #elif defined(_WIN32)
-@@ -777,6 +779,11 @@
+@@ -785,6 +787,11 @@
        }
      }
    }
diff --git a/multimedia/xbmc/pkg-descr b/multimedia/xbmc/pkg-descr
index cecc1bd633d7..ffd168df0dfc 100644
--- a/multimedia/xbmc/pkg-descr
+++ b/multimedia/xbmc/pkg-descr
@@ -2,4 +2,4 @@ XBMC Media Center (formerly named "XBox Media Center")
 is a free and open source cross-platform media-player
 and entertainment hub.
 
-WWW:	http://xbmc.org/
+WWW: http://xbmc.org/
diff --git a/multimedia/xbmc/pkg-plist b/multimedia/xbmc/pkg-plist
index c0b6ee8ed902..0d521ef7cb62 100644
--- a/multimedia/xbmc/pkg-plist
+++ b/multimedia/xbmc/pkg-plist
@@ -167,6 +167,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/script.recentlyadded/LICENSE.txt
 %%DATADIR%%/addons/script.recentlyadded/RecentlyAdded.py
 %%DATADIR%%/addons/script.recentlyadded/addon.xml
+%%DATADIR%%/addons/script.recentlyadded/changelog.txt
 %%DATADIR%%/addons/script.rss.editor/LICENSE.txt
 %%DATADIR%%/addons/script.rss.editor/addon.xml
 %%DATADIR%%/addons/script.rss.editor/default.py