- 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)

4 files changed, 20 insertions, 16 deletions

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