Module Name: src
Committed By: mrg
Date: Sat Jul 23 23:38:19 UTC 2011
Modified Files:
src/external/mit/xorg/lib/freetype: Makefile
src/external/mit/xorg/lib/freetype/freetype/internal: Makefile
Log Message:
obsolete pcftypes.h and link against -lbz2.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/lib/freetype/freetype/internal/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.9 src/external/mit/xorg/lib/freetype/Makefile:1.10
--- src/external/mit/xorg/lib/freetype/Makefile:1.9 Sat Jul 23 23:30:19 2011
+++ src/external/mit/xorg/lib/freetype/Makefile Sat Jul 23 23:38:19 2011
@@ -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}
Index: src/external/mit/xorg/lib/freetype/freetype/internal/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/internal/Makefile:1.1.1.1 src/external/mit/xorg/lib/freetype/freetype/internal/Makefile:1.2
--- src/external/mit/xorg/lib/freetype/freetype/internal/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/lib/freetype/freetype/internal/Makefile Sat Jul 23 23:38:19 2011
@@ -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>
