[Midnightbsd-cvs] mports: x11-fonts/libXft: Update to 2.1.12

[ctriv at midnightbsd.org]

Log Message:
-----------
Update to 2.1.12

Modified Files:
--------------
    mports/x11-fonts/libXft:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.1.1.1 -> r1.2)
        pkg-plist (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11-fonts/libXft/pkg-plist,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-fonts/libXft/pkg-plist -Lx11-fonts/libXft/pkg-plist -u -r1.1.1.1 -r1.2
--- x11-fonts/libXft/pkg-plist
+++ x11-fonts/libXft/pkg-plist
@@ -1,9 +1,9 @@
 bin/xft-config
 include/X11/Xft/Xft.h
 include/X11/Xft/XftCompat.h
-lib/libXft.a
-lib/libXft.la
-lib/libXft.so
 lib/libXft.so.2
+lib/libXft.so
+lib/libXft.la
+lib/libXft.a
 libdata/pkgconfig/xft.pc
 @dirrm include/X11/Xft
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-fonts/libXft/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lx11-fonts/libXft/Makefile -Lx11-fonts/libXft/Makefile -u -r1.3 -r1.4
--- x11-fonts/libXft/Makefile
+++ x11-fonts/libXft/Makefile
@@ -2,38 +2,26 @@
 # Date created:		06 October 2002
 # Whom:			Joe Marcus Clarke <marcus at FreeBSD.org>
 #
+# $FreeBSD: ports/x11-fonts/libXft/Makefile,v 1.44 2007/05/19 20:29:31 flz Exp $
 # $MidnightBSD$
-# $FreeBSD: ports/x11-fonts/libXft/Makefile,v 1.39 2006/05/16 05:35:53 mezz Exp $
 #
 
 PORTNAME=	libXft
-PORTVERSION=	2.1.7
-PORTREVISION=	2
+PORTVERSION=	2.1.12
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://xlibs.freedesktop.org/release/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A client-sided font API for X applications
+LICENSE=	x11
 
-LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_XLIB=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack gnometarget
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib"
+XORG_CAT=	lib
+USE_XORG=	xproto:both xrender
 
+MAN1=		xft-config.1
 MAN3=		Xft.3
 
-.if defined(WITH_CJK)
-PATCH_SITES=    http://bsdchat.com/dist/firefly-cjk-patchset/ \
-		http://bbs.ilc.edu.tw/~chinsan/ \
-		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
-PATCHFILES+=    cjk-patch-libXft-20050716.diff.gz
-.endif
-
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-fonts/libXft/distinfo,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-fonts/libXft/distinfo -Lx11-fonts/libXft/distinfo -u -r1.1.1.1 -r1.2
--- x11-fonts/libXft/distinfo
+++ x11-fonts/libXft/distinfo
@@ -1,6 +1,3 @@
-MD5 (libXft-2.1.7.tar.bz2) = 3e311b4095283d59488b95c8bd772521
-SHA256 (libXft-2.1.7.tar.bz2) = 6c917395ecd3b39ea0e15a0ab1c89ec862a429d1e5f92de9651522bdae8abf56
-SIZE (libXft-2.1.7.tar.bz2) = 237056
-MD5 (cjk-patch-libXft-20050716.diff.gz) = 55d3b9b312643a3da07fd8ed8ecefd76
-SHA256 (cjk-patch-libXft-20050716.diff.gz) = 33b81a7df12c8c37538091482b4fd9537b1ac111e1519717bc8ad5fd6bbe4eff
-SIZE (cjk-patch-libXft-20050716.diff.gz) = 3488
+MD5 (xorg/lib/libXft-2.1.12.tar.bz2) = 1309301e2d979bd475dc58325cb8c056
+SHA256 (xorg/lib/libXft-2.1.12.tar.bz2) = 68b46f85caaf0b30c876bd983abe144c25755bee7532e8738ab7ebe29a428986
+SIZE (xorg/lib/libXft-2.1.12.tar.bz2) = 260437