2 files changed, 21 insertions, 260 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 77ce0c88854f..340729c0ba23 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -3,17 +3,19 @@
 
 PORTNAME=	libwmf
 PORTVERSION=	0.2.8.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	SF/wvware/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tools and library for converting Microsoft WMF (windows metafile)
 
-BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2     # XXX
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
+LICENSE=	GPLv2
+
+BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
-		freetype.9:${PORTSDIR}/print/freetype2
+		freetype:${PORTSDIR}/print/freetype2
 
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	libxml2
@@ -22,18 +24,24 @@ CONFIGURE_ARGS=	--with-sys-gd=no \
 		--with-png=${LOCALBASE} --with-jpeg=${LOCALBASE} \
 		--with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts
 USE_LDCONFIG=	yes
-
 MAKE_JOBS_SAFE=	yes
 
-.if defined(WITHOUT_X11)
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	X11
+OPTIONS_DEFAULT=	X11
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
+USE_XORG=	x11
+PLIST_SUB+=	X11=""
+CONFLICTS+=	libwmf-nox11-0.*
+.else
 PKGNAMESUFFIX=	-nox11
 CONFIGURE_ARGS+=	--with-x=no
-PLIST_SUB+=	X11='@comment '
+PLIST_SUB+=	X11="@comment "
 CONFLICTS+=	libwmf-0.*
-.else
-USE_XORG=	x11
-PLIST_SUB+=	X11=''
-CONFLICTS+=	libwmf-nox11-0.*
 .endif
 
 post-patch:
@@ -46,12 +54,11 @@ post-patch:
 		 s|: install-loaderLTLIBRARIES|:|g' ${WRKSRC}/src/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . | \
+	@${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . | \
 		${TAR} -C ${DOCSDIR} --unlink -xf -
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGROUP} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
-
diff --git a/graphics/libwmf/pkg-plist b/graphics/libwmf/pkg-plist
index cf71c273f373..d03cfba1f490 100644
--- a/graphics/libwmf/pkg-plist
+++ b/graphics/libwmf/pkg-plist
@@ -37,247 +37,6 @@ lib/libwmflite.a
 lib/libwmflite.la
 lib/libwmflite.so
 lib/libwmflite.so.7
-%%PORTDOCS%%%%DOCSDIR%%/caolan/2.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/Arc.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/BitBlt.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/Bmpfrmat.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/Chord.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/CreateBrushIndirect.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/CreatePenIndirect.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/CreateRegion.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/DeleteObject.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/DibBitBlt.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/DibCreatePatternBrush.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/DibStretchBlt.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/Ellipse.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/ExcludeClipRect.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/ExtFloodFill.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/ExtTextOut.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/FillRgn.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/FloodFill.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/FrameRgn.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/IntersectClipRect.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/InvertRgn.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/LineTo.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/MoveTo.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/OffsetClipRgn.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/OffsetViewportOrg.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/OffsetWindowOrg.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/PaintRgn.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/PatBlt.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/Pie.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/PolyPolygon.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/Polygon.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/Polyline.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/Rectangle.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/RestoreDC.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/RoundRect.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SaveDC.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/ScaleViewportExt.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/ScaleWindowExt.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SelectClipRgn.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SelectObject.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetBkColor.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetBkMode.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetDIBitsToDevice.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetMapMode.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetMapperFlags.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetPixel.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetPolyFillMode.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetROP2.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetStretchBltMode.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetTextAlign.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetTextCharacterExtra.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetTextColor.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetTextJustification.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetViewportExt.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetViewportOrg.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetWindowExt.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/SetWindowOrg.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/StretchDib.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/TextOut.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/dibs.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/esc.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/index.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/mapmode.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/msmeta01.gif
-%%PORTDOCS%%%%DOCSDIR%%/caolan/msmeta02.gif
-%%PORTDOCS%%%%DOCSDIR%%/caolan/msmeta03.gif
-%%PORTDOCS%%%%DOCSDIR%%/caolan/msmeta04.gif
-%%PORTDOCS%%%%DOCSDIR%%/caolan/ora-clp.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/ora-wmf.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/pics/weave.jpg
-%%PORTDOCS%%%%DOCSDIR%%/caolan/rop.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/support.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/support2.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/template.html
-%%PORTDOCS%%%%DOCSDIR%%/caolan/unknown.html
-%%PORTDOCS%%%%DOCSDIR%%/dlayer.html
-%%PORTDOCS%%%%DOCSDIR%%/gd.html
-%%PORTDOCS%%%%DOCSDIR%%/html/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bbuf_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/canvas_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/clip_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/coord_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dc_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/defaults_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/defs_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/html/eps_2bmp_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/eps_2device_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/eps_2draw_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/eps_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/eps_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/fig_2bmp_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/fig_2device_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/fig_2draw_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/fig_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/fig_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/files.html
-%%PORTDOCS%%%%DOCSDIR%%/html/font_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/foreign_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/foreign_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/html/fund_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/gd_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/html/include_2libwmf_2color_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/include_2libwmf_2font_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/io-wmf_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ipa_2bmp_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ipa_2eps_2region_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ipa_2fig_2region_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ipa_2magick_2region_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ipa_2plot_2region_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ipa_2svg_2region_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ipa_2x_2region_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ipa_2xgd_2region_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ipa_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ipa_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/macro_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/magick_2bmp_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/magick_2device_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/magick_2draw_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/magick_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/magick_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/meta_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/meta_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/metadefs_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/player_2region_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/player_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/plot_2bmp_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/plot_2device_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/plot_2draw_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/plot_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/plot_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/record_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/recorder_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/recorder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/src_2font_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/src_2ipa_2fig_2color_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/src_2ipa_2fig_2font_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/src_2ipa_2ipa_2color_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/src_2ipa_2ipa_2font_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/src_2ipa_2x_2color_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/src_2ipa_2x_2font_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/src_2ipa_2xgd_2font_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/src_2player_2color_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/stream_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/structWmfContext.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfAPI.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfAPI__Options.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfAttributeStore.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfAttributes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfBMP.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfBMP__Draw__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfBMP__Read__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfBrush.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfCanvasBrush.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfCanvasFont.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfCanvasPen.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfColorData.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfConstruct.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfDC.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfD__Coord.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfD__Rect.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfDrawArc__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfDrawLine__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfDrawPixel__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfDrawRectangle__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfDrawText__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfFT__CacheEntry.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfFT__Mapping.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfFlood__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfFont.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfFontData.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfFontMap.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfFontmapData.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfFunctionReference.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfGS__FontData.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfGS__FontInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfHead.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfIPAFont.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfImage.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfMapping.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfMetaHeader.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfPen.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfPlaceableMetaHeader.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfPolyLine__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfPolyPoly__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfPolyRectangle__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfRGB.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfROP__Draw__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfRecordBox.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfStream.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfUserData__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfWriteFileInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfXML__FontData.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfXML__FontInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmfXML__InputData.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmf__eps__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmf__fig__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmf__fig__t_1_1__wmf__fig__image.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmf__foreign__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmf__gd__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmf__gd__t_1_1__wmf__gd__sink.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmf__magick__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmf__magick__t_1_1__wmf__magick__image.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmf__plot__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmf__svg__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmf__svg__t_1_1__wmf__svg__image.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmf__template__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/struct__wmf__x__t.html
-%%PORTDOCS%%%%DOCSDIR%%/html/svg_2bmp_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/svg_2device_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/svg_2draw_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/svg_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/svg_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/template_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/template_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/types_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/wmf_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x_2bmp_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x_2device_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x_2draw_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/xgd_2bmp_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/xgd_2device_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/xgd_2draw_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/xgd_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/xml_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/xml_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/smlogo2.gif
-%%PORTDOCS%%%%DOCSDIR%%/tutapi.html
-%%PORTDOCS%%%%DOCSDIR%%/tutipa.html
-%%PORTDOCS%%%%DOCSDIR%%/wmfpic.png
 %%DATADIR%%/fonts/fontmap
 %%DATADIR%%/fonts/n019003l.afm
 %%DATADIR%%/fonts/n019003l.pfb
@@ -307,10 +66,5 @@ lib/libwmflite.so.7
 %%DATADIR%%/fonts/s050000l.pfb
 @dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/caolan/pics
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/caolan
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/libwmf/gd
 @dirrm include/libwmf
-