Sat Oct 4 02:29:15 2008 UTC ()
- install missing headers (reported by hubertf@ through proxy jmcneill@)
- clean up creation/installation of freetype-config


(cube)
diff -r1.4 -r1.5 src/external/mit/xorg/lib/freetype/freetype/Makefile
cvs diff -r1.4 -r1.5 src/external/mit/xorg/lib/freetype/freetype/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/freetype/freetype/Makefile 2008/09/13 20:51:34 1.4
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile 2008/10/04 02:29:15 1.5
@@ -1,38 +1,40 @@ @@ -1,38 +1,40 @@
1# $NetBSD: Makefile,v 1.4 2008/09/13 20:51:34 cube Exp $ 1# $NetBSD: Makefile,v 1.5 2008/10/04 02:29:15 cube Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5SUBDIR= config internal 5SUBDIR= config internal
6 6
7.PATH: ${X11SRCDIR.freetype}/include/freetype 7.PATH: ${X11SRCDIR.freetype}/include/freetype
8 8
9INCSDIR=${X11INCDIR}/freetype2/freetype 9INCSDIR=${X11INCDIR}/freetype2/freetype
10 10
11INCS= freetype.h ftbbox.h ftbdf.h ftcache.h ftchapters.h fterrdef.h \ 11INCS= freetype.h ftbbox.h ftbdf.h ftbitmap.h ftcache.h ftchapters.h ftcid.h \
12 fterrors.h ftglyph.h ftgzip.h ftimage.h ftincrem.h ftlist.h \ 12 fterrdef.h fterrors.h ftgasp.h ftglyph.h ftgxval.h ftgzip.h ftimage.h \
13 ftmac.h ftmm.h ftmoderr.h ftoutln.h ftpfr.h \ 13 ftincrem.h ftlcdfil.h ftlist.h ftlzw.h ftmac.h ftmm.h ftmodapi.h \
14 ftrender.h ftsizes.h ftsnames.h ftsynth.h \ 14 ftmoderr.h ftotval.h ftoutln.h ftpfr.h ftrender.h ftsizes.h \
15 ftsystem.h fttrigon.h fttypes.h ftwinfnt.h ftxf86.h \ 15 ftsnames.h ftstroke.h ftsynth.h ftsystem.h fttrigon.h fttypes.h \
16 t1tables.h ttnameid.h tttables.h tttags.h ftmodapi.h ftstroke.h \ 16 ftwinfnt.h ftxf86.h \
17 ftlzw.h ttunpat.h 17 t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h
18 18
19SCRIPTS= freetype-config 19SCRIPTS= freetype-config
20 20
21CLEANFILES+= ${SCRIPTS} 21CLEANFILES+= ${SCRIPTS}
22 22
23# XXX hijack config-subst from Xft 23# XXX hijack config-subst from Xft
24CONFIG_SUBST= sed -e 's%@prefix@%${X11ROOTDIR}%' \ 24CONFIG_SUBST= ${TOOL_SED} -e 's%@prefix@%${X11ROOTDIR}%' \
25 -e 's%@exec_prefix@%${X11BINDIR}%' \ 25 -e 's%@exec_prefix@%${X11BINDIR}%' \
26 -e 's%@libdir@%${X11USRLIBDIR}%g' \ 26 -e 's%@libdir@%${X11USRLIBDIR}%g' \
27 -e 's%@includedir@%${X11INCDIR}%' \ 27 -e 's%@includedir@%${X11INCDIR}%' \
28 -e 's%@ft_version@%9.17.3%' \ 28 -e 's%@ft_version@%9.17.3%' \
29 -e 's%@FT2_EXTRA_LIBS@%%' \ 29 -e 's%@FT2_EXTRA_LIBS@%%' \
30 -e 's%@hardcode_libdir_flag_spec@%-Wl,-rpath,${X11USRLIBDIR}%' \ 30 -e 's%@hardcode_libdir_flag_spec@%-Wl,-rpath,${X11USRLIBDIR}%' \
31 -e 's%@LIBZ@%-lz%' \ 31 -e 's%@LIBZ@%-lz%'
32 32
33freetype-config: 33.PATH: ${X11SRCDIR.freetype}/builds/unix
34 ${CONFIG_SUBST} < ${X11SRCDIR.freetype}/builds/unix/freetype-config.in > ${.TARGET} 34freetype-config: freetype-config.in
 35 ${_MKTARGET_CREATE}
 36 ${CONFIG_SUBST} < ${.ALLSRC} > ${.TARGET}
35 37
36.include <bsd.x11.mk> 38.include <bsd.x11.mk>
37.include <bsd.prog.mk> 39.include <bsd.prog.mk>
38.include <bsd.subdir.mk> 40.include <bsd.subdir.mk>