diff options
| author | Juergen Lock <nox@FreeBSD.org> | 2014-03-01 12:21:13 +0000 |
|---|---|---|
| committer | Juergen Lock <nox@FreeBSD.org> | 2014-03-01 12:21:13 +0000 |
| commit | 47452dcb43fe706a104d820e5e33726758a0362a (patch) | |
| tree | 5b514c92c45cfe80c1cae5cd74f5bbac9f011628 | |
| parent | 7a2c2ce6e780ec6a01f1de55c980810b9175edce (diff) | |
| download | ports-47452dcb43fe706a104d820e5e33726758a0362a.tar.gz ports-47452dcb43fe706a104d820e5e33726758a0362a.zip | |
Notes
52 files changed, 273 insertions, 259 deletions
diff --git a/multimedia/vdr-plugin-control/Makefile b/multimedia/vdr-plugin-control/Makefile index 262b9ff36b50..d794254ce839 100644 --- a/multimedia/vdr-plugin-control/Makefile +++ b/multimedia/vdr-plugin-control/Makefile @@ -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> diff --git a/multimedia/vdr-plugin-control/files/patch-Makefile b/multimedia/vdr-plugin-control/files/patch-Makefile index df1ed41927b4..e3d3022bf5a5 100644 --- a/multimedia/vdr-plugin-control/files/patch-Makefile +++ b/multimedia/vdr-plugin-control/files/patch-Makefile @@ -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: diff --git a/multimedia/vdr-plugin-eepg/Makefile b/multimedia/vdr-plugin-eepg/Makefile index 06d5ef119ec2..093bc715c7cc 100644 --- a/multimedia/vdr-plugin-eepg/Makefile +++ b/multimedia/vdr-plugin-eepg/Makefile @@ -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> diff --git a/multimedia/vdr-plugin-eepg/files/patch-Makefile b/multimedia/vdr-plugin-eepg/files/patch-Makefile index 1da862b8cdea..0dc6a27961c8 100644 --- a/multimedia/vdr-plugin-eepg/files/patch-Makefile +++ b/multimedia/vdr-plugin-eepg/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-epgsearch/Makefile b/multimedia/vdr-plugin-epgsearch/Makefile index d762b572b0d6..4a3ceee162ba 100644 --- a/multimedia/vdr-plugin-epgsearch/Makefile +++ b/multimedia/vdr-plugin-epgsearch/Makefile @@ -12,8 +12,8 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:snapshot 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> diff --git a/multimedia/vdr-plugin-epgsearch/files/patch-Makefile b/multimedia/vdr-plugin-epgsearch/files/patch-Makefile index 7f3b80b4cac5..b51a60b220c7 100644 --- a/multimedia/vdr-plugin-epgsearch/files/patch-Makefile +++ b/multimedia/vdr-plugin-epgsearch/files/patch-Makefile @@ -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 diff --git a/multimedia/vdr-plugin-extrecmenu/Makefile b/multimedia/vdr-plugin-extrecmenu/Makefile index 48dd6ca5d162..8f555fb779db 100644 --- a/multimedia/vdr-plugin-extrecmenu/Makefile +++ b/multimedia/vdr-plugin-extrecmenu/Makefile @@ -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> diff --git a/multimedia/vdr-plugin-extrecmenu/files/patch-Makefile b/multimedia/vdr-plugin-extrecmenu/files/patch-Makefile index 8ed76494d5ef..dd117afa657a 100644 --- a/multimedia/vdr-plugin-extrecmenu/files/patch-Makefile +++ b/multimedia/vdr-plugin-extrecmenu/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-femon/Makefile b/multimedia/vdr-plugin-femon/Makefile index edfaee0fc839..1b777239348e 100644 --- a/multimedia/vdr-plugin-femon/Makefile +++ b/multimedia/vdr-plugin-femon/Makefile @@ -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> diff --git a/multimedia/vdr-plugin-femon/files/patch-Makefile b/multimedia/vdr-plugin-femon/files/patch-Makefile index d7e349515791..bccb4ce1170c 100644 --- a/multimedia/vdr-plugin-femon/files/patch-Makefile +++ b/multimedia/vdr-plugin-femon/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-infosatepg/Makefile b/multimedia/vdr-plugin-infosatepg/Makefile index f7bd39ecbf7b..3147b6bbfcf4 100644 --- a/multimedia/vdr-plugin-infosatepg/Makefile +++ b/multimedia/vdr-plugin-infosatepg/Makefile @@ -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> diff --git a/multimedia/vdr-plugin-infosatepg/files/patch-Makefile b/multimedia/vdr-plugin-infosatepg/files/patch-Makefile index 442e90a98803..75f98bc8f2c5 100644 --- a/multimedia/vdr-plugin-infosatepg/files/patch-Makefile +++ b/multimedia/vdr-plugin-infosatepg/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-iptv/Makefile b/multimedia/vdr-plugin-iptv/Makefile index 7a1d30a42046..1fc8e674583c 100644 --- a/multimedia/vdr-plugin-iptv/Makefile +++ b/multimedia/vdr-plugin-iptv/Makefile @@ -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> diff --git a/multimedia/vdr-plugin-iptv/files/patch-Makefile b/multimedia/vdr-plugin-iptv/files/patch-Makefile index b45e1b1645ad..8099e1af3ea3 100644 --- a/multimedia/vdr-plugin-iptv/files/patch-Makefile +++ b/multimedia/vdr-plugin-iptv/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-markad/Makefile b/multimedia/vdr-plugin-markad/Makefile index 3dea5fca1fe5..3c135537571f 100644 --- a/multimedia/vdr-plugin-markad/Makefile +++ b/multimedia/vdr-plugin-markad/Makefile @@ -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/Makefile ${WRKSRC}/plugin/Makefile 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> diff --git a/multimedia/vdr-plugin-markad/files/patch-command-Makefile b/multimedia/vdr-plugin-markad/files/patch-command-Makefile index 0d9c33552bde..a2982c81f707 100644 --- a/multimedia/vdr-plugin-markad/files/patch-command-Makefile +++ b/multimedia/vdr-plugin-markad/files/patch-command-Makefile @@ -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 diff --git a/multimedia/vdr-plugin-markad/files/patch-plugin-Makefile b/multimedia/vdr-plugin-markad/files/patch-plugin-Makefile index 948b589939c7..528e9cc30d1a 100644 --- a/multimedia/vdr-plugin-markad/files/patch-plugin-Makefile +++ b/multimedia/vdr-plugin-markad/files/patch-plugin-Makefile @@ -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 diff --git a/multimedia/vdr-plugin-markad/pkg-plist b/multimedia/vdr-plugin-markad/pkg-plist index 022b5e006971..aa52462031e4 100644 --- a/multimedia/vdr-plugin-markad/pkg-plist +++ b/multimedia/vdr-plugin-markad/pkg-plist @@ -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 diff --git a/multimedia/vdr-plugin-osdpip/Makefile b/multimedia/vdr-plugin-osdpip/Makefile index 9c9500b828bb..041d872437b8 100644 --- a/multimedia/vdr-plugin-osdpip/Makefile +++ b/multimedia/vdr-plugin-osdpip/Makefile @@ -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> diff --git a/multimedia/vdr-plugin-osdpip/files/patch-Makefile b/multimedia/vdr-plugin-osdpip/files/patch-Makefile index 70d9b1e7c8ff..69ad8ea22094 100644 --- a/multimedia/vdr-plugin-osdpip/files/patch-Makefile +++ b/multimedia/vdr-plugin-osdpip/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-osdteletext/Makefile b/multimedia/vdr-plugin-osdteletext/Makefile index d75cd253357c..52fcf16d7650 100644 --- a/multimedia/vdr-plugin-osdteletext/Makefile +++ b/multimedia/vdr-plugin-osdteletext/Makefile @@ -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> diff --git a/multimedia/vdr-plugin-osdteletext/files/patch-Makefile b/multimedia/vdr-plugin-osdteletext/files/patch-Makefile index 6aaa8ca6b801..211175d7efb0 100644 --- a/multimedia/vdr-plugin-osdteletext/files/patch-Makefile +++ b/multimedia/vdr-plugin-osdteletext/files/patch-Makefile @@ -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 diff --git a/multimedia/vdr-plugin-reelchannelscan/Makefile b/multimedia/vdr-plugin-reelchannelscan/Makefile index 67665c60ceb7..247100028a15 100644 --- a/multimedia/vdr-plugin-reelchannelscan/Makefile +++ b/multimedia/vdr-plugin-reelchannelscan/Makefile @@ -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> diff --git a/multimedia/vdr-plugin-reelchannelscan/files/patch-Makefile b/multimedia/vdr-plugin-reelchannelscan/files/patch-Makefile index 0ccec398a86f..e39e774839dc 100644 --- a/multimedia/vdr-plugin-reelchannelscan/files/patch-Makefile +++ b/multimedia/vdr-plugin-reelchannelscan/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-remote/Makefile b/multimedia/vdr-plugin-remote/Makefile index 89fee968ef0e..336faa536659 100644 --- a/multimedia/vdr-plugin-remote/Makefile +++ b/multimedia/vdr-plugin-remote/Makefile @@ -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> diff --git a/multimedia/vdr-plugin-remote/files/patch-Makefile b/multimedia/vdr-plugin-remote/files/patch-Makefile index 59b7603187c4..45e0d87e4b88 100644 --- a/multimedia/vdr-plugin-remote/files/patch-Makefile +++ b/multimedia/vdr-plugin-remote/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-skinenigmang/Makefile b/multimedia/vdr-plugin-skinenigmang/Makefile index 0f3d0b0a2a85..52eef7588bdd 100644 --- a/multimedia/vdr-plugin-skinenigmang/Makefile +++ b/multimedia/vdr-plugin-skinenigmang/Makefile @@ -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> diff --git a/multimedia/vdr-plugin-skinenigmang/files/patch-Makefile b/multimedia/vdr-plugin-skinenigmang/files/patch-Makefile index 911e0b4e70fe..dd5c05629b8d 100644 --- a/multimedia/vdr-plugin-skinenigmang/files/patch-Makefile +++ b/multimedia/vdr-plugin-skinenigmang/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-sleeptimer/Makefile b/multimedia/vdr-plugin-sleeptimer/Makefile index 24bb46c923d0..88939a4ede72 100644 --- a/multimedia/vdr-plugin-sleeptimer/Makefile +++ b/multimedia/vdr-plugin-sleeptimer/Makefile @@ -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> diff --git a/multimedia/vdr-plugin-sleeptimer/files/patch-Makefile b/multimedia/vdr-plugin-sleeptimer/files/patch-Makefile index 3a230caa2e85..2c7d45c57184 100644 --- a/multimedia/vdr-plugin-sleeptimer/files/patch-Makefile +++ b/multimedia/vdr-plugin-sleeptimer/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-softhddevice/Makefile b/multimedia/vdr-plugin-softhddevice/Makefile index 381006bf26dc..bf34df775360 100644 --- a/multimedia/vdr-plugin-softhddevice/Makefile +++ b/multimedia/vdr-plugin-softhddevice/Makefile @@ -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 (experimental) .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> diff --git a/multimedia/vdr-plugin-softhddevice/files/patch-Makefile b/multimedia/vdr-plugin-softhddevice/files/patch-Makefile index ac5b0ca2cac1..56ebb35b5d3d 100644 --- a/multimedia/vdr-plugin-softhddevice/files/patch-Makefile +++ b/multimedia/vdr-plugin-softhddevice/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-streamdev/Makefile b/multimedia/vdr-plugin-streamdev/Makefile index 7fe4910dd8c2..cbee81a5e59d 100644 --- a/multimedia/vdr-plugin-streamdev/Makefile +++ b/multimedia/vdr-plugin-streamdev/Makefile @@ -23,7 +23,6 @@ WRKSRC= ${WRKDIR}/${PLUGIN}-${PORTVERSION} 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> diff --git a/multimedia/vdr-plugin-streamdev/files/patch-Makefile b/multimedia/vdr-plugin-streamdev/files/patch-Makefile index bc7db13a2d09..ebe57386cdc5 100644 --- a/multimedia/vdr-plugin-streamdev/files/patch-Makefile +++ b/multimedia/vdr-plugin-streamdev/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-ttxtsubs/Makefile b/multimedia/vdr-plugin-ttxtsubs/Makefile index 8056e3346623..fbf96b8d9b73 100644 --- a/multimedia/vdr-plugin-ttxtsubs/Makefile +++ b/multimedia/vdr-plugin-ttxtsubs/Makefile @@ -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> diff --git a/multimedia/vdr-plugin-ttxtsubs/files/patch-Makefile b/multimedia/vdr-plugin-ttxtsubs/files/patch-Makefile index f8839ad70cfb..b54f465bdcd1 100644 --- a/multimedia/vdr-plugin-ttxtsubs/files/patch-Makefile +++ b/multimedia/vdr-plugin-ttxtsubs/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-upnp/Makefile b/multimedia/vdr-plugin-upnp/Makefile index 726023e295e5..6a166500f47a 100644 --- a/multimedia/vdr-plugin-upnp/Makefile +++ b/multimedia/vdr-plugin-upnp/Makefile @@ -26,7 +26,6 @@ WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION:S/a2//} 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> diff --git a/multimedia/vdr-plugin-upnp/files/patch-Makefile b/multimedia/vdr-plugin-upnp/files/patch-Makefile index 3576ae999cc7..c994c2c2d778 100644 --- a/multimedia/vdr-plugin-upnp/files/patch-Makefile +++ b/multimedia/vdr-plugin-upnp/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-vdrmanager/Makefile b/multimedia/vdr-plugin-vdrmanager/Makefile index 59ae60b65ead..79dbbc4133ce 100644 --- a/multimedia/vdr-plugin-vdrmanager/Makefile +++ b/multimedia/vdr-plugin-vdrmanager/Makefile @@ -14,17 +14,18 @@ COMMENT= Video Disk Recorder - VDR-Manager server plugin 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> diff --git a/multimedia/vdr-plugin-vdrmanager/files/patch-Makefile b/multimedia/vdr-plugin-vdrmanager/files/patch-Makefile index c1c4550ecc81..0eac21c279ab 100644 --- a/multimedia/vdr-plugin-vdrmanager/files/patch-Makefile +++ b/multimedia/vdr-plugin-vdrmanager/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-vnsiserver/Makefile b/multimedia/vdr-plugin-vnsiserver/Makefile index df5fa0a5c25a..5e873b1ca726 100644 --- a/multimedia/vdr-plugin-vnsiserver/Makefile +++ b/multimedia/vdr-plugin-vnsiserver/Makefile @@ -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> diff --git a/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile b/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile index e2c5946790fa..9dfec422d9cc 100644 --- a/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile +++ b/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-wirbelscan/Makefile b/multimedia/vdr-plugin-wirbelscan/Makefile index b51f9fd1e735..26563045011f 100644 --- a/multimedia/vdr-plugin-wirbelscan/Makefile +++ b/multimedia/vdr-plugin-wirbelscan/Makefile @@ -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> diff --git a/multimedia/vdr-plugin-wirbelscan/files/patch-Makefile b/multimedia/vdr-plugin-wirbelscan/files/patch-Makefile index fa0a8e115701..6529121a74e6 100644 --- a/multimedia/vdr-plugin-wirbelscan/files/patch-Makefile +++ b/multimedia/vdr-plugin-wirbelscan/files/patch-Makefile @@ -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) diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile index e5fbc7271531..56d53ae2778f 100644 --- a/multimedia/vdr-plugin-xineliboutput/Makefile +++ b/multimedia/vdr-plugin-xineliboutput/Makefile @@ -14,10 +14,10 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:snapshot 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_PLUGINSDIR} 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> diff --git a/multimedia/vdr-plugin-xineliboutput/files/patch-Makefile b/multimedia/vdr-plugin-xineliboutput/files/patch-Makefile index 22f253842162..510b1084a45d 100644 --- a/multimedia/vdr-plugin-xineliboutput/files/patch-Makefile +++ b/multimedia/vdr-plugin-xineliboutput/files/patch-Makefile @@ -24,15 +24,51 @@ ### -@@ -410,7 +408,7 @@ ifeq ($(XINELIBOUTPUT_VDRPLUGIN), yes) - @echo Installing $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN) - @mkdir -p $(DESTDIR)$(LIBDIR) - @-rm -rf $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN) +@@ -410,10 +410,10 @@ ifeq ($(XINELIBOUTPUT_XINEPLUGIN), yes) + endif + ifeq ($(XINELIBOUTPUT_VDRPLUGIN), yes) + ifeq ($(VDR_TREE), no) +- @echo Installing $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN) +- @mkdir -p $(DESTDIR)$(LIBDIR) +- @-rm -rf $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN) - @$(INSTALL) -D -m 0755 $(VDRPLUGIN) $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN) -+ @$(INSTALL) -m 0755 $(VDRPLUGIN) $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN) ++ @echo Installing $(LIBDIR)/$(VDRPLUGIN) ++ @mkdir -p $(LIBDIR) ++ @-rm -rf $(LIBDIR)/$(VDRPLUGIN) ++ @$(INSTALL) -m 0755 $(VDRPLUGIN) $(LIBDIR)/$(VDRPLUGIN) endif endif ifeq ($(XINELIBOUTPUT_FB), yes) +@@ -423,10 +423,10 @@ ifeq ($(XINELIBOUTPUT_FB), yes) + @$(INSTALL) -m 0755 vdr-fbfe $(DESTDIR)/$(BINDIR)/vdr-fbfe + ifeq ($(XINELIBOUTPUT_VDRPLUGIN), yes) + ifeq ($(VDR_TREE), no) +- @echo Installing $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_FBFE) +- @mkdir -p $(DESTDIR)$(LIBDIR) +- @-rm -rf $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_FBFE) +- @$(INSTALL) -m 0755 $(VDRPLUGIN_FBFE) $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_FBFE) ++ @echo Installing $(LIBDIR)/$(VDRPLUGIN_FBFE) ++ @mkdir -p $(LIBDIR) ++ @-rm -rf $(LIBDIR)/$(VDRPLUGIN_FBFE) ++ @$(INSTALL) -m 0755 $(VDRPLUGIN_FBFE) $(LIBDIR)/$(VDRPLUGIN_FBFE) + endif + endif + endif +@@ -437,10 +437,10 @@ ifeq ($(XINELIBOUTPUT_X11), yes) + @$(INSTALL) -m 0755 vdr-sxfe $(DESTDIR)/$(BINDIR)/vdr-sxfe + ifeq ($(XINELIBOUTPUT_VDRPLUGIN), yes) + ifeq ($(VDR_TREE), no) +- @echo Installing $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_SXFE) +- @mkdir -p $(DESTDIR)$(LIBDIR) +- @-rm -rf $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_SXFE) +- @$(INSTALL) -m 0755 $(VDRPLUGIN_SXFE) $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_SXFE) ++ @echo Installing $(LIBDIR)/$(VDRPLUGIN_SXFE) ++ @mkdir -p $(LIBDIR) ++ @-rm -rf $(LIBDIR)/$(VDRPLUGIN_SXFE) ++ @$(INSTALL) -m 0755 $(VDRPLUGIN_SXFE) $(LIBDIR)/$(VDRPLUGIN_SXFE) + endif + endif + endif @@ -441,6 +439,11 @@ ifeq ($(XINELIBOUTPUT_X11), yes) endif endif diff --git a/multimedia/vdr-plugin-xvdr/Makefile b/multimedia/vdr-plugin-xvdr/Makefile index 05e74a2f67fc..ba95d20186b7 100644 --- a/multimedia/vdr-plugin-xvdr/Makefile +++ b/multimedia/vdr-plugin-xvdr/Makefile @@ -17,20 +17,18 @@ HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/pipelka-${PORTNAME}-${GITHASH} -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} - @${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}; \ - fi -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN} + ${INSTALL_DATA} ${WRKSRC}/${PLUGIN}/allowed_hosts.conf \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/allowed_hosts.conf.sample + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> diff --git a/multimedia/vdr-plugin-xvdr/files/patch-Makefile b/multimedia/vdr-plugin-xvdr/files/patch-Makefile index ab221cdf52f5..559f7a28f8e6 100644 --- a/multimedia/vdr-plugin-xvdr/files/patch-Makefile +++ b/multimedia/vdr-plugin-xvdr/files/patch-Makefile @@ -6,4 +6,4 @@ install: - @install -d ../../man - @install README ../../man/$(PLUGIN).man -+ ${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) diff --git a/multimedia/vdr-plugins/Makefile b/multimedia/vdr-plugins/Makefile index 78aaf1c6f4cb..edb7e7b5aa1e 100644 --- a/multimedia/vdr-plugins/Makefile +++ b/multimedia/vdr-plugins/Makefile @@ -3,6 +3,7 @@ PORTNAME= vdr-plugins PORTVERSION= 1.7.29 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= # none DISTFILES= # none @@ -48,10 +49,9 @@ MARKAD_DESC= MarkAd plugin OPTIONS_DEFAULT= CONTROL EPGSEARCH FEMON INFOSATEPG IPTV OSDPIP \ OSDTELETEXT REELSCAN REMOTE SKINENIGMANG STREAMDEV \ - TTXTSUBS WIRBELSCAN XINELIBOUTPUT LIVE UPNP \ - SLEEPTIMER XVDR EEPG VDRMANAGER SOFTHDDEVICE EXTRECMENU + TTXTSUBS WIRBELSCAN XINELIBOUTPUT LIVE \ + SLEEPTIMER EEPG VDRMANAGER EXTRECMENU VNSISERVER -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MCONTROL} diff --git a/www/vdr-plugin-live/Makefile b/www/vdr-plugin-live/Makefile index 99c161eaddd7..f29365985648 100644 --- a/www/vdr-plugin-live/Makefile +++ b/www/vdr-plugin-live/Makefile @@ -23,8 +23,6 @@ MAKE_ARGS+= INCLUDES="-I$(LOCALBASE)/include -I${WRKSRC}" MAKE_ARGS+= PREFIX="${PREFIX}" USES= compiler:features -NO_STAGE= yes - .include "${.CURDIR}/../../multimedia/vdr/Makefile.plugins" .include <bsd.port.pre.mk> @@ -37,16 +35,15 @@ EXTRA_PATCH_STRIP= -p1 post-patch: post-patch-plugin ${CP} ${FILESDIR}/gen_version_suffix.h ${WRKSRC} -pre-su-install: - ${MKDIR} ${PREFIX}/lib/vdr +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr post-install: post-install-pluginlocales - (cd ${WRKSRC}/${PLUGIN} && \ - ${COPYTREE_SHARE} \* ${PREFIX}/etc/vdr/plugins/${PLUGIN} ) - ${CHOWN} -R ${VDR_USER}:${VDR_GROUP} ${PREFIX}/etc/vdr/plugins/${PLUGIN} + (cd ${WRKSRC}/${PLUGIN} && ${COPYTREE_SHARE} \* \ + ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN} ) .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> diff --git a/www/vdr-plugin-live/files/patch-Makefile b/www/vdr-plugin-live/files/patch-Makefile index 5fee58e207b2..51a406566295 100644 --- a/www/vdr-plugin-live/files/patch-Makefile +++ b/www/vdr-plugin-live/files/patch-Makefile @@ -31,7 +31,7 @@ @-rm -f $(VERSIONSUFFIX) +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) + .PRECIOUS: $(I18Npo) diff --git a/www/vdr-plugin-live/pkg-plist b/www/vdr-plugin-live/pkg-plist index c52155602bce..aad9895af846 100644 --- a/www/vdr-plugin-live/pkg-plist +++ b/www/vdr-plugin-live/pkg-plist @@ -150,6 +150,7 @@ etc/vdr/plugins/live/themes/veltliner/img/logo.png etc/vdr/plugins/live/themes/veltliner/img/logo_login.png etc/vdr/plugins/live/themes/veltliner/img/menu_line_bg.png etc/vdr/plugins/live/themes/veltliner/img/zap.png +@exec chown -R %%VDR_USER%%:%%VDR_GROUP%% %D/etc/vdr/plugins/live @dirrm etc/vdr/plugins/live/css @dirrm etc/vdr/plugins/live/img @dirrm etc/vdr/plugins/live/js/live |