From c0f21daf1d159f288b1382d441e0cd556f0e6b4c Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Wed, 14 May 2003 21:06:40 +0000
Subject: Update to 2.1.2.  This wraps up a lot of our patches, and fixes some
 other rendering bugs.

---
 x11-fonts/libXft/Makefile | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'x11-fonts/libXft/Makefile')

diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index fe1bc43c6dae..b3c6e3a7541e 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	Xft
-PORTVERSION=	2.1
-PORTREVISION=	8
+PORTVERSION=	2.1.2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://fontconfig.org/fontconfig/release/
-DISTNAME=	fcpackage.${PORTVERSION:S/./_/}
+DISTNAME=	xft-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A client-sided font API for X applications
@@ -20,29 +19,18 @@ LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack gnometarget
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=	--with-fontconfig-config="pkg-config fontconfig"
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
-		LIBS="-L${X11BASE}/lib"
-WRKSRC=	${WRKDIR}/${DISTNAME}/Xft
+		LDFLAGS="-L${X11BASE}/lib"
 
 MAN3=		Xft.3
 
 .include <bsd.port.pre.mk>
 
 .if ${XFREE86_VERSION} == 3
-BROKEN=	Xft2 requires XFree86 4.x to build.
+BROKEN=	Xft requires XFree86 4.x to build.
 .endif
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in
-
-pre-install:
-	-${MKDIR} ${PREFIX}/include/X11/Xft
-
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/Xft.man ${PREFIX}/man/man3/Xft.3
-
 .include <bsd.port.post.mk>
-- 
cgit v1.2.3