Remove expired ports:

2013-12-31 multimedia/xbmc-pvr: multimedia/xbmc and multimedia/xbmc-addon-pvr are newer 2013-12-31 misc/libmcal: No more used and development discontinued 2014-02-01 textproc/py-4suite: only builds with Python up to version 2.4 2014-02-01 multimedia/xbmc-addon-xvdr: Depends on expired multimedia/xbmc-pvr 2014-02-01 deskutils/gmcal: Depends on expired misc/libmcal 2014-02-01 deskutils/mcal: Depends on expired misc/libmcal 2014-02-01 sysutils/relpath: unfetchable distfiles 2014-02-01 sysutils/decomment: unfetchable distfiles 2014-02-03 multimedia/openmovieeditor: segfaults, upstread development ceased
svn path=/head/; revision=342429
2024-10-19 19:59:43 +00:00 · 2014-02-03 11:37:02 +00:00 · 2014-02-03 11:37:02 +00:00 · f8340f24c1 · 2021-03-31 03:12:20 +00:00
commit f8340f24c1
parent b7f3ba7623
116 changed files with 9 additions and 8389 deletions
--- a/9
+++ b/9
@ -5426,3 +5426,12 @@ dns/bind96||2014-01-31|Has expired: EOL in January 2014, consider moving to Bind
 x11-drivers/xf86-video-nouveau||2014-01-31|Has expired: Not supported, missing kernel support. use the nvidia driver.
 cad/mars||2014-01-31|Removed, abandonware, no releases in the past 20 years
 polish/gimp-help||2014-02-01|Removed, excluded from gimp-help-2.8.1 release
+multimedia/xbmc-pvr||2014-02-03|Has expired: multimedia/xbmc and multimedia/xbmc-addon-pvr are newer
+misc/libmcal||2014-02-03|Has expired: No more used and development discontinued
+textproc/py-4suite||2014-02-03|Has expired: only builds with Python up to version 2.4
+multimedia/xbmc-addon-xvdr||2014-02-03|Has expired: Depends on expired multimedia/xbmc-pvr
+deskutils/gmcal||2014-02-03|Has expired: Depends on expired misc/libmcal
+deskutils/mcal||2014-02-03|Has expired: Depends on expired misc/libmcal
+sysutils/relpath||2014-02-03|Has expired: unfetchable distfiles
+sysutils/decomment||2014-02-03|Has expired: unfetchable distfiles
+multimedia/openmovieeditor||2014-02-03|Has expired: segfaults, upstread development ceased
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@ -65,7 +65,6 @@
    SUBDIR += glabels
    SUBDIR += glipper
    SUBDIR += global-menu
-    SUBDIR += gmcal
    SUBDIR += gnochm
    SUBDIR += gnome-blog
    SUBDIR += gnome-main-menu
@ -140,7 +139,6 @@
    SUBDIR += mate-menu-editor
    SUBDIR += mate-notification-daemon
    SUBDIR += mate-utils
-    SUBDIR += mcal
    SUBDIR += mdh
    SUBDIR += mencal
    SUBDIR += menumaker
--- a/deskutils/gmcal/Makefile
+++ b/deskutils/gmcal/Makefile
@ -1,38 +0,0 @@
-# Created by: thierry@pompo.net
-# $FreeBSD$
-
-PORTNAME=	gmcal
-PORTVERSION=	0.0.1
-PORTREVISION=	4
-CATEGORIES=	deskutils
-MASTER_SITES=	SF/libmcal/${PORTNAME}/${PORTVERSION}
-
-MAINTAINER=	thierry@pompo.net
-COMMENT=	GMCAL is a GTK+ frontend for the libmcal package
-
-DEPRECATED=	Depends on expired misc/libmcal
-EXPIRATION_DATE=2014-02-01
-
-LIB_DEPENDS=	libmcal.so:${PORTSDIR}/misc/libmcal
-RUN_DEPENDS=	${LOCALBASE}/mcal/mcal:${PORTSDIR}/deskutils/mcal
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-PLIST_FILES=	bin/gmcal
-USE_GNOME=	gtk12
-
-NO_STAGE=	yes
-post-extract:
-	${CHMOD} a-x ${WRKSRC}/*
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gmcal ${PREFIX}/bin
-
-post-install:
-	@${ECHO} "*****************************************************************************"
-	@${ECHO} ""
-	@${ECHO} " gmcal has been installed as ${PREFIX}/bin/gmcal."
-	@${ECHO} ""
-	@${ECHO} "*****************************************************************************"
-
-.include <bsd.port.mk>
--- a/deskutils/gmcal/distinfo
+++ b/deskutils/gmcal/distinfo
@ -1,2 +0,0 @@
-SHA256 (gmcal-0.0.1.tar.gz) = bdd4ec0cc0e1649e6c0cf9c22c4d9ab8a1b516bd7a9c56aa0ccaf0be2d0a38ee
-SIZE (gmcal-0.0.1.tar.gz) = 4707
--- a/deskutils/gmcal/files/patch-aa
+++ b/deskutils/gmcal/files/patch-aa
@ -1,15 +0,0 @@
--- Makefile.orig	Fri Dec 17 17:59:16 1999
-+++ Makefile	Mon Oct 15 22:59:33 2001
-@@ -1,7 +1,11 @@
- # 	$Id: Makefile,v 1.1.1.1 1999/12/02 08:00:57 zircote Exp $
- 
-+INCLUDE=-I$(LOCALBASE)/include/mcal -I/usr/include/rpcsvc/
-+
-+all: gmcal
-+
- gmcal: gmcal.c 
-	gcc -I../libmcal -Wall -g gmcal.c -o gmcal -L../libmcal -lmcal -lcrypt `gtk-config --cflags` `gtk-config --libs`
-+	$(CC) $(INCLUDE) $(CFLAGS) gmcal.c -o gmcal -L$(LOCALBASE)/lib -lmcal -lcrypt `$(GTK_CONFIG) --cflags` `$(GTK_CONFIG) --libs`
- clean: 
- 	rm gmcal
- 	
--- a/deskutils/gmcal/files/patch-ab
+++ b/deskutils/gmcal/files/patch-ab
@ -1,36 +0,0 @@
--- gmcal.c.orig	Fri Dec 17 17:59:16 1999
-+++ gmcal.c	Mon Oct 15 23:56:27 2001
-@@ -8,9 +8,15 @@
- 
- #include <string.h>
- #include <pwd.h>
-+#if HAVE_GETOPT_H
- #include <getopt.h>
-+#else
-+extern	int	getopt();
-+extern	char	*optarg;
-+extern	int	optind;
-+#endif
-+
- 
-#include <malloc.h>
- #include <gtk/gtk.h>
- #include <gtk/gtkcalendar.h>
- #include <mcal.h>
-@@ -177,15 +183,8 @@
-     while (1)
- 	    {
- 	      int option_index = 0;
-	      static struct option long_options[] =
-	      {
-			{"version", 0, 0, 'v'},
-			{"help", 0, 0, 'h'},
-			{0, 0, 0, 0}
-      	  };
- 
-        c = getopt_long (argc, argv, ":hv",
-  		       long_options, &option_index);
-+        c = getopt (argc, argv, ":hv");
-         if (c == -1)
-   	break;
- 
--- a/deskutils/gmcal/pkg-descr
+++ b/deskutils/gmcal/pkg-descr
@ -1,8 +0,0 @@
-This is a very early release of a GTK+ app that can display your
-calendar and appointment either via mstore or ICAP protocol drivers.
-You may create these calendars with mcal (see deskutils/mcal).
-
-The use of this should only be considered for testing and development.
-It still has much work left before it is a stable production application.
-
-WWW: http://mcal.chek.com/
--- a/deskutils/mcal/Makefile
+++ b/deskutils/mcal/Makefile
@ -1,27 +0,0 @@
-# Created by: thierry@pompo.net
-# $FreeBSD$
-
-PORTNAME=	mcal
-PORTVERSION=	0.3
-CATEGORIES=	deskutils
-MASTER_SITES=	SF/lib${PORTNAME}/${PORTNAME}/${PORTVERSION}
-
-MAINTAINER=	thierry@pompo.net
-COMMENT=	A libmcal powered cal replacement
-
-DEPRECATED=	Depends on expired misc/libmcal
-EXPIRATION_DATE=2014-02-01
-
-LIB_DEPENDS=	libmcal.so:${PORTSDIR}/misc/libmcal
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-NO_STAGE=	yes
-post-install:
-	@${ECHO} "*****************************************************************************"
-	@${ECHO} ""
-	@${ECHO} " mcal has been installed in ${PREFIX}/mcal."
-	@${ECHO} ""
-	@${ECHO} "*****************************************************************************"
-
-.include <bsd.port.mk>
--- a/deskutils/mcal/distinfo
+++ b/deskutils/mcal/distinfo
@ -1,2 +0,0 @@
-SHA256 (mcal-0.3.tar.gz) = 678a81400040ea316eb87c62fafa5474bb073941d31cfe28c7462ba920a749bc
-SIZE (mcal-0.3.tar.gz) = 3933
--- a/deskutils/mcal/files/patch-aa
+++ b/deskutils/mcal/files/patch-aa
@ -1,34 +0,0 @@
--- Makefile.orig	Thu Dec  2 09:02:04 1999
-+++ Makefile	Tue Oct 23 23:59:32 2001
-@@ -1,21 +1,23 @@
- # $Id: Makefile,v 1.1.1.1 1999/12/02 08:02:04 zircote Exp $
-CC=gcc
-FLEX=flex
-INCLUDE=-I../libmcal
-CFLAGS=-O0 -Wall -g $(INCLUDE)
-+INCLUDE=-I$(LOCALBASE)/include/mcal
- 
- LIBCAL=mcal
-LIBDIR=../libmcal
-
-+LIBDIR=$(LOCALBASE)/lib
-+DESTDIR=$(LOCALBASE)/mcal
- 
- all: mcal 
- 
- mcal: mcal.o 
-	gcc -Wall -g -o mcal mcal.o -L$(LIBDIR) -l$(LIBCAL) -lcrypt
-+	$(CC) $(CFLAGS) -o mcal mcal.o -L$(LIBDIR) -l$(LIBCAL) -lcrypt
- 
- mcal.o: mcal.c
-	gcc -Wall -c $(INCLUDE) -g mcal.c 
-+	$(CC) $(CFLAGS) -c $(INCLUDE) mcal.c 
- 
- clean:
- 	rm -f *.o mcal 
- 
-+install: all
-+	strip mcal
-+	mkdir -p $(DESTDIR)
-+	install -m 755 -o 0 -g 0 mcal $(DESTDIR)
-+	install -m 644 -o 0 -g 0 LICENSE $(DESTDIR)
--- a/deskutils/mcal/files/patch-ab
+++ b/deskutils/mcal/files/patch-ab
@ -1,67 +0,0 @@
--- mcal.c.orig	Mon Mar 27 06:06:04 2000
-+++ mcal.c	Tue Oct 23 23:41:33 2001
-@@ -35,7 +35,15 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
-+
-+#if HAVE_GETOPT_H
- #include <getopt.h>
-+#else
-+extern int	getopt();
-+extern char	*optarg;
-+extern int	optind;
-+#endif
-+
- #include <unistd.h>
- #include <string.h>
- #include <pwd.h>
-@@ -44,7 +52,7 @@
- 
- #define REVON "\033[7m"
- #define REVOFF "\033[27m"
-#define MCAL_VER "0.3"
-+#define MCAL_VER "0.3-FreeBSD"
- 
- CALSTREAM *stream;
- int events[13][32];
-@@ -75,20 +83,7 @@
- 
-   while (1)
-     {
-      int option_index = 0;
-      static struct option long_options[] =
-      {
-	{"folder", 1, 0, 'f'},
-	{"user", 0, 0, 'u'},
-	{"password", 0, 0, 'p'},
-	{"store", 0, 0, 's'},
-	{"version", 0, 0, 'v'},
-	{"help", 0, 0, 'h'},
-	{0, 0, 0, 0}
-      };
-
-      c = getopt_long (argc, argv, "f:upsvh",
-		       long_options, &option_index);
-+      c = getopt (argc, argv, "f:upsvh");
-       if (c == -1)
- 	break;
- 
-@@ -109,7 +104,7 @@
- 	   case 'v':
- 	 printf("MCAL Version %s\n",MCAL_VER);
- 	 printf("\tLicensed Under GPL\n");
-	 printf("\thttp://mcal.chek.com\n");
-+	 printf("\thttp://mcal.chek.com/\n");
- 	 printf("\tMark Musone musone@edgeglobal.com\n\n");
-  	 exit(0);
- 	 break;
-@@ -118,7 +113,7 @@
- 	 printf("\t-f foldername\n");
- 	 printf("\tuse calendar from specified folder or server.\n");
- 	 printf("\tfolder names can be standard calendar folders:\n");
-	 printf("\t{servername/protocol}foldername\n\n");
-+	 printf("\t{servername/protocol}foldername - e.g.: -f {/mstore}\n\n");
- 	 printf("\t-u prompt for a username. uses current username if flag not set\n");
- 	 printf("\t-p dont prompt for a password. sends a blank password if flag set\n");
- 	 printf("\t-s store event in the given YYYYMMDD\n");
--- a/deskutils/mcal/pkg-descr
+++ b/deskutils/mcal/pkg-descr
@ -1,5 +0,0 @@
-Mcal is a program based on the libmcal library that can create your
-calendar and appointment either via mstore or ICAP protocol drivers.
-You may display these calendars with gmcal (see deskutils/gmcal).
-
-WWW: http://mcal.chek.com/
--- a/deskutils/mcal/pkg-plist
+++ b/deskutils/mcal/pkg-plist
@ -1,3 +0,0 @@
-mcal/mcal
-mcal/LICENSE
-@dirrm mcal
--- a/misc/Makefile
+++ b/misc/Makefile
@ -252,7 +252,6 @@
    SUBDIR += libeatmydata
    SUBDIR += libhome
    SUBDIR += libkdeedu
-    SUBDIR += libmcal
    SUBDIR += libmetalink
    SUBDIR += libpri
    SUBDIR += libsupertone
--- a/misc/libmcal/Makefile
+++ b/misc/libmcal/Makefile
@ -1,72 +0,0 @@
-# Created by: thierry@thomas.as
-# $FreeBSD$
-
-PORTNAME=	libmcal
-PORTVERSION=	0.7
-PORTREVISION=	2
-CATEGORIES=	misc
-MASTER_SITES=	SF
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} mcaldrivers-0.9.tar.gz
-
-MAINTAINER=	thierry@FreeBSD.org
-COMMENT=	Modular Calendar Access Library
-
-DEPRECATED=	No more used and development discontinued
-EXPIRATION_DATE=2013-12-31
-
-USE_AUTOTOOLS=	libltdl
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_ARGS=	--with-mstore --with-icap \
-		--prefix=${PREFIX} --exec-prefix=${PREFIX}
-USE_LDCONFIG=	yes
-USES=		bison
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-WRKSRCDRV=	${WRKDIR}/mcal-drivers
-
-DOCS=		CHANGELOG FAQ-MCAL FEATURE-IMPLEMENTATION FUNCTION-REF.html \
-		HOW-TO-MCAL LICENSE README mstore/README.mstore
-
-PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message
-
-NO_STAGE=	yes
-post-extract:
-	${CP} -pR ${WRKSRCDRV}/mstore ${WRKSRC}
-	${CP} -pR ${WRKSRCDRV}/icap ${WRKSRC}
-	${MV} ${WRKSRC}/mstore/Makefile ${WRKSRC}/mstore/Makefile.dist
-	${MV} ${WRKSRC}/mstore/Makefile.FreeBSD ${WRKSRC}/mstore/Makefile
-	${MV} ${WRKSRC}/icap/Makefile ${WRKSRC}/icap/Makefile.dist
-	${MV} ${WRKSRC}/icap/Makefile.FreeBSD ${WRKSRC}/icap/Makefile
-	${MV} ${WRKSRC}/configure ${WRKSRC}/configure.dist
-	${MV} ${WRKSRC}/configure.FreeBSD ${WRKSRC}/configure
-	${CHMOD} u+x ${WRKSRC}/configure
-	${MV} ${WRKSRC}/mstore/README ${WRKSRC}/mstore/README.mstore
-
-pre-configure:
-	${REINPLACE_CMD} -e "s:/etc/mpasswd:${PREFIX}/etc/mpasswd:" ${WRKSRC}/mstore/mstore.c
-	@${ECHO_MSG} "===>  Building the driver mstore"
-	cd ${WRKSRC}/mstore ; \
-		${MAKE}
-	@${ECHO_MSG} "===>  Building the driver icap"
-	cd ${WRKSRC}/icap ; \
-		${MAKE}
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${REINPLACE_CMD} -e "s:/etc/mpasswd:${LOCALBASE}/etc/mpasswd:" \
-		${WRKSRC}/FAQ-MCAL
-	${REINPLACE_CMD} -e "s:/etc/mpasswd:${LOCALBASE}/etc/mpasswd:" \
-		${WRKSRC}/mstore/README.mstore
-	${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-	@${ECHO_MSG} "===>  Documentation installed in ${DOCSDIR}."
-.endif
-	@${ECHO}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO}
-
-.include <bsd.port.mk>
--- a/misc/libmcal/distinfo
+++ b/misc/libmcal/distinfo
@ -1,4 +0,0 @@
-SHA256 (libmcal-0.7.tar.gz) = 5e9fc22ac4b73ad2fed4fc6eab0c413fd3eb1ea750ab1da6f8a6931e8af48861
-SIZE (libmcal-0.7.tar.gz) = 49039
-SHA256 (mcaldrivers-0.9.tar.gz) = 9af4110285a6b7a08a272a9f7a20f43f2731200dd03878a651f303302be7161f
-SIZE (mcaldrivers-0.9.tar.gz) = 13445
--- a/misc/libmcal/files/patch-aa
+++ b/misc/libmcal/files/patch-aa
@ -1,15 +0,0 @@
--- mstore/Makefile.orig	Sat Feb  5 06:48:22 2000
-+++ mstore/Makefile	Mon Oct 15 12:05:54 2001
-@@ -1,9 +1,8 @@
- # $Id: Makefile.FreeBSD,v 1.1 2000/02/05 05:48:22 mayo Exp $
- 
-CC=gcc
-FLEX=flex
-INCLUDE=-I..
-CFLAGS=-O0 -Wall -g $(INCLUDE)
-+FLEX=/usr/bin/flex
-+INCLUDE=-I.. -I/usr/include/rpcsvc/
-+CFLAGS+=-Wall $(INCLUDE) -fPIC
- ALLOBJS=mstore.o
- TARGET=mstore_driver.o
- 
--- a/misc/libmcal/files/patch-ab
+++ b/misc/libmcal/files/patch-ab
@ -1,32 +0,0 @@
--- icap/Makefile.orig	Sat Feb  5 06:50:57 2000
-+++ icap/Makefile	Tue Oct 16 22:54:11 2001
-@@ -1,10 +1,9 @@
- #$Id: Makefile.FreeBSD,v 1.1 2000/02/05 05:50:57 mayo Exp $
- 
-CC=gcc
-FLEX=flex
-+FLEX=/usr/bin/flex
- INCLUDE=-I..
-CFLAGS=-O0 -Wall -g $(INCLUDE)
-ALLOBJS=icap.o icaproutines.o lex.ical_yy.o lex.icap_yy.o
-+CFLAGS+=-Wall $(INCLUDE) -fPIC
-+ALLOBJS=icap.o icaproutines.o lex.icap_yy.o
- TARGET=icap_driver.o
- 
- all: $(TARGET)
-@@ -14,14 +13,11 @@
- 	ld -r -o $(TARGET) $(ALLOBJS)
- 	touch bootstrap.in
- 
-lex.ical_yy.c: icalscanner.lex
-	$(FLEX) icalscanner.lex
-
- lex.icap_yy.c: icapscanner.lex
- 	$(FLEX) icapscanner.lex
- 
- clean:
-	rm -f $(ALLOBJS) $(TARGET) lex.ical_yy.c lex.icap_yy.c bootstrap.in
-+	rm -f $(ALLOBJS) $(TARGET) lex.icap_yy.c bootstrap.in
- 
- dep: depend
- 
--- a/misc/libmcal/files/patch-ac
+++ b/misc/libmcal/files/patch-ac
@ -1,81 +0,0 @@
--- Makefile.in.orig	Tue Jan 28 18:45:21 2003
-+++ Makefile.in	Tue Jan 28 23:17:26 2003
-@@ -1,56 +1,63 @@
- # 	$Id: Makefile.in,v 1.5 2001/07/03 16:03:19 rufustfirefly Exp $
- 
-CC=gcc
-FLEX=flex
-+FLEX=/usr/bin/flex
- 
- @BOOTSTRAP@
- 
- INCLUDE=@DRIVER_INCDIR@  ${OTHERINCDIR} -I.
- 
-CFLAGS=-O0 -Wall -g ${INCLUDE} ${OTHER_CFLAGS}
-+CFLAGS+=-Wall ${INCLUDE} ${OTHER_CFLAGS} -D_REENTRANT -fPIC
- 
- LIBOBJS=mcal.o datetime.o lex.ical_yy.o icalroutines.o cal_misc.o $(DRIVER_LIBS)
- ALLOBJS=${LIBOBJS} tester.o
- OTHERLIBS=${OTHERLIBS}
- OTHERLIBDIR=${OTHERLIBDIR}
- 
-+SHLIBLDFLAGS=-shared
-+REV=0.6
-+
- LIBCAL=libmcal.a
- LIBCAL_SO=libmcal.so
- 
-all: libmcal.a libmcal.so
-+all: $(LIBCAL) $(LIBCAL_SO).$(REV)
- 
-install: libmcal.a libmcal.so
-+install: all
- 	mkdir -p ${DESTDIR}@prefix@/lib/
- 	mkdir -p ${DESTDIR}@prefix@/include/mcal/
-	install -m 755 -o 0 -g 0 libmcal.a libmcal.so ${DESTDIR}@prefix@/lib
-+	rm -f ${DESTDIR}@prefix@/lib/$(LIBCAL_SO)
-+	install -m 755 -o 0 -g 0 $(LIBCAL) $(LIBCAL_SO).0 ${DESTDIR}@prefix@/lib
-+	ln -s ${DESTDIR}@prefix@/lib/$(LIBCAL_SO).0 ${DESTDIR}@prefix@/lib/$(LIBCAL_SO)
- 	install -m 644 -o 0 -g 0 \
- 	  mcal.h bool.h datetime.h drivers.h cal_misc.h icalroutines.h \
- 	  ${DESTDIR}@prefix@/include/mcal/
- 	touch installed
- 
- install-strip: installed
-	strip ${DESTDIR}@prefix@/lib/libmcal.so
-	strip ${DESTDIR}@prefix@/lib/libmcal.a
-+	strip ${DESTDIR}@prefix@/lib/$(LIBCAL_SO).$(REV)
-+	strip ${DESTDIR}@prefix@/lib/$(LIBCAL)
- 
-libmcal.a: $(LIBOBJS)
-+$(LIBCAL): $(LIBOBJS)
- 	rm -f $(LIBCAL)
- 	ar r $(LIBCAL) $(LIBOBJS)
- 
-libmcal.so: $(LIBOBJS)
-	rm -f $(LIBCAL_SO)
-	gcc $(CFLAGS) -shared -o $(LIBCAL_SO) $(LIBOBJS)
-+$(LIBCAL_SO).$(REV): $(LIBOBJS)
-+	rm -f $@
-+	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(LIBOBJS)
-+	strip --strip-unneeded $@
-+	rm -f $(LIBCAL_SO).0
-+	ln -s $@ $(LIBCAL_SO).0
- 
- lex.ical_yy.c: icalscanner.lex
- 	$(FLEX) $<
- 
-tester: tester.o libmcal.a
-	gcc -Wall -g -o tester tester.o $(LIBCAL) -lcrypt
-+tester: tester.o $(LIBCAL)
-+	$(CC) $(CFLAGS) -g -o tester tester.o $(LIBCAL) -lcrypt
- 
- clean:
- 	rm -f *.o *~ core $(LIBCAL) $(LIBCAL_SO) tester installed 
- 
- distclean: clean
-	rm -f  config.cache  config.status config.log Makefile drivers.c drivers.h bootstrap.in
-+	rm -f config.cache config.status config.log Makefile drivers.c drivers.h bootstrap.in
- 
- 
- dep: depend
--- a/misc/libmcal/files/patch-icap_icap.c
+++ b/misc/libmcal/files/patch-icap_icap.c
@ -1,11 +0,0 @@
--- icap/icap.c.orig	Tue Jan 28 18:31:33 2003
-+++ icap/icap.c	Tue Mar 20 21:49:33 2007
-@@ -159,7 +159,7 @@
- 	if (!reopen) {
- 		if ((stream = calloc(1, sizeof(*stream))) == NULL)
- 			goto fail;
-		if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
-+		if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
- 			goto fail;
- 
- 		/* Copy host. */
--- a/misc/libmcal/files/patch-mstore_mstore.c
+++ b/misc/libmcal/files/patch-mstore_mstore.c
@ -1,20 +0,0 @@
--- mstore/mstore.c.orig	Tue Jan 28 18:31:33 2003
-+++ mstore/mstore.c	Tue Mar 20 21:46:20 2007
-@@ -308,7 +308,7 @@
- 	if (!reopen) {
- 		if ((stream = calloc(1, sizeof(*stream))) == NULL)
- 			goto fail;
-		if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
-+		if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
- 			goto fail;
- 	}
- 
-@@ -773,7 +773,7 @@
-         while((event=read_event(calfile))) {
- 	  if (event->id == modified_event->id)
- 	    {
-	    (const CALEVENT*)event = modified_event;         
-+	      event = modified_event;
- 	  /*is more required here to assign objects, a loop through all the properties*/
- 	    /*    We actually only want to modify any individual property, not the whole thing..
- 		  TODO */
--- a/misc/libmcal/files/pkg-message.in
+++ b/misc/libmcal/files/pkg-message.in
@ -1,16 +0,0 @@
-*****************************************************************************
- libmcal has been installed. In order to end its configuration,
- please enter the following commands:
-
-      mkdir /var/calendar
-      chmod 1777 /var/calendar
-
- To work with the mstore driver, using the Apache's htpasswd utility,
- you may create the mpasswd file with the command below:
-
-      htpasswd -c %%LOCALBASE%%/etc/mpasswd username
-
- To add or update this file you would execute as follows:
-
-      htpasswd %%LOCALBASE%%/etc/mpasswd username
-*****************************************************************************
--- a/misc/libmcal/pkg-descr
+++ b/misc/libmcal/pkg-descr
@ -1,9 +0,0 @@
-Mcal stands for Modular Calendar Access Library. libmcal is a C library
-for accessing calendars.
-
-It's written to be very modular, with pluggable drivers.
-One of the main drivers it handles is ICAP.
-
-You may configure mod_php to use it.
-
-WWW: http://mcal.chek.com/
--- a/misc/libmcal/pkg-plist
+++ b/misc/libmcal/pkg-plist
@ -1,19 +0,0 @@
-include/mcal/bool.h
-include/mcal/cal_misc.h
-include/mcal/datetime.h
-include/mcal/drivers.h
-include/mcal/icalroutines.h
-include/mcal/mcal.h
-lib/libmcal.a
-lib/libmcal.so
-lib/libmcal.so.0
-@dirrm include/mcal
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/FAQ-MCAL
-%%PORTDOCS%%%%DOCSDIR%%/FEATURE-IMPLEMENTATION
-%%PORTDOCS%%%%DOCSDIR%%/FUNCTION-REF.html
-%%PORTDOCS%%%%DOCSDIR%%/HOW-TO-MCAL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.mstore
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@ -246,7 +246,6 @@
    SUBDIR += ogmrip
    SUBDIR += ogmtools
    SUBDIR += opencinematools
-    SUBDIR += openmovieeditor
    SUBDIR += openquicktime
    SUBDIR += openshot
    SUBDIR += oqtencoder
@ -391,8 +390,6 @@
    SUBDIR += xawtv
    SUBDIR += xbmc
    SUBDIR += xbmc-addon-pvr
-    SUBDIR += xbmc-addon-xvdr
-    SUBDIR += xbmc-pvr
    SUBDIR += xfce4-parole
    SUBDIR += xfce4-xmms-plugin
    SUBDIR += xine
--- a/multimedia/openmovieeditor/Makefile
+++ b/multimedia/openmovieeditor/Makefile
@ -1,52 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
-# $FreeBSD$
-
-PORTNAME=	openmovieeditor
-PORTVERSION=	0.0.20090105
-PORTREVISION=	9
-CATEGORIES=	multimedia
-MASTER_SITES=	SF
-
-MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	Simple non-linear movie editor
-
-LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate \
-		sndfile:${PORTSDIR}/audio/libsndfile \
-		gavl:${PORTSDIR}/multimedia/gavl \
-		gmerlin_avdec:${PORTSDIR}/multimedia/gmerlin-avdecoder \
-		gmerlin:${PORTSDIR}/multimedia/gmerlin \
-		quicktime:${PORTSDIR}/multimedia/libquicktime \
-		avcodec:${PORTSDIR}/multimedia/ffmpeg \
-		jack:${PORTSDIR}/audio/jack \
-		fltk:${PORTSDIR}/x11-toolkits/fltk \
-		portaudio.2:${PORTSDIR}/audio/portaudio2
-BUILD_DEPENDS=	${LOCALBASE}/lib/libmpeg3.a:${PORTSDIR}/multimedia/libmpeg3 \
-		${LOCALBASE}/lib/libquicktime/lqt_lame.so:${PORTSDIR}/multimedia/libquicktime-lame
-RUN_DEPENDS=	${LOCALBASE}/lib/libquicktime/lqt_lame.so:${PORTSDIR}/multimedia/libquicktime-lame
-
-BROKEN=		segfaults, upstread development ceased
-DEPRECATED=	segfaults, upstread development ceased
-EXPIRATION_DATE=2014-02-03
-
-USES=		gmake pkgconfig
-GNU_CONFIGURE=	yes
-USE_GL=		yes
-USE_GNOME=	glib20
-CONFIGURE_ARGS=	CPPFLAGS="-I${WRKSRC}/src/tinyxml -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib `fltk-config --ldflags`"
-USE_DOS2UNIX=	yes
-
-PORTDOCS=	*
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/images
-	${INSTALL_DATA} ${WRKSRC}/doc/style.css ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/tutorial.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR}/images
-.endif
-
-.include <bsd.port.mk>
--- a/multimedia/openmovieeditor/distinfo
+++ b/multimedia/openmovieeditor/distinfo
@ -1,2 +0,0 @@
-SHA256 (openmovieeditor-0.0.20090105.tar.gz) = e50592fe65eb3a6e1b1b7d7499e438e1ae351417ed9bc7c875c50006f4259500
-SIZE (openmovieeditor-0.0.20090105.tar.gz) = 1319264
--- a/multimedia/openmovieeditor/files/patch-src-Fl__Split.cpp
+++ b/multimedia/openmovieeditor/files/patch-src-Fl__Split.cpp
@ -1,31 +0,0 @@
--- src/Fl_Split.cpp.orig	2008-03-26 11:16:57.000000000 +0300
-+++ src/Fl_Split.cpp	2012-02-14 10:49:26.565769160 +0400
-@@ -38,7 +38,7 @@
- 
- void Fl_Split::position(int oix, int oiy, int newx, int newy) {
-   Fl_Widget*const* a = array();
-  short* p = sizes();
-+  int* p = sizes();
-   p += 8; // skip group & resizable's saved size
-   for (int i=children(); i--; p += 4) {
-     Fl_Widget* o = *a++;
-@@ -88,7 +88,7 @@
- 	  return;
-   }
- 
-  short* p = sizes();
-+  int* p = sizes();
-   // resize this (skip the Fl_Group resize):
-   Fl_Widget::resize(X,Y,W,H);
- 
-@@ -155,8 +155,8 @@
- 		  int oldx = 0;
- 		  int oldy = 0;
- 		  Fl_Widget*const* a = array();
-		  short* q = sizes();
-		  short* p = q+8;
-+		  int* q = sizes();
-+		  int* p = q+8;
- 		  //printf("cursor(%d,%d)\n", mx,my);
- 		  for (int i=children(); i--; p += 4) {
- 			  Fl_Widget* o = *a++;
--- a/multimedia/openmovieeditor/files/patch-src-NodeEditor-SrcNode.H
+++ b/multimedia/openmovieeditor/files/patch-src-NodeEditor-SrcNode.H
@ -1,11 +0,0 @@
--- src/NodeEditor/SrcNode.H.orig	2008-04-19 18:19:27.000000000 +0400
-+++ src/NodeEditor/SrcNode.H	2013-08-30 16:56:41.373227557 +0400
-@@ -4,7 +4,7 @@
- 
- #include "INode.H"
- 
-class nle::NodeFilter;
-+namespace nle { class NodeFilter; }
- class SrcNode : public INode
- {
- 	public:
--- a/multimedia/openmovieeditor/files/patch-src-TimelineView.cxx
+++ b/multimedia/openmovieeditor/files/patch-src-TimelineView.cxx
@ -1,20 +0,0 @@
--- src/TimelineView.cxx.orig	2008-10-29 13:46:23.000000000 +0300
-+++ src/TimelineView.cxx	2013-08-30 17:22:00.908622066 +0400
-@@ -206,13 +206,15 @@
- 			cl = get_clip( _x, _y );
- 			if ( cl && ( _x < get_screen_position( cl->position(), cl->track()->stretchFactor() ) + 8 ) ) {
- 				if ( current_cursor != FL_CURSOR_WE ) {
-					flmm_cursor( window(), &Flmm_Cursor_Shape(clip_a_cursor_crsr) );
-+					Flmm_Cursor_Shape cs(clip_a_cursor_crsr);
-+					flmm_cursor( window(), &cs );
- 					//window()->cursor( FL_CURSOR_WE, fl_rgb_color(254,254,254), fl_rgb_color(1,1,1) );
- 					current_cursor = FL_CURSOR_WE;
- 				}
- 			} else if ( cl &&  ( _x > get_screen_position( cl->position() + (cl->length()+1), cl->track()->stretchFactor() ) - 8 ) ) {
- 				if ( current_cursor != FL_CURSOR_NE ) {
-					flmm_cursor( window(), &Flmm_Cursor_Shape(clip_b_cursor_crsr) );
-+					Flmm_Cursor_Shape cs(clip_b_cursor_crsr);
-+					flmm_cursor( window(), &cs );
- 					current_cursor = FL_CURSOR_NE;
- 				}
- 			} else {
--- a/multimedia/openmovieeditor/files/patch-src_AddCommand.cxx
+++ b/multimedia/openmovieeditor/files/patch-src_AddCommand.cxx
@ -1,10 +0,0 @@
--- src/AddCommand.cxx.orig	2013-10-30 13:00:57.000000000 +0100
-+++ src/AddCommand.cxx
-@@ -18,6 +18,7 @@
-  */
- 
- 
-+#include <cstdio>
- #include "AddCommand.H"
- #include "timeline/Clip.H"
- #include "Timeline.H"
--- a/multimedia/openmovieeditor/files/patch-src_DiskCache.H
+++ b/multimedia/openmovieeditor/files/patch-src_DiskCache.H
@ -1,10 +0,0 @@
--- src/DiskCache.H.orig	2013-10-30 13:04:06.000000000 +0100
-+++ src/DiskCache.H
-@@ -20,6 +20,7 @@
- #ifndef _DISK_CACHE_H_
- #define _DISK_CACHE_H_
- 
-+#include <cstdio>
- #include "global_includes.H"
- namespace nle
- {
--- a/multimedia/openmovieeditor/files/patch-src_DiskCache.cxx
+++ b/multimedia/openmovieeditor/files/patch-src_DiskCache.cxx
@ -1,10 +0,0 @@
--- src/DiskCache.cxx.orig	2013-10-29 00:12:10.513674000 +0000
-+++ src/DiskCache.cxx
-@@ -25,6 +25,7 @@
- #include <sys/stat.h>
- #include <cerrno>
- #include <cstring>
-+#include <unistd.h>
- 
- #include "DiskCache.H"
- #include "globals.H"
--- a/multimedia/openmovieeditor/files/patch-src_WaveForm.H
+++ b/multimedia/openmovieeditor/files/patch-src_WaveForm.H
@ -1,10 +0,0 @@
--- src/WaveForm.H.orig	2013-10-30 12:48:34.000000000 +0100
-+++ src/WaveForm.H
-@@ -21,6 +21,7 @@
- #include "JobManager.H"
- 
- #include <string>
-+#include <stdint.h>
- 
- namespace nle
- {
--- a/multimedia/openmovieeditor/pkg-descr
+++ b/multimedia/openmovieeditor/pkg-descr
@ -1,5 +0,0 @@
-Open Movie Editor is designed to be a simple video editor, that
-provides basic movie making capabilities. It aims to be powerful
-enough for the amateur movie artist, yet easy to use.
-
-WWW: http://openmovieeditor.sourceforge.net
--- a/multimedia/openmovieeditor/pkg-plist
+++ b/multimedia/openmovieeditor/pkg-plist
@ -1,3 +0,0 @@
-bin/openmovieeditor
-share/applications/openmovieeditor.desktop
-share/pixmaps/openmovieeditor.xpm
--- a/multimedia/xbmc-addon-xvdr/Makefile
+++ b/multimedia/xbmc-addon-xvdr/Makefile
@ -1,41 +0,0 @@
-# Created by: Juergen Lock <nox@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	xbmc-addon-xvdr
-PORTVERSION=	0.9.5
-PORTREVISION=	3
-CATEGORIES=	multimedia
-MASTER_SITES=	LOCAL/nox
-DISTNAME=	pipelka-${PORTNAME}-xvdr-${PORTVERSION}-0-g${GITHASH}
-
-MAINTAINER=	nox@FreeBSD.org
-COMMENT=	XBMC xvdr pvr addon
-
-DEPRECATED=	Depends on expired multimedia/xbmc-pvr
-EXPIRATION_DATE=2014-02-01
-
-BUILD_DEPENDS+=	xbmc:${PORTSDIR}/multimedia/xbmc-pvr
-RUN_DEPENDS+=	xbmc:${PORTSDIR}/multimedia/xbmc-pvr
-
-GITHASH=	9d3d6ea
-WRKSRC=		${WRKDIR}/pipelka-${PORTNAME}-${GITHASH}
-PATCH_STRIP=	-p1
-USE_AUTOTOOLS=	libtoolize aclocal libtool automake autoconf
-ACLOCAL_ARGS=	-I.
-AUTOMAKE_ARGS=	--add-missing
-GNU_CONFIGURE_PREFIX=	${PREFIX}/share/xbmc
-CONFLICTS=	xbmc-[0-9]*
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 900033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
-MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
-.endif
-
-post-patch:
-	(cd ${WRKSRC} && ${TOUCH} ./NEWS ./AUTHORS ./ChangeLog)
-
-.include <bsd.port.post.mk>
--- a/multimedia/xbmc-addon-xvdr/distinfo
+++ b/multimedia/xbmc-addon-xvdr/distinfo
@ -1,2 +0,0 @@
-SHA256 (pipelka-xbmc-addon-xvdr-xvdr-0.9.5-0-g9d3d6ea.tar.gz) = 04ff1893d1cf07a48e7aa5b983b3c4e0f59247e93eb6f14566d742467233acf6
-SIZE (pipelka-xbmc-addon-xvdr-xvdr-0.9.5-0-g9d3d6ea.tar.gz) = 117836
--- a/multimedia/xbmc-addon-xvdr/files/patch-addons-library.xbmc.addon-libXBMC_addon.h
+++ b/multimedia/xbmc-addon-xvdr/files/patch-addons-library.xbmc.addon-libXBMC_addon.h
@ -1,34 +0,0 @@
--- a/addons/library.xbmc.addon/libXBMC_addon.h
-+++ b/addons/library.xbmc.addon/libXBMC_addon.h
-@@ -40,15 +40,31 @@
- #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-x86-osx.so"
- #endif
- #elif defined(__x86_64__)
-+#ifdef __FreeBSD__
-+#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-x86_64-freebsd.so"
-+#else
- #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-x86_64-linux.so"
-+#endif
- #elif defined(_POWERPC)
-+#ifdef __FreeBSD__
-+#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-powerpc-freebsd.so"
-+#else
- #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-powerpc-linux.so"
-+#endif
- #elif defined(_POWERPC64)
-+#ifdef __FreeBSD__
-+#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-powerpc64-freebsd.so"
-+#else
- #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-powerpc64-linux.so"
-+#endif
- #elif defined(_ARMEL)
- #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-arm.so"
- #else /* !__x86_64__ && !__powerpc__ */
-+#ifdef __FreeBSD__
-+#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-i386-freebsd.so"
-+#else
- #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-i486-linux.so"
-+#endif
- #endif /* __x86_64__ */
- #endif /* _LINUX */
- 
--- a/multimedia/xbmc-addon-xvdr/files/patch-addons-library.xbmc.gui-libXBMC_gui.h
+++ b/multimedia/xbmc-addon-xvdr/files/patch-addons-library.xbmc.gui-libXBMC_gui.h
@ -1,32 +0,0 @@
--- a/addons/library.xbmc.gui/libXBMC_gui.h
-+++ b/addons/library.xbmc.gui/libXBMC_gui.h
-@@ -44,13 +44,29 @@ typedef void* GUIHANDLE;
- #elif defined(_ARMEL)
- #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-arm.so"
- #elif defined(__x86_64__)
-+#ifdef __FreeBSD__
-+#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-x86_64-freebsd.so"
-+#else
- #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-x86_64-linux.so"
-+#endif
- #elif defined(_POWERPC)
-+#ifdef __FreeBSD__
-+#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-powerpc-freebsd.so"
-+#else
- #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-powerpc-linux.so"
-+#endif
- #elif defined(_POWERPC64)
-+#ifdef __FreeBSD__
-+#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-powerpc64-freebsd.so"
-+#else
- #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-powerpc64-linux.so"
-+#endif
- #else /* !__x86_64__ && !__powerpc__ && !_ARMEL */
-+#ifdef __FreeBSD__
-+#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-i386-freebsd.so"
-+#else
- #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-i486-linux.so"
-+#endif
- #endif /* __x86_64__ */
- #endif /* _LINUX */
- 
--- a/multimedia/xbmc-addon-xvdr/files/patch-addons-library.xbmc.pvr-libXBMC_pvr.h
+++ b/multimedia/xbmc-addon-xvdr/files/patch-addons-library.xbmc.pvr-libXBMC_pvr.h
@ -1,34 +0,0 @@
--- a/addons/library.xbmc.pvr/libXBMC_pvr.h
-+++ b/addons/library.xbmc.pvr/libXBMC_pvr.h
-@@ -41,15 +41,31 @@
- #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-x86-osx.so"
- #endif
- #elif defined(__x86_64__)
-+#ifdef __FreeBSD__
-+#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-x86_64-freebsd.so"
-+#else
- #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-x86_64-linux.so"
-+#endif
- #elif defined(_POWERPC)
-+#ifdef __FreeBSD__
-+#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-powerpc-freebsd.so"
-+#else
- #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-powerpc-linux.so"
-+#endif
- #elif defined(_POWERPC64)
-+#ifdef __FreeBSD__
-+#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-powerpc64-freebsd.so"
-+#else
- #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-powerpc64-linux.so"
-+#endif
- #elif defined(_ARMEL)
- #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-arm.so"
- #else /* !__x86_64__ && !__powerpc__ */
-+#ifdef __FreeBSD__
-+#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-i386-freebsd.so"
-+#else
- #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-i486-linux.so"
-+#endif
- #endif /* __x86_64__ */
- #endif /* _LINUX */
- 
--- a/multimedia/xbmc-addon-xvdr/files/patch-src-libPlatform-linux-os_posix.h
+++ b/multimedia/xbmc-addon-xvdr/files/patch-src-libPlatform-linux-os_posix.h
@ -1,11 +0,0 @@
--- a/src/libPlatform/linux/os_posix.h
-+++ b/src/libPlatform/linux/os_posix.h
-@@ -32,7 +32,7 @@
- #include <sys/timeb.h>
- #include <sys/resource.h>
- #include <sys/syscall.h>
-#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <sys/prctl.h> 
- #endif
- #include <pthread.h>
--- a/multimedia/xbmc-addon-xvdr/files/patch-src-xvdr-Makefile.am
+++ b/multimedia/xbmc-addon-xvdr/files/patch-src-xvdr-Makefile.am
@ -1,11 +0,0 @@
--- a/src/xvdr/Makefile.am
-+++ b/src/xvdr/Makefile.am
-@@ -5,7 +5,7 @@
- # how to reach the author.
- #
- 
-LIBS   =-ldl
-+#LIBS   =-ldl
- LIBDIR = ../../addons/pvr.vdr.xvdr
- LIB    = ../../addons/pvr.vdr.xvdr/XBMC_VDR_xvdr.pvr
- 
--- a/multimedia/xbmc-addon-xvdr/files/patch-src-xvdr-thread.cpp
+++ b/multimedia/xbmc-addon-xvdr/files/patch-src-xvdr-thread.cpp
@ -1,38 +0,0 @@
--- a/src/xvdr/thread.cpp
-+++ b/src/xvdr/thread.cpp
-@@ -29,10 +29,14 @@
- #include "thread.h"
- #include "client.h"
- 
-#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <malloc.h>
- #endif
- 
-+#if defined(__FreeBSD__)
-+#include <signal.h>
-+#endif
-+
- #if !defined(__WINDOWS__)
- #include <sys/signal.h>
- #endif
-@@ -163,7 +167,7 @@ cMutex::cMutex(void)
-   locked = 0;
-   pthread_mutexattr_t attr;
-   pthread_mutexattr_init(&attr);
-#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
-   pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
- #else
-   pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
-@@ -349,8 +353,8 @@ void cThread::Cancel(int WaitSeconds)
- 
- tThreadId cThread::ThreadId(void)
- {
-#ifdef __APPLE__
-    return (int)pthread_self();
-+#if defined(__APPLE__) || defined(__FreeBSD__)
-+    return (tThreadId)pthread_self();
- #else
- #ifdef __WINDOWS__
-   return GetCurrentThreadId();
--- a/multimedia/xbmc-addon-xvdr/files/patch-src-xvdr-thread.h
+++ b/multimedia/xbmc-addon-xvdr/files/patch-src-xvdr-thread.h
@ -1,23 +0,0 @@
--- a/src/xvdr/thread.h
-+++ b/src/xvdr/thread.h
-@@ -77,7 +77,11 @@ public:
-   void Unlock(void);
-   };
- 
-+#ifdef __FreeBSD__
-+typedef pthread_t tThreadId;
-+#else
- typedef pid_t tThreadId;
-+#endif
- 
- class cThread {
-   friend class cThreadLock;
-@@ -124,7 +128,7 @@ public:
-   bool Active(void);
-        ///< Checks whether the thread is still alive.
-   static tThreadId ThreadId(void);
-  static tThreadId IsMainThread(void) { return ThreadId() == mainThreadId; }
-+  static int IsMainThread(void) { return ThreadId() == mainThreadId; }
-   static void SetMainThreadId(void);
-   };
- 
--- a/multimedia/xbmc-addon-xvdr/pkg-descr
+++ b/multimedia/xbmc-addon-xvdr/pkg-descr
@ -1,12 +0,0 @@
-This is a PVR add-on for XBMC to add VDR (http://www.cadsoft.de/vdr)
-as a TV/PVR Backend to XBMC.
-
-It adds support for Live TV watching, replaying of Recordings,
-programming Timers and EPG TV Guide to use on same computer or over
-the Network.
-
-This add-on requires the installed "vdr-plugin-xvdr" plugin on the
-VDR server.  VDR itself doen't need any patches or modification to
-use all the current features.
-
-WWW: https://github.com/pipelka/xbmc-addon-xvdr
--- a/multimedia/xbmc-addon-xvdr/pkg-plist
+++ b/multimedia/xbmc-addon-xvdr/pkg-plist
@ -1,19 +0,0 @@
-share/xbmc/addons/pvr.vdr.xvdr/XBMC_VDR_xvdr.pvr
-share/xbmc/addons/pvr.vdr.xvdr/addon.xml
-share/xbmc/addons/pvr.vdr.xvdr/icon.png
-share/xbmc/addons/pvr.vdr.xvdr/resources/language/Dutch/strings.xml
-share/xbmc/addons/pvr.vdr.xvdr/resources/language/English/strings.xml
-share/xbmc/addons/pvr.vdr.xvdr/resources/language/Finnish/strings.xml
-share/xbmc/addons/pvr.vdr.xvdr/resources/language/German/strings.xml
-share/xbmc/addons/pvr.vdr.xvdr/resources/settings.xml
-share/xbmc/addons/pvr.vdr.xvdr/resources/skins/Confluence/720p/ChannelScan.xml
-@dirrm share/xbmc/addons/pvr.vdr.xvdr/resources/skins/Confluence/720p
-@dirrm share/xbmc/addons/pvr.vdr.xvdr/resources/skins/Confluence
-@dirrm share/xbmc/addons/pvr.vdr.xvdr/resources/skins
-@dirrm share/xbmc/addons/pvr.vdr.xvdr/resources/language/German
-@dirrm share/xbmc/addons/pvr.vdr.xvdr/resources/language/Finnish
-@dirrm share/xbmc/addons/pvr.vdr.xvdr/resources/language/English
-@dirrm share/xbmc/addons/pvr.vdr.xvdr/resources/language/Dutch
-@dirrm share/xbmc/addons/pvr.vdr.xvdr/resources/language
-@dirrm share/xbmc/addons/pvr.vdr.xvdr/resources
-@dirrm share/xbmc/addons/pvr.vdr.xvdr
--- a/multimedia/xbmc-pvr/Makefile
+++ b/multimedia/xbmc-pvr/Makefile
@ -1,263 +0,0 @@
-# Created by: Mickael Maillot <mickael.maillot@gmail.com>
-# $FreeBSD$
-
-PORTNAME=	xbmc
-PORTVERSION=	70
-PORTREVISION=	11
-CATEGORIES=	multimedia
-MASTER_SITES=	LOCAL/nox
-PKGNAMESUFFIX=	-pvr-ppa-odk
-DISTNAME=	opdenkamp-${PORTNAME}${PKGNAMESUFFIX}${PORTVERSION}-0-g${GITHASH}
-
-MAINTAINER=	nox@FreeBSD.org
-COMMENT=	XBMC is an award winning media center application - PVR branch
-
-LICENSE=	GPLv2
-
-BUILD_DEPENDS=	enca:${PORTSDIR}/converters/enca \
-		gawk:${PORTSDIR}/lang/gawk \
-		gperf:${PORTSDIR}/devel/gperf \
-		cmake:${PORTSDIR}/devel/cmake \
-		zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip \
-		nasm:${PORTSDIR}/devel/nasm \
-		dvdread-config:${PORTSDIR}/multimedia/libdvdread
-
-LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib	\
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libcdio.so:${PORTSDIR}/sysutils/libcdio	\
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libenca.so:${PORTSDIR}/converters/enca \
-		libGLEW.so:${PORTSDIR}/graphics/glew \
-		libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0	\
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		liblzo2.so:${PORTSDIR}/archivers/lzo2 \
-		libjasper.so:${PORTSDIR}/graphics/jasper \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libfaad.so:${PORTSDIR}/audio/faad \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libmodplug.so:${PORTSDIR}/audio/libmodplug \
-		libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libpng15.so:${PORTSDIR}/graphics/png \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient	\
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libass.so:${PORTSDIR}/multimedia/libass \
-		libwavpack.so:${PORTSDIR}/audio/wavpack \
-		libyajl.so:${PORTSDIR}/devel/yajl \
-		libplist.so:${PORTSDIR}/devel/libplist
-
-RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		glxinfo:${PORTSDIR}/graphics/mesa-demos \
-		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
-		xdpyinfo:${PORTSDIR}/x11/xdpyinfo
-
-BROKEN=		no longer builds, use multimedia/xbmc and multimedia/xbmc-addon-pvr
-DEPRECATED=	multimedia/xbmc and multimedia/xbmc-addon-pvr are newer
-EXPIRATION_DATE=	2013-12-31
-GITHASH=	9023e39
-WRKSRC=		${WRKDIR}/opdenkamp-${PORTNAME}-${GITHASH}
-USES=		iconv pkgconfig
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf libtool automake libltdl
-GNU_CONFIGURE=	yes
-USE_XORG=	xinerama xt xmu xtst
-USE_GL=		glu
-USE_SDL=	image mixer sdl
-USE_MYSQL=	yes
-USE_PYTHON=	2
-NOPRECIOUSMAKEVARS=	yes
-INSTALLS_ICONS=	yes
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LDCONFIG=	${PREFIX}/lib/xbmc/system \
-		${PREFIX}/lib/xbmc/system/players/dvdplayer \
-		${PREFIX}/lib/xbmc/system/players/paplayer
-CONFLICTS_INSTALL=	xbmc-[0-9]*
-
-PLIST_SUB+=	PYVER="${PYTHON_VERSION:S/python//:S/.//g}"
-
-OPTIONS_DEFINE=	AVAHI LIBBLURAY FAAC HAL LIRC MMS NONFREE PULSEAUDIO RTMP \
-		VAAPI VDPAU XRANDR WEBSERVER
-MMS_DESC=	Enable mms:// & mmsh:// support
-NONFREE_DESC=	Enable non-free components (rar, ccx, ffmpeg)
-OPTIONS_DEFAULT=	AVAHI LIBBLURAY HAL MMS XRANDR
-
-DESKTOP_ENTRIES="XBMC" \
-		"${COMMENT}" \
-		"${DATADIR}/media/icon.png" \
-		"xbmc" \
-		"AudioVideo;Video;" \
-		true
-
-CPPFLAGS+=	-I${LOCALBASE}/include/ffmpeg0
-CXXFLAGS+=	-I${LOCALBASE}/include/ffmpeg0
-CFLAGS+=	-I${LOCALBASE}/include/ffmpeg0
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-CONFIGURE_ARGS+=	--enable-external-libraries
-
-NO_STAGE=	yes
-.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
-PLIST_SUB+=	ARCH="x86_64"
-.endif
-
-.if ${PORT_OPTIONS:MAVAHI}
-CONFIGURE_ARGS+=	--enable-avahi
-LIB_DEPENDS+=	libavahi-common.so:${PORTSDIR}/net/avahi-app
-.else
-CONFIGURE_ARGS+=	--disable-avahi
-.endif
-
-.if ${PORT_OPTIONS:MLIBBLURAY}
-CONFIGURE_ARGS+=	--enable-libbluray
-LIB_DEPENDS+=	libbluray.so:${PORTSDIR}/multimedia/libbluray
-.else
-CONFIGURE_ARGS+=	--disable-libbluray
-.endif
-
-.if ${PORT_OPTIONS:MFAAC}
-CONFIGURE_ARGS+=	--enable-faac
-LIB_DEPENDS+=	libfaac.so:${PORTSDIR}/audio/faac
-.else
-CONFIGURE_ARGS+=	--disable-faac
-.endif
-
-.if ${PORT_OPTIONS:MHAL}
-CONFIGURE_ARGS+=	--enable-hal
-LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
-.else
-CONFIGURE_ARGS+=	--disable-hal
-.endif
-
-.if ${PORT_OPTIONS:MLIRC}
-RUN_DEPENDS+=	lircd:${PORTSDIR}/comms/lirc
-.endif
-
-.if ${PORT_OPTIONS:MMMS}
-CONFIGURE_ARGS+=	--enable-libmms
-LIB_DEPENDS+=	libmms.so:${PORTSDIR}/net/libmms
-.else
-CONFIGURE_ARGS+=	--disable-libmms
-.endif
-
-.if ${PORT_OPTIONS:MNONFREE}
-CONFIGURE_ARGS+=	--enable-non-free
-NO_CDROM=	Restricted binary distribution
-NO_PACKAGE=	${NO_CDROM}
-.else
-CONFIGURE_ARGS+=	--disable-non-free
-.endif
-
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-CONFIGURE_ARGS+=	--enable-pulse
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
-.else
-CONFIGURE_ARGS+=	--disable-pulse
-.endif
-
-.if ${PORT_OPTIONS:MRTMP}
-CONFIGURE_ARGS+=	--enable-rtmp
-LIB_DEPENDS+=	librtmp.so:${PORTSDIR}/multimedia/librtmp
-.else
-CONFIGURE_ARGS+=	--disable-rtmp
-.endif
-
-.if ${PORT_OPTIONS:MVAAPI}
-LIB_DEPENDS+=	libva.so:${PORTSDIR}/multimedia/libva
-CONFIGURE_ARGS+=	--enable-vaapi
-.else
-CONFIGURE_ARGS+=	--disable-vaapi
-.endif
-
-.if ${PORT_OPTIONS:MVDPAU}
-LIB_DEPENDS+=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
-CONFIGURE_ARGS+=	--enable-vdpau
-.else
-CONFIGURE_ARGS+=	--disable-vdpau
-.endif
-
-.if ${PORT_OPTIONS:MWEBSERVER}
-CONFIGURE_ARGS+=	--enable-webserver
-LIB_DEPENDS+=	libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd
-PLIST_SUB+=	HTTPD=""
-.else
-CONFIGURE_ARGS+=	--disable-webserver
-PLIST_SUB+=	HTTPD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MXRANDR}
-CONFIGURE_ARGS+=	--enable-xrandr
-USE_XORG+=	xrandr
-PLIST_SUB+=	XRANDR=""
-.else
-CONFIGURE_ARGS+=	--disable-xrandr
-PLIST_SUB+=	XRANDR="@comment "
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/configure.in \
-		${WRKSRC}/lib/asap/Makefile.in \
-		${WRKSRC}/lib/libdvd/libdvdnav/configure.ac \
-		${WRKSRC}/lib/libdvd/libdvdnav/configure2 \
-		${WRKSRC}/lib/libdvd/libdvdread/configure.ac \
-		${WRKSRC}/lib/libdvd/libdvdread/configure2 \
-		${WRKSRC}/lib/libsidplay2/libsidplay/unix/my_macros.m4 \
-		${WRKSRC}/lib/timidity/configure.in \
-		${WRKSRC}/xbmc/screensavers/rsxs-0.9/acinclude.m4
-	@${REINPLACE_CMD} \
-		-e 's|libavcodec |libavcodec0 |g' \
-		-e 's|libavfilter |libavfilter0 |g' \
-		-e 's|libavformat |libavformat0 |g' \
-		-e 's|libavutil |libavutil0 |g' \
-		-e 's|libpostproc |libpostproc0 |g' \
-		-e 's|libswscale"|libswscale0"|g' \
-		-e 's|avcodec\]|avcodec0\]|g' \
-		${WRKSRC}/configure.in
-	${RM} ${WRKSRC}/addons/library.xbmc.addon/libXBMC_addon.h.orig
-# XXX somehow there are still references to linux libraries, if you find
-# where they come from please tell us!
-.if ${ARCH} == "amd64"
-	${LN} -s libXBMC_addon-x86_64-freebsd.so ${WRKSRC}/addons/library.xbmc.addon/libXBMC_addon-x86_64-linux.so
-	${LN} -s libXBMC_gui-x86_64-freebsd.so ${WRKSRC}/addons/library.xbmc.gui/libXBMC_gui-x86_64-linux.so
-	${LN} -s libXBMC_pvr-x86_64-freebsd.so ${WRKSRC}/addons/library.xbmc.pvr/libXBMC_pvr-x86_64-linux.so
-.else
-	${LN} -s libXBMC_addon-x86-freebsd.so ${WRKSRC}/addons/library.xbmc.addon/libXBMC_addon-x86-linux.so
-	${LN} -s libXBMC_gui-x86-freebsd.so ${WRKSRC}/addons/library.xbmc.gui/libXBMC_gui-x86-linux.so
-	${LN} -s libXBMC_pvr-x86-freebsd.so ${WRKSRC}/addons/library.xbmc.pvr/libXBMC_pvr-x86-linux.so
-.endif
-
-pre-configure:
-	cd ${WRKSRC} && ./bootstrap
-
-post-install:
-# XXX somehow there are still references to linux libraries, if you find
-# where they come from please tell us!
-.if ${ARCH} == "amd64"
-	${LN} -s libXBMC_addon-x86_64-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.addon/libXBMC_addon-x86_64-linux.so
-	${LN} -s libXBMC_gui-x86_64-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.gui/libXBMC_gui-x86_64-linux.so
-	${LN} -s libXBMC_pvr-x86_64-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.pvr/libXBMC_pvr-x86_64-linux.so
-.else
-	${LN} -s libXBMC_addon-x86-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.addon/libXBMC_addon-x86-linux.so
-	${LN} -s libXBMC_gui-x86-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.gui/libXBMC_gui-x86-linux.so
-	${LN} -s libXBMC_pvr-x86-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.pvr/libXBMC_pvr-x86-linux.so
-.endif
-
-.include <bsd.port.post.mk>
--- a/multimedia/xbmc-pvr/distinfo
+++ b/multimedia/xbmc-pvr/distinfo
@ -1,2 +0,0 @@
-SHA256 (opdenkamp-xbmc-pvr-ppa-odk70-0-g9023e39.tar.gz) = fc0bd23fcc938c4e11934e216af4cb659b2557ddf4888f96878f9e72407c7889
-SIZE (opdenkamp-xbmc-pvr-ppa-odk70-0-g9023e39.tar.gz) = 61713939
--- a/multimedia/xbmc-pvr/files/patch-Makefile.in
+++ b/multimedia/xbmc-pvr/files/patch-Makefile.in
@ -1,20 +0,0 @@
--- Makefile.in.orig
-+++ Makefile.in
-@@ -127,7 +127,6 @@ PAPCODECS_DIRS= \
- 	lib/timidity \
- 	lib/libsidplay2 \
- 	lib/stsound/StSoundLibrary \
-	lib/snesapu/SNES/SNESAPU \
- 	lib/vgmstream
- 
- ifeq (@USE_ASAP_CODEC@,1)
-@@ -463,9 +462,6 @@ ifeq (@USE_ASAP_CODEC@,1)
-   endif
- endif
- 	$(MAKE) -C lib/stsound/StSoundLibrary	
-ifeq ($(or $(findstring powerpc,@ARCH@),$(findstring x86_64-linux,@ARCH@),$(findstring arm, @ARCH@)),)
-	$(MAKE) -C lib/snesapu/SNES/SNESAPU
-endif
- imagelib: dllloader
- 	$(MAKE) -C lib/cximage-6.0
- 
--- a/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.addon-libXBMC_addon.h
+++ b/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.addon-libXBMC_addon.h
@ -1,33 +0,0 @@
--- addons/library.xbmc.addon/libXBMC_addon.h.orig
-+++ addons/library.xbmc.addon/libXBMC_addon.h
-@@ -41,6 +41,22 @@
- #else
- #define ADDON_HELPER_ARCH       "x86"
- #endif
-+#else
-+#if defined(__FreeBSD__)         // FreeBSD
-+#define ADDON_HELPER_PLATFORM   "freebsd"
-+#if defined(__x86_64__)
-+#define ADDON_HELPER_ARCH       "x86_64"
-+#elif defined(_POWERPC)
-+#define ADDON_HELPER_ARCH       "powerpc"
-+#elif defined(_POWERPC64)
-+#define ADDON_HELPER_ARCH       "powerpc64"
-+#elif defined(_ARMEL)
-+#define ADDON_HELPER_ARCH       "arm"
-+#elif defined(_MIPSEL)
-+#define ADDON_HELPER_ARCH       "mipsel"
-+#else
-+#define ADDON_HELPER_ARCH       "x86"
-+#endif
- #else                           // linux
- #define ADDON_HELPER_PLATFORM   "linux"
- #if defined(__x86_64__)
-@@ -57,6 +73,7 @@
- #define ADDON_HELPER_ARCH       "i486"
- #endif
- #endif
-+#endif
- #include <dlfcn.h>              // linux+osx
- #define ADDON_HELPER_EXT        ".so"
- #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-" ADDON_HELPER_ARCH "-" ADDON_HELPER_PLATFORM ADDON_HELPER_EXT
--- a/multimedia/xbmc-pvr/files/patch-configure.in
+++ b/multimedia/xbmc-pvr/files/patch-configure.in
@ -1,118 +0,0 @@
--- configure.in.orig
-+++ configure.in
-@@ -20,7 +20,7 @@ AC_DEFUN([XB_FIND_SONAME],
- [
-   if [[ "$host_vendor" != "apple" ]]; then
-     AC_MSG_CHECKING([for lib$2 soname])
-    $1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
-+    $1_FILENAME=$($CC -nostdlib $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
-     if [[ ! -z $$1_FILENAME ]]; then
-       $1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
-     fi
-@@ -385,6 +385,12 @@ AC_ARG_ENABLE([texturepacker],
-   [use_texturepacker=$enableval],
-   [use_texturepacker=auto])
- 
-+AC_ARG_ENABLE([libmms],
-+  [AS_HELP_STRING([--enable-libmms],
-+  [enable mms:// and mmsh:// support (default is auto)])],
-+  [use_libmms=$enableval],
-+  [use_libmms=auto])
-+
- AC_ARG_WITH([lirc-device],
-   [AS_HELP_STRING([--with-lirc-device=file],
-   [specify the default LIRC device (default is /dev/lircd)])],
-@@ -453,6 +459,20 @@ case $host in
-      ARCH="x86_64-linux"
-      AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
-      ;;
-+  i386-*-freebsd*)
-+     ARCH="x86-freebsd"
-+     MAKE="gmake"
-+       CFLAGS="$CFLAGS -I/usr/local/include"
-+       CXXFLAGS="$CXXFLAGS -I/usr/local/include"
-+     AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
-+     ;;
-+  amd64-*-freebsd*)
-+     ARCH="x86_64-freebsd"
-+     MAKE="gmake"
-+       CFLAGS="$CFLAGS -I/usr/local/include"
-+       CXXFLAGS="$CXXFLAGS -I/usr/local/include"
-+     AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
-+     ;;
-   arm-apple-darwin*)
-      use_joystick=no
-      use_neon=yes
-@@ -636,6 +656,8 @@ INCLUDES="$INCLUDES -I\$(abs_top_srcdir)
- # Check inotify availability
- AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)
- 
-+AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[""]),)
-+
- # Checks for boost headers using CXX instead of CC
- AC_LANG_PUSH([C++])
- AC_CHECK_HEADER([boost/shared_ptr.hpp],, AC_MSG_ERROR($missing_library))
-@@ -800,6 +822,29 @@ AS_CASE([x$use_libbluray],
-   ]
- )
- 
-+# check for libmms
-+AS_CASE([x$use_libmms],
-+  [xyes],[
-+    PKG_CHECK_MODULES([LIBMMS],[libmms],[use_libmms="yes"], AC_MSG_ERROR($missing_library))
-+  ],
-+  [xauto],[
-+    PKG_CHECK_MODULES([LIBMMS],[libmms],[use_libmms="yes"], [use_libmms="no"])
-+  ])
-+
-+AS_CASE([x$use_libmms],
-+  [xyes],[
-+    INCLUDES="$INCLUDES $LIBMMS_CFLAGS";
-+    LIBS="$LIBS $LIBMMS_LIBS";
-+    if test "$host_vendor" != "apple"; then
-+      XB_FIND_SONAME([MMS], [mms], [use_libmms])
-+    fi;
-+    AC_DEFINE([HAVE_LIBMMS], 1, [System has libmms library])
-+    AC_SUBST([HAVE_LIBMMS], 1)
-+  ],[
-+    AC_SUBST([HAVE_LIBMMS], 0)
-+  ]
-+)
-+
- # platform dependent libraries
- if test "$host_vendor" = "apple" ; then
-   AC_CHECK_LIB([iconv],     [main],, AC_MSG_ERROR($missing_library))
-@@ -809,8 +854,12 @@ if test "$host_vendor" = "apple" ; then
-     AC_DEFINE([HAVE_SDL],[1],["Define to 1 if using sdl"])
-   fi
- else
-+  if echo "$ARCH" | grep -vq freebsd; then
-   AC_CHECK_LIB([dl],         [main],, AC_MSG_ERROR($missing_library))
-   AC_CHECK_LIB([resolv],     [main],, AC_MSG_ERROR($missing_library))
-+  else
-+  AC_CHECK_LIB([iconv],      [main],, AC_MSG_ERROR($missing_library))
-+  fi
-   AC_CHECK_LIB([jasper],     [main],, AC_MSG_ERROR($missing_library)) # check for cximage
-   AC_CHECK_LIB([rt],         [clock_gettime],, AC_MSG_ERROR($missing_library))
- 
-@@ -1662,6 +1711,12 @@ else
-   USE_TEXTUREPACKER=0
- fi
- 
-+if test "$use_libmms" = "yes"; then
-+  final_message="$final_message\n  MMS Support:\tYes"
-+else
-+  final_message="$final_message\n  MMS Support:\tNo"
-+fi
-+
- if test "$use_mid" = "yes"; then
-   final_message="$final_message\n  MID Support:\tYes"
-   SDL_DEFINES="$SDL_DEFINES -DMID"
-@@ -1865,7 +1920,6 @@ OUTPUT_FILES="Makefile \
-     lib/nosefart/Makefile \
-     lib/libsidplay2/Makefile \
-     lib/vgmstream/Makefile \
-    lib/snesapu/SNES/SNESAPU/Makefile \
-     lib/stsound/StSoundLibrary/Makefile \
-     xbmc/cores/playercorefactory/Makefile \
-     xbmc/music/karaoke/Makefile \
--- a/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.cpp
+++ b/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.cpp
@ -1,74 +0,0 @@
--- lib/cximage-6.0/CxImage/ximapng.cpp.orig	2012-03-16 00:33:05.000000000 +0100
-+++ lib/cximage-6.0/CxImage/ximapng.cpp	2012-04-28 06:40:43.000000000 +0200
-@@ -15,7 +15,7 @@
- void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)
- {
- 	strcpy(info.szLastError,message);
-	longjmp(png_ptr->jmpbuf, 1);
-+	longjmp(png_jmpbuf(png_ptr), 1);
- }
- ////////////////////////////////////////////////////////////////////////////////
- #if CXIMAGE_SUPPORT_DECODE
-@@ -62,7 +62,7 @@
-     /* Set error handling if you are using the setjmp/longjmp method (this is
-     * the normal method of doing things with libpng).  REQUIRED unless you
-     * set up your own error handlers in the png_create_read_struct() earlier. */
-	if (setjmp(png_ptr->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		delete [] row_pointers;
- 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -80,7 +80,7 @@
- 		head.biWidth = info_ptr->width;
- 		head.biHeight= info_ptr->height;
- 		info.dwType = CXIMAGE_FORMAT_PNG;
-		longjmp(png_ptr->jmpbuf, 1);
-+		longjmp(png_jmpbuf(png_ptr), 1);
- 	}
- 
- 	/* calculate new number of channels */
-@@ -101,7 +101,7 @@
- 		break;
- 	default:
- 		strcpy(info.szLastError,"unknown PNG color type");
-		longjmp(png_ptr->jmpbuf, 1);
-+		longjmp(png_jmpbuf(png_ptr), 1);
- 	}
- 
- 	//find the right pixel depth used for cximage
-@@ -111,7 +111,7 @@
- 	if (channels >= 3) pixel_depth=24;
- 
- 	if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){
-		longjmp(png_ptr->jmpbuf, 1);
-+		longjmp(png_jmpbuf(png_ptr), 1);
- 	}
- 
- 	/* get metrics */
-@@ -207,7 +207,7 @@
- 	}
- 
- 	// <vho> - handle cancel
-	if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
-+	if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
- 
- 	// row_bytes is the width x number of channels x (bit-depth / 8)
- 	row_pointers = new BYTE[info_ptr->rowbytes + 8];
-@@ -230,7 +230,7 @@
- 		do	{
- 
- 			// <vho> - handle cancel
-			if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
-+			if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
- 
- #if CXIMAGE_SUPPORT_ALPHA	// <vho>
- 			if (AlphaIsValid()) {
-@@ -361,7 +361,7 @@
-    /* Set error handling.  REQUIRED if you aren't supplying your own
-     * error hadnling functions in the png_create_write_struct() call.
-     */
-	if (setjmp(png_ptr->jmpbuf)){
-+	if (setjmp(png_jmpbuf(png_ptr))){
- 		/* If we get here, we had a problem reading the file */
- 		if (info_ptr->palette) free(info_ptr->palette);
- 		png_destroy_write_struct(&png_ptr,  (png_infopp)&info_ptr);
--- a/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.h
+++ b/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.h
@ -1,19 +0,0 @@
--- lib/cximage-6.0/CxImage/ximapng.h.orig	2012-03-16 00:33:05.000000000 +0100
-+++ lib/cximage-6.0/CxImage/ximapng.h	2012-04-28 06:17:43.000000000 +0200
-@@ -25,6 +25,7 @@
- #ifdef _LINUX
- #undef _DLL
- #include <png.h>
-+#include <pngpriv.h>
- #else
- #include "../png/png.h"
- #endif
-@@ -70,7 +71,7 @@
-     static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)
- 	{
- 		strncpy((char*)png_ptr->error_ptr,error_msg,255);
-		longjmp(png_ptr->jmpbuf, 1);
-+		longjmp(png_jmpbuf(png_ptr), 1);
- 	}
- };
- 
--- a/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-raw-dcr.c
+++ b/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-raw-dcr.c
@ -1,12 +0,0 @@
--- lib/cximage-6.0/raw/dcr.c.orig
-+++ lib/cximage-6.0/raw/dcr.c
-@@ -144,7 +144,9 @@ int DCR_CLASS main (int argc, char **arg
- 
- 		//!!! set return point for error handling
- 		if (setjmp (dcr.failure)) {
-+#if !defined(__FreeBSD__)
- 			if (fileno(dcr.obj_) > 2) (*dcr.ops_->close_)(dcr.obj_);
-+#endif
- 			if (fileno(ofp) > 2) fclose(ofp);
- 			status = 1;
- 			goto cleanup;
--- a/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-raw-libdcr.h
+++ b/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-raw-libdcr.h
@ -1,11 +0,0 @@
--- lib/cximage-6.0/raw/libdcr.h.orig
-+++ lib/cximage-6.0/raw/libdcr.h
-@@ -41,7 +41,7 @@
- #include <setjmp.h>
- #include <sys/types.h>
- #endif
-#if defined(_LINUX) || defined(__APPLE__)
-+#if defined(_LINUX) || defined(__APPLE__) || defined(__FreeBSD__)
- #include <setjmp.h>
- #include <sys/types.h>
- #define _swab   swab
--- a/multimedia/xbmc-pvr/files/patch-lib-libPlatform-linux-os_posix.h
+++ b/multimedia/xbmc-pvr/files/patch-lib-libPlatform-linux-os_posix.h
@ -1,11 +0,0 @@
--- lib/libPlatform/linux/os_posix.h.orig
-+++ lib/libPlatform/linux/os_posix.h
-@@ -32,7 +32,7 @@
- #include <sys/timeb.h>
- #include <sys/resource.h>
- #include <sys/syscall.h>
-#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <sys/prctl.h> 
- #endif
- #include <pthread.h>
--- a/multimedia/xbmc-pvr/files/patch-lib-libXDAAP-httpClient.c
+++ b/multimedia/xbmc-pvr/files/patch-lib-libXDAAP-httpClient.c
@ -1,14 +0,0 @@
--- lib/libXDAAP/httpClient.c.orig
-+++ lib/libXDAAP/httpClient.c
-@@ -61,6 +61,11 @@
- #include <netinet/in.h>
- #endif
- 
-+#if defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#endif /* __FreeBSD__ */
-+
- struct HTTP_ConnectionTAG
- {
-     char *host;
--- a/multimedia/xbmc-pvr/files/patch-lib-libXDAAP-ioloop.c
+++ b/multimedia/xbmc-pvr/files/patch-lib-libXDAAP-ioloop.c
@ -1,13 +0,0 @@
--- lib/libXDAAP/ioloop.c.orig
-+++ lib/libXDAAP/ioloop.c
-@@ -122,9 +122,9 @@
- 
- void fd_event_reset(fd_event *event)
- {
-    event->signalled = 0;
-     char buf[1] = {0};
-     int flags;
-+    event->signalled = 0;
- 
-     /* set non-blocking on read pipe */
-     flags = fcntl(event->pipe[0], F_GETFL, 0);
--- a/multimedia/xbmc-pvr/files/patch-lib-libXDAAP-threadpool.c
+++ b/multimedia/xbmc-pvr/files/patch-lib-libXDAAP-threadpool.c
@ -1,15 +0,0 @@
--- lib/libXDAAP/threadpool.c.orig
-+++ lib/libXDAAP/threadpool.c
-@@ -279,10 +279,10 @@
- void CP_ThreadPool_QueueWorkItem(CP_SThreadPool *pTPThis, CP_TPfnJob pfnCallback,
-                                  void *arg1, void *arg2)
- {
-    ts_mutex_lock(pTPThis->mtJobQueueMutex);
-
-     CP_STPJobQueue *pTPJQNewJob = malloc(sizeof(CP_STPJobQueue));
- 
-+    ts_mutex_lock(pTPThis->mtJobQueueMutex);
-+
-     pTPJQNewJob->fnJobCallback = pfnCallback;
-     pTPJQNewJob->arg1 = arg1;
-     pTPJQNewJob->arg2 = arg2;
--- a/multimedia/xbmc-pvr/files/patch-lib-libsidplay2-eventh
+++ b/multimedia/xbmc-pvr/files/patch-lib-libsidplay2-eventh
@ -1,88 +0,0 @@
--- lib/libsidplay2/libsidplay/src/event.cpp.orig
-+++ lib/libsidplay2/libsidplay/src/event.cpp
-@@ -50,7 +50,7 @@
-  ***************************************************************************/
- 
- #include <string.h>
-#include "event.h"
-+#include "../../include/sidplay/event.h"
- 
- #define EVENT_TIMEWARP_COUNT 0x0FFFFF
- 
--- lib/libsidplay2/libsidplay/src/mos6510/mos6510.h.orig
-+++ lib/libsidplay2/libsidplay/src/mos6510/mos6510.h
-@@ -36,7 +36,7 @@
- #include "config.h"
- #include "component.h"
- #include "sidenv.h"
-#include "event.h"
-+#include "../../include/sidplay/event.h"
- 
- #undef  MOS6510_VERSION
- #undef  MOS6510_DATE
--- lib/libsidplay2/libsidplay/include/sidplay/c64env.h.orig
-+++ lib/libsidplay2/libsidplay/include/sidplay/c64env.h
-@@ -19,7 +19,7 @@
- #define _c64env_h_
- 
- #include "sidtypes.h"
-#include "event.h"
-+#include "../../include/sidplay/event.h"
-  
- /* An implementation of of this class can be created to perform the C64
-    specifics.  A pointer to this child class can then be passed to
--- lib/libsidplay2/libsidplay/include/sidplay/sid2types.h.orig
-+++ lib/libsidplay2/libsidplay/include/sidplay/sid2types.h
-@@ -19,7 +19,7 @@
- #define _sid2types_h_
- 
- #include "sidtypes.h"
-#include "event.h"
-+#include "../../include/sidplay/event.h"
- 
- class   sidbuilder;
- struct  SidTuneInfo;
--- lib/libsidplay2/libsidplay/src/mos6526/mos6526.h.orig
-+++ lib/libsidplay2/libsidplay/src/mos6526/mos6526.h
-@@ -85,7 +85,7 @@
- #define _mos6526_h_
- 
- #include "component.h"
-#include "event.h"
-+#include "../../include/sidplay/event.h"
- 
- class MOS6526: public component
- {
--- lib/libsidplay2/libsidplay/src/mos656x/mos656x.h.orig
-+++ lib/libsidplay2/libsidplay/src/mos656x/mos656x.h
-@@ -19,7 +19,7 @@
- #define _mos656x_h_
- 
- #include "component.h"
-#include "event.h"
-+#include "../../include/sidplay/event.h"
- 
- typedef enum
- {
--- lib/libsidplay2/libsidplay/src/sid6526/sid6526.h.orig
-+++ lib/libsidplay2/libsidplay/src/sid6526/sid6526.h
-@@ -38,7 +38,7 @@
- #define _sid6526_h_
- 
- #include "component.h"
-#include "event.h"
-+#include "../../include/sidplay/event.h"
- #include "c64env.h"
- 
- class SID6526: public component
--- lib/libsidplay2/libsidplay/src/xsid/xsid.h.orig
-+++ lib/libsidplay2/libsidplay/src/xsid/xsid.h
-@@ -106,7 +106,7 @@ programmed with.
- 
- #include "config.h"
- #include "sidbuilder.h"
-#include "event.h"
-+#include "../../include/sidplay/event.h"
- 
- // XSID configuration settings
- //#define XSID_DEBUG 1
--- a/multimedia/xbmc-pvr/files/patch-lib-platform-posix-os-types.h
+++ b/multimedia/xbmc-pvr/files/patch-lib-platform-posix-os-types.h
@ -1,11 +0,0 @@
--- lib/platform/posix/os-types.h.orig
-+++ lib/platform/posix/os-types.h
-@@ -35,7 +35,7 @@
- #include <string.h>
- #include <errno.h>
- #include <sys/time.h>
-#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <sys/prctl.h>
- #endif
- #include <pthread.h>
--- a/multimedia/xbmc-pvr/files/patch-libcplufflibcpluff__cpluff.c
+++ b/multimedia/xbmc-pvr/files/patch-libcplufflibcpluff__cpluff.c
@ -1,18 +0,0 @@
--- ./lib/cpluff/libcpluff/cpluff.c.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./lib/cpluff/libcpluff/cpluff.c	2012-01-02 10:14:38.000000000 +0100
-@@ -77,6 +77,7 @@
- 	return CP_HOST;
- }
- 
-+#if defined(CP_THREADS) || !defined(NDEBUG)
- CP_HIDDEN void cpi_lock_framework(void) {
- #if defined(CP_THREADS)
- 	cpi_lock_mutex(framework_mutex);
-@@ -93,6 +94,7 @@
- 	framework_locked--;
- #endif
- }
-+#endif
- 
- static void reset(void) {
- #ifdef CP_THREADS
--- a/multimedia/xbmc-pvr/files/patch-libcplufflibcpluff__logging.c
+++ b/multimedia/xbmc-pvr/files/patch-libcplufflibcpluff__logging.c
@ -1,26 +0,0 @@
--- ./lib/cpluff/libcpluff/logging.c.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./lib/cpluff/libcpluff/logging.c	2012-01-02 10:14:38.000000000 +0100
-@@ -130,9 +130,11 @@
- 	if (status == CP_ERR_RESOURCE) {
- 		cpi_error(context, N_("Logger could not be registered due to insufficient memory."));		
- 	} else if (cpi_is_logged(context, CP_LOG_DEBUG)) {
-+#ifndef __clang__
- 		char owner[64];
- 		/* TRANSLATORS: %s is the context owner */
- 		cpi_debugf(context, N_("%s registered a logger."), cpi_context_owner(context, owner, sizeof(owner)));
-+#endif
- 	}
- 	cpi_unlock_context(context);
- 
-@@ -167,9 +169,11 @@
- 		update_logging_limits(context);
- 	}
- 	if (cpi_is_logged(context, CP_LOG_DEBUG)) {
-+#ifndef __clang__
- 		char owner[64];
- 		/* TRANSLATORS: %s is the context owner */
- 		cpi_debugf(context, N_("%s unregistered a logger."), cpi_context_owner(context, owner, sizeof(owner)));
-+#endif
- 	}
- 	cpi_unlock_context(context);
- }
--- a/multimedia/xbmc-pvr/files/patch-libcplufflibcpluff__pinfo.c
+++ b/multimedia/xbmc-pvr/files/patch-libcplufflibcpluff__pinfo.c
@ -1,26 +0,0 @@
--- ./lib/cpluff/libcpluff/pinfo.c.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./lib/cpluff/libcpluff/pinfo.c	2012-01-02 10:14:38.000000000 +0100
-@@ -570,9 +570,11 @@
- 	if (status != CP_OK) {
- 		cpi_error(context, _("A plug-in listener could not be registered due to insufficient memory."));
- 	} else if (cpi_is_logged(context, CP_LOG_DEBUG)) {
-+#ifndef __clang__
- 		char owner[64];
- 		/* TRANSLATORS: %s is the context owner */
- 		cpi_debugf(context, N_("%s registered a plug-in listener."), cpi_context_owner(context, owner, sizeof(owner)));
-+#endif
- 	}
- 	cpi_unlock_context(context);
- 	
-@@ -592,9 +594,11 @@
- 		process_unregister_plistener(context->env->plugin_listeners, node, NULL);
- 	}
- 	if (cpi_is_logged(context, CP_LOG_DEBUG)) {
-+#ifndef __clang__
- 		char owner[64];
- 		/* TRANSLATORS: %s is the context owner */
- 		cpi_debugf(context, N_("%s unregistered a plug-in listener."), cpi_context_owner(context, owner, sizeof(owner)));
-+#endif
- 	}
- 	cpi_unlock_context(context);
- }
--- a/multimedia/xbmc-pvr/files/patch-libcplufflibcpluff__ploader.c
+++ b/multimedia/xbmc-pvr/files/patch-libcplufflibcpluff__ploader.c
@ -1,55 +0,0 @@
--- ./lib/cpluff/libcpluff/ploader.c.orig	2010-07-09 17:51:15.000000000 +0200
-+++ ./lib/cpluff/libcpluff/ploader.c	2010-12-01 12:17:34.288126970 +0100
-@@ -161,15 +161,15 @@
- 		cpi_warnf(plcontext->context,
- 			N_("Suspicious plug-in descriptor content in %s, line %d, column %d (%s)."),
- 		plcontext->file,
-		XML_GetCurrentLineNumber(plcontext->parser),
-		XML_GetCurrentColumnNumber(plcontext->parser) + 1,
-+		(int)XML_GetCurrentLineNumber(plcontext->parser),
-+		(int)XML_GetCurrentColumnNumber(plcontext->parser) + 1,
- 		message);
- 	} else {				
- 		cpi_errorf(plcontext->context,
- 			N_("Invalid plug-in descriptor content in %s, line %d, column %d (%s)."),
- 			plcontext->file,
-			XML_GetCurrentLineNumber(plcontext->parser),
-			XML_GetCurrentColumnNumber(plcontext->parser) + 1,
-+			(int)XML_GetCurrentLineNumber(plcontext->parser),
-+			(int)XML_GetCurrentColumnNumber(plcontext->parser) + 1,
- 			message);
- 	}
- 	if (!warn) {
-@@ -188,8 +188,8 @@
- 		cpi_errorf(plcontext->context,
- 			N_("Insufficient system resources to parse plug-in descriptor content in %s, line %d, column %d."),
- 			plcontext->file,
-			XML_GetCurrentLineNumber(plcontext->parser),
-			XML_GetCurrentColumnNumber(plcontext->parser) + 1);
-+			(int)XML_GetCurrentLineNumber(plcontext->parser),
-+			(int)XML_GetCurrentColumnNumber(plcontext->parser) + 1);
- 	}
- 	plcontext->resource_error_count++;
- }
-@@ -1084,8 +1084,8 @@
- 				cpi_errorf(context,
- 					N_("XML parsing error in %s, line %d, column %d (%s)."),
- 					file,
-					XML_GetErrorLineNumber(parser),
-					XML_GetErrorColumnNumber(parser) + 1,
-+					(int)XML_GetErrorLineNumber(parser),
-+					(int)XML_GetErrorColumnNumber(parser) + 1,
- 					XML_ErrorString(XML_GetErrorCode(parser)));
- 				cpi_unlock_context(context);
- 			}
-@@ -1270,8 +1270,8 @@
- 			  cpi_errorf(context,
- 				  N_("XML parsing error in %s, line %d, column %d (%s)."),
- 				  file,
-				  XML_GetErrorLineNumber(parser),
-				  XML_GetErrorColumnNumber(parser) + 1,
-+				  (int)XML_GetErrorLineNumber(parser),
-+				  (int)XML_GetErrorColumnNumber(parser) + 1,
- 				  XML_ErrorString(XML_GetErrorCode(parser)));
- 			  cpi_unlock_context(context);
- 		  }
--- a/multimedia/xbmc-pvr/files/patch-libcplufflibcpluff__psymbol.c
+++ b/multimedia/xbmc-pvr/files/patch-libcplufflibcpluff__psymbol.c
@ -1,26 +0,0 @@
--- ./lib/cpluff/libcpluff/psymbol.c.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./lib/cpluff/libcpluff/psymbol.c	2012-01-02 10:14:38.000000000 +0100
-@@ -249,9 +249,11 @@
- 		provider_info->usage_count++;
- 
- 		if (cpi_is_logged(context, CP_LOG_DEBUG)) {
-+#ifndef __clang__
- 			char owner[64];
- 			/* TRANSLATORS: First %s is the context owner */
- 			cpi_debugf(context, "%s resolved symbol %s defined by plug-in %s.", cpi_context_owner(context, owner, sizeof(owner)), name, id);
-+#endif
- 		}
- 	} while (0);
- 
-@@ -315,9 +317,11 @@
- 			hash_delete_free(context->resolved_symbols, node);
- 			free(symbol_info);
- 			if (cpi_is_logged(context, CP_LOG_DEBUG)) {
-+#ifndef __clang__
- 				char owner[64];
- 				/* TRANSLATORS: First %s is the context owner */
- 				cpi_debugf(context, _("%s released the symbol at address %p defined by plug-in %s."), cpi_context_owner(context, owner, sizeof(owner)), ptr, provider_info->plugin->plugin->identifier);
-+#endif
- 			}
- 		}
- 	
--- a/multimedia/xbmc-pvr/files/patch-libdl-freebsd
+++ b/multimedia/xbmc-pvr/files/patch-libdl-freebsd
@ -1,54 +0,0 @@
--- xbmc/pvrclients/MediaPortal/Makefile.in.orig
-+++ xbmc/pvrclients/MediaPortal/Makefile.in
-@@ -5,7 +5,7 @@
- # how to reach the author.
- #
- 
-LIBS   = @abs_top_srcdir@/lib/libTcpSocket/libTcpSocket.a lib/tinyxml/tinyxml.a -ldl
-+LIBS   = @abs_top_srcdir@/lib/libTcpSocket/libTcpSocket.a lib/tinyxml/tinyxml.a
- LIBDIR = @abs_top_srcdir@/addons/pvr.team-mediaportal.tvserver
- LIB    = @abs_top_srcdir@/addons/pvr.team-mediaportal.tvserver/XBMC_MPTV.pvr
- 
--- xbmc/pvrclients/mythtv/Makefile.in.orig
-+++ xbmc/pvrclients/mythtv/Makefile.in
-@@ -5,7 +5,6 @@
- # how to reach the author.
- #
- 
-LIBS   = -ldl
- LIBDIR = @abs_top_srcdir@/addons/pvr.mythtv
- LIB    = @abs_top_srcdir@/addons/pvr.mythtv/XBMC_Mythtv.pvr
- 
--- xbmc/pvrclients/tvheadend/Makefile.in.orig
-+++ xbmc/pvrclients/tvheadend/Makefile.in
-@@ -5,7 +5,7 @@
- # how to reach the author.
- #
- 
-LIBS   = @abs_top_srcdir@/lib/libhts/libhts.a -ldl
-+LIBS   = @abs_top_srcdir@/lib/libhts/libhts.a
- LIBDIR = @abs_top_srcdir@/addons/pvr.hts
- LIB    = @abs_top_srcdir@/addons/pvr.hts/XBMC_Tvheadend.pvr
- 
--- xbmc/pvrclients/vdr-vnsi/Makefile.in.orig
-+++ xbmc/pvrclients/vdr-vnsi/Makefile.in
-@@ -5,7 +5,7 @@
- # how to reach the author.
- #
- 
-LIBS   = -ldl
-+#LIBS   = -ldl
- LIBDIR = @abs_top_srcdir@/addons/pvr.vdr.vnsi
- LIB    = @abs_top_srcdir@/addons/pvr.vdr.vnsi/XBMC_VDR_vnsi.pvr
- 
--- xbmc/pvrclients/pvr-demo/Makefile.in.orig
-+++ xbmc/pvrclients/pvr-demo/Makefile.in
-@@ -5,7 +5,7 @@
- # how to reach the author.
- #
- 
-LIBS   = @abs_top_srcdir@/lib/tinyXML/tinyxml.a -ldl
-+LIBS   = @abs_top_srcdir@/lib/tinyXML/tinyxml.a
- LIBDIR = @abs_top_srcdir@/addons/pvr.demo
- LIB    = @abs_top_srcdir@/addons/pvr.demo/XBMC_demo.pvr
- 
--- a/multimedia/xbmc-pvr/files/patch-threadid-freebsd
+++ b/multimedia/xbmc-pvr/files/patch-threadid-freebsd
@ -1,177 +0,0 @@
--- xbmc/linux/XThreadUtils.cpp.orig
-+++ xbmc/linux/XThreadUtils.cpp
-@@ -38,7 +38,11 @@ HANDLE WINAPI CreateThread(
-           LPTHREAD_START_ROUTINE lpStartAddress,
-             LPVOID lpParameter,
-         DWORD dwCreationFlags,
-+#ifdef __FreeBSD__
-+          LPLONG lpThreadId
-+#else
-           LPDWORD lpThreadId
-+#endif
-     ) {
- 
-   // a thread handle would actually contain an event
-@@ -62,8 +66,12 @@ HANDLE WINAPI CreateThread(
-   pthread_attr_destroy(&attr);
- 
-   if (h && lpThreadId)
-+#ifdef __FreeBSD__
-+    *lpThreadId = (LONG)h->m_hThread;
-+#else
-     // WARNING: This can truncate thread IDs on x86_64.
-     *lpThreadId = (DWORD)h->m_hThread;
-+#endif
-   return h;
- }
- 
-@@ -89,10 +97,18 @@ HANDLE _beginthreadex(
-    int ( *start_address )( void * ),
-    void *arglist,
-    unsigned initflag,
-+#ifdef __FreeBSD__
-+   unsigned long *thrdaddr
-+#else
-    unsigned *thrdaddr
-+#endif
- ) {
- 
-+#ifdef __FreeBSD__
-+  HANDLE h = CreateThread(NULL, stack_size, start_address, arglist, initflag, (LPLONG)thrdaddr);
-+#else
-   HANDLE h = CreateThread(NULL, stack_size, start_address, arglist, initflag, (LPDWORD)thrdaddr);
-+#endif
-   return h;
- 
- }
--- xbmc/linux/XThreadUtils.h.orig
-+++ xbmc/linux/XThreadUtils.h
-@@ -30,7 +30,11 @@ HANDLE WINAPI CreateThread(
-           LPTHREAD_START_ROUTINE lpStartAddress,
-             LPVOID lpParameter,
-         DWORD dwCreationFlags,
-+#ifdef __FreeBSD__
-+          LPLONG lpThreadId
-+#else
-           LPDWORD lpThreadId
-+#endif
-     );
- 
- HANDLE _beginthreadex(
-@@ -39,7 +43,11 @@ HANDLE _beginthreadex(
-    int ( *start_address )( void * ),
-    void *arglist,
-    unsigned initflag,
-+#ifdef __FreeBSD__
-+   unsigned long *thrdaddr
-+#else
-    unsigned *thrdaddr
-+#endif
- );
- 
- uintptr_t _beginthread(
--- lib/asap/win32/winamp/in_asap.c.orig
-+++ lib/asap/win32/winamp/in_asap.c
-@@ -305,7 +305,11 @@ static int play(char *fn)
- {
- 	int song;
- 	int maxlatency;
-+#ifdef __FreeBSD__
-+	LONG threadId;
-+#else
- 	DWORD threadId;
-+#endif
- 	strcpy(current_filename_with_song, fn);
- 	song = extractSongNumber(fn, current_filename);
- 	if (!loadModule(current_filename, module, &module_len))
--- lib/timidity/interface/w32g.h.orig
-+++ lib/timidity/interface/w32g.h
-@@ -65,9 +65,14 @@ typedef LPTHREAD_START_ROUTINE BCC_BEGIN
- #define crt_beginthread(start_address,stack_size,arglist) \
- (HANDLE)_beginthread((BCC_BEGINTHREAD_START_ADDRESS)start_address,(unsigned)stack_size,(void *)arglist)
- #else
-+#ifdef __FreeBSD__
-+#define crt_beginthread(start_address,stack_size,arglist) \
-+(HANDLE)CreateThread(NULL,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,0,NULL)
-+#else
- #define crt_beginthread(start_address,stack_size,arglist) \
- (HANDLE)CreateThread(NULL,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,0,&dwTmp)
- #endif
-+#endif
- 
- // (HANDLE)crt_beginthreadex(LPSECURITY_ATTRIBUTES security, DWORD stack_size, LPTHREAD_START_ROUTINE start_address, LPVOID arglist, DWORD initflag, LPDWORD thrdaddr );
- #if defined(_MSC_VER) || defined(__WATCOMC__)
-@@ -77,9 +82,14 @@ typedef LPTHREAD_START_ROUTINE BCC_BEGIN
- #define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \
- (HANDLE)_beginthreadNT((BCC_BEGINTHREAD_START_ADDRESS)start_address,(unsigned)stack_size,(void *)arglist,(void *)security_attrib,(unsigned long)create_flags,(unsigned long *)thread_id)
- #else
-+#ifdef __FreeBSD__
-+#define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \
-+(HANDLE)CreateThread((LPSECURITY_ATTRIBUTES)security,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,(DWORD)initflag,(LPLONG)thrdaddr)
-+#else
- #define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \
- (HANDLE)CreateThread((LPSECURITY_ATTRIBUTES)security,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,(DWORD)initflag,(LPDWORD)thrdaddr)
- #endif
-+#endif
- 
- #if defined(_MSC_VER) || defined(__WATCOMC__)
- #define crt_endthread() _endthread()
--- lib/timidity/timidity/gogo_a.c.orig
-+++ lib/timidity/timidity/gogo_a.c
-@@ -109,9 +109,14 @@ typedef LPTHREAD_START_ROUTINE BCC_BEGIN
- #define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \
- (HANDLE)_beginthreadNT((BCC_BEGINTHREAD_START_ADDRESS)start_address,(unsigned)stack_size,(void *)arglist,(void *)security_attrib,(unsigned long)create_flags,(unsigned long *)thread_id)
- #else
-+#ifdef __FreeBSD__
-+#define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \
-+(HANDLE)CreateThread((LPSECURITY_ATTRIBUTES)security,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,(DWORD)initflag,(LPLONG)thrdaddr)
-+#else
- #define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \
- (HANDLE)CreateThread((LPSECURITY_ATTRIBUTES)security,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,(DWORD)initflag,(LPDWORD)thrdaddr)
- #endif
-+#endif
- 
- volatile extern char *w32g_output_dir;
- volatile extern int w32g_auto_output_mode;
--- xbmc/visualizations/XBMCProjectM/libprojectM/fftsg.cpp.orig
-+++ xbmc/visualizations/XBMCProjectM/libprojectM/fftsg.cpp
-@@ -782,6 +782,16 @@ void makect(int nc, int *ip, double *c)
- #include <stdio.h>
- #include <stdlib.h>
- #define cdft_thread_t HANDLE
-+#ifdef __FreeBSD__
-+#define cdft_thread_create(thp,func,argp) { \
-+    LONG thid; \
-+    *(thp) = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) func, (LPVOID) argp, 0, &thid); \
-+    if (*(thp) == 0) { \
-+        fprintf(stderr, "cdft thread error\n"); \
-+        exit(1); \
-+    } \
-+}
-+#else
- #define cdft_thread_create(thp,func,argp) { \
-     DWORD thid; \
-     *(thp) = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) func, (LPVOID) argp, 0, &thid); \
-@@ -790,6 +800,7 @@ void makect(int nc, int *ip, double *c)
-         exit(1); \
-     } \
- }
-+#endif
- #define cdft_thread_wait(th) { \
-     WaitForSingleObject(th, INFINITE); \
-     CloseHandle(th); \
--- xbmc/threads/Thread.h.orig
-+++ xbmc/threads/Thread.h
-@@ -117,8 +117,12 @@ private:
-   ThreadIdentifier ThreadId() const;
-   bool m_bAutoDelete;
-   CEvent m_StopEvent;
-+#ifdef __FreeBSD__
-+  unsigned long m_ThreadId;
-+#else
-   unsigned m_ThreadId; // This value is unreliable on platforms using pthreads
-                        // Use m_ThreadHandle->m_hThread instead
-+#endif
-   IRunnable* m_pRunnable;
- 
-   unsigned __int64 m_iLastUsage;
--- a/multimedia/xbmc-pvr/files/patch-tools-TexturePacker-XBTFWriter.cpp
+++ b/multimedia/xbmc-pvr/files/patch-tools-TexturePacker-XBTFWriter.cpp
@ -1,11 +0,0 @@
--- tools/TexturePacker/XBTFWriter.cpp.orig
-+++ tools/TexturePacker/XBTFWriter.cpp
-@@ -26,6 +26,8 @@
- #include "utils/EndianSwap.h"
- #if !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
- #endif
- #include <memory.h>
- 
--- a/multimedia/xbmc-pvr/files/patch-toolsLinuxxbmc.sh.in
+++ b/multimedia/xbmc-pvr/files/patch-toolsLinuxxbmc.sh.in
@ -1,28 +0,0 @@
--- ./tools/Linux/xbmc.sh.in.orig	2010-10-28 21:09:04.000000000 +0200
-+++ ./tools/Linux/xbmc.sh.in	2010-12-01 12:17:34.286115032 +0100
-@@ -23,6 +23,8 @@
- exec_prefix="@exec_prefix@"
- datarootdir="@datarootdir@"
- LIBDIR="@libdir@"
-+export XBMC_BIN_HOME="${LIBDIR}/xbmc"
-+export XBMC_HOME="${datarootdir}/xbmc"
- 
- # Check for some options used by this script
- while [ "$#" -gt "0" ]
-@@ -103,11 +105,11 @@
-   echo "Crash report available at $FILE"
- }
- 
-python @datadir@/xbmc/FEH.py $SAVED_ARGS
-RET=$?
-if [ $RET -ne 0 ]; then
-  exit $RET
-fi
-+# python @datadir@/xbmc/FEH.py $SAVED_ARGS
-+# RET=$?
-+# if [ $RET -ne 0 ]; then
-+#  exit $RET
-+# fi
- 
- if which gdb >/dev/null 2>&1; then
-   # Output warning in case ulimit is unsupported by shell
--- a/multimedia/xbmc-pvr/files/patch-xbmc-cores-VideoRenderers-LinuxRendererGL.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmc-cores-VideoRenderers-LinuxRendererGL.cpp
@ -1,33 +0,0 @@
--- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp.orig
-+++ xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
-@@ -159,6 +159,10 @@ CLinuxRendererGL::CLinuxRendererGL()
-   m_rgbPbo = 0;
- 
-   m_dllSwScale = new DllSwScale;
-+
-+#ifdef __FreeBSD__
-+  m_tid = NULL;
-+#endif
- }
- 
- CLinuxRendererGL::~CLinuxRendererGL()
-@@ -247,6 +251,9 @@ bool CLinuxRendererGL::ValidateRenderTar
-       (this->*m_textureCreate)(i);
- 
-     m_bValidated = true;
-+#ifdef __FreeBSD__
-+    m_tid = pthread_self();
-+#endif
-     return true;
-   }
-   return false;
-@@ -716,6 +723,9 @@ unsigned int CLinuxRendererGL::PreInit()
-   CSingleLock lock(g_graphicsContext);
-   m_bConfigured = false;
-   m_bValidated = false;
-+#ifdef __FreeBSD__ // XXX Will this leak?  It's needed to avoid crashes... :(
-+  if (pthread_self() == m_tid)
-+#endif
-   UnInit();
-   m_resolution = g_guiSettings.m_LookAndFeelResolution;
-   if ( m_resolution == RES_WINDOW )
--- a/multimedia/xbmc-pvr/files/patch-xbmc-cores-VideoRenderers-LinuxRendererGL.h
+++ b/multimedia/xbmc-pvr/files/patch-xbmc-cores-VideoRenderers-LinuxRendererGL.h
@ -1,13 +0,0 @@
--- xbmc/cores/VideoRenderers/LinuxRendererGL.h.orig
-+++ xbmc/cores/VideoRenderers/LinuxRendererGL.h
-@@ -228,6 +228,10 @@ protected:
-   int m_currentField;
-   int m_reloadShaders;
- 
-+#ifdef __FreeBSD__
-+  pthread_t m_tid;
-+#endif
-+
-   struct YUVPLANE
-   {
-     GLuint id;
--- a/multimedia/xbmc-pvr/files/patch-xbmc-filesystem-CacheStrategy.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmc-filesystem-CacheStrategy.cpp
@ -1,33 +0,0 @@
--- xbmc/filesystem/CacheStrategy.cpp.orig
-+++ xbmc/filesystem/CacheStrategy.cpp
-@@ -93,7 +93,8 @@
- 
-   if(m_hCacheFileWrite == INVALID_HANDLE_VALUE)
-   {
-    CLog::Log(LOGERROR, "%s - failed to create file %s with error code %d", __FUNCTION__, fileName.c_str(), GetLastError());
-+    CLog::Log(LOGERROR, "%s - failed to create file %s with error code %d",
-+      __FUNCTION__, fileName.c_str(), (int)GetLastError());
-     Close();
-     return CACHE_RC_ERROR;
-   }
-@@ -107,7 +108,8 @@
- 
-   if(m_hCacheFileRead == INVALID_HANDLE_VALUE)
-   {
-    CLog::Log(LOGERROR, "%s - failed to open file %s with error code %d", __FUNCTION__, fileName.c_str(), GetLastError());
-+    CLog::Log(LOGERROR, "%s - failed to open file %s with error code %d",
-+      __FUNCTION__, fileName.c_str(), (int)GetLastError());
-     Close();
-     return CACHE_RC_ERROR;
-   }
-@@ -140,8 +142,8 @@
-   DWORD iWritten=0;
-   if (!WriteFile(m_hCacheFileWrite, pBuffer, iSize, &iWritten, NULL))
-   {
-    CLog::Log(LOGERROR, "%s - failed to write to file. err: %u",
-                          __FUNCTION__, GetLastError());
-+    CLog::Log(LOGERROR, "%s - failed to write to file. err: %d",
-+                          __FUNCTION__, (int)GetLastError());
-     return CACHE_RC_ERROR;
-   }
- 
--- a/multimedia/xbmc-pvr/files/patch-xbmc-filesystem-SAPDirectory.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmc-filesystem-SAPDirectory.cpp
@ -1,12 +0,0 @@
--- xbmc/filesystem/SAPDirectory.cpp.orig
-+++ xbmc/filesystem/SAPDirectory.cpp
-@@ -31,6 +31,9 @@
- #ifdef __APPLE__
- #include "OSXGNUReplacements.h" // strnlen
- #endif
-+#ifdef __FreeBSD__
-+#include "FreeBSDGNUReplacements.h" // strnlen
-+#endif
- 
- #include <sys/socket.h>
- #include <netinet/in.h>
--- a/multimedia/xbmc-pvr/files/patch-xbmc-music-tags-MusicInfoTagLoaderWMA.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmc-music-tags-MusicInfoTagLoaderWMA.cpp
@ -1,11 +0,0 @@
--- xbmc/music/tags/MusicInfoTagLoaderWMA.cpp.orig
-+++ xbmc/music/tags/MusicInfoTagLoaderWMA.cpp
-@@ -538,7 +538,7 @@
-                                 "Unable to create album art for %s "
-                                 "(extension=%s, size=%u)",
-                       tag.GetURL().c_str(), strExtension.c_str(),
-                      picture.dwDataLen);
-+                      (unsigned int)picture.dwDataLen);
-           }
-         }
-       }
--- a/multimedia/xbmc-pvr/files/patch-xbmc-network-Network.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmc-network-Network.cpp
@ -1,12 +0,0 @@
--- xbmc/network/Network.cpp.orig
-+++ xbmc/network/Network.cpp
-@@ -31,6 +31,9 @@
- 
- #include <netinet/in.h>
- #include <arpa/inet.h>
-+#ifdef __FreeBSD__
-+#include <sys/socket.h>
-+#endif
- 
- using namespace std;
- 
--- a/multimedia/xbmc-pvr/files/patch-xbmc-network-linux-NetworkLinux.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmc-network-linux-NetworkLinux.cpp
@ -1,195 +0,0 @@
--- xbmc/network/linux/NetworkLinux.cpp.orig
-+++ xbmc/network/linux/NetworkLinux.cpp
-@@ -23,14 +23,14 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <linux/if.h>
- #include <linux/wireless.h>
- #include <linux/sockios.h>
- #endif
- #include <errno.h>
- #include <resolv.h>
-#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__FreeBSD__)
- #include <sys/sockio.h>
- #include <net/if.h>
- #include <net/if_dl.h>
-@@ -42,6 +42,9 @@
- #include "NetworkLinux.h"
- #include "Util.h"
- #include "utils/log.h"
-+#if defined(__FreeBSD__)
-+#include <net/route.h>
-+#endif
- 
- using namespace std;
- 
-@@ -64,7 +67,7 @@ CStdString& CNetworkInterfaceLinux::GetN
- 
- bool CNetworkInterfaceLinux::IsWireless()
- {
-#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__FreeBSD__)
-   return false;
- #else
-   struct iwreq wrq;
-@@ -144,7 +147,7 @@ CStdString CNetworkInterfaceLinux::GetCu
- {
-    CStdString result = "";
- 
-#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
-    char essid[IW_ESSID_MAX_SIZE + 1];
-    memset(&essid, 0, sizeof(essid));
- 
-@@ -166,7 +169,84 @@ CStdString CNetworkInterfaceLinux::GetCu
- {
-    CStdString result = "";
- 
-#ifndef __APPLE__
-+#if defined(__FreeBSD__)
-+  struct {
-+  	struct  rt_msghdr m_rtm;
-+  	char    m_space[512];
-+  } m_rtmsg;
-+  int s, seq, l, pid, rtm_addrs, i;
-+  struct sockaddr so_dst, so_mask;
-+  struct  rt_msghdr rtm;
-+  char *cp = m_rtmsg.m_space;
-+  struct sockaddr *gate = NULL, *sa;
-+  struct  rt_msghdr *rtm_aux;
-+
-+#define ROUNDUP(a) \
-+	        ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
-+
-+#define NEXTADDR(w, u) \
-+        if (rtm_addrs & (w)) {\
-+            l = ROUNDUP(u.sa_len); memmove(cp, &(u), l); cp += l;\
-+        }
-+
-+#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
-+
-+  pid = getpid();
-+  seq = 0;
-+  rtm_addrs = RTA_DST | RTA_NETMASK;
-+
-+  bzero(&so_dst, sizeof(so_dst));
-+  bzero(&so_mask, sizeof(so_mask));
-+  bzero(&rtm, sizeof(struct rt_msghdr));
-+
-+  rtm.rtm_type = RTM_GET;
-+  rtm.rtm_flags = RTF_UP | RTF_GATEWAY;
-+  rtm.rtm_version = RTM_VERSION;
-+  rtm.rtm_seq = ++seq;
-+  rtm.rtm_addrs = rtm_addrs; 
-+
-+  so_dst.sa_family = AF_INET;
-+  so_dst.sa_len = sizeof(struct sockaddr_in);
-+  so_mask.sa_family = AF_INET;
-+  so_mask.sa_len = sizeof(struct sockaddr_in);
-+
-+  NEXTADDR(RTA_DST, so_dst);
-+  NEXTADDR(RTA_NETMASK, so_mask);
-+
-+  rtm.rtm_msglen = l = cp - (char *)&m_rtmsg;
-+
-+  s = socket(PF_ROUTE, SOCK_RAW, 0);
-+
-+  if (write(s, (char *)&m_rtmsg, l) < 0)
-+    return result;
-+
-+  do {
-+    l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg));
-+  } while (l > 0 && (rtm.rtm_seq != seq || rtm.rtm_pid != pid));
-+                        
-+  close(s);
-+
-+  rtm_aux = &rtm;
-+
-+  cp = ((char *)(rtm_aux + 1));
-+  if (rtm_aux->rtm_addrs) {
-+    for (i = 1; i; i <<= 1)
-+      if (i & rtm_aux->rtm_addrs) {
-+	    sa = (struct sockaddr *)cp;
-+	    if (i == RTA_GATEWAY)
-+	      gate = sa;
-+	    ADVANCE(cp, sa);
-+      }
-+  }
-+  else
-+      return result;
-+
-+  if (gate != NULL)
-+	result = inet_ntoa(((struct sockaddr_in *)gate)->sin_addr);
-+
-+  return result;
-+
-+#elif !defined(__APPLE__)
-    FILE* fp = fopen("/proc/net/route", "r");
-    if (!fp)
-    {
-@@ -267,7 +347,7 @@ CNetworkInterface* CNetworkLinux::GetFir
- CStdString CNetworkLinux::GetMacAddress(CStdString interfaceName)
- {
-   CStdString result = "00:00:00:00:00:00";
-#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__FreeBSD__)
- 
- #if ! defined(IFT_ETHER)
- #define IFT_ETHER 0x6/* Ethernet CSMACD */
-@@ -333,7 +413,7 @@ void CNetworkLinux::queryInterfaceList()
-   CStdString macAddr = "";
-   m_interfaces.clear();
- 
-#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__FreeBSD__)
- 
-    // Query the list of interfaces.
-    struct ifaddrs *list;
-@@ -352,7 +432,6 @@ void CNetworkLinux::queryInterfaceList()
-    }
- 
-    freeifaddrs(list);
-
- #else
-    FILE* fp = fopen("/proc/net/dev", "r");
-    if (!fp)
-@@ -394,7 +473,7 @@ void CNetworkLinux::queryInterfaceList()
- std::vector<CStdString> CNetworkLinux::GetNameServers(void)
- {
-    std::vector<CStdString> result;
-#ifndef __APPLE__
-+#if !defined(__APPLE__)
-    res_init();
- 
-    for (int i = 0; i < _res.nscount; i ++)
-@@ -430,7 +509,7 @@ std::vector<NetworkAccessPoint> CNetwork
-    if (!IsWireless())
-       return result;
- 
-#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
-    // Query the wireless extentsions version number. It will help us when we
-    // parse the resulting events
-    struct iwreq iwr;
-@@ -616,7 +695,7 @@ void CNetworkInterfaceLinux::GetSettings
-    encryptionMode = ENC_NONE;
-    assignment = NETWORK_DISABLED;
- 
-#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
-    FILE* fp = fopen("/etc/network/interfaces", "r");
-    if (!fp)
-    {
-@@ -692,7 +771,7 @@ void CNetworkInterfaceLinux::GetSettings
- 
- void CNetworkInterfaceLinux::SetSettings(NetworkAssignment& assignment, CStdString& ipAddress, CStdString& networkMask, CStdString& defaultGateway, CStdString& essId, CStdString& key, EncMode& encryptionMode)
- {
-#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
-    FILE* fr = fopen("/etc/network/interfaces", "r");
-    if (!fr)
-    {
--- a/multimedia/xbmc-pvr/files/patch-xbmc-programs-ProgramDatabase.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmc-programs-ProgramDatabase.cpp
@ -1,11 +0,0 @@
--- xbmc/programs/ProgramDatabase.cpp.orig
-+++ xbmc/programs/ProgramDatabase.cpp
-@@ -63,7 +63,7 @@
-   catch (...)
-   {
-     CLog::Log(LOGERROR, "programdatabase::unable to create tables:%u",
-              GetLastError());
-+              (unsigned int)GetLastError());
-     return false;
-   }
- 
--- a/multimedia/xbmc-pvr/files/patch-xbmc-pvr-PVRManager.h
+++ b/multimedia/xbmc-pvr/files/patch-xbmc-pvr-PVRManager.h
@ -1,11 +0,0 @@
--- xbmc/pvr/PVRManager.h.orig
-+++ xbmc/pvr/PVRManager.h
-@@ -532,7 +532,7 @@ namespace PVR
-     int                             m_LastChannel;
-     unsigned int                    m_LastChannelChanged;
- 
-    ManagerState                    m_managerState;
-+    long                            m_managerState;
-   };
- 
-   class CPVRRecordingsUpdateJob : public CJob
--- a/multimedia/xbmc-pvr/files/patch-xbmc-pvrclients-MediaPortal-CriticalSection.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmc-pvrclients-MediaPortal-CriticalSection.cpp
@ -1,13 +0,0 @@
--- xbmc/pvrclients/MediaPortal/CriticalSection.cpp.orig
-+++ xbmc/pvrclients/MediaPortal/CriticalSection.cpp
-@@ -18,6 +18,10 @@
- 
- #include "CriticalSection.h"
- 
-+#ifdef __FreeBSD__
-+#define	PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
-+#endif
-+
- CCriticalSection::CCriticalSection(void)
- {
- }
--- a/multimedia/xbmc-pvr/files/patch-xbmc-screensavers-rsxs-0.9-lib-argp-fmtstream.h
+++ b/multimedia/xbmc-pvr/files/patch-xbmc-screensavers-rsxs-0.9-lib-argp-fmtstream.h
@ -1,11 +0,0 @@
--- xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h.orig
-+++ xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h
-@@ -182,7 +182,7 @@ extern void __argp_fmtstream_update (arg
- extern int _argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
- extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
- 
-#ifdef __OPTIMIZE__
-+#if defined(__OPTIMIZE__) && (!defined(__clang__) || defined(ARGP_FS_EI))
- /* Inline versions of above routines.  */
- 
- #if !_LIBC
--- a/multimedia/xbmc-pvr/files/patch-xbmc-screensavers-rsxs-0.9-lib-argp-help.c
+++ b/multimedia/xbmc-pvr/files/patch-xbmc-screensavers-rsxs-0.9-lib-argp-help.c
@ -1,12 +0,0 @@
--- xbmc/screensavers/rsxs-0.9/lib/argp-help.c.orig
-+++ xbmc/screensavers/rsxs-0.9/lib/argp-help.c
-@@ -48,6 +48,9 @@
- #endif
- 
- #include "argp.h"
-+#ifdef __clang__ // XXX
-+#define ARGP_FS_EI
-+#endif
- #include "argp-fmtstream.h"
- #include "argp-namefrob.h"
- 
--- a/multimedia/xbmc-pvr/files/patch-xbmc-storage-IoSupport.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmc-storage-IoSupport.cpp
@ -1,39 +0,0 @@
--- xbmc/storage/IoSupport.cpp.orig
-+++ xbmc/storage/IoSupport.cpp
-@@ -30,7 +30,7 @@
- #include "WIN32Util.h"
- #include "utils/CharsetConverter.h"
- #endif
-#if defined (_LINUX) && !defined(__APPLE__)
-+#if defined (_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <linux/limits.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
-@@ -54,6 +54,9 @@
- #include <IOKit/storage/IOStorageDeviceCharacteristics.h>
- #endif
- #endif
-+#ifdef __FreeBSD__
-+#include <sys/syslimits.h>
-+#endif
- #include "cdioSupport.h"
- #include "filesystem/iso9660.h"
- #include "MediaManager.h"
-@@ -226,7 +229,7 @@ HRESULT CIoSupport::EjectTray( const boo
- HRESULT CIoSupport::CloseTray()
- {
- #ifdef HAS_DVD_DRIVE
-#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__FreeBSD__)
-   // FIXME...
- #elif defined(_LINUX)
-   char* dvdDevice = CLibcdio::GetInstance()->GetDeviceFileName();
-@@ -402,6 +405,8 @@ INT CIoSupport::ReadSectorMode2(HANDLE h
-     return -1;
-   }
-   return MODE2_DATA_SIZE;
-+#elif defined(__FreeBSD__)
-+  // TODO
- #elif defined(_LINUX)
-   if (hDevice->m_bCDROM)
-   {
--- a/multimedia/xbmc-pvr/files/patch-xbmc-utils-StdString.h
+++ b/multimedia/xbmc-pvr/files/patch-xbmc-utils-StdString.h
@ -1,10 +0,0 @@
--- xbmc/utils/StdString.h.orig
-+++ xbmc/utils/StdString.h
-@@ -2,6 +2,7 @@
- #include <string>
- #include <stdint.h>
- #include <vector>
-+#include <cstring>
- 
- #if defined(_WIN32) && !defined(va_copy)
- #define va_copy(dst, src) ((dst) = (src))
--- a/multimedia/xbmc-pvr/files/patch-xbmc-windowing-X11-XRandR.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmc-windowing-X11-XRandR.cpp
@ -1,14 +0,0 @@
--- xbmc/windowing/X11/XRandR.cpp.orig
-+++ xbmc/windowing/X11/XRandR.cpp
-@@ -29,6 +29,11 @@
- #include "tinyXML/tinyxml.h"
- #include "../xbmc/utils/log.h"
- 
-+#if defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <sys/wait.h>
-+#endif
-+
- using namespace std;
- 
- CXRandR::CXRandR(bool query)
--- a/multimedia/xbmc-pvr/files/patch-xbmc__ViewDatabase.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmc__ViewDatabase.cpp
@ -1,11 +0,0 @@
--- ./xbmc/ViewDatabase.cpp.orig	2010-07-03 13:07:36.000000000 +0200
-+++ ./xbmc/ViewDatabase.cpp	2010-12-01 12:17:34.233780060 +0100
-@@ -62,7 +62,7 @@
-   catch (...)
-   {
-     CLog::Log(LOGERROR, "%s unable to create tables:%u",
-              __FUNCTION__, GetLastError());
-+              __FUNCTION__, (unsigned int)GetLastError());
-     return false;
-   }
- 
--- a/multimedia/xbmc-pvr/files/patch-xbmcaddonsAddon.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmcaddonsAddon.cpp
@ -1,12 +0,0 @@
--- xbmc/addons/Addon.cpp.orig
-+++ xbmc/addons/Addon.cpp
-@@ -28,6 +28,9 @@
- #ifdef __APPLE__
- #include "../osx/OSXGNUReplacements.h"
- #endif
-+#ifdef __FreeBSD__
-+#include "FreeBSDGNUReplacements.h" // strverscmp
-+#endif
- #include "utils/log.h"
- #include "utils/URIUtils.h"
- #include <vector>
--- a/multimedia/xbmc-pvr/files/patch-xbmccoresDllLoaderexportsemu_msvcrt.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmccoresDllLoaderexportsemu_msvcrt.cpp
@ -1,169 +0,0 @@
--- xbmc/cores/DllLoader/exports/emu_msvcrt.cpp.orig
-+++ xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
-@@ -27,7 +27,7 @@
- #include <direct.h>
- #include <process.h>
- #else
-#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <mntent.h>
- #endif
- #endif
-@@ -36,6 +36,7 @@
- #include <sys/timeb.h>
- #include "system.h" // for HAS_DVD_DRIVE
- #ifdef HAS_DVD_DRIVE
-+#if !defined(__FreeBSD__)
-   #ifdef _LINUX
-     #include <sys/ioctl.h>
-     #ifndef __APPLE__
-@@ -45,6 +46,7 @@
-     #endif
-   #endif
- #endif
-+#endif
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-@@ -139,6 +141,8 @@ extern "C" void __stdcall init_emu_envir
-   dll_putenv("OS=darwin");
- #elif defined(_LINUX)
-   dll_putenv("OS=linux");
-+#elif defined(__FreeBSD__)
-+  dll_putenv("OS=freebsd");
- #else
-   dll_putenv("OS=unknown");
- #endif
-@@ -159,11 +163,11 @@ extern "C" void __stdcall init_emu_envir
-     dll_putenv(string("PATH=.;" + _P("special://xbmc") + ";" + _P("special://xbmc/system/python")).c_str());
-   }
-   //dll_putenv("PYTHONCASEOK=1");
-  //dll_putenv("PYTHONDEBUG=1");
-+  dll_putenv("PYTHONDEBUG=1");
-   //dll_putenv("PYTHONVERBOSE=2"); // "1" for normal verbose, "2" for more verbose ?
-   dll_putenv("PYTHONOPTIMIZE=1");
-   //dll_putenv("PYTHONDUMPREFS=1");
-  //dll_putenv("THREADDEBUG=1");
-+  dll_putenv("THREADDEBUG=1");
-   //dll_putenv("PYTHONMALLOCSTATS=1");
-   //dll_putenv("PYTHONY2K=1");
-   dll_putenv("TEMP=special://temp/temp"); // for python tempdir
-@@ -1159,7 +1163,7 @@ extern "C"
-   FILE* dll_fopen(const char* filename, const char* mode)
-   {
-     FILE* file = NULL;
-#if defined(_LINUX) && !defined(__APPLE__)
-+#if defined(_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__)
-     if (strcmp(filename, MOUNTED) == 0
-     ||  strcmp(filename, MNTTAB) == 0)
-     {
-@@ -1267,7 +1271,7 @@ extern "C"
-     {
-       // it might be something else than a file, or the file is not emulated
-       // let the operating system handle it
-#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__FreeBSD__)
-       return fseek(stream, offset, origin);
- #else
-       return fseeko64(stream, offset, origin);
-@@ -1332,7 +1336,7 @@ extern "C"
-     {
-       // it might be something else than a file, or the file is not emulated
-       // let the operating system handle it
-#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__FreeBSD__)
-       return ftello(stream);
- #else
-       return ftello64(stream);
-@@ -1378,7 +1382,7 @@ extern "C"
-       CLog::Log(LOGWARNING, "msvcrt.dll: dll_telli64 called, TODO: add 'int64 -> long' type checking");      //warning
- #ifndef _LINUX
-       return (__int64)tell(fd);
-#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__FreeBSD__)
-       return lseek(fd, 0, SEEK_CUR);
- #else
-       return lseek64(fd, 0, SEEK_CUR);
-@@ -1555,7 +1559,7 @@ extern "C"
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
-#if !defined(_LINUX) || defined(__APPLE__)
-+#if !defined(_LINUX) || defined(__APPLE__) || defined(__FreeBSD__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1568,7 +1572,7 @@ extern "C"
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
-#if !defined(_LINUX) || defined(__APPLE__)
-+#if !defined(_LINUX) || defined(__APPLE__) || defined(__FreeBSD__)
-       *pos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
-@@ -1590,7 +1594,7 @@ extern "C"
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
-#if !defined(_LINUX) || defined(__APPLE__)
-+#if !defined(_LINUX) || defined(__APPLE__) || defined(__FreeBSD__)
-       if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
-@@ -1607,7 +1611,7 @@ extern "C"
-     {
-       // it might be something else than a file, or the file is not emulated
-       // let the operating system handle it
-#if !defined(_LINUX) || defined(__APPLE__)
-+#if !defined(_LINUX) || defined(__APPLE__) || defined(__FreeBSD__)
-       return fsetpos(stream, pos);
- #else
-       return fsetpos64(stream, pos);
-@@ -1623,7 +1627,7 @@ extern "C"
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
-#if !defined(_LINUX) || defined(__APPLE__)
-+#if !defined(_LINUX) || defined(__APPLE__) || defined(__FreeBSD__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
-@@ -2069,7 +2073,7 @@ extern "C"
-     return (char***)&t;
-   }
- 
-#ifdef _LINUX
-+#if defined(_LINUX)
-   int * __cdecl dll_errno(void)
-   {
-     return &errno;
-@@ -2083,7 +2087,9 @@ extern "C"
-        return -1;
- 
- #ifdef HAS_DVD_DRIVE
-#ifndef __APPLE__
-+#if defined(__FreeBSD__)
-+	if (0)
-+#elif !defined(__APPLE__)
-     if(request == DVD_READ_STRUCT || request == DVD_AUTH)
- #else
-     if(request == DKIOCDVDSENDKEY || request == DKIOCDVDREPORTKEY || request == DKIOCDVDREADSTRUCTURE)
-@@ -2125,7 +2131,7 @@ extern "C"
-       CLog::Log(LOGERROR, "%s - getmntent is not implemented for our virtual filesystem", __FUNCTION__);
-       return NULL;
-     }
-#if defined(_LINUX) && !defined(__APPLE__)
-+#if defined(_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__)
-     return getmntent(fp);
- #else
-     CLog::Log(LOGWARNING, "%s - unimplemented function called", __FUNCTION__);
-@@ -2150,7 +2156,7 @@ extern "C"
-       else
-         return 0;
-     }
-#ifdef _LINUX
-+#if defined(_LINUX)
-     return 0;
- #else
-     return _filbuf(fp);
--- a/multimedia/xbmc-pvr/files/patch-xbmccoresDllLoaderexportsemu_msvcrt.h
+++ b/multimedia/xbmc-pvr/files/patch-xbmccoresDllLoaderexportsemu_msvcrt.h
@ -1,18 +0,0 @@
--- ./xbmc/cores/DllLoader/exports/emu_msvcrt.h.orig	2010-05-28 21:31:42.000000000 +0200
-+++ ./xbmc/cores/DllLoader/exports/emu_msvcrt.h	2010-12-01 12:17:34.210600869 +0100
-@@ -35,9 +35,15 @@
- 
- typedef void ( *PFV)(void);
- 
-+#if defined(__FreeBSD__)
-+#define __IS_STDIN_STREAM(stream)   (stream->_file == STDIN_FILENO)
-+#define __IS_STDOUT_STREAM(stream)  (stream->_file == STDOUT_FILENO)
-+#define __IS_STDERR_STREAM(stream)  (stream->_file == STDERR_FILENO)
-+#else
- #define __IS_STDIN_STREAM(stream)   (stream == stdin  || stream->_file == stdin->_file || stream->_file == 0)
- #define __IS_STDOUT_STREAM(stream)  (stream == stdout || stream->_file == stdout->_file || stream->_file == 1)
- #define __IS_STDERR_STREAM(stream)  (stream == stderr || stream->_file == stderr->_file || stream->_file == 2)
-+#endif
- #define IS_STDIN_STREAM(stream)     (stream != NULL && __IS_STDIN_STREAM(stream))
- #define IS_STDOUT_STREAM(stream)    (stream != NULL && __IS_STDOUT_STREAM(stream))
- #define IS_STDERR_STREAM(stream)    (stream != NULL && __IS_STDERR_STREAM(stream))
--- a/multimedia/xbmc-pvr/files/patch-xbmccoresdvdplayer__DVDAudio.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmccoresdvdplayer__DVDAudio.cpp
@ -1,19 +0,0 @@
--- xbmc/cores/dvdplayer/DVDAudio.cpp.orig
-+++ xbmc/cores/dvdplayer/DVDAudio.cpp
-@@ -237,14 +237,14 @@ void CDVDAudio::Finish()
- 
-   if(silence > 0 && m_iBufferSize > 0)
-   {
-    CLog::Log(LOGDEBUG, "CDVDAudio::Drain - adding %d bytes of silence, buffer size: %d, chunk size: %d", silence, m_iBufferSize, m_dwPacketSize);
-+    CLog::Log(LOGDEBUG, "CDVDAudio::Drain - adding %d bytes of silence, buffer size: %d, chunk size: %d", (int)silence, (int)m_iBufferSize, (int)m_dwPacketSize);
-     m_pBuffer = (BYTE*)realloc(m_pBuffer, m_iBufferSize + silence);
-     memset(m_pBuffer+m_iBufferSize, 0, silence);
-     m_iBufferSize += silence;
-   }
- 
-   if(AddPacketsRenderer(m_pBuffer, m_iBufferSize, lock) != m_iBufferSize)
-    CLog::Log(LOGERROR, "CDVDAudio::Drain - failed to play the final %d bytes", m_iBufferSize);
-+    CLog::Log(LOGERROR, "CDVDAudio::Drain - failed to play the final %d bytes", (int)m_iBufferSize);
- 
-   m_iBufferSize = 0;
- }
--- a/multimedia/xbmc-pvr/files/patch-xbmccoresdvdplayer__DVDPlayer.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmccoresdvdplayer__DVDPlayer.cpp
@ -1,11 +0,0 @@
--- ./xbmc/cores/dvdplayer/DVDPlayer.cpp.orig	2010-10-27 19:02:14.000000000 +0200
-+++ ./xbmc/cores/dvdplayer/DVDPlayer.cpp	2010-12-01 12:17:34.204563658 +0100
-@@ -2868,7 +2868,7 @@
-           m_dvd.state = DVDSTATE_STILL;
-           CLog::Log(LOGDEBUG,
-                     "DVDNAV_STILL_FRAME - waiting %i sec, with delay of %d sec",
-                    still_event->length, time / 1000);
-+                    still_event->length, (int)(time / 1000));
-         }
-         return NAVRESULT_HOLD;
-       }
--- a/multimedia/xbmc-pvr/files/patch-xbmccorespaplayer__Makefile.in
+++ b/multimedia/xbmc-pvr/files/patch-xbmccorespaplayer__Makefile.in
@ -1,10 +0,0 @@
--- 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
- 
--- a/multimedia/xbmc-pvr/files/patch-xbmccorespaplayer__PAPlayer.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmccorespaplayer__PAPlayer.cpp
@ -1,12 +0,0 @@
--- xbmc/cores/paplayer/PAPlayer.cpp.orig
-+++ xbmc/cores/paplayer/PAPlayer.cpp
-@@ -341,7 +341,8 @@
- 
-   if(silence > 0 && m_bufferPos[stream] > 0)
-   {
-    CLog::Log(LOGDEBUG, "PAPlayer: Drain - adding %d bytes of silence, real pcmdata size: %d, chunk size: %d", silence, m_bufferPos[stream], m_pAudioDecoder[stream]->GetChunkLen());
-+    CLog::Log(LOGDEBUG, "PAPlayer: Drain - adding %d bytes of silence, real pcmdata size: %d, chunk size: %d",
-+      (int)silence, m_bufferPos[stream], m_pAudioDecoder[stream]->GetChunkLen());
-     memset(m_pcmBuffer[stream] + m_bufferPos[stream], 0, silence);
-     m_bufferPos[stream] += silence;
-   }
--- a/multimedia/xbmc-pvr/files/patch-xbmccorespaplayer__WAVcodec.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmccorespaplayer__WAVcodec.cpp
@ -1,11 +0,0 @@
--- ./xbmc/cores/paplayer/WAVcodec.cpp.orig	2010-06-03 06:23:58.000000000 +0200
-+++ ./xbmc/cores/paplayer/WAVcodec.cpp	2010-12-01 12:17:34.221698375 +0100
-@@ -137,7 +137,7 @@
-             return false;
-           }
-           m_ChannelMask = Endian_SwapLE32(wfx.dwChannelMask);
-          CLog::Log(LOGINFO, "WAVCodec::Init - WAVE_FORMAT_EXTENSIBLE detected, channel mask: %d", m_ChannelMask);
-+          CLog::Log(LOGINFO, "WAVCodec::Init - WAVE_FORMAT_EXTENSIBLE detected, channel mask: %d", (int)m_ChannelMask);
- 
-           wfx.SubFormat.Data1 = Endian_SwapLE32(wfx.SubFormat.Data1);
-           wfx.SubFormat.Data2 = Endian_SwapLE16(wfx.SubFormat.Data2);
--- a/multimedia/xbmc-pvr/files/patch-xbmclinuxFreeBSDGNUReplacements.c
+++ b/multimedia/xbmc-pvr/files/patch-xbmclinuxFreeBSDGNUReplacements.c
@ -1,255 +0,0 @@
--- /dev/null	2010-12-16 16:44:10.000000000 +0100
-+++ xbmc/linux/FreeBSDGNUReplacements.c	2010-12-16 16:45:22.613185593 +0100
-@@ -0,0 +1,252 @@
-+
-+#include "FreeBSDGNUReplacements.h"
-+
-+#if __FreeBSD_version < 800067
-+
-+/*-
-+ * Copyright (c) 2009 David Schultz <das@FreeBSD.org>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+size_t
-+strnlen(const char *s, size_t maxlen)
-+{
-+	size_t len;
-+
-+	for (len = 0; len < maxlen; len++, s++) {
-+		if (!*s)
-+			break;
-+	}   
-+	return (len);
-+}
-+
-+/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+*/
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <errno.h>
-+
-+/* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
-+   (and null-terminate it). *LINEPTR is a pointer returned from malloc (or
-+   NULL), pointing to *N characters of space.  It is realloc'd as
-+   necessary.  Returns the number of characters read (not including the
-+   null terminator), or -1 on error or EOF.  */
-+
-+ssize_t
-+getdelim(char **lineptr, size_t *n, int terminator, FILE *stream)
-+{
-+  char *line, *p;
-+  size_t size, copy;
-+
-+  if (stream == NULL || lineptr == NULL || n == NULL)
-+    {
-+      errno = EINVAL;
-+      return -1;
-+    }
-+
-+  if (ferror (stream))
-+    return -1;
-+
-+  /* Make sure we have a line buffer to start with.  */
-+  if (*lineptr == NULL || *n < 2) /* !seen and no buf yet need 2 chars.  */
-+    {
-+#ifndef	MAX_CANON
-+#define	MAX_CANON	256
-+#endif
-+      line = (char *)realloc (*lineptr, MAX_CANON);
-+      if (line == NULL)
-+	return -1;
-+      *lineptr = line;
-+      *n = MAX_CANON;
-+    }
-+
-+  line = *lineptr;
-+  size = *n;
-+
-+  copy = size;
-+  p = line;
-+
-+      while (1)
-+	{
-+	  size_t len;
-+
-+	  while (--copy > 0)
-+	    {
-+	      register int c = getc (stream);
-+	      if (c == EOF)
-+		goto lose;
-+	      else if ((*p++ = c) == terminator)
-+		goto win;
-+	    }
-+
-+	  /* Need to enlarge the line buffer.  */
-+	  len = p - line;
-+	  size *= 2;
-+	  line = (char *)realloc (line, size);
-+	  if (line == NULL)
-+	    goto lose;
-+	  *lineptr = line;
-+	  *n = size;
-+	  p = line + len;
-+	  copy = size - len;
-+	}
-+
-+ lose:
-+  if (p == *lineptr)
-+    return -1;
-+  /* Return a partial line since we got an error in the middle.  */
-+ win:
-+  *p = '\0';
-+  return p - *lineptr;
-+}
-+
-+#endif
-+
-+/* Compare strings while treating digits characters numerically.
-+   Copyright (C) 1997, 2002, 2005 Free Software Foundation, Inc.
-+   This file is part of the libiberty library.
-+   Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
-+
-+   Libiberty is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   Libiberty is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+   02110-1301 USA.  */
-+
-+#include <ctype.h>
-+
-+#define ISASCII(c) isascii(c)
-+#define ISDIGIT(c) (ISASCII (c) && isdigit (c))
-+/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
-+           fractional parts, S_Z: idem but with leading Zeroes only */
-+#define  S_N    0x0
-+#define  S_I    0x4
-+#define  S_F    0x8
-+#define  S_Z    0xC
-+
-+/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
-+#define  CMP    2
-+#define  LEN    3
-+
-+
-+/* Compare S1 and S2 as strings holding indices/version numbers,
-+   returning less than, equal to or greater than zero if S1 is less than,
-+   equal to or greater than S2 (for more info, see the Glibc texinfo doc).  */
-+
-+int
-+strverscmp (const char *s1, const char *s2)
-+{
-+  const unsigned char *p1 = (const unsigned char *) s1;
-+  const unsigned char *p2 = (const unsigned char *) s2;
-+  unsigned char c1, c2;
-+  int state;
-+  int diff;
-+
-+  /* Symbol(s)    0       [1-9]   others  (padding)
-+     Transition   (10) 0  (01) d  (00) x  (11) -   */
-+  static const unsigned int next_state[] =
-+    {
-+      /* state    x    d    0    - */
-+      /* S_N */  S_N, S_I, S_Z, S_N,
-+      /* S_I */  S_N, S_I, S_I, S_I,
-+      /* S_F */  S_N, S_F, S_F, S_F,
-+      /* S_Z */  S_N, S_F, S_Z, S_Z
-+    };
-+
-+  static const int result_type[] =
-+    {
-+      /* state   x/x  x/d  x/0  x/-  d/x  d/d  d/0  d/-
-+                 0/x  0/d  0/0  0/-  -/x  -/d  -/0  -/- */
-+
-+      /* S_N */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
-+                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
-+      /* S_I */  CMP, -1,  -1,  CMP, +1,  LEN, LEN, CMP,
-+                 +1,  LEN, LEN, CMP, CMP, CMP, CMP, CMP,
-+      /* S_F */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
-+                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
-+      /* S_Z */  CMP, +1,  +1,  CMP, -1,  CMP, CMP, CMP,
-+                 -1,  CMP, CMP, CMP
-+    };
-+
-+  if (p1 == p2)
-+    return 0;
-+
-+  c1 = *p1++;
-+  c2 = *p2++;
-+  /* Hint: '0' is a digit too.  */
-+  state = S_N | ((c1 == '0') + (ISDIGIT (c1) != 0));
-+
-+  while ((diff = c1 - c2) == 0 && c1 != '\0')
-+    {
-+      state = next_state[state];
-+      c1 = *p1++;
-+      c2 = *p2++;
-+      state |= (c1 == '0') + (ISDIGIT (c1) != 0);
-+    }
-+
-+  state = result_type[state << 2 | (((c2 == '0') + (ISDIGIT (c2) != 0)))];
-+
-+  switch (state)
-+    {
-+    case CMP:
-+      return diff;
-+      
-+    case LEN:
-+      while (ISDIGIT (*p1++))
-+	if (!ISDIGIT (*p2++))
-+	  return 1;
-+      
-+      return ISDIGIT (*p2) ? -1 : diff;
-+      
-+    default:
-+      return state;
-+    }
-+}
--- a/multimedia/xbmc-pvr/files/patch-xbmclinuxFreeBSDGNUReplacements.h
+++ b/multimedia/xbmc-pvr/files/patch-xbmclinuxFreeBSDGNUReplacements.h
@ -1,28 +0,0 @@
--- /dev/null	2010-12-16 17:00:01.000000000 +0100
-+++ xbmc/linux/FreeBSDGNUReplacements.h	2010-12-16 16:54:02.098300652 +0100
-@@ -0,0 +1,25 @@
-+#ifndef __FREEBSDGNUREPLACEMENTS_H__
-+#define __FREEBSDGNUREPLACEMENTS_H__
-+
-+#include <sys/param.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
-+#if __FreeBSD_version < 800067
-+
-+size_t strnlen(const char *s, size_t n);
-+ssize_t getdelim(char **lineptr, size_t *n, int delimiter, FILE *stream);
-+
-+#endif
-+
-+int strverscmp(const char *s1, const char *s2);
-+
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-+
-+#endif
--- a/multimedia/xbmc-pvr/files/patch-xbmclinuxLinuxTimezone.cpp
+++ b/multimedia/xbmc-pvr/files/patch-xbmclinuxLinuxTimezone.cpp
@ -1,189 +0,0 @@
--- xbmc/linux/LinuxTimezone.cpp	(revision 35637)
-+++ xbmc/linux/LinuxTimezone.cpp	(working copy)
-@@ -28,6 +28,12 @@
- #include "OSXGNUReplacements.h"
- #endif
- 
-+#if defined(__FreeBSD__)
-+#include "FreeBSDGNUReplacements.h" // getdelim
-+#include <sys/types.h>
-+#include <dirent.h>
-+#endif
-+
- #include "Util.h"
- 
- using namespace std;
-@@ -90,7 +96,11 @@ CLinuxTimezone::CLinuxTimezone() : m_IsD
-    }
- 
-    // Load countries
-+#if defined(__FreeBSD__)
-+   fp = fopen("/usr/share/misc/iso3166", "r");
-+#else
-    fp = fopen("/usr/share/zoneinfo/iso3166.tab", "r");
-+#endif   
-    if (fp)
-    {
-       CStdString countryCode;
-@@ -110,7 +120,14 @@ CLinuxTimezone::CLinuxTimezone() : m_IsD
-          // Search for the first non space from the 2nd character and on
-          int i = 2;
-          while (s[i] == ' ' || s[i] == '\t') i++;
-
-+#if defined(__FreeBSD__)
-+         // skip three 
-+         while (s[i] != ' ' && s[i] != '\t') i++;
-+         while (s[i] == ' ' || s[i] == '\t') i++;
-+         // skip number
-+         while (s[i] != ' ' && s[i] != '\t') i++;
-+         while (s[i] == ' ' || s[i] == '\t') i++;
-+#endif
-          countryCode = s.Left(2);
-          countryName = s.Mid(i);
- 
-@@ -156,15 +173,137 @@ void CLinuxTimezone::SetTimezone(CStdStr
-   
-   if (use_timezone)
-   {
-+#if defined(__FreeBSD__)
-+    setenv("TZ", timezoneName.c_str(), 1);
-+    tzset();
-+#else
-     static char env_var[255];
-     sprintf(env_var, "TZ=:%s", timezoneName.c_str());
-     putenv(env_var);
-+#endif
-     tzset();
-   }
- }
- 
-+#if defined(__FreeBSD__)
-+/*
-+* Scans the specified directory and its subdirectories to find a
-+* zoneinfo file which has the same content as /etc/localtime given in
-+* 'buf'. Returns a zone ID if found, otherwise, NULL is returned.
-+*/
-+static char *
-+findZoneinfoFile(char *buf, size_t size, const char *dir)
-+{
-+   DIR *dirp = NULL;
-+   struct stat statbuf;
-+   struct dirent entry;
-+   struct dirent *dp;
-+   char *pathname = NULL;
-+   int fd = -1;
-+   char *dbuf = NULL;
-+   char *tz = NULL;
-+   char *p;
-+
-+   dirp = opendir(dir);
-+   if (dirp == NULL)
-+      return NULL;
-+
-+   while (readdir_r(dirp, &entry, &dp) == 0 && dp != NULL) {
-+      if (dp->d_name[0] == '.')
-+         continue;
-+
-+      if (strcmp(dp->d_name, "zone.tab") == 0)
-+         continue;
-+
-+      p = (char *)malloc(strlen(dir) + strlen(dp->d_name) + 2);
-+	  if (p == NULL)
-+         break;
-+
-+      pathname = strcat(strcat(strcpy(p, dir), "/"), dp->d_name);
-+      if (pathname == NULL)
-+         break;
-+
-+      if (stat(pathname, &statbuf) == -1)
-+         break;
-+
-+      if (S_ISDIR(statbuf.st_mode)) {
-+         tz = findZoneinfoFile(buf, size, pathname);
-+         if (tz != NULL)
-+            break;
-+      } else if (S_ISREG(statbuf.st_mode) && (size_t)statbuf.st_size == size) {
-+         dbuf = (char *)malloc(size);
-+         if (dbuf == NULL)
-+            break;
-+         if ((fd = open(pathname, O_RDONLY)) == -1) {
-+            fd = 0;
-+            break;
-+         }
-+         if (read(fd, dbuf, size) != (ssize_t)size)
-+            break;
-+         if (memcmp(buf, dbuf, size) == 0) {
-+			p = strstr(pathname, "zoneinfo/");
-+			if (p == NULL)
-+				break;
-+			p += strlen("zoneinfo/");	
-+            tz = strdup(p);
-+            break;
-+         }
-+         free(dbuf);
-+         dbuf = NULL;
-+         (void)close(fd);
-+         fd = 0;
-+      }
-+      free(pathname);
-+      pathname = NULL;
-+   }
-+
-+   if (dirp != NULL)
-+      (void)closedir(dirp);
-+   if (pathname != NULL)
-+      free(pathname);
-+   if (fd != 0)
-+      (void)close(fd);
-+   if (dbuf != NULL)
-+      free(dbuf);
-+
-+   return tz;
-+}
-+#endif
-+
- CStdString CLinuxTimezone::GetOSConfiguredTimezone()
- {
-+#if defined(__FreeBSD__)
-+   const char * timezonefile = "/etc/localtime";
-+   struct stat statbuf;
-+   int fd;
-+   char *buf;
-+   char *tz;
-+   size_t size;
-+
-+   if (lstat(timezonefile, &statbuf) == -1)
-+      return "";   
-+   if (!S_ISREG(statbuf.st_mode))
-+      return "";   
-+	  
-+   size = (size_t)statbuf.st_size;
-+   buf = (char *)malloc(size);
-+
-+   if ((fd = open(timezonefile, O_RDONLY)) == -1) {
-+      free(buf);
-+      return "";
-+   }
-+
-+   if (read(fd, buf, size) != (ssize_t) size) {
-+      (void)close(fd);
-+	  free(buf);
-+	  return "";
-+   }
-+   (void)close(fd);
-+
-+   tz = findZoneinfoFile(buf, size, "/usr/share/zoneinfo");
-+   free(buf);
-+   return tz;
-+#else
-    char timezoneName[255];
- 
-    // try Slackware approach first
-@@ -191,6 +330,7 @@ CStdString CLinuxTimezone::GetOSConfigur
-    }
- 
-    return timezoneName;
-+#endif   
- }
- 
- CLinuxTimezone g_timezone;
--- a/multimedia/xbmc-pvr/files/patch-xbmclinuxMakefile.in
+++ b/multimedia/xbmc-pvr/files/patch-xbmclinuxMakefile.in
@ -1,15 +0,0 @@
-Index: xbmc/linux/Makefile.in
-===================================================================
--- xbmc/linux/Makefile.in	(revision 35575)
-+++ xbmc/linux/Makefile.in	(working copy)
-@@ -9,6 +9,10 @@
- 
- SRCS=ConvUtils.cpp XEventUtils.cpp XFileUtils.cpp XHandle.cpp XSyncUtils.cpp XTimeUtils.cpp XMemUtils.cpp XThreadUtils.cpp NetworkLinux.cpp LinuxResourceCounter.cpp LinuxTimezone.cpp XRandR.cpp XCriticalSection.cpp XLCDproc.cpp HALManager.cpp HALPowerSyscall.cpp ConsoleDeviceKitPowerSyscall.cpp DBusUtil.cpp DBusMessage.cpp ZeroconfAvahi.cpp ZeroconfBrowserAvahi.cpp HALProvider.cpp PosixMountProvider.cpp DeviceKitDisksProvider.cpp UDisksProvider.cpp ConsoleUPowerSyscall.cpp
- 
-+ifeq ($(findstring freebsd,$(ARCH)), freebsd)
-+	SRCS+=FreeBSDGNUReplacements.cpp
-+endif
-+
- LIB=linux.a
- 
- include ../../Makefile.include
--- a/multimedia/xbmc-pvr/files/patch-xbmclinuxPlatformDefs.h
+++ b/multimedia/xbmc-pvr/files/patch-xbmclinuxPlatformDefs.h
@ -1,48 +0,0 @@
--- ./xbmc/linux/PlatformDefs.h.orig	2010-06-09 07:05:59.000000000 +0200
-+++ ./xbmc/linux/PlatformDefs.h	2010-12-01 12:17:34.264972083 +0100
-@@ -39,11 +39,15 @@
- #include <unistd.h>
- #include <pthread.h>
- #include <string.h>
-#ifdef __APPLE__
-+#if defined(__APPLE__)
- #include <stdio.h>
- #include <sys/sysctl.h>
- #include <mach/mach.h>
-#else
-+#elif defined(__FreeBSD__)
-+#include <stdio.h>
-+#include <sys/sysctl.h>
-+#include <sys/types.h>
-+#else /* !__APPLE__ && !__FreeBSD__ */
- #include <sys/sysinfo.h>
- #endif
- #include <sys/time.h>
-@@ -166,7 +170,7 @@
- #define CALLBACK    __stdcall
- #define WINAPI      __stdcall
- #define WINAPIV     __cdecl
-#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- #define APIENTRY    WINAPI
- #else
- #define APIENTRY
-@@ -344,14 +360,16 @@ typedef int (*LPTHREAD_START_ROUTINE)(vo
- #define _O_WRONLY O_WRONLY
- #define _off_t off_t
- 
-#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__FreeBSD__)
-+#ifdef __APPLE__
- #include <sched.h>
- #include <AvailabilityMacros.h>
-+#endif
- typedef int64_t   off64_t;
- typedef off_t     __off_t;
- typedef off64_t   __off64_t;
- typedef fpos_t fpos64_t;
-#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1050)
-+#if defined(__FreeBSD__) || (defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED < 1050))
- #define __stat64 stat
- #define stat64 stat
- #define statfs64 statfs
--- a/Show More
+++ b/Show More