Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 May 2014 16:04:28 +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: r353715 - head/multimedia/vdr
Message-ID:  <201405111604.s4BG4Swg051337@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nox
Date: Sun May 11 16:04:28 2014
New Revision: 353715
URL: http://svnweb.freebsd.org/changeset/ports/353715
QAT: https://qat.redports.org/buildarchive/r353715/

Log:
  - Add RUN_DEPENDS on x11-fonts/xorg-fonts-truetype.
  - Add USES= shebangfix for svdrpsend.
  - Use @sample.
  - Pet check-plist.
  - Bump PORTREVISION.

Modified:
  head/multimedia/vdr/Makefile
  head/multimedia/vdr/pkg-plist

Modified: head/multimedia/vdr/Makefile
==============================================================================
--- head/multimedia/vdr/Makefile	Sun May 11 15:49:03 2014	(r353714)
+++ head/multimedia/vdr/Makefile	Sun May 11 16:04:28 2014	(r353715)
@@ -3,7 +3,7 @@
 
 PORTNAME=	vdr
 PORTVERSION=	1.7.29
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.tvdr.de/vdr/Developer/
 
@@ -13,7 +13,8 @@ COMMENT=	Video Disk Recorder - developme
 BUILD_DEPENDS=  v4l_compat>=1.0.20120501:${PORTSDIR}/multimedia/v4l_compat
 LIB_DEPENDS=    libjpeg.so:${PORTSDIR}/graphics/jpeg
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig \
+		xorg-fonts-truetype>=0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype
 
 OPTIONS_DEFINE=		IPTVPATCH TTXPATCH STB0899_SIGNAL
 IPTVPATCH_DESC=		Stops EIT scans on IPTV channels
@@ -22,7 +23,8 @@ DVBPATCH_DESC=		DVB audio patch for some
 STB0899_SIGNAL_DESC=	STB0899 signal strength patch
 OPTIONS_DEFAULT=	IPTVPATCH TTXPATCH
 
-USES=		pkgconfig gettext iconv:wchar_t gmake tar:bzip2
+USES=		pkgconfig gettext iconv:wchar_t gmake shebangfix tar:bzip2
+SHEBANG_FILES=	svdrpsend
 DIST_SUBDIR=	vdr
 PORTDOCS=	COPYING INSTALL MANUAL README HISTORY
 CONFDIR=	$(ETCDIR)
@@ -104,7 +106,8 @@ post-install:
 	${MKDIR} ${STAGEDIR}${CONFDIR}/plugins
 	${INSTALL_DATA} ${FILESDIR}/remote.conf ${STAGEDIR}${CONFDIR}/remote.conf.sample
 	for i in $$(cd ${WRKSRC} && ls *.conf); do \
-		${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${CONFDIR}/$$i.sample; \
+		${MV} -i ${STAGEDIR}${CONFDIR}/$$i \
+			${STAGEDIR}${CONFDIR}/$$i.sample; \
 	done
 	${INSTALL_SCRIPT} ${WRKDIR}/vdr-waitdvb ${STAGEDIR}${PREFIX}/bin
 .if ${PORT_OPTIONS:MDOCS}

Modified: head/multimedia/vdr/pkg-plist
==============================================================================
--- head/multimedia/vdr/pkg-plist	Sun May 11 15:49:03 2014	(r353714)
+++ head/multimedia/vdr/pkg-plist	Sun May 11 16:04:28 2014	(r353715)
@@ -143,27 +143,13 @@ include/vdr/videodir.h
 %%TTXPATCH%%include/vdr/vdrttxtsubshooks.h
 @exec mkdir -p %D/etc/vdr/plugins
 @exec chown %%VDR_USER%%:%%VDR_GROUP%% %D/etc/vdr %D/etc/vdr/plugins
-@unexec if cmp -s %D/etc/vdr/remote.conf.sample %D/etc/vdr/remote.conf; then rm -f %D/etc/vdr/remote.conf; fi
-etc/vdr/remote.conf.sample
-@exec if [ ! -f %D/etc/vdr/remote.conf ] ; then cp -p %D/%F %B/remote.conf; fi
-@unexec if cmp -s %D/etc/vdr/channels.conf.sample %D/etc/vdr/channels.conf; then rm -f %D/etc/vdr/channels.conf; fi
-etc/vdr/channels.conf.sample
-@exec if [ ! -f %D/etc/vdr/channels.conf ] ; then cp -p %D/%F %B/channels.conf; fi
-@unexec if cmp -s %D/etc/vdr/diseqc.conf.sample %D/etc/vdr/diseqc.conf; then rm -f %D/etc/vdr/diseqc.conf; fi
-etc/vdr/diseqc.conf.sample
-@exec if [ ! -f %D/etc/vdr/diseqc.conf ] ; then cp -p %D/%F %B/diseqc.conf; fi
-@unexec if cmp -s %D/etc/vdr/keymacros.conf.sample %D/etc/vdr/keymacros.conf; then rm -f %D/etc/vdr/keymacros.conf; fi
-etc/vdr/keymacros.conf.sample
-@exec if [ ! -f %D/etc/vdr/keymacros.conf ] ; then cp -p %D/%F %B/keymacros.conf; fi
-@unexec if cmp -s %D/etc/vdr/scr.conf.sample %D/etc/vdr/scr.conf; then rm -f %D/etc/vdr/scr.conf; fi
-etc/vdr/scr.conf.sample
-@exec if [ ! -f %D/etc/vdr/scr.conf ] ; then cp -p %D/%F %B/scr.conf; fi
-@unexec if cmp -s %D/etc/vdr/sources.conf.sample %D/etc/vdr/sources.conf; then rm -f %D/etc/vdr/sources.conf; fi
-etc/vdr/sources.conf.sample
-@exec if [ ! -f %D/etc/vdr/sources.conf ] ; then cp -p %D/%F %B/sources.conf; fi
-@unexec if cmp -s %D/etc/vdr/svdrphosts.conf.sample %D/etc/vdr/svdrphosts.conf; then rm -f %D/etc/vdr/svdrphosts.conf; fi
-etc/vdr/svdrphosts.conf.sample
-@exec if [ ! -f %D/etc/vdr/svdrphosts.conf ] ; then cp -p %D/%F %B/svdrphosts.conf; fi
+@sample etc/vdr/remote.conf.sample
+@sample etc/vdr/channels.conf.sample
+@sample etc/vdr/diseqc.conf.sample
+@sample etc/vdr/keymacros.conf.sample
+@sample etc/vdr/scr.conf.sample
+@sample etc/vdr/sources.conf.sample
+@sample etc/vdr/svdrphosts.conf.sample
 %%NLS%%@dirrmtry share/locale/ca_ES/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ca_ES
 %%NLS%%@dirrmtry share/locale/cs_CZ/LC_MESSAGES



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405111604.s4BG4Swg051337>