2 files changed, 32 insertions, 35 deletions

diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index f3ca0f54f948..fd56b9438868 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -35,9 +35,6 @@ X11_CONFIGURE_ENABLE=	x11
 .if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto \
 	${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-xml
-PLIST_SUB+=	WITH_DOCBOOK=''
-.else
-PLIST_SUB+=	WITH_DOCBOOK='@comment '
 .endif
 
 .if ${PORT_OPTIONS:MX11}
diff --git a/graphics/giflib/pkg-plist b/graphics/giflib/pkg-plist
index ee742757ffd4..d71566c8452c 100644
--- a/graphics/giflib/pkg-plist
+++ b/graphics/giflib/pkg-plist
@@ -57,35 +57,35 @@ man/man1/icon2gif.1.gz
 man/man1/raw2gif.1.gz
 man/man1/rgb2gif.1.gz
 man/man1/text2gif.1.gz
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gif2rgb.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gif2x11.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gif89.txt
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gif_lib.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifasm.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifbg.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifclip.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifclrmp.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifcolor.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifcomb.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifcompose.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/giffiltr.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/giffix.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifflip.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifhisto.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifinter.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifinto.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifovly.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifpos.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifrotat.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifrsize.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifspnge.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/giftext.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifwedge.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/icon2gif.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/intro.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/liberror.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/lzgif.txt
-%%WITH_DOCBOOK%%%%DOCSDIR%%/raw2gif.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/rgb2gif.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/text2gif.html
-%%WITH_DOCBOOK%%@dirrm %%DOCSDIR%%
+%%DOCBOOK%%%%DOCSDIR%%/gif2rgb.html
+%%DOCBOOK%%%%DOCSDIR%%/gif2x11.html
+%%DOCBOOK%%%%DOCSDIR%%/gif89.txt
+%%DOCBOOK%%%%DOCSDIR%%/gif_lib.html
+%%DOCBOOK%%%%DOCSDIR%%/gifasm.html
+%%DOCBOOK%%%%DOCSDIR%%/gifbg.html
+%%DOCBOOK%%%%DOCSDIR%%/gifclip.html
+%%DOCBOOK%%%%DOCSDIR%%/gifclrmp.html
+%%DOCBOOK%%%%DOCSDIR%%/gifcolor.html
+%%DOCBOOK%%%%DOCSDIR%%/gifcomb.html
+%%DOCBOOK%%%%DOCSDIR%%/gifcompose.html
+%%DOCBOOK%%%%DOCSDIR%%/giffiltr.html
+%%DOCBOOK%%%%DOCSDIR%%/giffix.html
+%%DOCBOOK%%%%DOCSDIR%%/gifflip.html
+%%DOCBOOK%%%%DOCSDIR%%/gifhisto.html
+%%DOCBOOK%%%%DOCSDIR%%/gifinter.html
+%%DOCBOOK%%%%DOCSDIR%%/gifinto.html
+%%DOCBOOK%%%%DOCSDIR%%/gifovly.html
+%%DOCBOOK%%%%DOCSDIR%%/gifpos.html
+%%DOCBOOK%%%%DOCSDIR%%/gifrotat.html
+%%DOCBOOK%%%%DOCSDIR%%/gifrsize.html
+%%DOCBOOK%%%%DOCSDIR%%/gifspnge.html
+%%DOCBOOK%%%%DOCSDIR%%/giftext.html
+%%DOCBOOK%%%%DOCSDIR%%/gifwedge.html
+%%DOCBOOK%%%%DOCSDIR%%/icon2gif.html
+%%DOCBOOK%%%%DOCSDIR%%/intro.html
+%%DOCBOOK%%%%DOCSDIR%%/liberror.html
+%%DOCBOOK%%%%DOCSDIR%%/lzgif.txt
+%%DOCBOOK%%%%DOCSDIR%%/raw2gif.html
+%%DOCBOOK%%%%DOCSDIR%%/rgb2gif.html
+%%DOCBOOK%%%%DOCSDIR%%/text2gif.html
+%%DOCBOOK%%@dirrm %%DOCSDIR%%