svn commit: r516436 - in head: graphics/vapoursynth-fmtconv graphics/vapoursynth-waifu2x-w2xc multimedia/vapoursynth-l-smash-works

[Jan Beich]

Author: jbeich
Date: Sun Nov  3 15:52:34 2019
New Revision: 516436
URL: https://svnweb.freebsd.org/changeset/ports/516436

Log:
  multimedia/vapoursynth-*: stop using %%FOO%% outside of pkg-plist

Modified:
  head/graphics/vapoursynth-fmtconv/Makefile   (contents, props changed)
  head/graphics/vapoursynth-waifu2x-w2xc/Makefile   (contents, props changed)
  head/multimedia/vapoursynth-l-smash-works/Makefile   (contents, props changed)

Modified: head/graphics/vapoursynth-fmtconv/Makefile
==============================================================================
--- head/graphics/vapoursynth-fmtconv/Makefile	Sun Nov  3 15:52:21 2019	(r516435)
+++ head/graphics/vapoursynth-fmtconv/Makefile	Sun Nov  3 15:52:34 2019	(r516436)
@@ -30,7 +30,7 @@ CPPFLAGS+=	`pkg-config vapoursynth --cflags`
 INSTALL_TARGET=	install-strip
 DATADIR=	${PREFIX}/lib/vapoursynth
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
-PLIST_FILES=	%%DATADIR%%/libfmtconv.so
+PORTDATA=	lib${PORTNAME}.so
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS

Modified: head/graphics/vapoursynth-waifu2x-w2xc/Makefile
==============================================================================
--- head/graphics/vapoursynth-waifu2x-w2xc/Makefile	Sun Nov  3 15:52:21 2019	(r516435)
+++ head/graphics/vapoursynth-waifu2x-w2xc/Makefile	Sun Nov  3 15:52:34 2019	(r516436)
@@ -30,8 +30,7 @@ MAKEFILE=	GNUmakefile
 MAKE_ARGS=	STRIP="${STRIP_CMD}"
 DATADIR=	${PREFIX}/lib/vapoursynth
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
-PLIST_FILES=	%%DATADIR%%/libwaifu2x-w2xc.so
-PORTDATA=	models
+PORTDATA=	lib${PORTNAME}.so models
 PORTDOCS=	*.md
 
 OPTIONS_DEFINE=	DOCS
@@ -44,7 +43,7 @@ post-patch:
 
 post-install:
 	(cd ${WRKSRC}/Waifu2x-w2xc && ${COPYTREE_SHARE} \
-		"${PORTDATA}" ${STAGEDIR}${DATADIR})
+		"${PORTDATA:N*.so}" ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 

Modified: head/multimedia/vapoursynth-l-smash-works/Makefile
==============================================================================
--- head/multimedia/vapoursynth-l-smash-works/Makefile	Sun Nov  3 15:52:21 2019	(r516435)
+++ head/multimedia/vapoursynth-l-smash-works/Makefile	Sun Nov  3 15:52:34 2019	(r516436)
@@ -40,8 +40,8 @@ CPPFLAGS+=	`pkg-config vapoursynth --cflags`
 USE_LDCONFIG=	yes
 DATADIR=	${PREFIX}/lib/vapoursynth
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
-PLIST_FILES=	lib/libvslsmashsource.so.${PORTVERSION:E} \
-		%%DATADIR%%/libvslsmashsource.so
+PLIST_FILES=	lib/libvslsmashsource.so.${PORTVERSION:E}
+PORTDATA=	libvslsmashsource.so
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
@@ -54,6 +54,8 @@ post-patch:
 	@${REINPLACE_CMD} 's/ -msse2 -g0//' ${WRKSRC}/${MAKEFILE}
 
 post-install:
+	${RLN} ${STAGEDIR}${PREFIX}/lib/libvslsmashsource.so.${PORTVERSION:E} \
+		${STAGEDIR}${DATADIR}/libvslsmashsource.so
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})