Skip to content

Commit

Permalink
Fix PR pkg/46681.
Browse files Browse the repository at this point in the history 
PLIST of doxygen varies depending on graphviz configuration.
Say, graphviz configured with PKG_OPTIONS.pangocairo yes or no.

Graphviz/buildlink3.mk will set PKG_BUILD_OPTIONS.graphviz
for use with doxygen PLIST variation.

Thanks Ian McWilliam for reporting and testing the problem.
  • Loading branch information
mef committed Aug 17, 2012
1 parent 435424d commit 49adb1f
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 21 deletions.
12 changes: 11 additions & 1 deletion devel/doxygen/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.89 2012/08/15 23:25:15 dsainty Exp $
# $NetBSD: Makefile,v 1.90 2012/08/17 01:02:05 mef Exp $

DISTNAME= doxygen-1.8.1.1.src
PKGNAME= ${DISTNAME:S/.src//}
Expand Down Expand Up @@ -28,8 +28,12 @@ CONFIGURE_ARGS+= --docdir ${PREFIX}/share/doc/doxygen
MAKE_ENV+= PKGSRC_CFLAGS=${CFLAGS:Q}
MAKE_FLAGS+= MAN1DIR=${PKGMANDIR}/man1

# Case Insensitive fs or Sensitive
PLIST_VARS+= ci cs

# pangocairo: basic ps/pdf support via PKG_BUILD_OPTIONS.graphviz
PLIST_VARS+= pangocairo nopangocairo

SUBST_CLASSES+= path
SUBST_STAGE.path= pre-configure
SUBST_FILES.path= doc/Makefile.in
Expand Down Expand Up @@ -75,5 +79,11 @@ BUILDLINK_API_DEPENDS.graphviz+= graphviz>=2.12nb1
.include "options.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../graphics/graphviz/buildlink3.mk"

.if !empty(PKG_BUILD_OPTIONS.graphviz:Mpangocairo)
PLIST.pangocairo= yes
.else
PLIST.nopangocairo= yes
.endif
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"
57 changes: 38 additions & 19 deletions devel/doxygen/PLIST
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.30 2012/07/13 07:23:42 mef Exp $
@comment $NetBSD: PLIST,v 1.31 2012/08/17 01:02:06 mef Exp $
bin/doxygen
man/man1/doxygen.1
${PLIST.latex}share/doc/doxygen/doxygen_manual.pdf
Expand Down Expand Up @@ -231,74 +231,91 @@ ${PLIST.latex}share/doc/doxygen/examples/diagrams/html/bc_s.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/bdwn.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_a-members.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_a.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_a__coll__graph.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_a__coll__graph.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_a__coll__graph.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_a__coll__graph.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_a__coll__graph.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_a__inherit__graph.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_a__inherit__graph.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_a__inherit__graph.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_a__inherit__graph.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_a__inherit__graph.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_b-members.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_b.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_b__coll__graph.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_b__coll__graph.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_b__coll__graph.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_b__coll__graph.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_b__coll__graph.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_b__inherit__graph.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_b__inherit__graph.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_b__inherit__graph.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_b__inherit__graph.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_b__inherit__graph.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_c-members.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_c.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_c__coll__graph.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_c__coll__graph.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_c__coll__graph.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_c__coll__graph.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_c__coll__graph.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_c__inherit__graph.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_c__inherit__graph.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_c__inherit__graph.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_c__inherit__graph.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_c__inherit__graph.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_d-members.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_d.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_d__coll__graph.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_d__coll__graph.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_d__coll__graph.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_d__coll__graph.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_d__coll__graph.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_d__inherit__graph.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_d__inherit__graph.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_d__inherit__graph.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_d__inherit__graph.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_d__inherit__graph.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_e-members.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_e.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_e__coll__graph.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_e__coll__graph.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_e__coll__graph.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_e__coll__graph.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_e__coll__graph.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_e__inherit__graph.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_e__inherit__graph.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_e__inherit__graph.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_e__inherit__graph.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/class_e__inherit__graph.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/classes.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/closed.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__a_8h.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__a_8h__dep__incl.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__a_8h__dep__incl.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__a_8h__dep__incl.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__a_8h__dep__incl.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__a_8h__dep__incl.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__a_8h_source.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__b_8h.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__b_8h__dep__incl.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__b_8h__dep__incl.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__b_8h__dep__incl.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__b_8h__dep__incl.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__b_8h__dep__incl.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__b_8h_source.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__c_8h.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__dep__incl.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__dep__incl.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__dep__incl.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__dep__incl.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__dep__incl.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__incl.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__incl.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__incl.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__incl.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__incl.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__c_8h_source.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__d_8h.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__dep__incl.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__dep__incl.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__dep__incl.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__dep__incl.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__dep__incl.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__incl.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__incl.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__incl.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__incl.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__incl.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__d_8h_source.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__e_8h.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__e_8h__incl.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__e_8h__incl.map
${PLIST.nopangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__e_8h__incl.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__e_8h__incl.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__e_8h__incl.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/diagrams__e_8h_source.html
Expand All @@ -324,12 +341,14 @@ ${PLIST.latex}share/doc/doxygen/examples/diagrams/html/ftv2splitbar.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/ftv2vertline.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/functions.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/functions_vars.html
${PLIST.nopangocairo}share/doc/doxygen/examples/diagrams/html/graph_legend.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/graph_legend.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/graph_legend.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/graph_legend.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/hierarchy.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/index.html
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/inherit_graph_0.map
${PLIST.pangocairo}${PLIST.latex}share/doc/doxygen/examples/diagrams/html/inherit_graph_0.map
${PLIST.nopangocairo}share/doc/doxygen/examples/diagrams/html/inherit_graph_0.dot
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/inherit_graph_0.md5
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/inherit_graph_0.png
${PLIST.latex}share/doc/doxygen/examples/diagrams/html/inherits.html
Expand Down
6 changes: 5 additions & 1 deletion graphics/graphviz/buildlink3.mk
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.19 2011/11/01 06:01:36 sbd Exp $
# $NetBSD: buildlink3.mk,v 1.20 2012/08/17 01:02:05 mef Exp $

BUILDLINK_TREE+= graphviz

Expand All @@ -9,6 +9,10 @@ BUILDLINK_API_DEPENDS.graphviz+= graphviz>=2.26.3
BUILDLINK_ABI_DEPENDS.graphviz+= graphviz>=2.26.3nb4
BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz

# doxygen PLIST varies with pangocairo of PKG_OPTIONS
pkgbase := graphviz
.include "../../mk/pkg-build-options.mk"

.include "../../converters/libiconv/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
Expand Down

0 comments on commit 49adb1f

Please sign in to comment.