3 files changed, 21 insertions, 18 deletions

diff --git a/x11-fonts/font-gost/Makefile b/x11-fonts/font-gost/Makefile
index 0843becf30b1..905dc008fee4 100644
--- a/x11-fonts/font-gost/Makefile
+++ b/x11-fonts/font-gost/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gost
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://sd.ascon.ru/ftp/Public/Utils/DWG-DXF/ \
 		http://fbsd.zlonet.ru/distfiles/
@@ -22,7 +23,8 @@ USE_ZIP=	yes
 NO_BUILD=	yes
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 FONTSDIR=	${PREFIX}/lib/X11/fonts/gost
-
+SUB_FILES=	pkg-message
+SUB_LIST=	FONTSDIR=${FONTSDIR}
 WRKSRC=		${WRKDIR}/Fonts
 
 do-install:
@@ -31,14 +33,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.TTF ${FONTSDIR}
 
 post-install:
-	${ECHO_MSG} "===> Running fc-cache"
+	@${ECHO_MSG} "===> Running fc-cache"
 	-${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR}
-	${ECHO_MSG}
-	${CAT} ${PKGMESSAGE}
-	${ECHO_MSG}
-	@${ECHO_MSG} "Standart GOST font. GOST 2.304-81"
-	@${ECHO_MSG} "Pay attention to copyright issues before\
-		any commercial use this fonts."
-	@${ECHO_MSG} "Copyright (c) 1996-2010. ASCON. All Rights Reserved."
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-gost/files/pkg-message.in b/x11-fonts/font-gost/files/pkg-message.in
new file mode 100644
index 000000000000..d8ead78a7ffa
--- /dev/null
+++ b/x11-fonts/font-gost/files/pkg-message.in
@@ -0,0 +1,16 @@
+===============================================================================
+
+Standart GOST font. GOST 2.304-81
+Pay attention to copyright issues before any commercial use of this fonts.
+Copyright (c) 1996-2010. ASCON. All Rights Reserved.
+
+===============================================================================
+
+Make sure that the freetype module is loaded.  If it is not, add the following
+line to the "Modules" section of your X Windows configuration file:
+
+        Load "freetype"
+
+Add the following line to the "Files" section of X Windows configuration file:
+
+        FontPath "%%FONTSDIR%%/"
diff --git a/x11-fonts/font-gost/pkg-message b/x11-fonts/font-gost/pkg-message
deleted file mode 100644
index e9e0e7d21237..000000000000
--- a/x11-fonts/font-gost/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-Make sure that the freetype module is loaded.  If it is not, add the following
-line to the "Modules" section of your X Windows configuration file:
-
-        Load "freetype"
-
-Add the following line to the "Files" section of X Windows configuration file:
-
-        FontPath "%%FONTSDIR%%/"
-