Wed May 21 08:42:55 2014 UTC ()
Search standard font paths on OS X


(adam)
diff -r1.88 -r1.89 pkgsrc/fonts/fontconfig/Makefile
cvs diff -r1.88 -r1.89 pkgsrc/fonts/fontconfig/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/fontconfig/Makefile 2014/04/01 21:21:28 1.88
+++ pkgsrc/fonts/fontconfig/Makefile 2014/05/21 08:42:55 1.89
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.88 2014/04/01 21:21:28 wiz Exp $ 1# $NetBSD: Makefile,v 1.89 2014/05/21 08:42:55 adam Exp $
2 2
3DISTNAME= fontconfig-2.11.1 3DISTNAME= fontconfig-2.11.1
4CATEGORIES= fonts 4CATEGORIES= fonts
5MASTER_SITES= http://www.fontconfig.org/release/ 5MASTER_SITES= http://www.fontconfig.org/release/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
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
14 14
@@ -19,36 +19,38 @@ CONFIGURE_ARGS+= --with-default-fonts=${ @@ -19,36 +19,38 @@ CONFIGURE_ARGS+= --with-default-fonts=${
19CONFIGURE_ARGS+= --with-expat-includes=${BUILDLINK_PREFIX.expat}/include 19CONFIGURE_ARGS+= --with-expat-includes=${BUILDLINK_PREFIX.expat}/include
20CONFIGURE_ARGS+= --with-expat-lib=${BUILDLINK_PREFIX.expat}/lib 20CONFIGURE_ARGS+= --with-expat-lib=${BUILDLINK_PREFIX.expat}/lib
21CONFIGURE_ARGS+= --with-baseconfigdir=${PKG_SYSCONFDIR} 21CONFIGURE_ARGS+= --with-baseconfigdir=${PKG_SYSCONFDIR}
22CONFIGURE_ARGS+= --with-cache-dir=${VARBASE}/cache/fontconfig 22CONFIGURE_ARGS+= --with-cache-dir=${VARBASE}/cache/fontconfig
23CONFIGURE_ARGS+= --enable-docs 23CONFIGURE_ARGS+= --enable-docs
24CONFIGURE_ENV+= HASDOCBOOK=no 24CONFIGURE_ENV+= HASDOCBOOK=no
25 25
26PKGCONFIG_OVERRIDE= fontconfig.pc.in 26PKGCONFIG_OVERRIDE= fontconfig.pc.in
27 27
28PKG_SYSCONFSUBDIR= fontconfig 28PKG_SYSCONFSUBDIR= fontconfig
29 29
30.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
31 31
32GSFONTS= ${PREFIX}/share/fonts/urw,${PREFIX}/share/ghostscript/fonts 32ADDFONTS= ${PREFIX}/share/fonts/urw,${PREFIX}/share/ghostscript/fonts
33.if ${X11BASE} != ${LOCALBASE} 33.if ${X11BASE} != ${LOCALBASE}
34CONFIGURE_ARGS+= --with-add-fonts=${X11BASE}/lib/X11/fonts,${GSFONTS} 34ADDFONTS:= ${X11BASE}/lib/X11/fonts,${ADDFONTS}
35.else 35.else
36CONFIGURE_ARGS+= --with-add-fonts=${LOCALBASE}/share/fonts/X11,${GSFONTS} 36ADDFONTS:= ${LOCALBASE}/lib/X11/fonts,${ADDFONTS}
37.endif 37.endif
38 38
39.if ${OPSYS} == "Darwin" 39.if ${OPSYS} == "Darwin"
 40ADDFONTS:= ~/Library/Fonts,/Library/Fonts,/System/Library/Fonts,${ADDFONTS}
40CONFIGURE_ARGS+= --with-arch=${MACHINE_ARCH} 41CONFIGURE_ARGS+= --with-arch=${MACHINE_ARCH}
41.endif 42.endif
 43CONFIGURE_ARGS+= --with-add-fonts=${ADDFONTS}
42 44
43SUBST_CLASSES+= prefix 45SUBST_CLASSES+= prefix
44SUBST_STAGE.prefix= post-build 46SUBST_STAGE.prefix= post-build
45SUBST_FILES.prefix= conf.d/README 47SUBST_FILES.prefix= conf.d/README
46SUBST_VARS.prefix= PREFIX 48SUBST_VARS.prefix= PREFIX
47 49
48EGDIR= ${PREFIX}/share/examples/fontconfig 50EGDIR= ${PREFIX}/share/examples/fontconfig
49CONF_FILES= ${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf 51CONF_FILES= ${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf
50CONF_FILES+= ${EGDIR}/conf.d/README ${PKG_SYSCONFDIR}/conf.d/README 52CONF_FILES+= ${EGDIR}/conf.d/README ${PKG_SYSCONFDIR}/conf.d/README
51 53
52TMPLDIR= ${PREFIX}/share/fontconfig/conf.avail 54TMPLDIR= ${PREFIX}/share/fontconfig/conf.avail
53MAKE_DIRS+= ${PKG_SYSCONFDIR}/conf.d 55MAKE_DIRS+= ${PKG_SYSCONFDIR}/conf.d
54# following list from ${WRKSRC}/conf.d/Makefile.am 56# following list from ${WRKSRC}/conf.d/Makefile.am
@@ -63,20 +65,19 @@ FC_STDCONF+= 30-pkgsrc-aliases.conf @@ -63,20 +65,19 @@ FC_STDCONF+= 30-pkgsrc-aliases.conf
63CONF_FILES+= ${TMPLDIR}/${f} ${PKG_SYSCONFDIR}/conf.d/${f} 65CONF_FILES+= ${TMPLDIR}/${f} ${PKG_SYSCONFDIR}/conf.d/${f}
64.endfor 66.endfor
65 67
66MAKE_DIRS+= ${VARBASE}/cache 68MAKE_DIRS+= ${VARBASE}/cache
67BUILD_DEFS+= VARBASE 69BUILD_DEFS+= VARBASE
68 70
69TEST_TARGET= check 71TEST_TARGET= check
70 72
71.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 73.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
72CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} 74CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
73.endif 75.endif
74 76
75post-install: 77post-install:
76 ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf \ 78 ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR}
77 ${DESTDIR}${TMPLDIR} 
78 79
79.include "../../devel/zlib/buildlink3.mk" 80.include "../../devel/zlib/buildlink3.mk"
80.include "../../graphics/freetype2/buildlink3.mk" 81.include "../../graphics/freetype2/buildlink3.mk"
81.include "../../textproc/expat/buildlink3.mk" 82.include "../../textproc/expat/buildlink3.mk"
82.include "../../mk/bsd.pkg.mk" 83.include "../../mk/bsd.pkg.mk"