3 files changed, 78 insertions, 37 deletions

diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index a778100ee46f..f9a0c4213ea8 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	1.0rc2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fluxbox
@@ -31,6 +31,7 @@ GNU_CONFIGURE=	yes
 DOCS=		AUTHORS COPYING ChangeLog NEWS README TODO
 MAN1=		fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox.1 fluxstyle.1 \
 		startfluxbox.1
+DOCSVERSION=	20060629
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
@@ -39,17 +40,19 @@ STRIP=
 .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
+MASTER_SITES+=		${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:html \
+			http://people.freebsd.org/~mezz/distfiles/:html
+DISTFILES+=		fb-doc-mfhtml-${DOCSVERSION}.tgz:html
+EXTRACT_ONLY+=		fb-doc-mfhtml-${DOCSVERSION}.tgz
 PLIST_SUB+=		DOCHTML:=""
 .else
 PLIST_SUB+=		DOCHTML:="@comment "
 .endif
 
 .if defined(WITH_DOCPDF)
-MASTER_SITES+=		http://fluxbox.org/docbook/en/pdf/:pdf
-DISTFILES+=		fluxbook.pdf:pdf
+MASTER_SITES+=		${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:pdf \
+			http://people.freebsd.org/~mezz/distfiles/:pdf
+DISTFILES+=		fluxbook-${DOCSVERSION}.pdf:pdf
 PLIST_SUB+=		DOCPDF:=""
 .else
 PLIST_SUB+=		DOCPDF:="@comment "
diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo
index 0cb11cd5bae5..44e62cb53da4 100644
--- a/x11-wm/fluxbox-devel/distinfo
+++ b/x11-wm/fluxbox-devel/distinfo
@@ -1,9 +1,9 @@
 MD5 (fluxbox-1.0rc2.tar.gz) = 701d6e55553dc53f70e97e639a8cc583
 SHA256 (fluxbox-1.0rc2.tar.gz) = ee27c57ddc7e0bc66c32e5e4e92026aa6db513dddd345b2e9f895ff8789dabf2
 SIZE (fluxbox-1.0rc2.tar.gz) = 1016197
-MD5 (fb-doc-mfhtml.tgz) = 127722f85b2edadec63157fbcbceecf5
-SHA256 (fb-doc-mfhtml.tgz) = 1a175f7b7765c7e27005562ee337e2f2d4378da94f417e1969e756f1dea62416
-SIZE (fb-doc-mfhtml.tgz) = 74142
-MD5 (fluxbook.pdf) = 571d22679d6a0a1f8a92e0e93c40c0b1
-SHA256 (fluxbook.pdf) = debe5c66f7bdbd2e68b6cd63eec184294f593371925dfae3f921971be3bf708c
-SIZE (fluxbook.pdf) = 429962
+MD5 (fb-doc-mfhtml-20060629.tgz) = 0c100fe1489c22f5b205d87b9a6fa006
+SHA256 (fb-doc-mfhtml-20060629.tgz) = 98d37b73dbb1caf1361b098bffc69d1f365f9b324a71f622ba72ed5da5d9b9ec
+SIZE (fb-doc-mfhtml-20060629.tgz) = 115560
+MD5 (fluxbook-20060629.pdf) = 83d96b1c8a9276238300cf732f137182
+SHA256 (fluxbook-20060629.pdf) = 8f225b101e9ab81543182c83699aeef3fe86370d72da215831321c903eee9cde
+SIZE (fluxbook-20060629.pdf) = 430351
diff --git a/x11-wm/fluxbox-devel/pkg-plist b/x11-wm/fluxbox-devel/pkg-plist
index a1aa645a07bb..87102623f77d 100644
--- a/x11-wm/fluxbox-devel/pkg-plist
+++ b/x11-wm/fluxbox-devel/pkg-plist
@@ -15,16 +15,32 @@ bin/startfluxbox
 %%DOCHTML:%%%%DOCSDIR%%/html/app-setup.html
 %%DOCHTML:%%%%DOCSDIR%%/html/app-themeref.html
 %%DOCHTML:%%%%DOCSDIR%%/html/book1.html
-%%DOCHTML:%%%%DOCSDIR%%/html/bsetroot-man.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c151.html
 %%DOCHTML:%%%%DOCSDIR%%/html/c152.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c153.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c155.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c157.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c158.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c160.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c161.html
 %%DOCHTML:%%%%DOCSDIR%%/html/c28.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c287.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c288.html
 %%DOCHTML:%%%%DOCSDIR%%/html/c289.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c722.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c724.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c728.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c290.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c292.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c294.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c295.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c297.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c298.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c731.html
 %%DOCHTML:%%%%DOCSDIR%%/html/c732.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c733.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c735.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c737.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c738.html
 %%DOCHTML:%%%%DOCSDIR%%/html/c740.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c741.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c96.html
 %%DOCHTML:%%%%DOCSDIR%%/html/c98.html
 %%DOCHTML:%%%%DOCSDIR%%/html/chap-bg.html
 %%DOCHTML:%%%%DOCSDIR%%/html/chap-slit.html
@@ -33,39 +49,61 @@ bin/startfluxbox
 %%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/x148.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x159.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x160.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x231.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x161.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x163.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x165.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x166.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x168.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x169.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x232.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x233.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x315.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x317.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x234.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x236.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x238.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x239.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x241.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x242.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x320.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x321.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x346.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x348.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x322.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x324.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x326.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x327.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x329.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x330.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x351.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x352.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x353.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x355.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x357.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x358.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x360.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x361.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x47.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x739.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x741.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x745.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x748.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x749.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x750.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x752.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x754.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x755.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x757.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x795.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x812.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x813.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x814.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x817.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x820.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x824.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x758.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x827.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x828.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x829.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x831.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x833.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x834.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x836.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x837.html
 %%DOCPDF:%%%%DOCSDIR%%/pdf/fluxbook.pdf
 %%DATADIR%%/init
 %%DATADIR%%/keys