Sync with multimedia/xbmc-addon-pvr update.

11 files changed, 31 insertions, 136 deletions

diff --git a/multimedia/vdr-plugin-vnsiserver/Makefile b/multimedia/vdr-plugin-vnsiserver/Makefile
index f350f9fee136..df5fa0a5c25a 100644
--- a/multimedia/vdr-plugin-vnsiserver/Makefile
+++ b/multimedia/vdr-plugin-vnsiserver/Makefile
@@ -3,18 +3,25 @@
 
 PORTNAME=	vdr-plugin-vnsiserver
 PORTVERSION=	12.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://people.freebsd.org/~decke/distfiles/
-DISTNAME=	xbmc-pvr-addons-${PORTVERSION}-Frodo
+DISTNAME=	xbmc-pvr-addons-${PORTVERSION}-20140104
 
 MAINTAINER=	nox@FreeBSD.org
-COMMENT=	Video Disk Recorder - VNSI server plugin (Frodo)
+COMMENT=	Video Disk Recorder - VNSI server plugin
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	opdenkamp
+GH_PROJECT=	xbmc-pvr-addons
+GH_COMMIT=	9021115
+GH_TAGNAME=	9021115
 
 USES=		pkgconfig
 PATCH_STRIP=	-p1
 HAVE_CONFIGURE=	yes
 PORTDOCS=	COPYING README HISTORY
-WRKSRC=		${WRKDIR}/xbmc-pvr-addons-${PORTVERSION}-Frodo/addons/pvr.vdr.vnsi/${PORTNAME}
+WRKSRC=		${WRKDIR}/opdenkamp-xbmc-pvr-addons-${GH_COMMIT}/addons/pvr.vdr.vnsi/${PORTNAME}
 
 MAKE_ARGS+=	LIBDIR=${WRKDIR}/lib \
 		LOCDIR=${WRKDIR}/locale \
@@ -22,15 +29,16 @@ MAKE_ARGS+=	LIBDIR=${WRKDIR}/lib \
 		INCLUDES=-I${LOCALBASE}/include
 
 NO_STAGE=	yes
+
 .include	"${.CURDIR}/../vdr/Makefile.plugins"
 
 post-patch: post-patch-plugin
 
 post-install:
-	@${MKDIR} ${PREFIX}/etc/vdr/plugins/${PLUGIN}
-	@${INSTALL_DATA} ${WRKSRC}/${PLUGIN}/allowed_hosts.conf ${PREFIX}/etc/vdr/plugins/${PLUGIN}/allowed_hosts.conf.sample
-	@if [ ! -f ${PREFIX}/etc/vdr/plugins/${PLUGIN}/allowed_hosts.conf ]; then \
-	    ${INSTALL_DATA} -o ${VDR_USER} -g ${VDR_GROUP} ${WRKSRC}/${PLUGIN}/allowed_hosts.conf ${PREFIX}/etc/vdr/plugins/${PLUGIN}; \
+	@${MKDIR} ${PREFIX}/etc/vdr/plugins/${PLUGIN}5
+	@${INSTALL_DATA} ${WRKSRC}/${PLUGIN}/allowed_hosts.conf ${PREFIX}/etc/vdr/plugins/${PLUGIN}5/allowed_hosts.conf.sample
+	@if [ ! -f ${PREFIX}/etc/vdr/plugins/${PLUGIN}5/allowed_hosts.conf ]; then \
+	    ${INSTALL_DATA} -o ${VDR_USER} -g ${VDR_GROUP} ${WRKSRC}/${PLUGIN}/allowed_hosts.conf ${PREFIX}/etc/vdr/plugins/${PLUGIN}5; \
 	fi
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/multimedia/vdr-plugin-vnsiserver/distinfo b/multimedia/vdr-plugin-vnsiserver/distinfo
index 2970ab3e7cde..854c3b909941 100644
--- a/multimedia/vdr-plugin-vnsiserver/distinfo
+++ b/multimedia/vdr-plugin-vnsiserver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vdr/xbmc-pvr-addons-12.0-Frodo.tar.gz) = 6a580bccda532369ce7b08319fc93341ca4e9b111b7b63e707d4c6fa8a3c5ee0
-SIZE (vdr/xbmc-pvr-addons-12.0-Frodo.tar.gz) = 3204309
+SHA256 (vdr/xbmc-pvr-addons-12.0-20140104.tar.gz) = cb010fa617182d708819529c212f289002392bd399405c01e880c89897fbe020
+SIZE (vdr/xbmc-pvr-addons-12.0-20140104.tar.gz) = 3716974
diff --git a/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile b/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile
index 0927fa0093a1..e2c5946790fa 100644
--- a/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile
+++ b/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile
@@ -1,9 +1,9 @@
---- a/Makefile
-+++ b/Makefile
-@@ -127,7 +127,11 @@ $(I18Npot): $(wildcard *.cc)
+--- Makefile.orig
++++ Makefile
+@@ -134,7 +134,11 @@ $(I18Npot): $(wildcard *.c)
  	@touch $@
  
- $(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+ $(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
 +ifdef FREEBSD
 +	install -m644 $< $@
 +else
@@ -12,20 +12,20 @@
  
  .PHONY: i18n
  i18n: $(I18Nmo) $(I18Npot)
-@@ -140,7 +144,11 @@ $(SOFILE): $(OBJS)
+@@ -147,7 +151,11 @@ $(SOFILE): $(OBJS)
  	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
  
  install-lib: $(SOFILE)
 +ifdef FREEBSD
-+	install $^ $(LIBDIR)/$^.$(APIVERSION)
++	install $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 +else
- 	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 +endif
  
  install: install-lib install-i18n
  
-@@ -157,3 +165,6 @@ clean:
- 	@-rm -f $(OBJS) $(DEPFILE) *.so *.so.* *.tgz core* *~
+@@ -164,3 +164,6 @@ clean:
+ 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
  
  compile: $(SOFILE)
 +
diff --git a/multimedia/vdr-plugin-vnsiserver/files/patch-cxsocket.c b/multimedia/vdr-plugin-vnsiserver/files/patch-cxsocket.c
deleted file mode 100644
index 8e0bd6ad004f..000000000000
--- a/multimedia/vdr-plugin-vnsiserver/files/patch-cxsocket.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cxsocket.c
-+++ b/cxsocket.c
-@@ -48,6 +48,10 @@
- #include "config.h"
- #include "cxsocket.h"
- 
-+#ifndef MSG_MORE
-+#define MSG_MORE 0
-+#endif
-+
- cxSocket::~cxSocket()
- {
-   close();
diff --git a/multimedia/vdr-plugin-vnsiserver/files/patch-cxsocket.h b/multimedia/vdr-plugin-vnsiserver/files/patch-cxsocket.h
deleted file mode 100644
index 0f296448ea69..000000000000
--- a/multimedia/vdr-plugin-vnsiserver/files/patch-cxsocket.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/cxsocket.h
-+++ b/cxsocket.h
-@@ -29,6 +29,9 @@
- #ifndef __CXSOCKET_H
- #define __CXSOCKET_H
- 
-+#ifdef __FreeBSD__
-+#include <netinet/in.h>
-+#endif
- #include <inttypes.h>
- #include <sys/types.h>
- #include <sys/socket.h>
diff --git a/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c b/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c
deleted file mode 100644
index df1865789ebd..000000000000
--- a/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/receiver.c
-+++ b/receiver.c
-@@ -32,7 +32,9 @@
- 
- #include <vdr/remux.h>
- #include <vdr/channels.h>
-+#ifndef __FreeBSD__
- #include <asm/byteorder.h>
-+#endif
- 
- #include "config.h"
- #include "receiver.h"
diff --git a/multimedia/vdr-plugin-vnsiserver/files/patch-recplayer.c b/multimedia/vdr-plugin-vnsiserver/files/patch-recplayer.c
deleted file mode 100644
index 089e3616790b..000000000000
--- a/multimedia/vdr-plugin-vnsiserver/files/patch-recplayer.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/recplayer.c
-+++ b/recplayer.c
-@@ -34,6 +34,10 @@
- #include <sys/stat.h>
- #include <unistd.h>
- 
-+#ifndef O_NOATIME
-+#define O_NOATIME 0
-+#endif
-+
- cRecPlayer::cRecPlayer(cRecording* rec)
- {
-   m_file          = -1;
-@@ -199,8 +203,10 @@ int cRecPlayer::getBlock(unsigned char* 
-     return 0;
-   }
- 
-+#ifndef __FreeBSD__
-   // Tell linux not to bother keeping the data in the FS cache
-   posix_fadvise(m_file, filePosition, bytes_read, POSIX_FADV_DONTNEED);
-+#endif
- 
-   // divide and conquer
-   if(bytes_read < amount) {
diff --git a/multimedia/vdr-plugin-vnsiserver/files/patch-requestpacket.c b/multimedia/vdr-plugin-vnsiserver/files/patch-requestpacket.c
deleted file mode 100644
index 651a6e160a43..000000000000
--- a/multimedia/vdr-plugin-vnsiserver/files/patch-requestpacket.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/requestpacket.c
-+++ b/requestpacket.c
-@@ -28,7 +28,13 @@
- #include <stdint.h>
- #include <string.h>
- 
-+#ifndef __FreeBSD__
- #include <asm/byteorder.h>
-+#else
-+#include <sys/endian.h>
-+#define __be64_to_cpu be64toh
-+#define __cpu_to_be64 htobe64
-+#endif
- 
- #include "config.h"
- #include "requestpacket.h"
diff --git a/multimedia/vdr-plugin-vnsiserver/files/patch-responsepacket.c b/multimedia/vdr-plugin-vnsiserver/files/patch-responsepacket.c
deleted file mode 100644
index 952dc5b12eb9..000000000000
--- a/multimedia/vdr-plugin-vnsiserver/files/patch-responsepacket.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/responsepacket.c
-+++ b/responsepacket.c
-@@ -31,8 +31,15 @@
- #include <arpa/inet.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <inttypes.h>
- 
-+#ifndef __FreeBSD__
- #include <asm/byteorder.h>
-+#else
-+#include <sys/endian.h>
-+#define __be64_to_cpu be64toh
-+#define __cpu_to_be64 htobe64
-+#endif
- 
- #include "responsepacket.h"
- #include "vnsicommand.h"
diff --git a/multimedia/vdr-plugin-vnsiserver/files/patch-vnsiserver.c b/multimedia/vdr-plugin-vnsiserver/files/patch-vnsiserver.c
deleted file mode 100644
index 8266479e2e58..000000000000
--- a/multimedia/vdr-plugin-vnsiserver/files/patch-vnsiserver.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/vnsiserver.c
-+++ b/vnsiserver.c
-@@ -156,6 +156,7 @@ void cVNSIServer::NewClientConnected(int
-   int val = 1;
-   setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val));
- 
-+#ifdef SOL_TCP
-   val = 30;
-   setsockopt(fd, SOL_TCP, TCP_KEEPIDLE, &val, sizeof(val));
- 
-@@ -167,6 +168,7 @@ void cVNSIServer::NewClientConnected(int
- 
-   val = 1;
-   setsockopt(fd, SOL_TCP, TCP_NODELAY, &val, sizeof(val));
-+#endif
- 
-   INFOLOG("Client with ID %d connected: %s", m_IdCnt, cxSocket::ip2txt(sin.sin_addr.s_addr, sin.sin_port, buf));
-   cVNSIClient *connection = new cVNSIClient(fd, m_IdCnt, cxSocket::ip2txt(sin.sin_addr.s_addr, sin.sin_port, buf));
diff --git a/multimedia/vdr-plugin-vnsiserver/pkg-plist b/multimedia/vdr-plugin-vnsiserver/pkg-plist
index 7dacf63d6196..18875548cf05 100644
--- a/multimedia/vdr-plugin-vnsiserver/pkg-plist
+++ b/multimedia/vdr-plugin-vnsiserver/pkg-plist
@@ -1,5 +1,5 @@
-lib/vdr/libvdr-vnsiserver.so.%%APIVERSION%%
-@unexec if cmp -s %D/etc/vdr/plugins/vnsiserver/allowed_hosts.conf.sample %D/etc/vdr/plugins/vnsiserver/allowed_hosts.conf; then rm -f %D/etc/vdr/plugins/vnsiserver/allowed_hosts.conf; fi
-etc/vdr/plugins/vnsiserver/allowed_hosts.conf.sample
-@exec if [ ! -f %D/etc/vdr/plugins/vnsiserver/allowed_hosts.conf ] ; then cp -p %D/%F %B/allowed_hosts.conf; fi
-@dirrmtry etc/vdr/plugins/vnsiserver
+lib/vdr/libvdr-vnsiserver5.so.%%APIVERSION%%
+@unexec if cmp -s %D/etc/vdr/plugins/vnsiserver5/allowed_hosts.conf.sample %D/etc/vdr/plugins/vnsiserver5/allowed_hosts.conf; then rm -f %D/etc/vdr/plugins/vnsiserver5/allowed_hosts.conf; fi
+etc/vdr/plugins/vnsiserver5/allowed_hosts.conf.sample
+@exec if [ ! -f %D/etc/vdr/plugins/vnsiserver5/allowed_hosts.conf ] ; then cp -p %D/%F %B/allowed_hosts.conf; fi
+@dirrmtry etc/vdr/plugins/vnsiserver5