- Add BLURAY option

- Respect WITH_DEBUG
- Add LICENSE
- Update MIRROR_SITES
- Add missing faad dependency [1]
- Correct plist for python != 2.6 [1]
- Remove useless patch for goom visualization
- Remove SNESAPU (spc codec) from build because of ASM code compile problems on -CURRENT

Submitted by:	Mickael Maillot <mickael dot maillot at gmail dot com> (maintainer),
		Anonymous <swell dot k at gmail dot com> [1]

7 files changed, 68 insertions, 80 deletions

diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index 6bc553dad568..52e98e45036a 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -7,14 +7,16 @@
 
 PORTNAME=	xbmc
 PORTVERSION=	10.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
-MASTER_SITES=	http://mirrors.xbmc.org/releases/source/ \
-		http://fneufn.eu/freebsd/xbmc/
+MASTER_SITES=	http://mirrors.xbmc.org/releases/source/
 
 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 \
 		gperf:${PORTSDIR}/devel/gperf \
@@ -38,6 +40,7 @@ LIB_DEPENDS=	asound.2:${PORTSDIR}/audio/alsa-lib	\
 		lzo2.2:${PORTSDIR}/archivers/lzo2 \
 		jasper.4:${PORTSDIR}/graphics/jasper \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
+		faad.2:${PORTSDIR}/audio/faad \
 		mad:${PORTSDIR}/audio/libmad \
 		modplug:${PORTSDIR}/audio/libmodplug \
 		mpeg2:${PORTSDIR}/multimedia/libmpeg2 \
@@ -76,8 +79,10 @@ USE_LDCONFIG=	${PREFIX}/lib/xbmc/system \
 		${PREFIX}/lib/xbmc/system/players/paplayer
 
 USE_DOS2UNIX=	xbmc/lib/libid3tag/libid3tag/compat.gperf
+PLIST_SUB+=	PYVER="${PYTHON_VERSION:S/python//:S/.//g}"
 
 OPTIONS=	AVAHI		"Enable Avahi support"			on \
+		LIBBLURAY	"Enable libbluray support"		on \
 		FAAC		"Enable FAAC support"			off \
 		HAL		"Enable HAL support"			on \
 		MMS		"Enable mms:// & mmsh:// support"	on \
@@ -97,11 +102,16 @@ DESKTOP_ENTRIES="XBMC" \
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-CONFIGURE_ARGS+=--enable-external-libraries \
-		--disable-debug
+CONFIGURE_ARGS+=	--enable-external-libraries
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--disable-debug
+.endif
+
 .if ${ARCH} == i386
 PLIST_SUB+=	ARCH="x86"
 .else
@@ -115,6 +125,13 @@ LIB_DEPENDS+=	avahi-common.3:${PORTSDIR}/net/avahi-app
 CONFIGURE_ARGS+=	--disable-avahi
 .endif
 
+.if !defined(WITHOUT_LIBBLURAY)
+CONFIGURE_ARGS+=	--enable-libbluray
+LIB_DEPENDS+=	bluray.0:${PORTSDIR}/multimedia/libbluray
+.else
+CONFIGURE_ARGS+=	--disable-libbluray
+.endif
+
 .if defined(WITH_FAAC)
 CONFIGURE_ARGS+=	--enable-faac
 LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
diff --git a/multimedia/xbmc/files/patch-Makefile.in b/multimedia/xbmc/files/patch-Makefile.in
index 902dc85711c7..b2166dbffeaf 100644
--- a/multimedia/xbmc/files/patch-Makefile.in
+++ b/multimedia/xbmc/files/patch-Makefile.in
@@ -1,6 +1,24 @@
---- ./Makefile.in.orig	2010-10-27 19:04:21.000000000 +0200
-+++ ./Makefile.in	2010-12-01 12:17:34.175401731 +0100
-@@ -507,7 +507,8 @@
+--- Makefile.in.orig	2010-12-17 07:17:41.000000000 +0100
++++ Makefile.in	2011-02-23 22:22:13.000000000 +0100
+@@ -71,7 +71,6 @@
+ 	xbmc/cores/paplayer/timidity \
+ 	xbmc/cores/paplayer/SIDCodec \
+ 	xbmc/cores/paplayer/YMCodec/StSoundLibrary \
+-	xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU \
+ 	xbmc/cores/paplayer/vgmstream \
+ 
+ ifeq (@USE_INTERNAL_LIBA52@,1)
+@@ -363,9 +362,6 @@
+   endif
+ endif
+ 	$(MAKE) -C xbmc/cores/paplayer/YMCodec/StSoundLibrary	
+-ifeq ($(or $(findstring powerpc,$(ARCH)),$(findstring x86_64-linux,$(ARCH)),$(findstring arm, $(ARCH))),)
+-	$(MAKE) -C xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU
+-endif
+ imagelib: dllloader
+ 	$(MAKE) -C xbmc/lib/cximage-6.0
+ 
+@@ -502,7 +498,8 @@
  	$(MAKE) -C tools/XBMCLive
  
  install-bin: xbmc.bin # developement convenience target
@@ -10,7 +28,7 @@
  
  ifeq ($(findstring osx,$(ARCH)), osx)
  	# TODO: add osx install
-@@ -516,45 +517,93 @@
+@@ -511,45 +508,93 @@
  
  install-binaries: install-scripts
  	@echo "Copying XBMC binary to $(DESTDIR)$(libdir)/xbmc/xbmc.bin"
diff --git a/multimedia/xbmc/files/patch-configure.in b/multimedia/xbmc/files/patch-configure.in
index 75db2925f6d4..4b2850d8f0ee 100644
--- a/multimedia/xbmc/files/patch-configure.in
+++ b/multimedia/xbmc/files/patch-configure.in
@@ -1,7 +1,5 @@
-Index: configure.in
-===================================================================
---- configure.in	(revision 35649)
-+++ configure.in	(working copy)
+--- configure.in.orig	2010-12-17 07:17:41.000000000 +0100
++++ configure.in	2011-02-23 21:51:33.000000000 +0100
 @@ -19,10 +19,10 @@
  [
    if [[ "$host_vendor" != "apple" ]]; then
@@ -136,7 +134,15 @@ Index: configure.in
  if test "$use_mid" = "yes"; then
    final_message="$final_message\n  MID Support:\tYes"
    SDL_DEFINES="$SDL_DEFINES -DMID"
-@@ -1735,7 +1785,7 @@
+@@ -1418,7 +1468,6 @@
+     xbmc/cores/paplayer/NSFCodec/Makefile \
+     xbmc/cores/paplayer/SIDCodec/Makefile \
+     xbmc/cores/paplayer/vgmstream/Makefile \
+-    xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile \
+     xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile \
+     xbmc/cores/playercorefactory/Makefile \
+     xbmc/karaoke/Makefile \
+@@ -1735,7 +1784,7 @@
        --enable-static \
        --disable-shared \
        --cc="$CC" &&
@@ -145,7 +151,7 @@ Index: configure.in
      mkdir -p `pwd`/../includes/dvdread
      cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
    else
-@@ -1744,13 +1794,14 @@
+@@ -1744,13 +1793,14 @@
        --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
        --host=$host_alias \
        --build=$build_alias \
@@ -162,7 +168,7 @@ Index: configure.in
      mkdir -p `pwd`/../includes/dvdread
      cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
    fi
-@@ -1766,6 +1817,17 @@
+@@ -1766,6 +1816,17 @@
        --enable-static \
        --disable-shared \
        --cc="$CC"
diff --git a/multimedia/xbmc/files/patch-xbmc__Util.cpp b/multimedia/xbmc/files/patch-xbmc__Util.cpp
index a9c86318a45f..974fcf9760fb 100644
--- a/multimedia/xbmc/files/patch-xbmc__Util.cpp
+++ b/multimedia/xbmc/files/patch-xbmc__Util.cpp
@@ -12,15 +12,6 @@
  #ifdef _LINUX
  #include <sys/types.h>
  #include <dirent.h>
-@@ -739,7 +744,7 @@
-       strPath = strHomePath;
-   }
- 
--#if defined(_LINUX) && !defined(__APPLE__)
-+#if ( defined(_LINUX) || defined(__FreeBSD__) ) && !defined(__APPLE__)
-   /* Change strPath accordingly when target is XBMC_HOME and when INSTALL_PATH
-    * and BIN_INSTALL_PATH differ
-    */
 @@ -1434,7 +1439,7 @@
  
  void CUtil::CacheSubtitles(const CStdString& strMovie, CStdString& strExtensionCached, XFILE::IFileCallback *pCallback )
@@ -39,15 +30,6 @@
    CLog::Log(LOGDEBUG,"%s: Done (time: %i ms)", __FUNCTION__, (int)(nextTimer - startTimer));
  
    CStdString strLExt;
-@@ -3211,7 +3216,7 @@
-   srand(seed);
- }
- 
--#ifdef _LINUX
-+#if defined(_LINUX) || defined(__FreeBSD__)
- bool CUtil::RunCommandLine(const CStdString& cmdLine, bool waitExit)
- {
-   CStdStringArray args;
 @@ -3440,6 +3445,22 @@
    if (result == 0)
      realpath(given_path, real_given_path);
diff --git a/multimedia/xbmc/files/patch-xbmc__cores__paplayer__Makefile.in b/multimedia/xbmc/files/patch-xbmc__cores__paplayer__Makefile.in
new file mode 100644
index 000000000000..f1db1efcc51a
--- /dev/null
+++ b/multimedia/xbmc/files/patch-xbmc__cores__paplayer__Makefile.in
@@ -0,0 +1,10 @@
+--- xbmc/cores/paplayer/Makefile.in.orig	2011-02-23 22:23:24.000000000 +0100
++++ xbmc/cores/paplayer/Makefile.in	2011-02-23 22:24:24.000000000 +0100
+@@ -20,7 +20,6 @@
+ endif
+ 
+ ifneq ($(ARCH), arm)
+-  CXXFLAGS+=-DHAS_SPC_CODEC
+   SRCS+=SPCCodec.cpp
+ endif
+ 
diff --git a/multimedia/xbmc/files/patch-xbmc__visualizations__Goom__Makefile.in b/multimedia/xbmc/files/patch-xbmc__visualizations__Goom__Makefile.in
deleted file mode 100644
index 22d44cf344b2..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__visualizations__Goom__Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- ./xbmc/visualizations/Goom/Makefile.in.orig	2010-06-11 00:43:09.000000000 +0200
-+++ ./xbmc/visualizations/Goom/Makefile.in	2010-12-01 12:17:34.253906704 +0100
-@@ -17,8 +17,39 @@
- 		`cat ../../cores/DllLoader/exports/wrapper.def` \
- 		../../cores/DllLoader/exports/wrapper.o
- endif
--	@find visualization.goom -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*\.pvr|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" ../../../addons/"{}" \; -printf " -- %-75.75f\r"
--	@find visualization.goom -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis\.vis" -iregex ".*\.vis" -exec install -D "{}" ../../../addons/"{}" \; -printf " -- %-75.75f\r"
-+ifeq ($(findstring bsd,$(ARCH)), bsd)
-+	@install -d ../../../addons/visualization.goom
-+	@find -E visualization.goom -type f \
-+		-not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*\.pvr|.*python/.*\.zlib|.*\.vis" \
-+		-exec install -m 0644 "{}" ../../../addons/"{}" \; \
-+		-exec printf " -- %-75.75s\r" "{}" \;
-+	@find visualization.goom -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis\.vis" \
-+		-iregex ".*\.vis" \
-+		-exec install "{}" ../../../addons/"{}" \; \
-+		-exec printf " -- %-75.75s\r" "{}" \;
-+else
-+ifeq ($(findstring osx,$(ARCH)), osx)
-+	@install -d ../../../addons/visualization.goom
-+	@find -E visualization.goom -type f \
-+		-not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*\.pvr|.*python/.*\.zlib|.*\.vis" \
-+		-exec install -m 0644 "{}" ../../../addons/"{}" \; \
-+		-exec printf " -- %-75.75s\r" "{}" \;
-+	@find visualization.goom -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis\.vis" \
-+		-iregex ".*\.vis" \
-+		-exec install "{}" ../../../addons/"{}" \; \
-+		-exec printf " -- %-75.75s\r" "{}" \;
-+else
-+	@find visualization.goom -regextype posix-extended -type f \
-+		-not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*\.pvr|.*python/.*\.zlib|.*\.vis" \
-+		-exec install -D -m 0644 "{}" ../../../addons/"{}" \; \
-+		-printf " -- %-75.75f\r"
-+	@find visualization.goom -type f \
-+		-not -iregex ".*svn.*|.*win32(dx)?\.vis\.vis" \
-+		-iregex ".*\.vis" \
-+		-exec install -D "{}" ../../../addons/"{}" \; \
-+		-printf " -- %-75.75f\r"
-+endif
-+endif
- 
- goom2k4-0/src/.libs/libgoom2.a:
- 	$(MAKE) -C goom2k4-0
diff --git a/multimedia/xbmc/pkg-plist b/multimedia/xbmc/pkg-plist
index 9ed1918ef30c..1f5981511f18 100644
--- a/multimedia/xbmc/pkg-plist
+++ b/multimedia/xbmc/pkg-plist
@@ -16,14 +16,13 @@ lib/xbmc/system/libid3tag-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/dvdplayer/libass-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/dvdplayer/libdvdcss-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/dvdplayer/libdvdnav-%%ARCH%%-freebsd.so
-lib/xbmc/system/players/paplayer/SNESAPU-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/paplayer/adpcm-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/paplayer/libsidplay2-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/paplayer/nosefart-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/paplayer/stsoundlibrary-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/paplayer/timidity-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/paplayer/vgmstream-%%ARCH%%-freebsd.so
-lib/xbmc/system/python/python26-%%ARCH%%-freebsd.so
+lib/xbmc/system/python/python%%PYVER%%-%%ARCH%%-freebsd.so
 lib/xbmc/xbmc-xrandr
 lib/xbmc/xbmc.bin
 %%DOCSDIR%%/LICENSE.GPL