Index: head/graphics/vapoursynth-fmtconv/Makefile
===================================================================
--- head/graphics/vapoursynth-fmtconv/Makefile	(revision 516435)
+++ head/graphics/vapoursynth-fmtconv/Makefile	(revision 516436)
@@ -1,47 +1,47 @@
 # $FreeBSD$
 
 PORTNAME=	fmtconv
 PORTVERSION=	r20
 PORTREVISION=	4
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	vapoursynth-
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Format conversion tools for Vapoursynth
 
 LICENSE=	WTFPL
 
 BUILD_DEPENDS=	${LOCALBASE}/include/vapoursynth/VapourSynth.h:multimedia/vapoursynth
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	https://github.com/EleonoreMizo/fmtconv/issues/8
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	EleonoreMizo
 
 USES=		autoreconf compiler:c++11-lib gmake libtool pkgconfig
 EXCLUDE=	VapourSynth.h *.txt
 EXTRACT_AFTER_ARGS=	${EXCLUDE:S,^,--exclude ,}
 WRKSRC_SUBDIR=	build/unix
 PATCH_WRKSRC=	${WRKSRC:H:H}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir="${DATADIR}"
 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
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/x86_64/&|amd64/' \
 		${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e 's/-O3 //' ${WRKSRC}/Makefile.am
 
 post-install:
 	(cd ${PATCH_WRKSRC}/doc && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/graphics/vapoursynth-waifu2x-w2xc/Makefile
===================================================================
--- head/graphics/vapoursynth-waifu2x-w2xc/Makefile	(revision 516435)
+++ head/graphics/vapoursynth-waifu2x-w2xc/Makefile	(revision 516436)
@@ -1,51 +1,50 @@
 # $FreeBSD$
 
 PORTNAME=	waifu2x-w2xc
 DISTVERSION=	r6
 PORTREVISION=	5
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	vapoursynth-
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Waifu2x (waifu2x-converter-cpp) plugin for VapourSynth
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/vapoursynth/VSHelper.h:multimedia/vapoursynth
 LIB_DEPENDS=	libw2xc.so:graphics/waifu2x-converter-cpp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	HomeOfVapourSynthEvolution
 GH_PROJECT=	VapourSynth-Waifu2x-w2xc
 
 USES=		compiler:c++11-lib gmake localbase pkgconfig
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--install="${STAGEDIR}${DATADIR}" \
 		--cxx="${CXX}" \
 		--extra-cxxflags="${CPPFLAGS} ${CXXFLAGS}" \
 		--extra-ldflags="${LDFLAGS}" \
 		--extra-libs="${LIBS}"
 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
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/\*linux\*/*/' \
 		-e 's/-O3 //; /=.*-mfpmath/d; /-msse/d' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} '/STRIP/s/-x //' ${WRKSRC}/${MAKEFILE}
 
 post-install:
 	(cd ${WRKSRC}/Waifu2x-w2xc && ${COPYTREE_SHARE} \
-		"${PORTDATA}" ${STAGEDIR}${DATADIR})
+		"${PORTDATA:N*.so}" ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/multimedia/vapoursynth-l-smash-works/Makefile
===================================================================
--- head/multimedia/vapoursynth-l-smash-works/Makefile	(revision 516435)
+++ head/multimedia/vapoursynth-l-smash-works/Makefile	(revision 516436)
@@ -1,60 +1,62 @@
 # $FreeBSD$
 
 PORTNAME=	l-smash-works
 DISTVERSION=	0.0-940 # git rev-list --count HEAD
 DISTVERSIONSUFFIX=	-g198cc78
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	vapoursynth-
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	L-SMASH source plugin for VapourSynth
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/vapoursynth/VSHelper.h:multimedia/vapoursynth
 BUILD_DEPENDS+=	ffmpeg>=3.2,1:multimedia/ffmpeg
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		liblsmash.so:multimedia/l-smash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	VFR-maniac
 GH_PROJECT=	L-SMASH-Works
 
 USES=		gmake pkgconfig shebangfix
 EXCLUDE=	VSHelper.h VSScript.h VapourSynth.h
 EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,}
 WRKSRC_SUBDIR=	VapourSynth
 SHEBANG_FILES=	configure
 bash_CMD=	${SH}
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	LD="${CC}" REV="${PORTVERSION:E}" \
 		HASH="${DISTVERSIONSUFFIX:S/^-g//}"
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--extra-cflags="${CPPFLAGS} ${CFLAGS}" \
 		--extra-ldflags="${LDFLAGS}" \
 		--extra-libs="${LIBS}"
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	STRIP="${STRIP_CMD}"
 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
 
 post-patch:
 	@${REINPLACE_CMD} -Ee '/CROSS/!s/^(CC|LD|REV|HASH)=.*/: $${&}/' \
 		-e 's/pushd/cd/; s/popd/cd -/' \
 		-e 's/-Os //; /=.*-fexcess-precision/d' \
 		${WRKSRC}/configure
 	@${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})
 
 .include <bsd.port.mk>