3 files changed, 27 insertions, 81 deletions

diff --git a/print/gsfonts/Makefile b/print/gsfonts/Makefile
index a06a5f865cfa..1bae0ab3d26d 100644
--- a/print/gsfonts/Makefile
+++ b/print/gsfonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gsfonts
 PORTVERSION=	8.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print x11-fonts
 MASTER_SITES=	ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/ \
 		${MASTER_SITE_TEX_CTAN:S/$/:CTAN/}
@@ -15,74 +15,40 @@ MASTER_SITE_SUBDIR=	support/ghostscript/fonts/:CTAN
 DISTFILES=	${GS_FONTS_STD:S/$/:DEFAULT,CTAN/} ${GS_FONTS_OTHER:S/$/:DEFAULT,CTAN/}
 DIST_SUBDIR=	ghostscript
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Fonts used by GNU Ghostscript (or X)
+MAINTAINER=	doceng@FreeBSD.org
+COMMENT=	Standard Fonts for Ghostscript
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 
-SUB_FILES=	pkg-message
-SUB_LIST=	FONTSDIR="${FONTSDIR}"
+PORTDOCS=	ChangeLog README README.tweaks TODO
 
-#
-# Local variables
-#
-
-FONTSDIR?=	${PREFIX}/share/ghostscript/fonts
+FONTSDIR=	${PREFIX}/share/ghostscript/fonts
 GS_FONTS_STD=	ghostscript-fonts-std-8.11.tar.gz
 GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
-CJKFONTS?=	TrueType/ipam.ttf Ryumin-Light.ttf \
-		TrueType/ipag.ttf GothicBBB-Medium.ttf \
-		TrueType/bkai00mp.ttf STHeiti-Regular.ttf \
-		TrueType/gbsn00lp.ttf STSong-Light.ttf \
-		TrueType/bsmi00lp.ttf MSung-Light.ttf
-.SILENT:
-
-post-patch:
-	${CP} ${WRKSRC}/fonts/fonts.scale ${WRKSRC}/fonts/fonts.scale.urw
-	${CP} ${FILESDIR}/fonts.scale ${WRKSRC}/fonts/fonts.scale
-	${CP} ${FILESDIR}/fonts.scale ${WRKSRC}/fonts/fonts.dir
-	${CP} ${FILESDIR}/Fontmap ${WRKSRC}/fonts/Fontmap
+CJKFONTS?=	std.ja_JP/Ryumin-Light \
+		std.ja_JP/GothicBBB-Medium \
+		std.zh_CN/STHeiti-Regular \
+		std.zh_CN/STSong-Light \
+		std.zh_CN/MSung-Light
 
-#
-# Install
-#
-
-do-install: install-fonts install-docs display-message
-
-install-fonts:
+do-install:
 	${MKDIR} ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/COPYING ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/*.afm ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/*.gsf ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/*.pfa ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/*.pfb ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/*.pfm ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/fonts.dir ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/fonts.scale ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/fonts.scale.urw ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/Fontmap ${FONTSDIR}
-	set -- ${CJKFONTS}; while :; do \
-	case $$# in \
-	0) break ;; \
-	*) LHS=$$1; shift; RHS=$$1; shift; \
-		cd ${FONTSDIR} \
-		&& ${LN} -s -f ${PREFIX}/share/fonts/$${LHS} $${RHS}; \
-	esac; \
+	cd ${WRKSRC}/fonts && \
+		${INSTALL_DATA} fonts.dir COPYING \
+			*.afm *.gsf *.pfa *.pfb *.pfm ${FONTSDIR}/ \
+		&& ${INSTALL_DATA} fonts.scale ${FONTSDIR}/fonts.scale.urw
+	cd ${FILESDIR} && \
+		${INSTALL_DATA} fonts.scale Fontmap ${FONTSDIR}/
+	for F in ${CJKFONTS}; do \
+		${LN} -s -f ${PREFIX}/share/fonts/$${F} ${FONTSDIR}/; \
 	done
 
-install-docs:
 .if !defined(NOPORTDOCS)
+post-install:
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/ChangeLog ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/README.tweaks ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/TODO ${DOCSDIR}
+	cd ${WRKSRC}/fonts && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-display-message:
-	${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/print/gsfonts/files/pkg-message.in b/print/gsfonts/files/pkg-message.in
deleted file mode 100644
index 36b5a77fe8d0..000000000000
--- a/print/gsfonts/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-===========================================================================
-
-IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these
-fonts before using.  The copyright can be found at %%FONTSDIR%%/COPYING.
-To use these fonts, follow the instructions below.
-
-Make sure that the freetype module is loaded.  If it is not, add the
-following line to the "Modules" section of XF86Config:
-
-	Load "freetype"
-
-Add the following line to the "Files" section of XF86Config:
-
-	FontPath "%%FONTSDIR%%/"
-
-===========================================================================
diff --git a/print/gsfonts/pkg-plist b/print/gsfonts/pkg-plist
index 37445171f8e5..2ab348a8f820 100644
--- a/print/gsfonts/pkg-plist
+++ b/print/gsfonts/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 %%FONTSDIR%%/COPYING
 %%FONTSDIR%%/Fontmap
 %%FONTSDIR%%/a010013l.afm
@@ -152,15 +153,10 @@
 %%FONTSDIR%%/z003034l.afm
 %%FONTSDIR%%/z003034l.pfb
 %%FONTSDIR%%/z003034l.pfm
-%%FONTSDIR%%/Ryumin-Light.ttf
-%%FONTSDIR%%/GothicBBB-Medium.ttf
-%%FONTSDIR%%/STHeiti-Regular.ttf
-%%FONTSDIR%%/STSong-Light.ttf
-%%FONTSDIR%%/MSung-Light.ttf
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.tweaks
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%FONTSDIR%%/Ryumin-Light
+%%FONTSDIR%%/GothicBBB-Medium
+%%FONTSDIR%%/STHeiti-Regular
+%%FONTSDIR%%/STSong-Light
+%%FONTSDIR%%/MSung-Light
 @dirrm %%FONTSDIR%%
 @dirrmtry share/ghostscript