3 files changed, 37 insertions, 40 deletions

diff --git a/x11-fonts/dejavu/Makefile b/x11-fonts/dejavu/Makefile
index 75b6eac7afb5..f0a85e3fbb2d 100644
--- a/x11-fonts/dejavu/Makefile
+++ b/x11-fonts/dejavu/Makefile
@@ -7,37 +7,33 @@
 #
 
 PORTNAME=	dejavu
-DISTVERSION=	2.31
+PORTVERSION=	2.31
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-fonts-ttf-${DISTVERSION}
+DISTNAME=	${PORTNAME}-fonts-ttf-${PORTVERSION}
 
-MAINTAINER=	naddy@FreeBSD.org
+MAINTAINER=	sunpoet@sunpoet.net
 COMMENT=	Bitstream Vera Fonts clone with a wider range of characters
 
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_BZIP2=	yes
 NO_BUILD=	yes
-PORTDOCS=	README status.txt unicover.txt langcover.txt
-PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}/"
-MSG_FILE=	${PKGDIR}/pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-FONTNAME=	${PORTNAME}
-FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTNAME}
+USE_BZIP2=	yes
 
-post-patch:
-	${SED} 's|%%FONTSDIR%%|${FONTSDIR}|g' ${MSG_FILE} > ${PKGMESSAGE}
+FONTSDIR=	${PREFIX}/${FONTSDIR_REL}
+FONTSDIR_REL?=	lib/X11/fonts/${PORTNAME}
+PLIST_SUB=	FONTSDIR_REL=${FONTSDIR_REL}
+PORTDOCS=	README langcover.txt status.txt unicover.txt
+SUB_FILES=	pkg-message
+SUB_LIST=	FONTSDIR=${FONTSDIR}
 
 do-install:
-	${MKDIR} ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${FONTSDIR}
+	@${MKDIR} ${FONTSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${FONTSDIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
+	@${MKDIR} ${DOCSDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 post-install:
diff --git a/x11-fonts/dejavu/pkg-message b/x11-fonts/dejavu/files/pkg-message.in
index f2c54fcf0dc6..f2c54fcf0dc6 100644
--- a/x11-fonts/dejavu/pkg-message
+++ b/x11-fonts/dejavu/files/pkg-message.in
diff --git a/x11-fonts/dejavu/pkg-plist b/x11-fonts/dejavu/pkg-plist
index 731128d35de1..21928797e749 100644
--- a/x11-fonts/dejavu/pkg-plist
+++ b/x11-fonts/dejavu/pkg-plist
@@ -1,22 +1,23 @@
-%%FONTSDIR%%/DejaVuSans-Bold.ttf
-%%FONTSDIR%%/DejaVuSans-BoldOblique.ttf
-%%FONTSDIR%%/DejaVuSans-ExtraLight.ttf
-%%FONTSDIR%%/DejaVuSans-Oblique.ttf
-%%FONTSDIR%%/DejaVuSans.ttf
-%%FONTSDIR%%/DejaVuSansCondensed-Bold.ttf
-%%FONTSDIR%%/DejaVuSansCondensed-BoldOblique.ttf
-%%FONTSDIR%%/DejaVuSansCondensed-Oblique.ttf
-%%FONTSDIR%%/DejaVuSansCondensed.ttf
-%%FONTSDIR%%/DejaVuSansMono-Bold.ttf
-%%FONTSDIR%%/DejaVuSansMono-BoldOblique.ttf
-%%FONTSDIR%%/DejaVuSansMono-Oblique.ttf
-%%FONTSDIR%%/DejaVuSansMono.ttf
-%%FONTSDIR%%/DejaVuSerif-Bold.ttf
-%%FONTSDIR%%/DejaVuSerif-BoldItalic.ttf
-%%FONTSDIR%%/DejaVuSerif-Italic.ttf
-%%FONTSDIR%%/DejaVuSerif.ttf
-%%FONTSDIR%%/DejaVuSerifCondensed-Bold.ttf
-%%FONTSDIR%%/DejaVuSerifCondensed-BoldItalic.ttf
-%%FONTSDIR%%/DejaVuSerifCondensed-Italic.ttf
-%%FONTSDIR%%/DejaVuSerifCondensed.ttf
-@dirrm %%FONTSDIR%%
+@comment $FreeBSD$
+%%FONTSDIR_REL%%/DejaVuSans-Bold.ttf
+%%FONTSDIR_REL%%/DejaVuSans-BoldOblique.ttf
+%%FONTSDIR_REL%%/DejaVuSans-ExtraLight.ttf
+%%FONTSDIR_REL%%/DejaVuSans-Oblique.ttf
+%%FONTSDIR_REL%%/DejaVuSans.ttf
+%%FONTSDIR_REL%%/DejaVuSansCondensed-Bold.ttf
+%%FONTSDIR_REL%%/DejaVuSansCondensed-BoldOblique.ttf
+%%FONTSDIR_REL%%/DejaVuSansCondensed-Oblique.ttf
+%%FONTSDIR_REL%%/DejaVuSansCondensed.ttf
+%%FONTSDIR_REL%%/DejaVuSansMono-Bold.ttf
+%%FONTSDIR_REL%%/DejaVuSansMono-BoldOblique.ttf
+%%FONTSDIR_REL%%/DejaVuSansMono-Oblique.ttf
+%%FONTSDIR_REL%%/DejaVuSansMono.ttf
+%%FONTSDIR_REL%%/DejaVuSerif-Bold.ttf
+%%FONTSDIR_REL%%/DejaVuSerif-BoldItalic.ttf
+%%FONTSDIR_REL%%/DejaVuSerif-Italic.ttf
+%%FONTSDIR_REL%%/DejaVuSerif.ttf
+%%FONTSDIR_REL%%/DejaVuSerifCondensed-Bold.ttf
+%%FONTSDIR_REL%%/DejaVuSerifCondensed-BoldItalic.ttf
+%%FONTSDIR_REL%%/DejaVuSerifCondensed-Italic.ttf
+%%FONTSDIR_REL%%/DejaVuSerifCondensed.ttf
+@dirrm %%FONTSDIR_REL%%