From 4a1808832c00d6b4fabdfd8ece85b76c31e1e9dc Mon Sep 17 00:00:00 2001 From: dsainty Date: Wed, 29 Aug 2012 00:33:56 +0000 Subject: [PATCH] Fix avr-libc failing (bulk build) during the documentation build with: ! LaTeX Error: File `tocloft.sty' not found. The necessary dependency was incorrectly marked as a doxygen build-only dependency, The complete list of styles was determined via this (partially Zsh) script: ( echo colortbl ; sed -n -e '/^[\t ]*\/\//d' -e 's/^.*package{\([^}<]*\)}.*$/\1/igp' -e 's/^.*package\[.*\]{\([^}<]*\)}.*$/\1/igp' src/latexgen.cpp src/perlmodgen.cpp ) | while read x; do for f in /usr/pkg/share/texmf-dist/**/${x}.sty; do pkg_info -Q PKGPATH -F "$f"; done; done|sed -e 's/^\(.*\)\/\(.*\)$/DEPENDS+=\t\2-[0-9]*:..\/..\/\1\/\2/'|sort -u Bump PKGREVISION for the dependency change. --- devel/doxygen/Makefile | 4 ++-- devel/doxygen/options.mk | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index b052043de0e8..b122fc058d17 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.90 2012/08/17 01:02:05 mef Exp $ +# $NetBSD: Makefile,v 1.91 2012/08/29 00:33:56 dsainty Exp $ DISTNAME= doxygen-1.8.1.1.src PKGNAME= ${DISTNAME:S/.src//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \ http://ftp.stack.nl/pub/users/dimitri/ diff --git a/devel/doxygen/options.mk b/devel/doxygen/options.mk index 62ec48ae6940..12980220bdfc 100644 --- a/devel/doxygen/options.mk +++ b/devel/doxygen/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2012/08/15 23:25:15 dsainty Exp $ +# $NetBSD: options.mk,v 1.7 2012/08/29 00:33:56 dsainty Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.doxygen PKG_SUPPORTED_OPTIONS= latex @@ -17,28 +17,32 @@ INSTALL_TARGET+= install_docs # build-time dependencies into USE_TOOLS framework. BUILD_DEPENDS+= tex-epsf-[0-9]*:../../print/tex-epsf -BUILD_DEPENDS+= tex-tocloft-[0-9]*:../../print/tex-tocloft DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk DEPENDS+= makeindexk-[0-9]*:../../textproc/makeindexk DEPENDS+= tex-a4wide>=2010nb1:../../print/tex-a4wide -DEPENDS+= tex-colortbl-[0-9]*:../../print/tex-colortbl DEPENDS+= tex-ec-[0-9]*:../../fonts/tex-ec DEPENDS+= tex-epstopdf-[0-9]*:../../graphics/tex-epstopdf +DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin +DEPENDS+= tex-rsfs-[0-9]*:../../fonts/tex-rsfs + +# +# Styles used by Doxygen output. +# +DEPENDS+= tex-colortbl-[0-9]*:../../print/tex-colortbl DEPENDS+= tex-fancyhdr-[0-9]*:../../print/tex-fancyhdr DEPENDS+= tex-float-[0-9]*:../../print/tex-float DEPENDS+= tex-geometry-[0-9]*:../../print/tex-geometry DEPENDS+= tex-graphics-[0-9]*:../../print/tex-graphics DEPENDS+= tex-hyperref-[0-9]*:../../print/tex-hyperref DEPENDS+= tex-latex-[0-9]*:../../print/tex-latex -DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin DEPENDS+= tex-listings-[0-9]*:../../print/tex-listings DEPENDS+= tex-multirow-[0-9]*:../../print/tex-multirow DEPENDS+= tex-natbib-[0-9]*:../../print/tex-natbib DEPENDS+= tex-oberdiek-[0-9]*:../../print/tex-oberdiek DEPENDS+= tex-psnfss>=9.2anb2:../../fonts/tex-psnfss DEPENDS+= tex-pspicture-[0-9]*:../../print/tex-pspicture -DEPENDS+= tex-rsfs-[0-9]*:../../fonts/tex-rsfs DEPENDS+= tex-sectsty-[0-9]*:../../print/tex-sectsty +DEPENDS+= tex-tocloft-[0-9]*:../../print/tex-tocloft DEPENDS+= tex-tools-[0-9]*:../../print/tex-tools DEPENDS+= tex-xcolor-[0-9]*:../../print/tex-xcolor DEPENDS+= tex-xtab-[0-9]*:../../print/tex-xtab