Mon May 12 03:10:57 2014 UTC ()
Let doxygen depend on Type 1 CM font packages

This prevents mktexpk from being called to create bitmap fonts for
TS1-encoded CM fonts.

This should fix PR 48762.


(minskim)
diff -r1.113 -r1.114 pkgsrc/devel/doxygen/Makefile
diff -r1.9 -r1.10 pkgsrc/devel/doxygen/options.mk
cvs diff -r1.113 -r1.114 pkgsrc/devel/doxygen/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/doxygen/Makefile 2014/05/09 07:36:59 1.113
+++ pkgsrc/devel/doxygen/Makefile 2014/05/12 03:10:57 1.114
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.113 2014/05/09 07:36:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.114 2014/05/12 03:10:57 minskim Exp $
2 2
3DISTNAME= doxygen-1.8.7.src 3DISTNAME= doxygen-1.8.7.src
4PKGNAME= ${DISTNAME:S/.src//} 4PKGNAME= ${DISTNAME:S/.src//}
 5PKGREVISION= 1
5CATEGORIES= devel 6CATEGORIES= devel
6MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \ 7MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
7 http://ftp.stack.nl/pub/users/dimitri/ 8 http://ftp.stack.nl/pub/users/dimitri/
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.doxygen.org/ 11HOMEPAGE= http://www.doxygen.org/
11COMMENT= Documentation system for C++, Java, IDL and C 12COMMENT= Documentation system for C++, Java, IDL and C
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
15UNLIMIT_RESOURCES+= datasize 16UNLIMIT_RESOURCES+= datasize
16# doxygen upstream uses this version of flex 17# doxygen upstream uses this version of flex
17FLEX_REQD= 2.5.35 18FLEX_REQD= 2.5.35
cvs diff -r1.9 -r1.10 pkgsrc/devel/doxygen/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/doxygen/options.mk 2014/05/08 23:41:52 1.9
+++ pkgsrc/devel/doxygen/options.mk 2014/05/12 03:10:57 1.10
@@ -1,35 +1,36 @@ @@ -1,35 +1,36 @@
1# $NetBSD: options.mk,v 1.9 2014/05/08 23:41:52 dsainty Exp $ 1# $NetBSD: options.mk,v 1.10 2014/05/12 03:10:57 minskim Exp $
2# 2#
3PKG_OPTIONS_VAR= PKG_OPTIONS.doxygen 3PKG_OPTIONS_VAR= PKG_OPTIONS.doxygen
4PKG_SUPPORTED_OPTIONS= latex 4PKG_SUPPORTED_OPTIONS= latex
5PKG_SUGGESTED_OPTIONS= latex 5PKG_SUGGESTED_OPTIONS= latex
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= latex 9PLIST_VARS+= latex
10 10
11.if !empty(PKG_OPTIONS:Mlatex) 11.if !empty(PKG_OPTIONS:Mlatex)
12PLIST.latex= yes 12PLIST.latex= yes
13 13
14INSTALL_TARGET+= install_docs 14INSTALL_TARGET+= install_docs
15 15
16# XXX Clearly separate what is build time vs runtime, and move 16# XXX Clearly separate what is build time vs runtime, and move
17# build-time dependencies into USE_TOOLS framework. 17# build-time dependencies into USE_TOOLS framework.
18 18
19BUILD_DEPENDS+= tex-epsf-[0-9]*:../../print/tex-epsf 19BUILD_DEPENDS+= tex-epsf-[0-9]*:../../print/tex-epsf
20DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk 20DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
21DEPENDS+= makeindexk-[0-9]*:../../textproc/makeindexk 21DEPENDS+= makeindexk-[0-9]*:../../textproc/makeindexk
22DEPENDS+= tex-a4wide>=2010nb1:../../print/tex-a4wide 22DEPENDS+= tex-a4wide>=2010nb1:../../print/tex-a4wide
 23DEPENDS+= tex-cm-super-[0-9]*:../../fonts/tex-cm-super
23DEPENDS+= tex-ec-[0-9]*:../../fonts/tex-ec 24DEPENDS+= tex-ec-[0-9]*:../../fonts/tex-ec
24DEPENDS+= tex-epstopdf-[0-9]*:../../graphics/tex-epstopdf 25DEPENDS+= tex-epstopdf-[0-9]*:../../graphics/tex-epstopdf
25DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin 26DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin
26DEPENDS+= tex-rsfs-[0-9]*:../../fonts/tex-rsfs 27DEPENDS+= tex-rsfs-[0-9]*:../../fonts/tex-rsfs
27 28
28# 29#
29# Styles used by Doxygen output. 30# Styles used by Doxygen output.
30# 31#
31DEPENDS+= tex-amsfonts-[0-9]*:../../fonts/tex-amsfonts 32DEPENDS+= tex-amsfonts-[0-9]*:../../fonts/tex-amsfonts
32DEPENDS+= tex-colortbl-[0-9]*:../../print/tex-colortbl 33DEPENDS+= tex-colortbl-[0-9]*:../../print/tex-colortbl
33DEPENDS+= tex-fancyhdr-[0-9]*:../../print/tex-fancyhdr 34DEPENDS+= tex-fancyhdr-[0-9]*:../../print/tex-fancyhdr
34DEPENDS+= tex-float-[0-9]*:../../print/tex-float 35DEPENDS+= tex-float-[0-9]*:../../print/tex-float
35DEPENDS+= tex-geometry-[0-9]*:../../print/tex-geometry 36DEPENDS+= tex-geometry-[0-9]*:../../print/tex-geometry