Thu May 8 23:41:52 2014 UTC ()
Make tex-wasysym option-conditional, like all the other Tex dependencies.


(dsainty)
diff -r1.111 -r1.112 pkgsrc/devel/doxygen/Makefile
diff -r1.8 -r1.9 pkgsrc/devel/doxygen/options.mk
cvs diff -r1.111 -r1.112 pkgsrc/devel/doxygen/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/doxygen/Makefile 2014/04/25 08:32:22 1.111
+++ pkgsrc/devel/doxygen/Makefile 2014/05/08 23:41:52 1.112
@@ -1,28 +1,26 @@ @@ -1,28 +1,26 @@
1# $NetBSD: Makefile,v 1.111 2014/04/25 08:32:22 wiz Exp $ 1# $NetBSD: Makefile,v 1.112 2014/05/08 23:41:52 dsainty Exp $
2 2
3DISTNAME= doxygen-1.8.7.src 3DISTNAME= doxygen-1.8.7.src
4PKGNAME= ${DISTNAME:S/.src//} 4PKGNAME= ${DISTNAME:S/.src//}
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \ 6MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
7 http://ftp.stack.nl/pub/users/dimitri/ 7 http://ftp.stack.nl/pub/users/dimitri/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.doxygen.org/ 10HOMEPAGE= http://www.doxygen.org/
11COMMENT= Documentation system for C++, Java, IDL and C 11COMMENT= Documentation system for C++, Java, IDL and C
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DEPENDS+= tex-wasysym-[0-9]*:../../fonts/tex-wasysym 
15 
16WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 14WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
17UNLIMIT_RESOURCES+= datasize 15UNLIMIT_RESOURCES+= datasize
18# doxygen upstream uses this version of flex 16# doxygen upstream uses this version of flex
19FLEX_REQD= 2.5.35 17FLEX_REQD= 2.5.35
20USE_TOOLS+= gmake gs:run perl:run bison flex 18USE_TOOLS+= gmake gs:run perl:run bison flex
21USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
22HAS_CONFIGURE= yes 20HAS_CONFIGURE= yes
23CONFIGURE_ARGS+= --make ${GMAKE} 21CONFIGURE_ARGS+= --make ${GMAKE}
24CONFIGURE_ARGS+= --perl ${PERL5} 22CONFIGURE_ARGS+= --perl ${PERL5}
25CONFIGURE_ARGS+= --python ${PYTHONBIN} 23CONFIGURE_ARGS+= --python ${PYTHONBIN}
26CONFIGURE_ARGS+= --install ${INSTALL} 24CONFIGURE_ARGS+= --install ${INSTALL}
27CONFIGURE_ARGS+= --dot ${PREFIX}/bin/dot 25CONFIGURE_ARGS+= --dot ${PREFIX}/bin/dot
28CONFIGURE_ARGS+= --prefix ${PREFIX} 26CONFIGURE_ARGS+= --prefix ${PREFIX}
cvs diff -r1.8 -r1.9 pkgsrc/devel/doxygen/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/doxygen/options.mk 2013/11/20 04:50:47 1.8
+++ pkgsrc/devel/doxygen/options.mk 2014/05/08 23:41:52 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.8 2013/11/20 04:50:47 dsainty Exp $ 1# $NetBSD: options.mk,v 1.9 2014/05/08 23:41:52 dsainty 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
@@ -35,17 +35,18 @@ DEPENDS+= tex-float-[0-9]*:../../print/t @@ -35,17 +35,18 @@ DEPENDS+= tex-float-[0-9]*:../../print/t
35DEPENDS+= tex-geometry-[0-9]*:../../print/tex-geometry 35DEPENDS+= tex-geometry-[0-9]*:../../print/tex-geometry
36DEPENDS+= tex-graphics-[0-9]*:../../print/tex-graphics 36DEPENDS+= tex-graphics-[0-9]*:../../print/tex-graphics
37DEPENDS+= tex-hyperref-[0-9]*:../../print/tex-hyperref 37DEPENDS+= tex-hyperref-[0-9]*:../../print/tex-hyperref
38DEPENDS+= tex-latex-[0-9]*:../../print/tex-latex 38DEPENDS+= tex-latex-[0-9]*:../../print/tex-latex
39DEPENDS+= tex-listings-[0-9]*:../../print/tex-listings 39DEPENDS+= tex-listings-[0-9]*:../../print/tex-listings
40DEPENDS+= tex-multirow-[0-9]*:../../print/tex-multirow 40DEPENDS+= tex-multirow-[0-9]*:../../print/tex-multirow
41DEPENDS+= tex-natbib-[0-9]*:../../print/tex-natbib 41DEPENDS+= tex-natbib-[0-9]*:../../print/tex-natbib
42DEPENDS+= tex-oberdiek-[0-9]*:../../print/tex-oberdiek 42DEPENDS+= tex-oberdiek-[0-9]*:../../print/tex-oberdiek
43DEPENDS+= tex-psnfss>=9.2anb2:../../fonts/tex-psnfss 43DEPENDS+= tex-psnfss>=9.2anb2:../../fonts/tex-psnfss
44DEPENDS+= tex-pspicture-[0-9]*:../../print/tex-pspicture 44DEPENDS+= tex-pspicture-[0-9]*:../../print/tex-pspicture
45DEPENDS+= tex-sectsty-[0-9]*:../../print/tex-sectsty 45DEPENDS+= tex-sectsty-[0-9]*:../../print/tex-sectsty
46DEPENDS+= tex-tocloft-[0-9]*:../../print/tex-tocloft 46DEPENDS+= tex-tocloft-[0-9]*:../../print/tex-tocloft
47DEPENDS+= tex-tools-[0-9]*:../../print/tex-tools 47DEPENDS+= tex-tools-[0-9]*:../../print/tex-tools
 48DEPENDS+= tex-wasysym-[0-9]*:../../fonts/tex-wasysym
48DEPENDS+= tex-xcolor-[0-9]*:../../print/tex-xcolor 49DEPENDS+= tex-xcolor-[0-9]*:../../print/tex-xcolor
49DEPENDS+= tex-xtab-[0-9]*:../../print/tex-xtab 50DEPENDS+= tex-xtab-[0-9]*:../../print/tex-xtab
50 51
51.endif 52.endif