1 files changed, 35 insertions, 118 deletions

diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile
index 7f2810493691..789e3efd7912 100644
--- a/x11-fonts/webfonts/Makefile
+++ b/x11-fonts/webfonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	webfonts
 PORTVERSION=	0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_NETBSD:S/%SUBDIR%/ms-ttf/} \
 	${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/corefonts/} \
@@ -28,162 +28,79 @@ MAINTAINER=	kkonstan@duth.gr
 COMMENT=	TrueType core fonts for the Web
 
 EXTRACT_DEPENDS=cabextract:${PORTSDIR}/archivers/cabextract
-BUILD_DEPENDS=	ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir
 
 USE_X_PREFIX=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-RUN_DEPENDS=	xfstt:${PORTSDIR}/x11-servers/Xfstt
-.endif
-
+NO_BUILD=	yes
 NO_CDROM=	"Restrictive license - cannot sell for profit"
 NO_PACKAGE=	"Restrictive license - cannot distribute in modified form"
 
 EXTRACT_CMD=		${LOCALBASE}/bin/cabextract
 EXTRACT_BEFORE_ARGS=	--lowercase --quiet
-EXTRACT_AFTER_ARGS=
-
-PLIST_SUB=	PKG_OLDXF86=${PKG_OLDXF86} \
-		PKG_NSALIAS=${PKG_NSALIAS} \
-		FONTNAME="${FONTNAME}" \
-		FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" \
-		TTFONTSDIR="${TTFONTSDIR:S|${X11BASE}/||}"
-
-MSG_FILE=	${PKGDIR}/pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-OLDXF86=
-.else
-OLDXF86=	"@comment "
-.endif
-
-.if defined(WITH_NETSCAPE_ALIASES)
-PKG_NSALIAS=
-.else
-PKG_NSALIAS=	"@comment "
-.endif
+EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
 #
 # Local variables
 #
-
 FONTNAME=	${PORTNAME}
 FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTNAME}
 TTFONTSDIR?=	${X11BASE}/lib/X11/fonts/TrueType
 
-TTMKFDIR_CMD?=	${X11BASE}/bin/ttmkfdir
-SORT?=	sort
-
-# The following are for the NS aliases, feel free to tweak them!
-FONTSIZES=	8 9 10 12 14 16 18 20 24
-FONTLIMIT=	11
+PLIST_SUB=	FONTNAME="${FONTNAME}" \
+		FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" \
+		TTFONTSDIR="${TTFONTSDIR:S|${X11BASE}/||}"
 
-.SILENT:
+MSG_FILE=	${PKGDIR}/pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
-#
-# Display options
-#
+.include <bsd.port.pre.mk>
 
-pre-everything::
-.if !defined(WITH_NETSCAPE_ALIASES)
-	${ECHO_MSG}
-	${ECHO_MSG} "If you want font aliases that work around Netscape's tiny font bug (4.x ONLY),"
-	${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_NETSCAPE_ALIASES=yes\""
-	${ECHO_MSG}
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
+RUN_DEPENDS=	xfstt:${PORTSDIR}/x11-servers/Xfstt
+PLIST_SUB+=	FCACHE="@comment " \
+		OLDXF86=""
+.else
+BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+PLIST_SUB+=	FCACHE="" \
+		OLDXF86="@comment "
 .endif
 
+.SILENT:
+
 #
 # Post-extract
 #
-
-post-extract: move-fonts rename-license remove-extras
-
-move-fonts:
-	${MKDIR} ${WRKSRC}
-	${MV} ${WRKDIR}/*.ttf ${WRKSRC}
-
-rename-license:
-	${MV} ${WRKDIR}/licen.txt ${WRKSRC}/LICENSE
-
-remove-extras:
-	${RM} -f ${WRKDIR}/*.dll ${WRKDIR}/*.exe ${WRKDIR}/*.inf
+post-extract:
+	${RM} -f ${WRKSRC}/*.dll ${WRKSRC}/*.exe ${WRKSRC}/*.inf
 
 #
 # Post-patch
 #
-
 post-patch:
 	${SED} 's|%%FONTSDIR%%|${FONTSDIR}|g' ${MSG_FILE} > ${PKGMESSAGE}
 
 #
-# Build
-#
-
-do-build: make-fonts.scale make-fonts.dir make-fonts.alias
-
-make-fonts.scale:
-	${TTMKFDIR_CMD} -c -d ${WRKSRC} | ${CAT} -n | ${SED} -e ' \
-		s,^     1,100000,; \
-		s,monotype,${FONTNAME},; \
-		s,microsoft,${FONTNAME},; \
-	' | ${SORT} -r | ${CUT} -c 8- > ${WRKSRC}/fonts.scale
-
-make-fonts.dir:
-	${CP} ${WRKSRC}/fonts.scale ${WRKSRC}/fonts.dir
-
-make-fonts.alias:
-.if defined(WITH_NETSCAPE_ALIASES)
-	${ECHO_MSG}
-	${ECHO_MSG} -n "Building aliases for Netscape..."
-	[ -t 0 ] && tty=/dev/tty || tty=/dev/null; \
-	${TAIL} +2 ${WRKSRC}/fonts.scale | ${CUT} -f 2- -d" " | \
-	while read font; do \
-		${ECHO_CMD} \"$${font}\" \"$${font}\"; \
-		for nsize in ${FONTSIZES}; do \
-			tsize=$${nsize}; \
-			[ $${tsize} -lt ${FONTLIMIT} ] && tsize=${FONTLIMIT}; \
-			${ECHO_CMD} \"$${font}\" \"$${font}\" | \
-			${SED}	-e "s,--0-0-0-0-,--$${nsize}-$${nsize}0-0-0-," \
-			      -e "s,--0-0-0-0-,--$${tsize}-$${tsize}0-75-75-," \
-			      -e "s,^\"-${FONTNAME},\"-netscape,"; \
-		done; \
-		${ECHO_MSG} -n "." > $${tty}; \
-	done | \
-	${SED} -n -e p -e "\
-		s,-Arial-,-Helvetica-,p; \
-		s,-Helvetica-,-MS Sans Serif-,p; \
-		s,-Times New Roman-,-Times-,p; \
-		s,-Courier New-,-Courier-,p; \
-	" | \
-	${SED} -e '/"\([^"]*\)" "\1"/d' > ${WRKSRC}/fonts.alias
-	${ECHO_MSG}
-.endif
-
-#
 # Install
 #
-
-do-install: install-fonts
-
-install-fonts:
-	${MKDIR} ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/* ${FONTSDIR}
+do-install:
+	${MKDIR} ${FONTSDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR}
+	${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR}
+	${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR}/fonts.scale
+	${INSTALL_DATA} ${WRKSRC}/licen.txt ${DOCSDIR}/LICENSE
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
+	${LN} -fs ${FONTSDIR} ${TTFONTSDIR}/${FONTNAME}
+.endif
 
 #
 # Post-install
 #
-
-post-install: truetype-link display-message
-
-truetype-link:
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-	${LN} -fs ${FONTSDIR} ${TTFONTSDIR}/${FONTNAME}
+post-install:
+.if ${X_WINDOW_SYSTEM:L} != xfree86-3
+	${ECHO_MSG} "===> Running fc-cache"
+	-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
 .endif
-
-display-message:
 	${ECHO_MSG}
 	${CAT} ${PKGMESSAGE}
 	${ECHO_MSG}