2 files changed, 44 insertions, 8 deletions

diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index b81d587187a7..f3ca0f54f948 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -19,17 +19,22 @@ USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
+LMAN1=	gif2rgb.1 gifasm.1 gifbg.1 gifclip.1 gifclrmp.1 gifcolor.1 gifcomb.1 \
+	gifcompose.1 giffiltr.1 giffix.1 gifflip.1 gifhisto.1 gifinter.1 \
+	gifinto.1 gifovly.1 gifpos.1 gifrotat.1 gifrsize.1 gifspnge.1 \
+	giftext.1 gifwedge.1 icon2gif.1 raw2gif.1 rgb2gif.1 text2gif.1
+
 OPTIONS_DEFINE=	DOCBOOK X11
 OPTIONS_SUB=	yes
 DOCBOOK_DESC=	Generate API documentation (requires DOCS)
 
 X11_CONFIGURE_ENABLE=	x11
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto \
-		${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-xml
+	${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-xml
 PLIST_SUB+=	WITH_DOCBOOK=''
 .else
 PLIST_SUB+=	WITH_DOCBOOK='@comment '
@@ -38,6 +43,7 @@ PLIST_SUB+=	WITH_DOCBOOK='@comment '
 .if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11 sm ice
 CPPFLAGS+=	-I${LOCALBASE}/include
+LMAN1+=		gif2x11.1
 .else
 NOX11SUFFIX=	-nox11
 .endif
@@ -45,15 +51,19 @@ NOX11SUFFIX=	-nox11
 post-patch:
 	${CP} ${FILESDIR}/quantize.c ${WRKSRC}/lib/
 .if ! ${PORT_OPTIONS:MDOCBOOK} || ! ${PORT_OPTIONS:MDOCS}
-	${REINPLACE_CMD} -e 's|SUBDIRS = lib util doc pic|SUBDIRS = lib util pic|' \
+	${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:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR}
+.for i in ${LMAN1}
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${STAGEDIR}${PREFIX}/man/man1/
+.endfor
+.if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/giflib/pkg-plist b/graphics/giflib/pkg-plist
index 1fee0b1c327d..ee742757ffd4 100644
--- a/graphics/giflib/pkg-plist
+++ b/graphics/giflib/pkg-plist
@@ -31,6 +31,32 @@ lib/libgif.a
 lib/libgif.la
 lib/libgif.so
 lib/libgif.so.5
+man/man1/gif2rgb.1.gz
+%%X11%%man/man1/gif2x11.1.gz
+man/man1/gifasm.1.gz
+man/man1/gifbg.1.gz
+man/man1/gifclip.1.gz
+man/man1/gifclrmp.1.gz
+man/man1/gifcolor.1.gz
+man/man1/gifcomb.1.gz
+man/man1/gifcompose.1.gz
+man/man1/giffiltr.1.gz
+man/man1/giffix.1.gz
+man/man1/gifflip.1.gz
+man/man1/gifhisto.1.gz
+man/man1/gifinter.1.gz
+man/man1/gifinto.1.gz
+man/man1/gifovly.1.gz
+man/man1/gifpos.1.gz
+man/man1/gifrotat.1.gz
+man/man1/gifrsize.1.gz
+man/man1/gifspnge.1.gz
+man/man1/giftext.1.gz
+man/man1/gifwedge.1.gz
+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