- Correct the message in WITHOUT_NLS, which it's really enable by default.

- Add two new WITH_DOCPDF and WITH_DOCHTML knobs to install documentation.

Approved by:	adamw (mentor)

3 files changed, 84 insertions, 6 deletions

diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index 4cfa818bafdd..e28b492099b1 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -11,6 +11,8 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fluxbox
 PKGNAMESUFFIX=	-devel
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://fluxbox.org/download/
 PATCHFILES=	fluxbox-0.9.9-gcc3.4.patch
@@ -25,7 +27,6 @@ RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools \
 
 CONFLICTS=	fluxbox-0.1.*
 
-USE_BZIP2=	yes
 WANT_GNOME=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
@@ -51,13 +52,30 @@ CONFIGURE_ARGS+=	--enable-kde
 CONFIGURE_ARGS+=	--disable-kde
 .endif
 
+.if defined(WITH_DOCPDF)
+MASTER_SITES+=		http://fluxbox.org/docbook/en/pdf/:pdf
+DISTFILES+=		fluxbook.pdf:pdf
+PLIST_SUB+=		DOCPDF:=""
+.else
+PLIST_SUB+=		DOCPDF:="@comment "
+.endif
+
+.if defined(WITH_DOCHTML)
+MASTER_SITES+=		http://fluxbox.org/docbook/en/tarballs/:html
+DISTFILES+=		fb-doc-mfhtml.tgz:html
+EXTRACT_ONLY+=		fb-doc-mfhtml.tgz
+PLIST_SUB+=		DOCHTML:=""
+.else
+PLIST_SUB+=		DOCHTML:="@comment "
+.endif
+
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
 CONFIGURE_ARGS+=	--enable-nls
-PLIST_SUB=		NLS:=""
+PLIST_SUB+=		NLS:=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB=		NLS:="@comment "
+PLIST_SUB+=		NLS:="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
@@ -84,8 +102,14 @@ pre-everything::
 .if !defined(WITH_GNOME)
 	@${ECHO_CMD} "WITH_GNOME=yes		Enable GNOME support"
 .endif
+.if !defined(WITH_DOCPDF)
+	@${ECHO_CMD} "WITH_DOCPDF=yes		Install the PDF documentation"
+.endif
+.if !defined(WITH_DOCHTML)
+	@${ECHO_CMD} "WITH_DOCHTML=yes	Install the HTML documentation"
+.endif
 .if !defined(WITHOUT_NLS)
-	@${ECHO_CMD} "WITH_NLS=yes		Enable NLS support"
+	@${ECHO_CMD} "WITHOUT_NLS=yes		Disable NLS support"
 .endif
 
 post-patch:
@@ -98,6 +122,15 @@ post-patch:
 .endif
 
 post-install:
+.if defined(WITH_DOCPDF)
+	@${MKDIR} ${DOCSDIR}/pdf
+	@${INSTALL_DATA} ${DISTDIR}/fluxbook.pdf ${DOCSDIR}/pdf/
+.endif
+.if defined(WITH_DOCHTML)
+	@${MKDIR} ${DOCSDIR}/html
+	@${INSTALL_DATA} ${WRKDIR}/html/*.css ${DOCSDIR}/html/
+	@${INSTALL_DATA} ${WRKDIR}/html/*.html ${DOCSDIR}/html/
+.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo
index dbdb1ee852a2..aea87aa60918 100644
--- a/x11-wm/fluxbox-devel/distinfo
+++ b/x11-wm/fluxbox-devel/distinfo
@@ -1,4 +1,8 @@
-MD5 (fluxbox-0.9.9.tar.bz2) = b96f9b23b6605274bf0f7c3f84d080f1
-SIZE (fluxbox-0.9.9.tar.bz2) = 536673
+MD5 (fluxbox-0.9.9.tar.gz) = b0c637b1b6baa646f99877321b5d9e53
+SIZE (fluxbox-0.9.9.tar.gz) = 723342
+MD5 (fluxbook.pdf) = 44ac2a2291d739cd72acfafced2baafe
+SIZE (fluxbook.pdf) = 202652
+MD5 (fb-doc-mfhtml.tgz) = ce0f9171b7b497eb08a93e035cf879b4
+SIZE (fb-doc-mfhtml.tgz) = 61972
 MD5 (fluxbox-0.9.9-gcc3.4.patch) = 8d626eb9d87864d51db64832dcc6a023
 SIZE (fluxbox-0.9.9-gcc3.4.patch) = 847
diff --git a/x11-wm/fluxbox-devel/pkg-plist b/x11-wm/fluxbox-devel/pkg-plist
index 46b682263174..9479335de5f1 100644
--- a/x11-wm/fluxbox-devel/pkg-plist
+++ b/x11-wm/fluxbox-devel/pkg-plist
@@ -3,6 +3,44 @@ bin/fbsetbg
 bin/fluxbox
 bin/fluxbox-generate_menu
 bin/startfluxbox
+%%DOCHTML:%%%%DOCSDIR%%/html/app-artwiz.html
+%%DOCHTML:%%%%DOCSDIR%%/html/app-debugging.html
+%%DOCHTML:%%%%DOCSDIR%%/html/app-setup.html
+%%DOCHTML:%%%%DOCSDIR%%/html/app-themeref.html
+%%DOCHTML:%%%%DOCSDIR%%/html/bsetroot-man.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c152.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c28.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c287.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c722.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c740.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c98.html
+%%DOCHTML:%%%%DOCSDIR%%/html/chap-bg.html
+%%DOCHTML:%%%%DOCSDIR%%/html/chap-slit.html
+%%DOCHTML:%%%%DOCSDIR%%/html/chap-tabs.html
+%%DOCHTML:%%%%DOCSDIR%%/html/chap-themes.html
+%%DOCHTML:%%%%DOCSDIR%%/html/chap-toolbar.html
+%%DOCHTML:%%%%DOCSDIR%%/html/docbook.css
+%%DOCHTML:%%%%DOCSDIR%%/html/faq.html
+%%DOCHTML:%%%%DOCSDIR%%/html/fbrun-man.html
+%%DOCHTML:%%%%DOCSDIR%%/html/fbsetbg-man.html
+%%DOCHTML:%%%%DOCSDIR%%/html/fluxbox-man.html
+%%DOCHTML:%%%%DOCSDIR%%/html/fluxboxstyle-man.html
+%%DOCHTML:%%%%DOCSDIR%%/html/fluxstyle-man.html
+%%DOCHTML:%%%%DOCSDIR%%/html/index.html
+%%DOCHTML:%%%%DOCSDIR%%/html/sect-fbgm.html
+%%DOCHTML:%%%%DOCSDIR%%/html/sect-fluxspace.html
+%%DOCHTML:%%%%DOCSDIR%%/html/sect-pager.html
+%%DOCHTML:%%%%DOCSDIR%%/html/sect-wmctrl.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x160.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x231.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x315.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x346.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x47.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x739.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x757.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x795.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x813.html
+%%DOCPDF:%%%%DOCSDIR%%/pdf/fluxbook.pdf
 share/fluxbox/init
 share/fluxbox/keys
 share/fluxbox/menu
@@ -124,3 +162,6 @@ share/fluxbox/styles/qnx-photon
 %%NLS:%%@dirrm share/fluxbox/nls/C
 %%NLS:%%@dirrm share/fluxbox/nls
 @dirrm share/fluxbox
+%%DOCPDF:%%@dirrm %%DOCSDIR%%/pdf
+%%DOCHTML:%%@dirrm %%DOCSDIR%%/html
+@dirrm %%DOCSDIR%%