* x11 is now an option

* install documentation into share/doc/${PKGNAME}

4 files changed, 265 insertions, 251 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index bd855882f75..b7f53e88e17 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.65 2010/06/13 22:44:38 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2010/11/11 11:38:36 adam Exp $
 
 DISTNAME=	libwmf-0.2.8.4
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wvware/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://wvware.sourceforge.net/libwmf.html
 COMMENT=	Library for reading and converting WMF (Windows Meta Files)
+LICENSE=	gnu-gpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -16,17 +17,16 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-gd
-CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/html/libwmf
+CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/${PKGNAME_NOREV}
 
 post-install:
 	${RMDIR} ${DESTDIR}${PREFIX}/include/libwmf/gd
 
+.include "options.mk"
+
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libwmf/PLIST b/graphics/libwmf/PLIST
index f9280385f23..c1cd133c807 100644
--- a/graphics/libwmf/PLIST
+++ b/graphics/libwmf/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:59:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2010/11/11 11:38:36 adam Exp $
 bin/libwmf-config
 bin/libwmf-fontmap
 bin/wmf2eps
 bin/wmf2fig
 bin/wmf2svg
-bin/wmf2x
+${PLIST.x11}bin/wmf2x
 include/libwmf/api.h
 include/libwmf/canvas.h
 include/libwmf/color.h
@@ -22,247 +22,247 @@ include/libwmf/types.h
 include/libwmf/x.h
 lib/libwmf.la
 lib/libwmflite.la
-share/doc/html/libwmf/caolan/2.html
-share/doc/html/libwmf/caolan/Arc.html
-share/doc/html/libwmf/caolan/BitBlt.html
-share/doc/html/libwmf/caolan/Bmpfrmat.html
-share/doc/html/libwmf/caolan/Chord.html
-share/doc/html/libwmf/caolan/CreateBrushIndirect.html
-share/doc/html/libwmf/caolan/CreatePenIndirect.html
-share/doc/html/libwmf/caolan/CreateRegion.html
-share/doc/html/libwmf/caolan/DeleteObject.html
-share/doc/html/libwmf/caolan/DibBitBlt.html
-share/doc/html/libwmf/caolan/DibCreatePatternBrush.html
-share/doc/html/libwmf/caolan/DibStretchBlt.html
-share/doc/html/libwmf/caolan/Ellipse.html
-share/doc/html/libwmf/caolan/ExcludeClipRect.html
-share/doc/html/libwmf/caolan/ExtFloodFill.html
-share/doc/html/libwmf/caolan/ExtTextOut.html
-share/doc/html/libwmf/caolan/FillRgn.html
-share/doc/html/libwmf/caolan/FloodFill.html
-share/doc/html/libwmf/caolan/FrameRgn.html
-share/doc/html/libwmf/caolan/IntersectClipRect.html
-share/doc/html/libwmf/caolan/InvertRgn.html
-share/doc/html/libwmf/caolan/LineTo.html
-share/doc/html/libwmf/caolan/MoveTo.html
-share/doc/html/libwmf/caolan/OffsetClipRgn.html
-share/doc/html/libwmf/caolan/OffsetViewportOrg.html
-share/doc/html/libwmf/caolan/OffsetWindowOrg.html
-share/doc/html/libwmf/caolan/PaintRgn.html
-share/doc/html/libwmf/caolan/PatBlt.html
-share/doc/html/libwmf/caolan/Pie.html
-share/doc/html/libwmf/caolan/PolyPolygon.html
-share/doc/html/libwmf/caolan/Polygon.html
-share/doc/html/libwmf/caolan/Polyline.html
-share/doc/html/libwmf/caolan/Rectangle.html
-share/doc/html/libwmf/caolan/RestoreDC.html
-share/doc/html/libwmf/caolan/RoundRect.html
-share/doc/html/libwmf/caolan/SaveDC.html
-share/doc/html/libwmf/caolan/ScaleViewportExt.html
-share/doc/html/libwmf/caolan/ScaleWindowExt.html
-share/doc/html/libwmf/caolan/SelectClipRgn.html
-share/doc/html/libwmf/caolan/SelectObject.html
-share/doc/html/libwmf/caolan/SetBkColor.html
-share/doc/html/libwmf/caolan/SetBkMode.html
-share/doc/html/libwmf/caolan/SetDIBitsToDevice.html
-share/doc/html/libwmf/caolan/SetMapMode.html
-share/doc/html/libwmf/caolan/SetMapperFlags.html
-share/doc/html/libwmf/caolan/SetPixel.html
-share/doc/html/libwmf/caolan/SetPolyFillMode.html
-share/doc/html/libwmf/caolan/SetROP2.html
-share/doc/html/libwmf/caolan/SetStretchBltMode.html
-share/doc/html/libwmf/caolan/SetTextAlign.html
-share/doc/html/libwmf/caolan/SetTextCharacterExtra.html
-share/doc/html/libwmf/caolan/SetTextColor.html
-share/doc/html/libwmf/caolan/SetTextJustification.html
-share/doc/html/libwmf/caolan/SetViewportExt.html
-share/doc/html/libwmf/caolan/SetViewportOrg.html
-share/doc/html/libwmf/caolan/SetWindowExt.html
-share/doc/html/libwmf/caolan/SetWindowOrg.html
-share/doc/html/libwmf/caolan/StretchDib.html
-share/doc/html/libwmf/caolan/TextOut.html
-share/doc/html/libwmf/caolan/dibs.html
-share/doc/html/libwmf/caolan/esc.html
-share/doc/html/libwmf/caolan/index.html
-share/doc/html/libwmf/caolan/mapmode.html
-share/doc/html/libwmf/caolan/msmeta01.gif
-share/doc/html/libwmf/caolan/msmeta02.gif
-share/doc/html/libwmf/caolan/msmeta03.gif
-share/doc/html/libwmf/caolan/msmeta04.gif
-share/doc/html/libwmf/caolan/ora-clp.html
-share/doc/html/libwmf/caolan/ora-wmf.html
-share/doc/html/libwmf/caolan/pics/weave.jpg
-share/doc/html/libwmf/caolan/rop.html
-share/doc/html/libwmf/caolan/support.html
-share/doc/html/libwmf/caolan/support2.html
-share/doc/html/libwmf/caolan/template.html
-share/doc/html/libwmf/caolan/unknown.html
-share/doc/html/libwmf/dlayer.html
-share/doc/html/libwmf/gd.html
-share/doc/html/libwmf/html/annotated.html
-share/doc/html/libwmf/html/api_8c.html
-share/doc/html/libwmf/html/api_8h.html
-share/doc/html/libwmf/html/bbuf_8c.html
-share/doc/html/libwmf/html/canvas_8h.html
-share/doc/html/libwmf/html/classes.html
-share/doc/html/libwmf/html/clip_8h.html
-share/doc/html/libwmf/html/coord_8h.html
-share/doc/html/libwmf/html/dc_8h.html
-share/doc/html/libwmf/html/defaults_8h.html
-share/doc/html/libwmf/html/defs_8h.html
-share/doc/html/libwmf/html/doxygen.css
-share/doc/html/libwmf/html/doxygen.gif
-share/doc/html/libwmf/html/doxygen.png
-share/doc/html/libwmf/html/eps_2bmp_8h.html
-share/doc/html/libwmf/html/eps_2device_8h.html
-share/doc/html/libwmf/html/eps_2draw_8h.html
-share/doc/html/libwmf/html/eps_8c.html
-share/doc/html/libwmf/html/eps_8h.html
-share/doc/html/libwmf/html/fig_2bmp_8h.html
-share/doc/html/libwmf/html/fig_2device_8h.html
-share/doc/html/libwmf/html/fig_2draw_8h.html
-share/doc/html/libwmf/html/fig_8c.html
-share/doc/html/libwmf/html/fig_8h.html
-share/doc/html/libwmf/html/files.html
-share/doc/html/libwmf/html/font_8c.html
-share/doc/html/libwmf/html/foreign_8c.html
-share/doc/html/libwmf/html/foreign_8h.html
-share/doc/html/libwmf/html/functions.html
-share/doc/html/libwmf/html/fund_8h.html
-share/doc/html/libwmf/html/gd_8h.html
-share/doc/html/libwmf/html/globals.html
-share/doc/html/libwmf/html/include_2libwmf_2color_8h.html
-share/doc/html/libwmf/html/include_2libwmf_2font_8h.html
-share/doc/html/libwmf/html/index.html
-share/doc/html/libwmf/html/io-wmf_8c.html
-share/doc/html/libwmf/html/ipa_2bmp_8h.html
-share/doc/html/libwmf/html/ipa_2eps_2region_8h.html
-share/doc/html/libwmf/html/ipa_2fig_2region_8h.html
-share/doc/html/libwmf/html/ipa_2magick_2region_8h.html
-share/doc/html/libwmf/html/ipa_2plot_2region_8h.html
-share/doc/html/libwmf/html/ipa_2svg_2region_8h.html
-share/doc/html/libwmf/html/ipa_2x_2region_8h.html
-share/doc/html/libwmf/html/ipa_2xgd_2region_8h.html
-share/doc/html/libwmf/html/ipa_8c.html
-share/doc/html/libwmf/html/ipa_8h.html
-share/doc/html/libwmf/html/macro_8h.html
-share/doc/html/libwmf/html/magick_2bmp_8h.html
-share/doc/html/libwmf/html/magick_2device_8h.html
-share/doc/html/libwmf/html/magick_2draw_8h.html
-share/doc/html/libwmf/html/magick_8c.html
-share/doc/html/libwmf/html/magick_8h.html
-share/doc/html/libwmf/html/meta_8c.html
-share/doc/html/libwmf/html/meta_8h.html
-share/doc/html/libwmf/html/metadefs_8h.html
-share/doc/html/libwmf/html/player_2region_8h.html
-share/doc/html/libwmf/html/player_8c.html
-share/doc/html/libwmf/html/plot_2bmp_8h.html
-share/doc/html/libwmf/html/plot_2device_8h.html
-share/doc/html/libwmf/html/plot_2draw_8h.html
-share/doc/html/libwmf/html/plot_8c.html
-share/doc/html/libwmf/html/plot_8h.html
-share/doc/html/libwmf/html/record_8h.html
-share/doc/html/libwmf/html/recorder_8c.html
-share/doc/html/libwmf/html/recorder_8h.html
-share/doc/html/libwmf/html/src_2font_8h.html
-share/doc/html/libwmf/html/src_2ipa_2fig_2color_8h.html
-share/doc/html/libwmf/html/src_2ipa_2fig_2font_8h.html
-share/doc/html/libwmf/html/src_2ipa_2ipa_2color_8h.html
-share/doc/html/libwmf/html/src_2ipa_2ipa_2font_8h.html
-share/doc/html/libwmf/html/src_2ipa_2x_2color_8h.html
-share/doc/html/libwmf/html/src_2ipa_2x_2font_8h.html
-share/doc/html/libwmf/html/src_2ipa_2xgd_2font_8h.html
-share/doc/html/libwmf/html/src_2player_2color_8h.html
-share/doc/html/libwmf/html/stream_8c.html
-share/doc/html/libwmf/html/structWmfContext.html
-share/doc/html/libwmf/html/struct__wmfAPI.html
-share/doc/html/libwmf/html/struct__wmfAPI__Options.html
-share/doc/html/libwmf/html/struct__wmfAttributeStore.html
-share/doc/html/libwmf/html/struct__wmfAttributes.html
-share/doc/html/libwmf/html/struct__wmfBMP.html
-share/doc/html/libwmf/html/struct__wmfBMP__Draw__t.html
-share/doc/html/libwmf/html/struct__wmfBMP__Read__t.html
-share/doc/html/libwmf/html/struct__wmfBrush.html
-share/doc/html/libwmf/html/struct__wmfCanvasBrush.html
-share/doc/html/libwmf/html/struct__wmfCanvasFont.html
-share/doc/html/libwmf/html/struct__wmfCanvasPen.html
-share/doc/html/libwmf/html/struct__wmfColorData.html
-share/doc/html/libwmf/html/struct__wmfConstruct.html
-share/doc/html/libwmf/html/struct__wmfDC.html
-share/doc/html/libwmf/html/struct__wmfD__Coord.html
-share/doc/html/libwmf/html/struct__wmfD__Rect.html
-share/doc/html/libwmf/html/struct__wmfDrawArc__t.html
-share/doc/html/libwmf/html/struct__wmfDrawLine__t.html
-share/doc/html/libwmf/html/struct__wmfDrawPixel__t.html
-share/doc/html/libwmf/html/struct__wmfDrawRectangle__t.html
-share/doc/html/libwmf/html/struct__wmfDrawText__t.html
-share/doc/html/libwmf/html/struct__wmfFT__CacheEntry.html
-share/doc/html/libwmf/html/struct__wmfFT__Mapping.html
-share/doc/html/libwmf/html/struct__wmfFlood__t.html
-share/doc/html/libwmf/html/struct__wmfFont.html
-share/doc/html/libwmf/html/struct__wmfFontData.html
-share/doc/html/libwmf/html/struct__wmfFontMap.html
-share/doc/html/libwmf/html/struct__wmfFontmapData.html
-share/doc/html/libwmf/html/struct__wmfFunctionReference.html
-share/doc/html/libwmf/html/struct__wmfGS__FontData.html
-share/doc/html/libwmf/html/struct__wmfGS__FontInfo.html
-share/doc/html/libwmf/html/struct__wmfHead.html
-share/doc/html/libwmf/html/struct__wmfIPAFont.html
-share/doc/html/libwmf/html/struct__wmfImage.html
-share/doc/html/libwmf/html/struct__wmfMapping.html
-share/doc/html/libwmf/html/struct__wmfMetaHeader.html
-share/doc/html/libwmf/html/struct__wmfPen.html
-share/doc/html/libwmf/html/struct__wmfPlaceableMetaHeader.html
-share/doc/html/libwmf/html/struct__wmfPolyLine__t.html
-share/doc/html/libwmf/html/struct__wmfPolyPoly__t.html
-share/doc/html/libwmf/html/struct__wmfPolyRectangle__t.html
-share/doc/html/libwmf/html/struct__wmfRGB.html
-share/doc/html/libwmf/html/struct__wmfROP__Draw__t.html
-share/doc/html/libwmf/html/struct__wmfRecordBox.html
-share/doc/html/libwmf/html/struct__wmfStream.html
-share/doc/html/libwmf/html/struct__wmfUserData__t.html
-share/doc/html/libwmf/html/struct__wmfWriteFileInfo.html
-share/doc/html/libwmf/html/struct__wmfXML__FontData.html
-share/doc/html/libwmf/html/struct__wmfXML__FontInfo.html
-share/doc/html/libwmf/html/struct__wmfXML__InputData.html
-share/doc/html/libwmf/html/struct__wmf__eps__t.html
-share/doc/html/libwmf/html/struct__wmf__fig__t.html
-share/doc/html/libwmf/html/struct__wmf__fig__t_1_1__wmf__fig__image.html
-share/doc/html/libwmf/html/struct__wmf__foreign__t.html
-share/doc/html/libwmf/html/struct__wmf__gd__t.html
-share/doc/html/libwmf/html/struct__wmf__gd__t_1_1__wmf__gd__sink.html
-share/doc/html/libwmf/html/struct__wmf__magick__t.html
-share/doc/html/libwmf/html/struct__wmf__magick__t_1_1__wmf__magick__image.html
-share/doc/html/libwmf/html/struct__wmf__plot__t.html
-share/doc/html/libwmf/html/struct__wmf__svg__t.html
-share/doc/html/libwmf/html/struct__wmf__svg__t_1_1__wmf__svg__image.html
-share/doc/html/libwmf/html/struct__wmf__template__t.html
-share/doc/html/libwmf/html/struct__wmf__x__t.html
-share/doc/html/libwmf/html/svg_2bmp_8h.html
-share/doc/html/libwmf/html/svg_2device_8h.html
-share/doc/html/libwmf/html/svg_2draw_8h.html
-share/doc/html/libwmf/html/svg_8c.html
-share/doc/html/libwmf/html/svg_8h.html
-share/doc/html/libwmf/html/template_8c.html
-share/doc/html/libwmf/html/template_8h.html
-share/doc/html/libwmf/html/types_8h.html
-share/doc/html/libwmf/html/wmf_8c.html
-share/doc/html/libwmf/html/x_2bmp_8h.html
-share/doc/html/libwmf/html/x_2device_8h.html
-share/doc/html/libwmf/html/x_2draw_8h.html
-share/doc/html/libwmf/html/x_8c.html
-share/doc/html/libwmf/html/x_8h.html
-share/doc/html/libwmf/html/xgd_2bmp_8h.html
-share/doc/html/libwmf/html/xgd_2device_8h.html
-share/doc/html/libwmf/html/xgd_2draw_8h.html
-share/doc/html/libwmf/html/xgd_8c.html
-share/doc/html/libwmf/html/xml_8c.html
-share/doc/html/libwmf/html/xml_8h.html
-share/doc/html/libwmf/index.html
-share/doc/html/libwmf/smlogo2.gif
-share/doc/html/libwmf/tutapi.html
-share/doc/html/libwmf/tutipa.html
-share/doc/html/libwmf/wmfpic.png
+share/doc/${PKGNAME}/caolan/2.html
+share/doc/${PKGNAME}/caolan/Arc.html
+share/doc/${PKGNAME}/caolan/BitBlt.html
+share/doc/${PKGNAME}/caolan/Bmpfrmat.html
+share/doc/${PKGNAME}/caolan/Chord.html
+share/doc/${PKGNAME}/caolan/CreateBrushIndirect.html
+share/doc/${PKGNAME}/caolan/CreatePenIndirect.html
+share/doc/${PKGNAME}/caolan/CreateRegion.html
+share/doc/${PKGNAME}/caolan/DeleteObject.html
+share/doc/${PKGNAME}/caolan/DibBitBlt.html
+share/doc/${PKGNAME}/caolan/DibCreatePatternBrush.html
+share/doc/${PKGNAME}/caolan/DibStretchBlt.html
+share/doc/${PKGNAME}/caolan/Ellipse.html
+share/doc/${PKGNAME}/caolan/ExcludeClipRect.html
+share/doc/${PKGNAME}/caolan/ExtFloodFill.html
+share/doc/${PKGNAME}/caolan/ExtTextOut.html
+share/doc/${PKGNAME}/caolan/FillRgn.html
+share/doc/${PKGNAME}/caolan/FloodFill.html
+share/doc/${PKGNAME}/caolan/FrameRgn.html
+share/doc/${PKGNAME}/caolan/IntersectClipRect.html
+share/doc/${PKGNAME}/caolan/InvertRgn.html
+share/doc/${PKGNAME}/caolan/LineTo.html
+share/doc/${PKGNAME}/caolan/MoveTo.html
+share/doc/${PKGNAME}/caolan/OffsetClipRgn.html
+share/doc/${PKGNAME}/caolan/OffsetViewportOrg.html
+share/doc/${PKGNAME}/caolan/OffsetWindowOrg.html
+share/doc/${PKGNAME}/caolan/PaintRgn.html
+share/doc/${PKGNAME}/caolan/PatBlt.html
+share/doc/${PKGNAME}/caolan/Pie.html
+share/doc/${PKGNAME}/caolan/PolyPolygon.html
+share/doc/${PKGNAME}/caolan/Polygon.html
+share/doc/${PKGNAME}/caolan/Polyline.html
+share/doc/${PKGNAME}/caolan/Rectangle.html
+share/doc/${PKGNAME}/caolan/RestoreDC.html
+share/doc/${PKGNAME}/caolan/RoundRect.html
+share/doc/${PKGNAME}/caolan/SaveDC.html
+share/doc/${PKGNAME}/caolan/ScaleViewportExt.html
+share/doc/${PKGNAME}/caolan/ScaleWindowExt.html
+share/doc/${PKGNAME}/caolan/SelectClipRgn.html
+share/doc/${PKGNAME}/caolan/SelectObject.html
+share/doc/${PKGNAME}/caolan/SetBkColor.html
+share/doc/${PKGNAME}/caolan/SetBkMode.html
+share/doc/${PKGNAME}/caolan/SetDIBitsToDevice.html
+share/doc/${PKGNAME}/caolan/SetMapMode.html
+share/doc/${PKGNAME}/caolan/SetMapperFlags.html
+share/doc/${PKGNAME}/caolan/SetPixel.html
+share/doc/${PKGNAME}/caolan/SetPolyFillMode.html
+share/doc/${PKGNAME}/caolan/SetROP2.html
+share/doc/${PKGNAME}/caolan/SetStretchBltMode.html
+share/doc/${PKGNAME}/caolan/SetTextAlign.html
+share/doc/${PKGNAME}/caolan/SetTextCharacterExtra.html
+share/doc/${PKGNAME}/caolan/SetTextColor.html
+share/doc/${PKGNAME}/caolan/SetTextJustification.html
+share/doc/${PKGNAME}/caolan/SetViewportExt.html
+share/doc/${PKGNAME}/caolan/SetViewportOrg.html
+share/doc/${PKGNAME}/caolan/SetWindowExt.html
+share/doc/${PKGNAME}/caolan/SetWindowOrg.html
+share/doc/${PKGNAME}/caolan/StretchDib.html
+share/doc/${PKGNAME}/caolan/TextOut.html
+share/doc/${PKGNAME}/caolan/dibs.html
+share/doc/${PKGNAME}/caolan/esc.html
+share/doc/${PKGNAME}/caolan/index.html
+share/doc/${PKGNAME}/caolan/mapmode.html
+share/doc/${PKGNAME}/caolan/msmeta01.gif
+share/doc/${PKGNAME}/caolan/msmeta02.gif
+share/doc/${PKGNAME}/caolan/msmeta03.gif
+share/doc/${PKGNAME}/caolan/msmeta04.gif
+share/doc/${PKGNAME}/caolan/ora-clp.html
+share/doc/${PKGNAME}/caolan/ora-wmf.html
+share/doc/${PKGNAME}/caolan/pics/weave.jpg
+share/doc/${PKGNAME}/caolan/rop.html
+share/doc/${PKGNAME}/caolan/support.html
+share/doc/${PKGNAME}/caolan/support2.html
+share/doc/${PKGNAME}/caolan/template.html
+share/doc/${PKGNAME}/caolan/unknown.html
+share/doc/${PKGNAME}/dlayer.html
+share/doc/${PKGNAME}/gd.html
+share/doc/${PKGNAME}/html/annotated.html
+share/doc/${PKGNAME}/html/api_8c.html
+share/doc/${PKGNAME}/html/api_8h.html
+share/doc/${PKGNAME}/html/bbuf_8c.html
+share/doc/${PKGNAME}/html/canvas_8h.html
+share/doc/${PKGNAME}/html/classes.html
+share/doc/${PKGNAME}/html/clip_8h.html
+share/doc/${PKGNAME}/html/coord_8h.html
+share/doc/${PKGNAME}/html/dc_8h.html
+share/doc/${PKGNAME}/html/defaults_8h.html
+share/doc/${PKGNAME}/html/defs_8h.html
+share/doc/${PKGNAME}/html/doxygen.css
+share/doc/${PKGNAME}/html/doxygen.gif
+share/doc/${PKGNAME}/html/doxygen.png
+share/doc/${PKGNAME}/html/eps_2bmp_8h.html
+share/doc/${PKGNAME}/html/eps_2device_8h.html
+share/doc/${PKGNAME}/html/eps_2draw_8h.html
+share/doc/${PKGNAME}/html/eps_8c.html
+share/doc/${PKGNAME}/html/eps_8h.html
+share/doc/${PKGNAME}/html/fig_2bmp_8h.html
+share/doc/${PKGNAME}/html/fig_2device_8h.html
+share/doc/${PKGNAME}/html/fig_2draw_8h.html
+share/doc/${PKGNAME}/html/fig_8c.html
+share/doc/${PKGNAME}/html/fig_8h.html
+share/doc/${PKGNAME}/html/files.html
+share/doc/${PKGNAME}/html/font_8c.html
+share/doc/${PKGNAME}/html/foreign_8c.html
+share/doc/${PKGNAME}/html/foreign_8h.html
+share/doc/${PKGNAME}/html/functions.html
+share/doc/${PKGNAME}/html/fund_8h.html
+share/doc/${PKGNAME}/html/gd_8h.html
+share/doc/${PKGNAME}/html/globals.html
+share/doc/${PKGNAME}/html/include_2libwmf_2color_8h.html
+share/doc/${PKGNAME}/html/include_2libwmf_2font_8h.html
+share/doc/${PKGNAME}/html/index.html
+share/doc/${PKGNAME}/html/io-wmf_8c.html
+share/doc/${PKGNAME}/html/ipa_2bmp_8h.html
+share/doc/${PKGNAME}/html/ipa_2eps_2region_8h.html
+share/doc/${PKGNAME}/html/ipa_2fig_2region_8h.html
+share/doc/${PKGNAME}/html/ipa_2magick_2region_8h.html
+share/doc/${PKGNAME}/html/ipa_2plot_2region_8h.html
+share/doc/${PKGNAME}/html/ipa_2svg_2region_8h.html
+share/doc/${PKGNAME}/html/ipa_2x_2region_8h.html
+share/doc/${PKGNAME}/html/ipa_2xgd_2region_8h.html
+share/doc/${PKGNAME}/html/ipa_8c.html
+share/doc/${PKGNAME}/html/ipa_8h.html
+share/doc/${PKGNAME}/html/macro_8h.html
+share/doc/${PKGNAME}/html/magick_2bmp_8h.html
+share/doc/${PKGNAME}/html/magick_2device_8h.html
+share/doc/${PKGNAME}/html/magick_2draw_8h.html
+share/doc/${PKGNAME}/html/magick_8c.html
+share/doc/${PKGNAME}/html/magick_8h.html
+share/doc/${PKGNAME}/html/meta_8c.html
+share/doc/${PKGNAME}/html/meta_8h.html
+share/doc/${PKGNAME}/html/metadefs_8h.html
+share/doc/${PKGNAME}/html/player_2region_8h.html
+share/doc/${PKGNAME}/html/player_8c.html
+share/doc/${PKGNAME}/html/plot_2bmp_8h.html
+share/doc/${PKGNAME}/html/plot_2device_8h.html
+share/doc/${PKGNAME}/html/plot_2draw_8h.html
+share/doc/${PKGNAME}/html/plot_8c.html
+share/doc/${PKGNAME}/html/plot_8h.html
+share/doc/${PKGNAME}/html/record_8h.html
+share/doc/${PKGNAME}/html/recorder_8c.html
+share/doc/${PKGNAME}/html/recorder_8h.html
+share/doc/${PKGNAME}/html/src_2font_8h.html
+share/doc/${PKGNAME}/html/src_2ipa_2fig_2color_8h.html
+share/doc/${PKGNAME}/html/src_2ipa_2fig_2font_8h.html
+share/doc/${PKGNAME}/html/src_2ipa_2ipa_2color_8h.html
+share/doc/${PKGNAME}/html/src_2ipa_2ipa_2font_8h.html
+share/doc/${PKGNAME}/html/src_2ipa_2x_2color_8h.html
+share/doc/${PKGNAME}/html/src_2ipa_2x_2font_8h.html
+share/doc/${PKGNAME}/html/src_2ipa_2xgd_2font_8h.html
+share/doc/${PKGNAME}/html/src_2player_2color_8h.html
+share/doc/${PKGNAME}/html/stream_8c.html
+share/doc/${PKGNAME}/html/structWmfContext.html
+share/doc/${PKGNAME}/html/struct__wmfAPI.html
+share/doc/${PKGNAME}/html/struct__wmfAPI__Options.html
+share/doc/${PKGNAME}/html/struct__wmfAttributeStore.html
+share/doc/${PKGNAME}/html/struct__wmfAttributes.html
+share/doc/${PKGNAME}/html/struct__wmfBMP.html
+share/doc/${PKGNAME}/html/struct__wmfBMP__Draw__t.html
+share/doc/${PKGNAME}/html/struct__wmfBMP__Read__t.html
+share/doc/${PKGNAME}/html/struct__wmfBrush.html
+share/doc/${PKGNAME}/html/struct__wmfCanvasBrush.html
+share/doc/${PKGNAME}/html/struct__wmfCanvasFont.html
+share/doc/${PKGNAME}/html/struct__wmfCanvasPen.html
+share/doc/${PKGNAME}/html/struct__wmfColorData.html
+share/doc/${PKGNAME}/html/struct__wmfConstruct.html
+share/doc/${PKGNAME}/html/struct__wmfDC.html
+share/doc/${PKGNAME}/html/struct__wmfD__Coord.html
+share/doc/${PKGNAME}/html/struct__wmfD__Rect.html
+share/doc/${PKGNAME}/html/struct__wmfDrawArc__t.html
+share/doc/${PKGNAME}/html/struct__wmfDrawLine__t.html
+share/doc/${PKGNAME}/html/struct__wmfDrawPixel__t.html
+share/doc/${PKGNAME}/html/struct__wmfDrawRectangle__t.html
+share/doc/${PKGNAME}/html/struct__wmfDrawText__t.html
+share/doc/${PKGNAME}/html/struct__wmfFT__CacheEntry.html
+share/doc/${PKGNAME}/html/struct__wmfFT__Mapping.html
+share/doc/${PKGNAME}/html/struct__wmfFlood__t.html
+share/doc/${PKGNAME}/html/struct__wmfFont.html
+share/doc/${PKGNAME}/html/struct__wmfFontData.html
+share/doc/${PKGNAME}/html/struct__wmfFontMap.html
+share/doc/${PKGNAME}/html/struct__wmfFontmapData.html
+share/doc/${PKGNAME}/html/struct__wmfFunctionReference.html
+share/doc/${PKGNAME}/html/struct__wmfGS__FontData.html
+share/doc/${PKGNAME}/html/struct__wmfGS__FontInfo.html
+share/doc/${PKGNAME}/html/struct__wmfHead.html
+share/doc/${PKGNAME}/html/struct__wmfIPAFont.html
+share/doc/${PKGNAME}/html/struct__wmfImage.html
+share/doc/${PKGNAME}/html/struct__wmfMapping.html
+share/doc/${PKGNAME}/html/struct__wmfMetaHeader.html
+share/doc/${PKGNAME}/html/struct__wmfPen.html
+share/doc/${PKGNAME}/html/struct__wmfPlaceableMetaHeader.html
+share/doc/${PKGNAME}/html/struct__wmfPolyLine__t.html
+share/doc/${PKGNAME}/html/struct__wmfPolyPoly__t.html
+share/doc/${PKGNAME}/html/struct__wmfPolyRectangle__t.html
+share/doc/${PKGNAME}/html/struct__wmfRGB.html
+share/doc/${PKGNAME}/html/struct__wmfROP__Draw__t.html
+share/doc/${PKGNAME}/html/struct__wmfRecordBox.html
+share/doc/${PKGNAME}/html/struct__wmfStream.html
+share/doc/${PKGNAME}/html/struct__wmfUserData__t.html
+share/doc/${PKGNAME}/html/struct__wmfWriteFileInfo.html
+share/doc/${PKGNAME}/html/struct__wmfXML__FontData.html
+share/doc/${PKGNAME}/html/struct__wmfXML__FontInfo.html
+share/doc/${PKGNAME}/html/struct__wmfXML__InputData.html
+share/doc/${PKGNAME}/html/struct__wmf__eps__t.html
+share/doc/${PKGNAME}/html/struct__wmf__fig__t.html
+share/doc/${PKGNAME}/html/struct__wmf__fig__t_1_1__wmf__fig__image.html
+share/doc/${PKGNAME}/html/struct__wmf__foreign__t.html
+share/doc/${PKGNAME}/html/struct__wmf__gd__t.html
+share/doc/${PKGNAME}/html/struct__wmf__gd__t_1_1__wmf__gd__sink.html
+share/doc/${PKGNAME}/html/struct__wmf__magick__t.html
+share/doc/${PKGNAME}/html/struct__wmf__magick__t_1_1__wmf__magick__image.html
+share/doc/${PKGNAME}/html/struct__wmf__plot__t.html
+share/doc/${PKGNAME}/html/struct__wmf__svg__t.html
+share/doc/${PKGNAME}/html/struct__wmf__svg__t_1_1__wmf__svg__image.html
+share/doc/${PKGNAME}/html/struct__wmf__template__t.html
+share/doc/${PKGNAME}/html/struct__wmf__x__t.html
+share/doc/${PKGNAME}/html/svg_2bmp_8h.html
+share/doc/${PKGNAME}/html/svg_2device_8h.html
+share/doc/${PKGNAME}/html/svg_2draw_8h.html
+share/doc/${PKGNAME}/html/svg_8c.html
+share/doc/${PKGNAME}/html/svg_8h.html
+share/doc/${PKGNAME}/html/template_8c.html
+share/doc/${PKGNAME}/html/template_8h.html
+share/doc/${PKGNAME}/html/types_8h.html
+share/doc/${PKGNAME}/html/wmf_8c.html
+share/doc/${PKGNAME}/html/x_2bmp_8h.html
+share/doc/${PKGNAME}/html/x_2device_8h.html
+share/doc/${PKGNAME}/html/x_2draw_8h.html
+share/doc/${PKGNAME}/html/x_8c.html
+share/doc/${PKGNAME}/html/x_8h.html
+share/doc/${PKGNAME}/html/xgd_2bmp_8h.html
+share/doc/${PKGNAME}/html/xgd_2device_8h.html
+share/doc/${PKGNAME}/html/xgd_2draw_8h.html
+share/doc/${PKGNAME}/html/xgd_8c.html
+share/doc/${PKGNAME}/html/xml_8c.html
+share/doc/${PKGNAME}/html/xml_8h.html
+share/doc/${PKGNAME}/index.html
+share/doc/${PKGNAME}/smlogo2.gif
+share/doc/${PKGNAME}/tutapi.html
+share/doc/${PKGNAME}/tutipa.html
+share/doc/${PKGNAME}/wmfpic.png
 share/libwmf/fonts/fontmap
 share/libwmf/fonts/n019003l.afm
 share/libwmf/fonts/n019003l.pfb
diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk
index 3a75656c3dc..7f2d8954bc6 100644
--- a/graphics/libwmf/buildlink3.mk
+++ b/graphics/libwmf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:44:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/11/11 11:38:36 adam Exp $
 
 BUILDLINK_TREE+=	libwmf
 
@@ -9,7 +9,6 @@ BUILDLINK_API_DEPENDS.libwmf+=	libwmf>=0.2.8nb2
 BUILDLINK_ABI_DEPENDS.libwmf+=	libwmf>=0.2.8.4nb7
 BUILDLINK_PKGSRCDIR.libwmf?=	../../graphics/libwmf
 
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/libwmf/options.mk b/graphics/libwmf/options.mk
new file mode 100644
index 00000000000..1781be63c0d
--- /dev/null
+++ b/graphics/libwmf/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2010/11/11 11:38:36 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.libwmf
+PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		x11
+
+.if !empty(PKG_OPTIONS:Mx11)
+PLIST.x11=		yes
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.endif