Date: Thu, 16 Jan 2014 23:31:00 +0000 (UTC) From: Juergen Lock <nox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339997 - in head/multimedia/vdr-plugin-vnsiserver: . files Message-ID: <201401162331.s0GNV0bq055282@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nox Date: Thu Jan 16 23:30:59 2014 New Revision: 339997 URL: http://svnweb.freebsd.org/changeset/ports/339997 QAT: https://qat.redports.org/buildarchive/r339997/ Log: Sync with multimedia/xbmc-addon-pvr update. Deleted: head/multimedia/vdr-plugin-vnsiserver/files/patch-cxsocket.c head/multimedia/vdr-plugin-vnsiserver/files/patch-cxsocket.h head/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c head/multimedia/vdr-plugin-vnsiserver/files/patch-recplayer.c head/multimedia/vdr-plugin-vnsiserver/files/patch-requestpacket.c head/multimedia/vdr-plugin-vnsiserver/files/patch-responsepacket.c head/multimedia/vdr-plugin-vnsiserver/files/patch-vnsiserver.c Modified: head/multimedia/vdr-plugin-vnsiserver/Makefile head/multimedia/vdr-plugin-vnsiserver/distinfo head/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile head/multimedia/vdr-plugin-vnsiserver/pkg-plist (contents, props changed) Modified: head/multimedia/vdr-plugin-vnsiserver/Makefile ============================================================================== --- head/multimedia/vdr-plugin-vnsiserver/Makefile Thu Jan 16 22:56:12 2014 (r339996) +++ head/multimedia/vdr-plugin-vnsiserver/Makefile Thu Jan 16 23:30:59 2014 (r339997) @@ -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} Modified: head/multimedia/vdr-plugin-vnsiserver/distinfo ============================================================================== --- head/multimedia/vdr-plugin-vnsiserver/distinfo Thu Jan 16 22:56:12 2014 (r339996) +++ head/multimedia/vdr-plugin-vnsiserver/distinfo Thu Jan 16 23:30:59 2014 (r339997) @@ -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 Modified: head/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile Thu Jan 16 22:56:12 2014 (r339996) +++ head/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile Thu Jan 16 23:30:59 2014 (r339997) @@ -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) + Modified: head/multimedia/vdr-plugin-vnsiserver/pkg-plist ============================================================================== --- head/multimedia/vdr-plugin-vnsiserver/pkg-plist Thu Jan 16 22:56:12 2014 (r339996) +++ head/multimedia/vdr-plugin-vnsiserver/pkg-plist Thu Jan 16 23:30:59 2014 (r339997) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401162331.s0GNV0bq055282>