2 files changed, 42 insertions, 35 deletions

diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index af75c94b1002..2db130090a03 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	giflib
 PORTVERSION=	4.2.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-4.x
 PKGNAMESUFFIX=	${NOX11SUFFIX}${PKGNAMESUFFIX2}
@@ -17,11 +18,17 @@ USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	DOCBOOK
+DOCBOOK_DESC=	Generate API documentation (requires DOCS)
+
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MDOCS}
+.if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto \
 		${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk
+PLIST_SUB+=	WITH_DOCBOOK=''
+.else
+PLIST_SUB+=	WITH_DOCBOOK='@comment '
 .endif
 
 .if defined(WITHOUT_X11)
@@ -36,13 +43,13 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	${CP} ${FILESDIR}/quantize.c ${WRKSRC}/lib/
-.if ! ${PORT_OPTIONS:MDOCS}
+.if ! ${PORT_OPTIONS:MDOCBOOK} || ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's|SUBDIRS = lib util doc pic|SUBDIRS = lib util pic|' \
 		${WRKSRC}/Makefile.in
 .endif
 
+.if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
diff --git a/graphics/giflib/pkg-plist b/graphics/giflib/pkg-plist
index 93fd721bf0b1..1fee0b1c327d 100644
--- a/graphics/giflib/pkg-plist
+++ b/graphics/giflib/pkg-plist
@@ -31,35 +31,35 @@ lib/libgif.a
 lib/libgif.la
 lib/libgif.so
 lib/libgif.so.5
-%%PORTDOCS%%%%DOCSDIR%%/gif2rgb.html
-%%PORTDOCS%%%%DOCSDIR%%/gif2x11.html
-%%PORTDOCS%%%%DOCSDIR%%/gif89.txt
-%%PORTDOCS%%%%DOCSDIR%%/gif_lib.html
-%%PORTDOCS%%%%DOCSDIR%%/gifasm.html
-%%PORTDOCS%%%%DOCSDIR%%/gifbg.html
-%%PORTDOCS%%%%DOCSDIR%%/gifclip.html
-%%PORTDOCS%%%%DOCSDIR%%/gifclrmp.html
-%%PORTDOCS%%%%DOCSDIR%%/gifcolor.html
-%%PORTDOCS%%%%DOCSDIR%%/gifcomb.html
-%%PORTDOCS%%%%DOCSDIR%%/gifcompose.html
-%%PORTDOCS%%%%DOCSDIR%%/giffiltr.html
-%%PORTDOCS%%%%DOCSDIR%%/giffix.html
-%%PORTDOCS%%%%DOCSDIR%%/gifflip.html
-%%PORTDOCS%%%%DOCSDIR%%/gifhisto.html
-%%PORTDOCS%%%%DOCSDIR%%/gifinter.html
-%%PORTDOCS%%%%DOCSDIR%%/gifinto.html
-%%PORTDOCS%%%%DOCSDIR%%/gifovly.html
-%%PORTDOCS%%%%DOCSDIR%%/gifpos.html
-%%PORTDOCS%%%%DOCSDIR%%/gifrotat.html
-%%PORTDOCS%%%%DOCSDIR%%/gifrsize.html
-%%PORTDOCS%%%%DOCSDIR%%/gifspnge.html
-%%PORTDOCS%%%%DOCSDIR%%/giftext.html
-%%PORTDOCS%%%%DOCSDIR%%/gifwedge.html
-%%PORTDOCS%%%%DOCSDIR%%/icon2gif.html
-%%PORTDOCS%%%%DOCSDIR%%/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/liberror.html
-%%PORTDOCS%%%%DOCSDIR%%/lzgif.txt
-%%PORTDOCS%%%%DOCSDIR%%/raw2gif.html
-%%PORTDOCS%%%%DOCSDIR%%/rgb2gif.html
-%%PORTDOCS%%%%DOCSDIR%%/text2gif.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%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%%