Wed Nov 9 03:20:06 2011 UTC ()
need <sys/stat.h> for fstat(2)


(christos)
diff -r1.73 -r1.74 pkgsrc/fonts/fontconfig/Makefile
diff -r1.32 -r1.33 pkgsrc/fonts/fontconfig/distinfo
cvs diff -r1.73 -r1.74 pkgsrc/fonts/fontconfig/Makefile (switch to unified diff)

--- pkgsrc/fonts/fontconfig/Makefile 2011/11/01 06:01:12 1.73
+++ pkgsrc/fonts/fontconfig/Makefile 2011/11/09 03:20:06 1.74
@@ -1,90 +1,90 @@ @@ -1,90 +1,90 @@
1# $NetBSD: Makefile,v 1.73 2011/11/01 06:01:12 sbd Exp $ 1# $NetBSD: Makefile,v 1.74 2011/11/09 03:20:06 christos Exp $
2 2
3DISTNAME= fontconfig-2.8.0 3DISTNAME= fontconfig-2.8.0
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= fonts 5CATEGORIES= fonts
6MASTER_SITES= http://www.fontconfig.org/release/ 6MASTER_SITES= http://www.fontconfig.org/release/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.fontconfig.org/ 9HOMEPAGE= http://www.fontconfig.org/
10COMMENT= Library for configuring and customizing font access 10COMMENT= Library for configuring and customizing font access
11#LICENSE= x11? 11#LICENSE= x11?
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
17USE_LIBTOOL= YES 17USE_LIBTOOL= YES
18USE_TOOLS+= gmake 18USE_TOOLS+= gmake
19 19
20PKGCONFIG_OVERRIDE= fontconfig.pc.in 20PKGCONFIG_OVERRIDE= fontconfig.pc.in
21 21
22PKG_SYSCONFSUBDIR= fontconfig 22PKG_SYSCONFSUBDIR= fontconfig
23 23
24CONFIGURE_ARGS+= --with-default-fonts=${LOCALBASE}/lib/X11/fonts 24CONFIGURE_ARGS+= --with-default-fonts=${LOCALBASE}/lib/X11/fonts
25CONFIGURE_ARGS+= --with-freetype-config=${BUILDLINK_PREFIX.freetype2}/bin/freetype-config 25CONFIGURE_ARGS+= --with-freetype-config=${BUILDLINK_PREFIX.freetype2}/bin/freetype-config
26CONFIGURE_ARGS+= --with-expat-includes=${BUILDLINK_PREFIX.expat}/include 26CONFIGURE_ARGS+= --with-expat-includes=${BUILDLINK_PREFIX.expat}/include
27CONFIGURE_ARGS+= --with-expat-lib=${BUILDLINK_PREFIX.expat}/lib 27CONFIGURE_ARGS+= --with-expat-lib=${BUILDLINK_PREFIX.expat}/lib
28CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q} 28CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q}
29CONFIGURE_ARGS+= --with-cache-dir=${VARBASE:Q}/cache/fontconfig 29CONFIGURE_ARGS+= --with-cache-dir=${VARBASE:Q}/cache/fontconfig
30CONFIGURE_ARGS+= --with-x 30CONFIGURE_ARGS+= --with-x
31CONFIGURE_ARGS+= --enable-docs 31CONFIGURE_ARGS+= --enable-docs
32CONFIGURE_ENV+= HASDOCBOOK=no 32CONFIGURE_ENV+= HASDOCBOOK=no
33 33
34.include "../../mk/bsd.prefs.mk" 34.include "../../mk/bsd.prefs.mk"
35 35
36GSFONTS= ${PREFIX}/share/fonts/urw,${PREFIX}/share/ghostscript/fonts 36GSFONTS= ${PREFIX}/share/fonts/urw,${PREFIX}/share/ghostscript/fonts
37.if ${X11BASE} != ${LOCALBASE} 37.if ${X11BASE} != ${LOCALBASE}
38CONFIGURE_ARGS+= --with-add-fonts=${X11BASE}/lib/X11/fonts,${GSFONTS} 38CONFIGURE_ARGS+= --with-add-fonts=${X11BASE}/lib/X11/fonts,${GSFONTS}
39.else 39.else
40CONFIGURE_ARGS+= --with-add-fonts=${GSFONTS} 40CONFIGURE_ARGS+= --with-add-fonts=${GSFONTS}
41.endif 41.endif
42 42
43.if ${OPSYS} == "Darwin" 43.if ${OPSYS} == "Darwin"
44CONFIGURE_ARGS+= --with-arch=${MACHINE_ARCH} 44CONFIGURE_ARGS+= --with-arch=${MACHINE_ARCH}
45.endif 45.endif
46 46
47EGDIR= ${PREFIX}/share/examples/fontconfig 47EGDIR= ${PREFIX}/share/examples/fontconfig
48CONF_FILES= ${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf 48CONF_FILES= ${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf
49CONF_FILES+= ${EGDIR}/fonts.dtd ${PKG_SYSCONFDIR}/fonts.dtd 49CONF_FILES+= ${EGDIR}/fonts.dtd ${PKG_SYSCONFDIR}/fonts.dtd
50MAKE_DIRS+= ${PKG_SYSCONFDIR}/conf.d 50MAKE_DIRS+= ${PKG_SYSCONFDIR}/conf.d
51CONF_FILES+= ${EGDIR}/conf.d/20-fix-globaladvance.conf ${PKG_SYSCONFDIR}/conf.d/20-fix-globaladvance.conf 51CONF_FILES+= ${EGDIR}/conf.d/20-fix-globaladvance.conf ${PKG_SYSCONFDIR}/conf.d/20-fix-globaladvance.conf
52CONF_FILES+= ${EGDIR}/conf.d/20-unhint-small-vera.conf ${PKG_SYSCONFDIR}/conf.d/20-unhint-small-vera.conf 52CONF_FILES+= ${EGDIR}/conf.d/20-unhint-small-vera.conf ${PKG_SYSCONFDIR}/conf.d/20-unhint-small-vera.conf
53CONF_FILES+= ${EGDIR}/conf.d/30-metric-aliases.conf ${PKG_SYSCONFDIR}/conf.d/30-metric-aliases.conf 53CONF_FILES+= ${EGDIR}/conf.d/30-metric-aliases.conf ${PKG_SYSCONFDIR}/conf.d/30-metric-aliases.conf
54CONF_FILES+= ${EGDIR}/conf.d/30-urw-aliases.conf ${PKG_SYSCONFDIR}/conf.d/30-urw-aliases.conf 54CONF_FILES+= ${EGDIR}/conf.d/30-urw-aliases.conf ${PKG_SYSCONFDIR}/conf.d/30-urw-aliases.conf
55CONF_FILES+= ${EGDIR}/conf.d/40-nonlatin.conf ${PKG_SYSCONFDIR}/conf.d/40-nonlatin.conf 55CONF_FILES+= ${EGDIR}/conf.d/40-nonlatin.conf ${PKG_SYSCONFDIR}/conf.d/40-nonlatin.conf
56CONF_FILES+= ${EGDIR}/conf.d/45-latin.conf ${PKG_SYSCONFDIR}/conf.d/45-latin.conf 56CONF_FILES+= ${EGDIR}/conf.d/45-latin.conf ${PKG_SYSCONFDIR}/conf.d/45-latin.conf
57CONF_FILES+= ${EGDIR}/conf.d/49-sansserif.conf ${PKG_SYSCONFDIR}/conf.d/49-sansserif.conf 57CONF_FILES+= ${EGDIR}/conf.d/49-sansserif.conf ${PKG_SYSCONFDIR}/conf.d/49-sansserif.conf
58CONF_FILES+= ${EGDIR}/conf.d/50-user.conf ${PKG_SYSCONFDIR}/conf.d/50-user.conf 58CONF_FILES+= ${EGDIR}/conf.d/50-user.conf ${PKG_SYSCONFDIR}/conf.d/50-user.conf
59CONF_FILES+= ${EGDIR}/conf.d/51-local.conf ${PKG_SYSCONFDIR}/conf.d/51-local.conf 59CONF_FILES+= ${EGDIR}/conf.d/51-local.conf ${PKG_SYSCONFDIR}/conf.d/51-local.conf
60CONF_FILES+= ${EGDIR}/conf.d/60-latin.conf ${PKG_SYSCONFDIR}/conf.d/60-latin.conf 60CONF_FILES+= ${EGDIR}/conf.d/60-latin.conf ${PKG_SYSCONFDIR}/conf.d/60-latin.conf
61CONF_FILES+= ${EGDIR}/conf.d/65-fonts-persian.conf ${PKG_SYSCONFDIR}/conf.d/65-fonts-persian.conf 61CONF_FILES+= ${EGDIR}/conf.d/65-fonts-persian.conf ${PKG_SYSCONFDIR}/conf.d/65-fonts-persian.conf
62CONF_FILES+= ${EGDIR}/conf.d/65-nonlatin.conf ${PKG_SYSCONFDIR}/conf.d/65-nonlatin.conf 62CONF_FILES+= ${EGDIR}/conf.d/65-nonlatin.conf ${PKG_SYSCONFDIR}/conf.d/65-nonlatin.conf
63CONF_FILES+= ${EGDIR}/conf.d/69-unifont.conf ${PKG_SYSCONFDIR}/conf.d/69-unifont.conf 63CONF_FILES+= ${EGDIR}/conf.d/69-unifont.conf ${PKG_SYSCONFDIR}/conf.d/69-unifont.conf
64CONF_FILES+= ${EGDIR}/conf.d/80-delicious.conf ${PKG_SYSCONFDIR}/conf.d/80-delicious.conf 64CONF_FILES+= ${EGDIR}/conf.d/80-delicious.conf ${PKG_SYSCONFDIR}/conf.d/80-delicious.conf
65CONF_FILES+= ${EGDIR}/conf.d/90-synthetic.conf ${PKG_SYSCONFDIR}/conf.d/90-synthetic.conf 65CONF_FILES+= ${EGDIR}/conf.d/90-synthetic.conf ${PKG_SYSCONFDIR}/conf.d/90-synthetic.conf
66CONF_FILES+= ${EGDIR}/conf.d/30-pkgsrc-aliases.conf ${PKG_SYSCONFDIR}/conf.d/30-pkgsrc-aliases.conf 66CONF_FILES+= ${EGDIR}/conf.d/30-pkgsrc-aliases.conf ${PKG_SYSCONFDIR}/conf.d/30-pkgsrc-aliases.conf
67 67
68MAKE_DIRS+= ${VARBASE}/cache 68MAKE_DIRS+= ${VARBASE}/cache
69BUILD_DEFS+= VARBASE 69BUILD_DEFS+= VARBASE
70 70
71LIBS+= ${BUILDLINK_LDADD.iconv} 71LIBS+= ${BUILDLINK_LDADD.iconv}
72 72
73TEST_TARGET= check 73TEST_TARGET= check
74 74
75.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 75.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
76CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} 76CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
77.endif 77.endif
78 78
79pre-configure: 79pre-configure:
80 ${ECHO} '#define FC_ARCHITECTURE "@host_cpu@"' > ${WRKSRC}/fc-arch/fcarch.h.in 80 ${ECHO} '#define FC_ARCHITECTURE "@host_cpu@"' > ${WRKSRC}/fc-arch/fcarch.h.in
81 81
82post-install: 82post-install:
83 ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf \ 83 ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf \
84 ${DESTDIR}${EGDIR}/conf.d 84 ${DESTDIR}${EGDIR}/conf.d
85 85
86.include "../../converters/libiconv/buildlink3.mk" 86.include "../../converters/libiconv/buildlink3.mk"
87.include "../../devel/zlib/buildlink3.mk" 87.include "../../devel/zlib/buildlink3.mk"
88.include "../../graphics/freetype2/buildlink3.mk" 88.include "../../graphics/freetype2/buildlink3.mk"
89.include "../../textproc/expat/buildlink3.mk" 89.include "../../textproc/expat/buildlink3.mk"
90.include "../../mk/bsd.pkg.mk" 90.include "../../mk/bsd.pkg.mk"
cvs diff -r1.32 -r1.33 pkgsrc/fonts/fontconfig/distinfo (switch to unified diff)

--- pkgsrc/fonts/fontconfig/distinfo 2009/12/06 13:19:15 1.32
+++ pkgsrc/fonts/fontconfig/distinfo 2011/11/09 03:20:06 1.33
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.32 2009/12/06 13:19:15 wiz Exp $ 1$NetBSD: distinfo,v 1.33 2011/11/09 03:20:06 christos Exp $
2 2
3SHA1 (fontconfig-2.8.0.tar.gz) = 570fb55eb14f2c92a7b470b941e9d35dbfafa716 3SHA1 (fontconfig-2.8.0.tar.gz) = 570fb55eb14f2c92a7b470b941e9d35dbfafa716
4RMD160 (fontconfig-2.8.0.tar.gz) = fefee412cad4fa71b573e997e14f1df12f439be2 4RMD160 (fontconfig-2.8.0.tar.gz) = fefee412cad4fa71b573e997e14f1df12f439be2
5Size (fontconfig-2.8.0.tar.gz) = 1548409 bytes 5Size (fontconfig-2.8.0.tar.gz) = 1548409 bytes
6SHA1 (patch-aa) = e49e03606abbf51231b1ced8cdaa4b1a2aa4940f 6SHA1 (patch-aa) = e49e03606abbf51231b1ced8cdaa4b1a2aa4940f
 7SHA1 (patch-ab) = 20412b1b56d833e4ae71350f45b6f998088268d2
7SHA1 (patch-ac) = 7745afc09fbd463c184bfb783acf8d30f2effbf4 8SHA1 (patch-ac) = 7745afc09fbd463c184bfb783acf8d30f2effbf4
8SHA1 (patch-ae) = 7348e85cfa2d0b97649b4648346e6ea906b02769 9SHA1 (patch-ae) = 7348e85cfa2d0b97649b4648346e6ea906b02769
9SHA1 (patch-ca) = 8d3abf96af648a44494afad8495635fceb6098ec 10SHA1 (patch-ca) = 8d3abf96af648a44494afad8495635fceb6098ec
10SHA1 (patch-cb) = 4816c914da277ccf826bdb8c82fec6de04e49a1d 11SHA1 (patch-cb) = 4816c914da277ccf826bdb8c82fec6de04e49a1d