[src/trunk]: src/external/mit/xorg/lib/freetype obsolete pcftypes.h and link ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b5efa2e8a151
branches:  trunk
changeset: 767601:b5efa2e8a151
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Jul 23 23:38:19 2011 +0000

description:
obsolete pcftypes.h and link against -lbz2.

diffstat:

 external/mit/xorg/lib/freetype/Makefile                   |  5 +++--
 external/mit/xorg/lib/freetype/freetype/internal/Makefile |  4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r e0b4d1fd7244 -r b5efa2e8a151 external/mit/xorg/lib/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/Makefile   Sat Jul 23 23:30:19 2011 +0000
+++ b/external/mit/xorg/lib/freetype/Makefile   Sat Jul 23 23:38:19 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2011/07/23 23:30:19 mrg Exp $
+#      $NetBSD: Makefile,v 1.10 2011/07/23 23:38:19 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -94,7 +94,8 @@
 .endif
 
 LIBDPLIBS= \
-       z ${.CURDIR}/../../../../../lib/libz
+       z ${.CURDIR}/../../../../../lib/libz \
+       bz2 ${.CURDIR}/../../../../../lib/libbz2
 
 PKGCONFIG=     freetype2
 PKGDIST.freetype2=     ${.CURDIR}
diff -r e0b4d1fd7244 -r b5efa2e8a151 external/mit/xorg/lib/freetype/freetype/internal/Makefile
--- a/external/mit/xorg/lib/freetype/freetype/internal/Makefile Sat Jul 23 23:30:19 2011 +0000
+++ b/external/mit/xorg/lib/freetype/freetype/internal/Makefile Sat Jul 23 23:38:19 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2011/07/23 23:38:19 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -9,7 +9,7 @@
 INCS=  autohint.h ftcalc.h \
        ftdebug.h ftdriver.h ftgloadr.h \
        ftmemory.h ftobjs.h ftstream.h \
-       fttrace.h internal.h pcftypes.h psaux.h pshints.h \
+       fttrace.h internal.h psaux.h pshints.h \
        sfnt.h t1types.h tttypes.h ftrfork.h ftserv.h
 
 .include <bsd.x11.mk>