From 259996651fd6cfd1c734f23b3f402da5740b1194 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Fri, 4 Apr 2003 16:01:55 +0000
Subject: Revert previous commit since it caused an infinite recursion loop in
 XFree86-clients.  I'll commit this to pango instead.

Requested by:	will
---
 x11-fonts/libXft/Makefile             | 12 +-----------
 x11-fonts/libXft/files/pkg-install.in |  9 ---------
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 x11-fonts/libXft/files/pkg-install.in

(limited to 'x11-fonts/libXft')

diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index 37eba1d6c816..013f972ea8d4 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Xft
 PORTVERSION=	2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://fontconfig.org/fontconfig/release/
 DISTNAME=	fcpackage.${PORTVERSION:S/./_/}
@@ -16,11 +16,6 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A client-sided font API for X applications
 
 LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
-		${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
-
-FONTSCALE=	${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
-FONTENCOD=	${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
@@ -48,10 +43,5 @@ pre-install:
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/Xft.man ${PREFIX}/man/man3/Xft.3
-	@${SED} -e 's|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \
-		> ${PKGINSTALL}
-.if !defined(PACKAGE_BUILDING)
-	 @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/libXft/files/pkg-install.in b/x11-fonts/libXft/files/pkg-install.in
deleted file mode 100644
index a45989535273..000000000000
--- a/x11-fonts/libXft/files/pkg-install.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:%%X11BASE%%/bin
-export PATH
-
-if [ "$2" = "POST-INSTALL" ]; then
-    echo "Running fc-cache to build fontconfig caches..."
-    fc-cache -f -v
-fi
-- 
cgit v1.2.3