Date: Sat, 1 Mar 2014 12:21:14 +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: r346615 - in head: multimedia/vdr-plugin-control multimedia/vdr-plugin-control/files multimedia/vdr-plugin-eepg multimedia/vdr-plugin-eepg/files multimedia/vdr-plugin-epgsearch multimed... Message-ID: <201403011221.s21CLENo053059@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nox Date: Sat Mar 1 12:21:13 2014 New Revision: 346615 URL: http://svnweb.freebsd.org/changeset/ports/346615 QAT: https://qat.redports.org/buildarchive/r346615/ Log: - Finally stagify the vdr ports. \o/ - Use new LIB_DEPENDS syntax. - Change multimedia/vdr-plugins defaults and bump PORTREVISION for it. (switch from xvdr to vnsiserver and disable plugins depending on ffmpeg0) Modified: head/multimedia/vdr-plugin-control/Makefile head/multimedia/vdr-plugin-control/files/patch-Makefile head/multimedia/vdr-plugin-eepg/Makefile head/multimedia/vdr-plugin-eepg/files/patch-Makefile head/multimedia/vdr-plugin-epgsearch/Makefile head/multimedia/vdr-plugin-epgsearch/files/patch-Makefile head/multimedia/vdr-plugin-extrecmenu/Makefile head/multimedia/vdr-plugin-extrecmenu/files/patch-Makefile head/multimedia/vdr-plugin-femon/Makefile head/multimedia/vdr-plugin-femon/files/patch-Makefile head/multimedia/vdr-plugin-infosatepg/Makefile head/multimedia/vdr-plugin-infosatepg/files/patch-Makefile head/multimedia/vdr-plugin-iptv/Makefile head/multimedia/vdr-plugin-iptv/files/patch-Makefile head/multimedia/vdr-plugin-markad/Makefile head/multimedia/vdr-plugin-markad/files/patch-command-Makefile head/multimedia/vdr-plugin-markad/files/patch-plugin-Makefile head/multimedia/vdr-plugin-markad/pkg-plist head/multimedia/vdr-plugin-osdpip/Makefile head/multimedia/vdr-plugin-osdpip/files/patch-Makefile head/multimedia/vdr-plugin-osdteletext/Makefile head/multimedia/vdr-plugin-osdteletext/files/patch-Makefile head/multimedia/vdr-plugin-reelchannelscan/Makefile head/multimedia/vdr-plugin-reelchannelscan/files/patch-Makefile head/multimedia/vdr-plugin-remote/Makefile head/multimedia/vdr-plugin-remote/files/patch-Makefile head/multimedia/vdr-plugin-skinenigmang/Makefile head/multimedia/vdr-plugin-skinenigmang/files/patch-Makefile head/multimedia/vdr-plugin-sleeptimer/Makefile head/multimedia/vdr-plugin-sleeptimer/files/patch-Makefile head/multimedia/vdr-plugin-softhddevice/Makefile head/multimedia/vdr-plugin-softhddevice/files/patch-Makefile head/multimedia/vdr-plugin-streamdev/Makefile head/multimedia/vdr-plugin-streamdev/files/patch-Makefile head/multimedia/vdr-plugin-ttxtsubs/Makefile head/multimedia/vdr-plugin-ttxtsubs/files/patch-Makefile head/multimedia/vdr-plugin-upnp/Makefile head/multimedia/vdr-plugin-upnp/files/patch-Makefile head/multimedia/vdr-plugin-vdrmanager/Makefile head/multimedia/vdr-plugin-vdrmanager/files/patch-Makefile head/multimedia/vdr-plugin-vnsiserver/Makefile head/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile head/multimedia/vdr-plugin-wirbelscan/Makefile head/multimedia/vdr-plugin-wirbelscan/files/patch-Makefile head/multimedia/vdr-plugin-xineliboutput/Makefile head/multimedia/vdr-plugin-xineliboutput/files/patch-Makefile head/multimedia/vdr-plugin-xvdr/Makefile head/multimedia/vdr-plugin-xvdr/files/patch-Makefile head/multimedia/vdr-plugins/Makefile head/www/vdr-plugin-live/Makefile head/www/vdr-plugin-live/files/patch-Makefile head/www/vdr-plugin-live/pkg-plist Modified: head/multimedia/vdr-plugin-control/Makefile ============================================================================== --- head/multimedia/vdr-plugin-control/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-control/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -22,7 +22,6 @@ HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION:S/a45/a/} -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin @@ -31,10 +30,11 @@ post-patch: post-patch-plugin ${PATCH} -d ${WRKSRC} `${SED} -n '/^#PATCHOPTIONS:/{s///;p;q;}' $$i` --forward --quiet <$$i ;\ done +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-control/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-control/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-control/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -16,7 +16,7 @@ +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) + ### Implicit rules: Modified: head/multimedia/vdr-plugin-eepg/Makefile ============================================================================== --- head/multimedia/vdr-plugin-eepg/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-eepg/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -17,21 +17,18 @@ HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/${PORTNAME}-${GITHASH} -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: - @${INSTALL} -o ${VDR_USER} -g ${VDR_GROUP} -d ${PREFIX}/etc/vdr/plugins/${PLUGIN} - @${INSTALL_DATA} ${WRKSRC}/eepg.equiv.IT ${PREFIX}/etc/vdr/plugins/${PLUGIN} - @${INSTALL_DATA} ${WRKSRC}/eepg.equiv.IT ${PREFIX}/etc/vdr/plugins/${PLUGIN}/eepg.equiv.sample - @if [ ! -f ${PREFIX}/etc/vdr/plugins/${PLUGIN}/eepg.equiv ]; then \ - ${INSTALL_DATA} -o ${VDR_USER} -g ${VDR_GROUP} ${WRKSRC}/eepg.equiv.IT ${PREFIX}/etc/vdr/plugins/${PLUGIN}/eepg.equiv; \ - fi -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN} + ${INSTALL_DATA} ${WRKSRC}/eepg.equiv.IT ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN} + ${INSTALL_DATA} ${WRKSRC}/eepg.equiv.IT ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/eepg.equiv.sample + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-eepg/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-eepg/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-eepg/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -6,4 +6,4 @@ # @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-epgsearch/Makefile ============================================================================== --- head/multimedia/vdr-plugin-epgsearch/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-epgsearch/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -12,8 +12,8 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sn MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - EPG search plugin -LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre \ - tre:${PORTSDIR}/textproc/libtre +LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \ + libtre.so:${PORTSDIR}/textproc/libtre USES= pkgconfig USE_BZIP2= yes @@ -22,7 +22,6 @@ PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/vdr-plugin-${PLUGIN} MAKE_ARGS+= INCLUDES="-I$(LOCALBASE)/include -I$(LOCALBASE)/include/vdr -I${WRKSRC}" -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin @@ -30,10 +29,11 @@ post-patch: post-patch-plugin -e 's/^#\(HAVE_LIBTRE=\)/\1/;' \ ${WRKSRC}/Makefile +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-epgsearch/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-epgsearch/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-epgsearch/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -42,13 +42,13 @@ @-rm -rf doc html man + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) +ifndef WITHOUT_EPGSEARCHONLY -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN2).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN2).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN2).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN2).so.$(APIVERSION) +endif +ifndef WITHOUT_CONFLICTCHECKONLY -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN3).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN3).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN3).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN3).so.$(APIVERSION) +endif +ifndef WITHOUT_QUICKSEARCH -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN4).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN4).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN4).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN4).so.$(APIVERSION) +endif Modified: head/multimedia/vdr-plugin-extrecmenu/Makefile ============================================================================== --- head/multimedia/vdr-plugin-extrecmenu/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-extrecmenu/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -17,15 +17,15 @@ HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/${PLUGIN}-${PORTVERSION} -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-extrecmenu/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-extrecmenu/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-extrecmenu/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -18,4 +18,4 @@ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-femon/Makefile ============================================================================== --- head/multimedia/vdr-plugin-femon/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-femon/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -17,15 +17,15 @@ HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-femon/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-femon/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-femon/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -6,4 +6,4 @@ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-infosatepg/Makefile ============================================================================== --- head/multimedia/vdr-plugin-infosatepg/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-infosatepg/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -17,16 +17,16 @@ HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif - ${INSTALL} -o ${VDR_USER} -g ${VDR_GROUP} -d /var/cache/vdr/${PLUGIN} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) + ${MKDIR} ${STAGEDIR}/var/cache/vdr/${PLUGIN} .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-infosatepg/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-infosatepg/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-infosatepg/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -18,4 +18,4 @@ @-rm -f $(OBJS) $(DEPFILE) *.so* *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-iptv/Makefile ============================================================================== --- head/multimedia/vdr-plugin-iptv/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-iptv/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -19,7 +19,6 @@ PORTEXAMPLES= channels.conf.iptv MAKE_ARGS+= IPTV_EXTSHELL=/bin/sh WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin @@ -27,45 +26,29 @@ post-patch: post-patch-plugin -e 's|^\(CHANNEL_SETTINGS_DIR[[:space:]]*\)[?]*\(=[[:space:]]*\)/etc|\1\2${PREFIX}/etc|;' \ ${WRKSRC}/iptv/vlc2iptv +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales - @${MKDIR} ${PREFIX}/etc/vdr/plugins/${PLUGIN} - @${MKDIR} ${PREFIX}/etc/vdr/plugins/${PLUGIN}/vlcinput - @${INSTALL_DATA} ${FILESDIR}/vlcinput/*.conf ${PREFIX}/etc/vdr/plugins/${PLUGIN}/vlcinput - @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/image.sh ${PREFIX}/etc/vdr/plugins/${PLUGIN}/image.sh.sample - @if [ ! -f ${PREFIX}/etc/vdr/plugins/${PLUGIN}/image.sh ]; then \ - ${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/image.sh ${PREFIX}/etc/vdr/plugins/${PLUGIN}; \ - fi - @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/internetradio.sh ${PREFIX}/etc/vdr/plugins/${PLUGIN}/internetradio.sh.sample - @if [ ! -f ${PREFIX}/etc/vdr/plugins/${PLUGIN}/internetradio.sh ]; then \ - ${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/internetradio.sh ${PREFIX}/etc/vdr/plugins/${PLUGIN}; \ - fi - @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/iptvstream-notrap.sh ${PREFIX}/etc/vdr/plugins/${PLUGIN}/iptvstream-notrap.sh.sample - @if [ ! -f ${PREFIX}/etc/vdr/plugins/${PLUGIN}/iptvstream-notrap.sh ]; then \ - ${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/iptvstream-notrap.sh ${PREFIX}/etc/vdr/plugins/${PLUGIN}; \ - fi - @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/iptvstream.sh ${PREFIX}/etc/vdr/plugins/${PLUGIN}/iptvstream.sh.sample - @if [ ! -f ${PREFIX}/etc/vdr/plugins/${PLUGIN}/iptvstream.sh ]; then \ - ${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/iptvstream.sh ${PREFIX}/etc/vdr/plugins/${PLUGIN}; \ - fi - @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/linein.sh ${PREFIX}/etc/vdr/plugins/${PLUGIN}/linein.sh.sample - @if [ ! -f ${PREFIX}/etc/vdr/plugins/${PLUGIN}/linein.sh ]; then \ - ${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/linein.sh ${PREFIX}/etc/vdr/plugins/${PLUGIN}; \ - fi - @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/vlc2iptv ${PREFIX}/etc/vdr/plugins/${PLUGIN}/vlc2iptv.sample - @if [ ! -f ${PREFIX}/etc/vdr/plugins/${PLUGIN}/vlc2iptv ]; then \ - ${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/vlc2iptv ${PREFIX}/etc/vdr/plugins/${PLUGIN}; \ - fi - @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/webcam.sh ${PREFIX}/etc/vdr/plugins/${PLUGIN}/webcam.sh.sample - @if [ ! -f ${PREFIX}/etc/vdr/plugins/${PLUGIN}/webcam.sh ]; then \ - ${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/webcam.sh ${PREFIX}/etc/vdr/plugins/${PLUGIN}; \ - fi -.if !defined(NOPORTEXAMPLES) - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${FILESDIR}/channels.conf.iptv ${EXAMPLESDIR} -.endif -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/vlcinput + @${INSTALL_DATA} ${FILESDIR}/vlcinput/*.conf ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/vlcinput + @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/image.sh \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/image.sh.sample + @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/internetradio.sh \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/internetradio.sh.sample + @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/iptvstream-notrap.sh \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/iptvstream-notrap.sh.sample + @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/iptvstream.sh \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/iptvstream.sh.sample + @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/linein.sh \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/linein.sh.sample + @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/vlc2iptv \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/vlc2iptv.sample + @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}/webcam.sh \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/webcam.sh.sample + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${FILESDIR}/channels.conf.iptv ${STAGEDIR}${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-iptv/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-iptv/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-iptv/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -25,4 +25,4 @@ cppcheck: $(OBJS) @cppcheck --enable=information,style,unusedFunction -v -f $(OBJS:%.o=%.c) +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-markad/Makefile ============================================================================== --- head/multimedia/vdr-plugin-markad/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-markad/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -11,8 +11,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - MarkAd plugin -LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg \ - execinfo:${PORTSDIR}/devel/libexecinfo +LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ + libexecinfo.so:${PORTSDIR}/devel/libexecinfo USES= pkgconfig PATCH_STRIP= -p1 @@ -24,12 +24,9 @@ VDR_PLUGIN_MAKEFILES= ${WRKSRC}/command/ DEFINES+= -DDATADIR=\\\"${DATADIR}\\\" -DPREFIX=\\\"${PREFIX}\\\" MAKE_ARGS+= DATADIR=${DATADIR} FREEBSD=1 MAKE_ENV+= DEFINES="${DEFINES}" -MANCOMPRESSED= yes -MAN1= markad.1 RESTRICTED= Installs station logos -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" # for libexecinfo: (so that __builtin_frame_address() finds the top @@ -42,10 +39,11 @@ CPPFLAGS+= -fno-omit-frame-pointer post-patch: post-patch-plugin @${LN} -s ../lib ../locale ${WRKSRC} +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-markad/files/patch-command-Makefile ============================================================================== --- head/multimedia/vdr-plugin-markad/files/patch-command-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-markad/files/patch-command-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -11,7 +11,7 @@ ### Includes and Defines (add further entries here): PKG-LIBS += libavcodec libavutil -@@ -86,17 +90,29 @@ markad: $(OBJS) +@@ -86,17 +90,34 @@ markad: $(OBJS) $(CXX) $(CXXFLAGS) $(OBJS) $(LIBS) -o $@ @@ -21,16 +21,21 @@ MANDIR = $(DESTDIR)/usr/share/man +endif install-doc: ++ifdef FREEBSD ++ @mkdir -p ${DESTDIR}$(MANDIR)/man1 ++ @gzip -c markad.1 > ${DESTDIR}$(MANDIR)/man1/markad.1.gz ++else @mkdir -p $(MANDIR)/man1 @gzip -c markad.1 > $(MANDIR)/man1/markad.1.gz ++endif install: install-doc markad $(I18Nmsgs) +ifdef FREEBSD -+ @mkdir -p $(PREFIX)/bin -+ @cp -f markad $(PREFIX)/bin/markad -+ @$(STRIP) $(PREFIX)/bin/markad -+ @mkdir -p $(DATADIR)/logos -+ @cp logos/* $(DATADIR)/logos ++ @mkdir -p ${DESTDIR}$(PREFIX)/bin ++ @cp -f markad ${DESTDIR}$(PREFIX)/bin/markad ++ @$(STRIP) ${DESTDIR}$(PREFIX)/bin/markad ++ @mkdir -p ${DESTDIR}$(DATADIR)/logos ++ @cp logos/* ${DESTDIR}$(DATADIR)/logos +else @mkdir -p $(DESTDIR)/usr/bin @cp --remove-destination markad $(DESTDIR)/usr/bin/markad Modified: head/multimedia/vdr-plugin-markad/files/patch-plugin-Makefile ============================================================================== --- head/multimedia/vdr-plugin-markad/files/patch-plugin-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-markad/files/patch-plugin-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -5,7 +5,7 @@ install: all +ifdef FREEBSD -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) +else cp --remove-destination libvdr-$(PLUGIN).so $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) +endif Modified: head/multimedia/vdr-plugin-markad/pkg-plist ============================================================================== --- head/multimedia/vdr-plugin-markad/pkg-plist Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-markad/pkg-plist Sat Mar 1 12:21:13 2014 (r346615) @@ -1,5 +1,6 @@ bin/markad lib/vdr/libvdr-markad.so.%%APIVERSION%% +man/man1/markad.1.gz %%NLS%%share/locale/de_DE/LC_MESSAGES/vdr-markad.mo %%NLS%%share/locale/es_ES/LC_MESSAGES/vdr-markad.mo %%NLS%%share/locale/fi_FI/LC_MESSAGES/vdr-markad.mo Modified: head/multimedia/vdr-plugin-osdpip/Makefile ============================================================================== --- head/multimedia/vdr-plugin-osdpip/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-osdpip/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -15,7 +15,7 @@ PATCHFILES= osdpip-vdr-1.7.26.diff MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - picture-in-picture plugin -LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg +LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg USES= pkgconfig DIST_SUBDIR= vdr @@ -25,15 +25,15 @@ HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-osdpip/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-osdpip/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-osdpip/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -15,4 +15,4 @@ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-osdteletext/Makefile ============================================================================== --- head/multimedia/vdr-plugin-osdteletext/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-osdteletext/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -17,16 +17,16 @@ HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif - ${INSTALL} -o ${VDR_USER} -g ${VDR_GROUP} -d /var/cache/vdr/vtx + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) + ${MKDIR} ${STAGEDIR}/var/cache/vdr/vtx .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-osdteletext/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-osdteletext/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-osdteletext/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -4,7 +4,7 @@ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) + +install-readme: @install -d ../../man Modified: head/multimedia/vdr-plugin-reelchannelscan/Makefile ============================================================================== --- head/multimedia/vdr-plugin-reelchannelscan/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-reelchannelscan/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -18,18 +18,18 @@ HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:S/b1.7.15//} -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales - ${MKDIR} ${PREFIX}/etc/vdr/plugins/transponders + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/transponders ${INSTALL_DATA} ${WRKDIR}/debian/transponders/*.tpl \ - ${PREFIX}/etc/vdr/plugins/transponders -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/transponders + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-reelchannelscan/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-reelchannelscan/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-reelchannelscan/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -5,4 +5,4 @@ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-remote/Makefile ============================================================================== --- head/multimedia/vdr-plugin-remote/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-remote/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -17,15 +17,15 @@ HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-remote/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-remote/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-remote/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -45,4 +45,4 @@ @-rm -f *.o $(DEPFILE) *.so *.tgz core* *~ + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-skinenigmang/Makefile ============================================================================== --- head/multimedia/vdr-plugin-skinenigmang/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-skinenigmang/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -19,17 +19,17 @@ HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/${PORTNAME} -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales (cd ${WRKDIR}/${PLUGIN} && \ - ${COPYTREE_SHARE} \* ${PREFIX}/etc/vdr/plugins/${PLUGIN} ) -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN} ) + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-skinenigmang/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-skinenigmang/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-skinenigmang/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -6,4 +6,4 @@ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-sleeptimer/Makefile ============================================================================== --- head/multimedia/vdr-plugin-sleeptimer/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-sleeptimer/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -16,15 +16,15 @@ HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/${PLUGIN}-${PORTVERSION} -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-sleeptimer/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-sleeptimer/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-sleeptimer/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -6,4 +6,4 @@ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-softhddevice/Makefile ============================================================================== --- head/multimedia/vdr-plugin-softhddevice/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-softhddevice/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -13,9 +13,9 @@ MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - softhddevice plugin LIB_DEPENDS+= libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 \ - vdpau:${PORTSDIR}/multimedia/libvdpau \ - xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \ - asound:${PORTSDIR}/audio/alsa-lib + libvdpau.so:${PORTSDIR}/multimedia/libvdpau \ + libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \ + libasound.so:${PORTSDIR}/audio/alsa-lib USES= pkgconfig USE_XORG+= xv x11 xcb xinerama @@ -29,7 +29,6 @@ CONFIG+= -DUSE_OSS MAKE_ARGS+= CONFIG="${CONFIG}" WRKSRC= ${WRKDIR}/${PLUGIN}-${PORTVERSION} -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" OPTIONS_DEFINE= VAAPI @@ -38,7 +37,7 @@ VAAPI_DESC= Enable vaapi support (experi .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MVAAPI} -LIB_DEPENDS+= va:${PORTSDIR}/multimedia/libva +LIB_DEPENDS+= libva.so:${PORTSDIR}/multimedia/libva CONFIG+= -DUSE_VAAPI .endif @@ -47,10 +46,13 @@ post-patch: post-patch-plugin -e 's,libavcodec,libavcodec0,g' \ ${WRKSRC}/Makefile +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .endif .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-softhddevice/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-softhddevice/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-softhddevice/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -69,7 +69,7 @@ + install: libvdr-$(PLUGIN).so +ifdef FREEBSD -+ ${INSTALL_PROGRAM} libvdr-$(PLUGIN).so $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} libvdr-$(PLUGIN).so ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) +else cp --remove-destination libvdr-$(PLUGIN).so \ /usr/lib/vdr/plugins/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-streamdev/Makefile ============================================================================== --- head/multimedia/vdr-plugin-streamdev/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-streamdev/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -23,7 +23,6 @@ WRKSRC= ${WRKDIR}/${PLUGIN}-${PORTVERSI VDR_PLUGIN_MAKEFILES= ${WRKSRC}/client/Makefile \ ${WRKSRC}/server/Makefile -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin @@ -31,19 +30,16 @@ post-patch: post-patch-plugin @${REINPLACE_CMD} '1s-^#!/bin/sh-#!${LOCALBASE}/bin/bash-' \ ${WRKSRC}/${PLUGIN}-server/externremux.sh +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales - @${MKDIR} ${PREFIX}/etc/vdr/plugins/${PLUGIN}-server - @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}-server/externremux.sh ${PREFIX}/etc/vdr/plugins/${PLUGIN}-server/externremux.sh.sample - @${INSTALL_DATA} ${WRKSRC}/${PLUGIN}-server/streamdevhosts.conf ${PREFIX}/etc/vdr/plugins/${PLUGIN}-server/streamdevhosts.conf.sample - @if [ ! -f ${PREFIX}/etc/vdr/plugins/${PLUGIN}-server/externremux.sh ]; then \ - ${INSTALL_SCRIPT} -o ${VDR_USER} -g ${VDR_GROUP} ${WRKSRC}/${PLUGIN}-server/externremux.sh ${PREFIX}/etc/vdr/plugins/${PLUGIN}-server; \ - fi - @if [ ! -f ${PREFIX}/etc/vdr/plugins/${PLUGIN}-server/streamdevhosts.conf ]; then \ - ${INSTALL_DATA} -o ${VDR_USER} -g ${VDR_GROUP} ${WRKSRC}/${PLUGIN}-server/streamdevhosts.conf ${PREFIX}/etc/vdr/plugins/${PLUGIN}-server; \ - fi -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}-server + @${INSTALL_SCRIPT} ${WRKSRC}/${PLUGIN}-server/externremux.sh \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}-server/externremux.sh.sample + @${INSTALL_DATA} ${WRKSRC}/${PLUGIN}-server/streamdevhosts.conf \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}-server/streamdevhosts.conf.sample + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-streamdev/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-streamdev/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-streamdev/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -6,5 +6,5 @@ $(MAKE) -C ./server clean + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN)-client.so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN)-client.so.$(APIVERSION) -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN)-server.so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN)-server.so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN)-client.so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN)-client.so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN)-server.so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN)-server.so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-ttxtsubs/Makefile ============================================================================== --- head/multimedia/vdr-plugin-ttxtsubs/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-ttxtsubs/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -16,15 +16,15 @@ HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-ttxtsubs/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-ttxtsubs/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-ttxtsubs/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -18,4 +18,4 @@ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-upnp/Makefile ============================================================================== --- head/multimedia/vdr-plugin-upnp/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-upnp/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -26,7 +26,6 @@ WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSI CXXFLAGS+= -L${LOCALBASE}/lib/ffmpeg0 -lavcodec0 -lavformat0 -fPIC MAKE_ARGS= LIBS="-I${LOCALBASE}/include/ffmpeg0" CXXFLAGS="${CXXFLAGS}" -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin @@ -35,15 +34,18 @@ post-patch: post-patch-plugin -e 's,lavformat,lavformat0,g' \ ${WRKSRC}/Makefile +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales - @${MKDIR} ${PREFIX}/etc/vdr/plugins/${PLUGIN}/http/icons - @${INSTALL_DATA} ${WRKSRC}/http/icons/* ${PREFIX}/etc/vdr/plugins/${PLUGIN}/http/icons - @${MKDIR} ${PREFIX}/etc/vdr/plugins/${PLUGIN}/http/xml - @${INSTALL_DATA} ${WRKSRC}/http/xml/* ${PREFIX}/etc/vdr/plugins/${PLUGIN}/http/xml - @${INSTALL} -o ${VDR_USER} -g ${VDR_GROUP} -d /var/cache/vdr/${PLUGIN} -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/http/icons + @${INSTALL_DATA} ${WRKSRC}/http/icons/* \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/http/icons + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/http/xml + @${INSTALL_DATA} ${WRKSRC}/http/xml/* \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/http/xml + @${MKDIR} ${STAGEDIR}/var/cache/vdr/${PLUGIN} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-upnp/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-upnp/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-upnp/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -28,4 +28,4 @@ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-vdrmanager/Makefile ============================================================================== --- head/multimedia/vdr-plugin-vdrmanager/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-vdrmanager/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -14,17 +14,18 @@ COMMENT= Video Disk Recorder - VDR-Manag PATCH_STRIP= -p1 PORTDOCS= COPYING README HISTORY -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: - @${MKDIR} ${PREFIX}/etc/vdr/plugins - @${INSTALL_DATA} ${WRKSRC}/examples/plugin.vdrmanager.conf ${PREFIX}/etc/vdr/plugins/plugin.vdrmanager.conf.sample -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins + @${INSTALL_DATA} ${WRKSRC}/examples/plugin.vdrmanager.conf \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/plugin.vdrmanager.conf.sample + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-vdrmanager/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-vdrmanager/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-vdrmanager/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -6,4 +6,4 @@ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-vnsiserver/Makefile ============================================================================== --- head/multimedia/vdr-plugin-vnsiserver/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-vnsiserver/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -28,21 +28,18 @@ MAKE_ARGS+= LIBDIR=${WRKDIR}/lib \ VDRSRC=${LOCALBASE}/include/vdr \ INCLUDES=-I${LOCALBASE}/include -NO_STAGE= yes - .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: - @${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} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}5 + ${INSTALL_DATA} ${WRKSRC}/${PLUGIN}/allowed_hosts.conf \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}5/allowed_hosts.conf.sample + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -17,7 +17,7 @@ install-lib: $(SOFILE) +ifdef FREEBSD -+ install $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) ++ install $^ $(LIBDIR)/$^.$(APIVERSION) +else install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) +endif @@ -30,4 +30,4 @@ compile: $(SOFILE) + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-wirbelscan/Makefile ============================================================================== --- head/multimedia/vdr-plugin-wirbelscan/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-wirbelscan/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -17,16 +17,16 @@ HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin ${REINPLACE_CMD} -f ${FILESDIR}/types.sed ${WRKSRC}/*.c ${WRKSRC}/*.h +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/multimedia/vdr-plugin-wirbelscan/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-wirbelscan/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-wirbelscan/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -18,4 +18,4 @@ uncrustify -c ../../../../clean_code/config --replace --no-backup $(UNCRUSTIFY_FILES) + +install: -+ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) ++ ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-xineliboutput/Makefile ============================================================================== --- head/multimedia/vdr-plugin-xineliboutput/Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-xineliboutput/Makefile Sat Mar 1 12:21:13 2014 (r346615) @@ -14,10 +14,10 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sn MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - xineliboutput plugin/viewer -LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine \ - avutil:${PORTSDIR}/multimedia/ffmpeg \ - dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ - vdpau:${PORTSDIR}/multimedia/libvdpau +LIB_DEPENDS+= libxine.so:${PORTSDIR}/multimedia/libxine \ + libavutil.so:${PORTSDIR}/multimedia/ffmpeg \ + libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ + libvdpau.so:${PORTSDIR}/multimedia/libvdpau USE_BZIP2= yes PATCH_STRIP= -p1 @@ -32,7 +32,6 @@ XINE_PLUGINSDIR= lib/xine/plugins/2.3 OPTIONS_DEFINE= LIBBLURAY LIBEXTRACTOR HAS_CONFIGURE= yes -NO_STAGE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" @@ -43,13 +42,13 @@ PLIST_SUB+= XINE_PLUGINSDIR=${XINE_PLUGI CONFIGURE_ARGS+= --cc="${CC}" --cxx="${CXX}" --add-cflags=-I${VDRDIR} .if ${PORT_OPTIONS:MLIBEXTRACTOR} -LIB_DEPENDS+= extractor:${PORTSDIR}/textproc/libextractor +LIB_DEPENDS+= libextractor.so:${PORTSDIR}/textproc/libextractor .else CONFIGURE_ARGS+= --disable-libextractor .endif .if ${PORT_OPTIONS:MLIBBLURAY} -LIB_DEPENDS+= bluray:${PORTSDIR}/multimedia/libbluray +LIB_DEPENDS+= libbluray.so:${PORTSDIR}/multimedia/libbluray .else CONFIGURE_ARGS+= --disable-libbluray .endif @@ -59,19 +58,20 @@ post-patch: post-patch-plugin ${TOUCH} -t 200001010000 ${WRKSRC}/nosignal_720x576.c \ ${WRKSRC}/black_720x576.c ${WRKSRC}/vdrlogo_720x576.c +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr + post-install: post-install-pluginlocales - @${INSTALL} -o ${VDR_USER} -g ${VDR_GROUP} -d ${PREFIX}/etc/vdr/plugins/${PLUGIN} - @${INSTALL_DATA} ${WRKSRC}/examples/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} ${WRKSRC}/examples/allowed_hosts.conf ${PREFIX}/etc/vdr/plugins/${PLUGIN}; \ - fi + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN} + ${INSTALL_DATA} ${WRKSRC}/examples/allowed_hosts.conf \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/allowed_hosts.conf.sample .if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR}/xine - ${INSTALL_DATA} ${FILESDIR}/keymap ${EXAMPLESDIR}/xine + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/xine + ${INSTALL_DATA} ${FILESDIR}/keymap ${STAGEDIR}${EXAMPLESDIR}/xine .endif .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .endif .include <bsd.port.post.mk> Modified: head/multimedia/vdr-plugin-xineliboutput/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-xineliboutput/files/patch-Makefile Sat Mar 1 10:52:55 2014 (r346614) +++ head/multimedia/vdr-plugin-xineliboutput/files/patch-Makefile Sat Mar 1 12:21:13 2014 (r346615) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403011221.s21CLENo053059>