diff --git a/de_DE.ISO8859-1/books/handbook/Makefile b/de_DE.ISO8859-1/books/handbook/Makefile
index 4c47db0ab8..f4d2e1c876 100644
--- a/de_DE.ISO8859-1/books/handbook/Makefile
+++ b/de_DE.ISO8859-1/books/handbook/Makefile
@@ -1,237 +1,226 @@
 #
 # $FreeBSD$
 # $FreeBSDde: de-docproj/books/handbook/Makefile,v 1.48 2006/03/13 20:57:05 jkois Exp $
 # basiert auf: 1.97
 #
 # Build the FreeBSD Handbook in its German translation.
 #
 
 .PATH: ${.CURDIR}/../../share/sgml/glossary
 
 MAINTAINER=de-bsd-translators@de.FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split
 
 HAS_INDEX= true
+USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 IMAGES_EN = advanced-networking/isdn-bus.eps
 IMAGES_EN+= advanced-networking/isdn-twisted-pair.eps
 IMAGES_EN+= advanced-networking/natd.eps
 IMAGES_EN+= advanced-networking/net-routing.pic
 IMAGES_EN+= advanced-networking/static-routes.pic
 IMAGES_EN+= geom/striping.pic
 IMAGES_EN+= install/adduser1.scr
 IMAGES_EN+= install/adduser2.scr
 IMAGES_EN+= install/adduser3.scr
 IMAGES_EN+= install/boot-mgr.scr
 IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
 IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
 IMAGES_EN+= install/disklabel-fs.scr
 IMAGES_EN+= install/disklabel-root1.scr
 IMAGES_EN+= install/disklabel-root2.scr
 IMAGES_EN+= install/disklabel-root3.scr
 IMAGES_EN+= install/disk-layout.eps
 IMAGES_EN+= install/dist-set.scr
 IMAGES_EN+= install/dist-set2.scr
 IMAGES_EN+= install/docmenu1.scr
 IMAGES_EN+= install/ed0-conf.scr
 IMAGES_EN+= install/ed0-conf2.scr
 IMAGES_EN+= install/edit-inetd-conf.scr
 IMAGES_EN+= install/fdisk-drive1.scr
 IMAGES_EN+= install/fdisk-drive2.scr
 IMAGES_EN+= install/fdisk-edit1.scr
 IMAGES_EN+= install/fdisk-edit2.scr
 IMAGES_EN+= install/ftp-anon1.scr
 IMAGES_EN+= install/ftp-anon2.scr
 IMAGES_EN+= install/hdwrconf.scr
 IMAGES_EN+= install/keymap.scr
 IMAGES_EN+= install/main1.scr
 IMAGES_EN+= install/mainexit.scr
 IMAGES_EN+= install/main-std.scr
 IMAGES_EN+= install/main-options.scr
 IMAGES_EN+= install/main-doc.scr
 IMAGES_EN+= install/main-keymap.scr
 IMAGES_EN+= install/media.scr
 IMAGES_EN+= install/mouse1.scr
 IMAGES_EN+= install/mouse2.scr
 IMAGES_EN+= install/mouse3.scr
 IMAGES_EN+= install/mouse4.scr
 IMAGES_EN+= install/mouse5.scr
 IMAGES_EN+= install/mouse6.scr
 IMAGES_EN+= install/mta-main.scr
 IMAGES_EN+= install/net-config-menu1.scr
 IMAGES_EN+= install/net-config-menu2.scr
 IMAGES_EN+= install/nfs-server-edit.scr
 IMAGES_EN+= install/ntp-config.scr
 IMAGES_EN+= install/options.scr
 IMAGES_EN+= install/pkg-cat.scr
 IMAGES_EN+= install/pkg-confirm.scr
 IMAGES_EN+= install/pkg-install.scr
 IMAGES_EN+= install/pkg-sel.scr
 IMAGES_EN+= install/probstart.scr
 IMAGES_EN+= install/routed.scr
 IMAGES_EN+= install/security.scr
 IMAGES_EN+= install/sysinstall-exit.scr
 IMAGES_EN+= install/timezone1.scr
 IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
 IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= install/example-dir1.eps
 IMAGES_EN+= install/example-dir2.eps
 IMAGES_EN+= install/example-dir3.eps
 IMAGES_EN+= install/example-dir4.eps
 IMAGES_EN+= install/example-dir5.eps
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
 IMAGES_EN+= mail/pine1.scr
 IMAGES_EN+= mail/pine2.scr
 IMAGES_EN+= mail/pine3.scr
 IMAGES_EN+= mail/pine4.scr
 IMAGES_EN+= mail/pine5.scr
 IMAGES_EN+= security/ipsec-network.pic
 IMAGES_EN+= security/ipsec-crypt-pkt.pic
 IMAGES_EN+= security/ipsec-encap-pkt.pic
 IMAGES_EN+= security/ipsec-out-pkt.pic
 IMAGES_EN+= vinum/vinum-concat.pic
 IMAGES_EN+= vinum/vinum-mirrored-vol.pic
 IMAGES_EN+= vinum/vinum-raid10-vol.pic
 IMAGES_EN+= vinum/vinum-raid5-org.pic
 IMAGES_EN+= vinum/vinum-simple-vol.pic
 IMAGES_EN+= vinum/vinum-striped-vol.pic
 IMAGES_EN+= vinum/vinum-striped.pic
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png
 IMAGES_LIB+= callouts/2.png
 IMAGES_LIB+= callouts/3.png
 IMAGES_LIB+= callouts/4.png
 IMAGES_LIB+= callouts/5.png
 IMAGES_LIB+= callouts/6.png
 IMAGES_LIB+= callouts/7.png
 IMAGES_LIB+= callouts/8.png
 IMAGES_LIB+= callouts/9.png
 IMAGES_LIB+= callouts/10.png
 
 #
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
 #
 
 # SGML content
 SRCS+= audit/chapter.sgml
 SRCS+= book.sgml
 SRCS+= colophon.sgml
 SRCS+= freebsd-glossary.sgml
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
 SRCS+= boot/chapter.sgml
 SRCS+= config/chapter.sgml
 SRCS+= cutting-edge/chapter.sgml
 SRCS+= desktop/chapter.sgml
 SRCS+= disks/chapter.sgml
 SRCS+= eresources/chapter.sgml
 SRCS+= firewalls/chapter.sgml
 SRCS+= geom/chapter.sgml
 SRCS+= install/chapter.sgml
 SRCS+= introduction/chapter.sgml
 SRCS+= kernelconfig/chapter.sgml
 SRCS+= l10n/chapter.sgml
 SRCS+= linuxemu/chapter.sgml
 SRCS+= mac/chapter.sgml
 SRCS+= mail/chapter.sgml
 SRCS+= mirrors/chapter.sgml
 SRCS+= multimedia/chapter.sgml
 SRCS+= network-servers/chapter.sgml
 SRCS+= pgpkeys/chapter.sgml
 SRCS+= ports/chapter.sgml
 SRCS+= ppp-and-slip/chapter.sgml
 SRCS+= preface/preface.sgml
 SRCS+= printing/chapter.sgml
 SRCS+= security/chapter.sgml
 SRCS+= serialcomms/chapter.sgml
 SRCS+= users/chapter.sgml
 SRCS+= vinum/chapter.sgml
 SRCS+= x11/chapter.sgml
 
 # Entities
 SRCS+= chapters.ent
 SRCS+= newsgroups.ent
 
 # alle Kapitel bauen
 CHAPTERS?= ${SRCS:M*chapter.sgml}
 
 SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
 SGMLFLAGS+= -i chap.freebsd-glossary
 
-# XXX The Handbook build currently overflows some internal, hardcoded
-# limits in pdftex.  Until we split the Handbook up, build the PDF
-# version using ps2pdf instead of pdftex.
-
-PS2PDF?=	${PREFIX}/bin/ps2pdf
-
-book.tex-pdf:
-	${TOUCH} book.tex-pdf
-
-book.pdf: book.ps
-	${PS2PDF} book.ps book.pdf
-
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 #
 # rules generating lists of mirror site from XML database.
 #
 XMLDOCS=	mirrors-ftp:::mirrors.sgml.ftp.inc.tmp \
 		mirrors-cvsup:::mirrors.sgml.cvsup.inc.tmp \
 		eresources:::eresources.sgml.www.inc.tmp
 DEPENDSET.DEFAULT=	transtable mirror
 XSLT.DEFAULT=		${XSL_MIRRORS}
 XML.DEFAULT=		${XML_MIRRORS}
 NO_TIDY.DEFAULT=	yes
 
 PARAMS.mirrors-ftp+=	--param 'type' "'ftp'" \
 			--param 'proto' "'ftp'" \
 			--param 'target' "'handbook/mirrors/chapter.sgml'"
 PARAMS.mirrors-cvsup+=	--param 'type' "'cvsup'" \
 			--param 'proto' "'cvsup'" \
 			--param 'target' "'handbook/mirrors/chapter.sgml'"
 PARAMS.eresources+=	--param 'type' "'www'" \
 			--param 'proto' "'http'" \
 			--param 'target' "'handbook/eresources/chapter.sgml'"
 
 SRCS+=		mirrors.sgml.ftp.inc \
 		mirrors.sgml.cvsup.inc \
 		eresources.sgml.www.inc
 CLEANFILES+=	mirrors.sgml.ftp.inc mirrors.sgml.ftp.inc.tmp \
 		mirrors.sgml.cvsup.inc mirrors.sgml.cvsup.inc.tmp \
 		eresources.sgml.www.inc eresources.sgml.www.inc.tmp
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
 .for p in ftp cvsup
 mirrors.sgml.${p}.inc: mirrors.sgml.${p}.inc.tmp
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
 .endfor
 
 eresources.sgml.www.inc: eresources.sgml.www.inc.tmp
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 4aae497e0f..b27f0720db 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -1,265 +1,254 @@
 #
 # $FreeBSD$
 #
 # Build the FreeBSD Handbook.
 #
 
 # ------------------------------------------------------------------------
 #
 # Handbook-specific variables
 #
 #	WITH_PGPKEYS	The print version of the handbook only prints PGP
 #			fingerprints by default.  If you would like for the
 #			entire key to be displayed, then set this variable.
 #			This option has no affect on the HTML formats.
 #			
 # Handbook-specific targets
 #
 #       pgpkeyring      This target will read the contents of
 #                       pgpkeys/chapter.sgml and will extract all of
 #                       the pgpkeys to standard out.  This output can then
 #                       be redirected into a file and distributed as a 
 #                       public keyring of FreeBSD developers that can
 #                       easily be imported into PGP/GPG.
 #
 # ------------------------------------------------------------------------
 
 .PATH: ${.CURDIR}/../../share/sgml/glossary
 
 MAINTAINER=	doc@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split
 
 HAS_INDEX= true
+USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 IMAGES_EN = advanced-networking/isdn-bus.eps
 IMAGES_EN+= advanced-networking/isdn-twisted-pair.eps
 IMAGES_EN+= advanced-networking/natd.eps
 IMAGES_EN+= advanced-networking/net-routing.pic
 IMAGES_EN+= advanced-networking/static-routes.pic
 IMAGES_EN+= geom/striping.pic
 IMAGES_EN+= install/adduser1.scr
 IMAGES_EN+= install/adduser2.scr
 IMAGES_EN+= install/adduser3.scr
 IMAGES_EN+= install/boot-mgr.scr
 IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
 IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
 IMAGES_EN+= install/disklabel-fs.scr
 IMAGES_EN+= install/disklabel-root1.scr
 IMAGES_EN+= install/disklabel-root2.scr
 IMAGES_EN+= install/disklabel-root3.scr
 IMAGES_EN+= install/disk-layout.eps
 IMAGES_EN+= install/dist-set.scr
 IMAGES_EN+= install/dist-set2.scr
 IMAGES_EN+= install/docmenu1.scr
 IMAGES_EN+= install/ed0-conf.scr
 IMAGES_EN+= install/ed0-conf2.scr
 IMAGES_EN+= install/edit-inetd-conf.scr
 IMAGES_EN+= install/fdisk-drive1.scr
 IMAGES_EN+= install/fdisk-drive2.scr
 IMAGES_EN+= install/fdisk-edit1.scr
 IMAGES_EN+= install/fdisk-edit2.scr
 IMAGES_EN+= install/ftp-anon1.scr
 IMAGES_EN+= install/ftp-anon2.scr
 IMAGES_EN+= install/hdwrconf.scr
 IMAGES_EN+= install/keymap.scr
 IMAGES_EN+= install/main1.scr
 IMAGES_EN+= install/mainexit.scr
 IMAGES_EN+= install/main-std.scr
 IMAGES_EN+= install/main-options.scr
 IMAGES_EN+= install/main-doc.scr
 IMAGES_EN+= install/main-keymap.scr
 IMAGES_EN+= install/media.scr
 IMAGES_EN+= install/mouse1.scr
 IMAGES_EN+= install/mouse2.scr
 IMAGES_EN+= install/mouse3.scr
 IMAGES_EN+= install/mouse4.scr
 IMAGES_EN+= install/mouse5.scr
 IMAGES_EN+= install/mouse6.scr
 IMAGES_EN+= install/mta-main.scr
 IMAGES_EN+= install/net-config-menu1.scr
 IMAGES_EN+= install/net-config-menu2.scr
 IMAGES_EN+= install/nfs-server-edit.scr
 IMAGES_EN+= install/ntp-config.scr
 IMAGES_EN+= install/options.scr
 IMAGES_EN+= install/pkg-cat.scr
 IMAGES_EN+= install/pkg-confirm.scr
 IMAGES_EN+= install/pkg-install.scr
 IMAGES_EN+= install/pkg-sel.scr
 IMAGES_EN+= install/probstart.scr
 IMAGES_EN+= install/routed.scr
 IMAGES_EN+= install/security.scr
 IMAGES_EN+= install/sysinstall-exit.scr
 IMAGES_EN+= install/timezone1.scr
 IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
 IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
 IMAGES_EN+= mail/pine1.scr
 IMAGES_EN+= mail/pine2.scr
 IMAGES_EN+= mail/pine3.scr
 IMAGES_EN+= mail/pine4.scr
 IMAGES_EN+= mail/pine5.scr
 
 IMAGES_EN+= install/example-dir1.eps
 IMAGES_EN+= install/example-dir2.eps
 IMAGES_EN+= install/example-dir3.eps
 IMAGES_EN+= install/example-dir4.eps
 IMAGES_EN+= install/example-dir5.eps
 IMAGES_EN+= security/ipsec-network.pic
 IMAGES_EN+= security/ipsec-crypt-pkt.pic
 IMAGES_EN+= security/ipsec-encap-pkt.pic
 IMAGES_EN+= security/ipsec-out-pkt.pic
 IMAGES_EN+= vinum/vinum-concat.pic
 IMAGES_EN+= vinum/vinum-mirrored-vol.pic
 IMAGES_EN+= vinum/vinum-raid10-vol.pic
 IMAGES_EN+= vinum/vinum-raid5-org.pic
 IMAGES_EN+= vinum/vinum-simple-vol.pic
 IMAGES_EN+= vinum/vinum-striped-vol.pic
 IMAGES_EN+= vinum/vinum-striped.pic
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png
 IMAGES_LIB+= callouts/2.png
 IMAGES_LIB+= callouts/3.png
 IMAGES_LIB+= callouts/4.png
 IMAGES_LIB+= callouts/5.png
 IMAGES_LIB+= callouts/6.png
 IMAGES_LIB+= callouts/7.png
 IMAGES_LIB+= callouts/8.png
 IMAGES_LIB+= callouts/9.png
 IMAGES_LIB+= callouts/10.png
 
 # 
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
 #
 
 # SGML content
 SRCS+= audit/chapter.sgml
 SRCS+= book.sgml
 SRCS+= colophon.sgml
 SRCS+= freebsd-glossary.sgml
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
 SRCS+= boot/chapter.sgml
 SRCS+= config/chapter.sgml
 SRCS+= cutting-edge/chapter.sgml
 SRCS+= desktop/chapter.sgml
 SRCS+= disks/chapter.sgml
 SRCS+= eresources/chapter.sgml
 SRCS+= firewalls/chapter.sgml
 SRCS+= geom/chapter.sgml
 SRCS+= install/chapter.sgml
 SRCS+= introduction/chapter.sgml
 SRCS+= kernelconfig/chapter.sgml
 SRCS+= l10n/chapter.sgml
 SRCS+= linuxemu/chapter.sgml
 SRCS+= mac/chapter.sgml
 SRCS+= mail/chapter.sgml
 SRCS+= mirrors/chapter.sgml
 SRCS+= multimedia/chapter.sgml
 SRCS+= network-servers/chapter.sgml
 SRCS+= pgpkeys/chapter.sgml
 SRCS+= ports/chapter.sgml
 SRCS+= ppp-and-slip/chapter.sgml
 SRCS+= preface/preface.sgml
 SRCS+= printing/chapter.sgml
 SRCS+= security/chapter.sgml
 SRCS+= serialcomms/chapter.sgml
 SRCS+= users/chapter.sgml
 SRCS+= vinum/chapter.sgml
 SRCS+= x11/chapter.sgml
 
 # Entities
 SRCS+= chapters.ent 
 
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
 # Turn on all the chapters.
 CHAPTERS?= ${SRCS:M*chapter.sgml}
 
 SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
 SGMLFLAGS+= -i chap.freebsd-glossary
 
-# XXX The Handbook build currently overflows some internal, hardcoded 
-# limits in pdftex.  Until we split the Handbook up, build the PDF 
-# version using ps2pdf instead of pdftex.
-
-PS2PDF?=	${PREFIX}/bin/ps2pdf
-
-book.tex-pdf:
-	${TOUCH} book.tex-pdf
-
-book.pdf: book.ps
-	${PS2PDF} book.ps book.pdf
-
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
 #
 # Handbook-specific variables
 #
 .if defined(WITH_PGPKEYS)
 JADEFLAGS+=	-V withpgpkeys
 .endif
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
 
 #
 # rules generating lists of mirror site from XML database.
 #
 XMLDOCS=	mirrors-ftp:::mirrors.sgml.ftp.inc.tmp \
 		mirrors-cvsup:::mirrors.sgml.cvsup.inc.tmp \
 		eresources:::eresources.sgml.www.inc.tmp
 DEPENDSET.DEFAULT=	transtable mirror
 XSLT.DEFAULT=		${XSL_MIRRORS}
 XML.DEFAULT=		${XML_MIRRORS}
 NO_TIDY.DEFAULT=	yes
 
 PARAMS.mirrors-ftp+=	--param 'type' "'ftp'" \
 			--param 'proto' "'ftp'" \
 			--param 'target' "'handbook/mirrors/chapter.sgml'"
 PARAMS.mirrors-cvsup+=	--param 'type' "'cvsup'" \
 			--param 'proto' "'cvsup'" \
 			--param 'target' "'handbook/mirrors/chapter.sgml'"
 PARAMS.eresources+=	--param 'type' "'www'" \
 			--param 'proto' "'http'" \
 			--param 'target' "'handbook/eresources/chapter.sgml'"
 
 SRCS+=		mirrors.sgml.ftp.inc \
 		mirrors.sgml.cvsup.inc \
 		eresources.sgml.www.inc
 
 CLEANFILES+=	mirrors.sgml.ftp.inc mirrors.sgml.ftp.inc.tmp \
 		mirrors.sgml.cvsup.inc mirrors.sgml.cvsup.inc.tmp \
 		eresources.sgml.www.inc eresources.sgml.www.inc.tmp
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
 .for p in ftp cvsup
 mirrors.sgml.${p}.inc: mirrors.sgml.${p}.inc.tmp
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
 .endfor
 
 eresources.sgml.www.inc: eresources.sgml.www.inc.tmp
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
diff --git a/es_ES.ISO8859-1/books/handbook/Makefile b/es_ES.ISO8859-1/books/handbook/Makefile
index 8c82d186c6..1475433c7a 100755
--- a/es_ES.ISO8859-1/books/handbook/Makefile
+++ b/es_ES.ISO8859-1/books/handbook/Makefile
@@ -1,222 +1,211 @@
 # 
 # $FreeBSD$
 # $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/Makefile,v 1.6 2004/10/08 22:36:28 jesusr Exp $
 #
 # Build the FreeBSD Handbook.
 #
 
 # ------------------------------------------------------------------------
 #
 # Handbook-specific variables
 #
 #	WITH_PGPKEYS	The print version of the handbook only prints PGP
 #			fingerprints by default.  If you would like for the
 #			entire key to be displayed, then set this variable.
 #			This option has no affect on the HTML formats.
 #			
 # Handbook-specific targets
 #
 #       pgpkeyring      This target will read the contents of
 #                       pgpkeys/chapter.sgml and will extract all of
 #                       the pgpkeys to standard out.  This output can then
 #                       be redirected into a file and distributed as a 
 #                       public keyring of FreeBSD developers that can
 #                       easily be imported into PGP/GPG.
 #
 # ------------------------------------------------------------------------
 
 MAINTAINER=	jesusr@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split
 
 HAS_INDEX= true
+USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 IMAGES_EN = advanced-networking/isdn-bus.eps
 IMAGES_EN+= advanced-networking/isdn-twisted-pair.eps
 IMAGES_EN+= advanced-networking/natd.eps
 IMAGES_EN+= advanced-networking/net-routing.pic
 IMAGES_EN+= advanced-networking/static-routes.pic
 IMAGES_EN+= geom/striping.pic
 IMAGES_EN+= install/adduser1.scr
 IMAGES_EN+= install/adduser2.scr
 IMAGES_EN+= install/adduser3.scr
 IMAGES_EN+= install/boot-mgr.scr
 IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
 IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
 IMAGES_EN+= install/disklabel-fs.scr
 IMAGES_EN+= install/disklabel-root1.scr
 IMAGES_EN+= install/disklabel-root2.scr
 IMAGES_EN+= install/disklabel-root3.scr
 IMAGES_EN+= install/disk-layout.eps
 IMAGES_EN+= install/dist-set.scr
 IMAGES_EN+= install/dist-set2.scr
 IMAGES_EN+= install/docmenu1.scr
 IMAGES_EN+= install/ed0-conf.scr
 IMAGES_EN+= install/ed0-conf2.scr
 IMAGES_EN+= install/edit-inetd-conf.scr
 IMAGES_EN+= install/fdisk-drive1.scr
 IMAGES_EN+= install/fdisk-drive2.scr
 IMAGES_EN+= install/fdisk-edit1.scr
 IMAGES_EN+= install/fdisk-edit2.scr
 IMAGES_EN+= install/ftp-anon1.scr
 IMAGES_EN+= install/ftp-anon2.scr
 IMAGES_EN+= install/hdwrconf.scr
 IMAGES_EN+= install/keymap.scr
 IMAGES_EN+= install/main1.scr
 IMAGES_EN+= install/mainexit.scr
 IMAGES_EN+= install/main-std.scr
 IMAGES_EN+= install/main-options.scr
 IMAGES_EN+= install/main-doc.scr
 IMAGES_EN+= install/main-keymap.scr
 IMAGES_EN+= install/media.scr
 IMAGES_EN+= install/mouse1.scr
 IMAGES_EN+= install/mouse2.scr
 IMAGES_EN+= install/mouse3.scr
 IMAGES_EN+= install/mouse4.scr
 IMAGES_EN+= install/mouse5.scr
 IMAGES_EN+= install/mouse6.scr
 IMAGES_EN+= install/mta-main.scr
 IMAGES_EN+= install/net-config-menu1.scr
 IMAGES_EN+= install/net-config-menu2.scr
 IMAGES_EN+= install/nfs-server-edit.scr
 IMAGES_EN+= install/ntp-config.scr
 IMAGES_EN+= install/options.scr
 IMAGES_EN+= install/pkg-cat.scr
 IMAGES_EN+= install/pkg-confirm.scr
 IMAGES_EN+= install/pkg-install.scr
 IMAGES_EN+= install/pkg-sel.scr
 IMAGES_EN+= install/probstart.scr
 IMAGES_EN+= install/routed.scr
 IMAGES_EN+= install/security.scr
 IMAGES_EN+= install/sysinstall-exit.scr
 IMAGES_EN+= install/timezone1.scr
 IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
 IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
 IMAGES_EN+= mail/pine1.scr
 IMAGES_EN+= mail/pine2.scr
 IMAGES_EN+= mail/pine3.scr
 IMAGES_EN+= mail/pine4.scr
 IMAGES_EN+= mail/pine5.scr
 
 IMAGES_EN+= install/example-dir1.eps
 IMAGES_EN+= install/example-dir2.eps
 IMAGES_EN+= install/example-dir3.eps
 IMAGES_EN+= install/example-dir4.eps
 IMAGES_EN+= install/example-dir5.eps
 IMAGES_EN+= security/ipsec-network.pic
 IMAGES_EN+= security/ipsec-crypt-pkt.pic
 IMAGES_EN+= security/ipsec-encap-pkt.pic
 IMAGES_EN+= security/ipsec-out-pkt.pic
 IMAGES_EN+= vinum/vinum-concat.pic
 IMAGES_EN+= vinum/vinum-mirrored-vol.pic
 IMAGES_EN+= vinum/vinum-raid10-vol.pic
 IMAGES_EN+= vinum/vinum-raid5-org.pic
 IMAGES_EN+= vinum/vinum-simple-vol.pic
 IMAGES_EN+= vinum/vinum-striped-vol.pic
 IMAGES_EN+= vinum/vinum-striped.pic
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png
 IMAGES_LIB+= callouts/2.png
 IMAGES_LIB+= callouts/3.png
 IMAGES_LIB+= callouts/4.png
 IMAGES_LIB+= callouts/5.png
 IMAGES_LIB+= callouts/6.png
 IMAGES_LIB+= callouts/7.png
 IMAGES_LIB+= callouts/8.png
 IMAGES_LIB+= callouts/9.png
 IMAGES_LIB+= callouts/10.png
 
 # 
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
 #
 
 # SGML content
 SRCS+=  book.sgml
 SRCS+= colophon.sgml
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
 SRCS+= boot/chapter.sgml
 SRCS+= config/chapter.sgml
 SRCS+= cutting-edge/chapter.sgml
 SRCS+= desktop/chapter.sgml
 SRCS+= disks/chapter.sgml
 SRCS+= eresources/chapter.sgml
 SRCS+= firewalls/chapter.sgml
 SRCS+= geom/chapter.sgml
 SRCS+= install/chapter.sgml
 SRCS+= introduction/chapter.sgml
 SRCS+= kernelconfig/chapter.sgml
 SRCS+= kerneldebug/chapter.sgml
 SRCS+= kernelopts/chapter.sgml
 SRCS+= l10n/chapter.sgml
 SRCS+= linuxemu/chapter.sgml
 SRCS+= mac/chapter.sgml
 SRCS+= mail/chapter.sgml
 SRCS+= mirrors/chapter.sgml
 SRCS+= multimedia/chapter.sgml
 SRCS+= pgpkeys/chapter.sgml
 SRCS+= ports/chapter.sgml
 SRCS+= ppp-and-slip/chapter.sgml
 SRCS+= preface/preface.sgml
 SRCS+= printing/chapter.sgml
 SRCS+= security/chapter.sgml
 SRCS+= serialcomms/chapter.sgml
 SRCS+= users/chapter.sgml
 SRCS+= vinum/chapter.sgml
 SRCS+= x11/chapter.sgml
 
 # Entities
 SRCS+= chapters.ent 
 
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
 # Turn on all the chapters.
 CHAPTERS?= ${SRCS:M*chapter.sgml}
 
 SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
 
-# XXX The Handbook build currently overflows some internal, hardcoded 
-# limits in pdftex.  Until we split the Handbook up, build the PDF 
-# version using ps2pdf instead of pdftex.
-
-PS2PDF?=	${PREFIX}/bin/ps2pdf
-
-book.tex-pdf:
-	${TOUCH} book.tex-pdf
-
-book.pdf: book.ps
-	${PS2PDF} book.ps book.pdf
-
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 #
 # Handbook-specific variables
 #
 .if defined(WITH_PGPKEYS)
 JADEFLAGS+=	-V withpgpkeys
 .endif
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/fr_FR.ISO8859-1/books/handbook/Makefile b/fr_FR.ISO8859-1/books/handbook/Makefile
index dea132cd9a..a7d601efa2 100644
--- a/fr_FR.ISO8859-1/books/handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/Makefile
@@ -1,258 +1,247 @@
 # The FreeBSD Documentation Project
 # The FreeBSD French Documentation Project
 #
 # $FreeBSD$
 # Original revision: 1.95 manque 1.91, 1.94 partiel
 #
 # Build the FreeBSD Handbook.
 #
 
 # ------------------------------------------------------------------------
 #
 # Handbook-specific variables
 #
 #	WITH_PGPKEYS	The print version of the handbook only prints PGP
 #			fingerprints by default.  If you would like for the
 #			entire key to be displayed, then set this variable.
 #			This option has no affect on the HTML formats.
 #			
 # Handbook-specific targets
 #
 #       pgpkeyring      This target will read the contents of
 #                       pgpkeys/chapter.sgml and will extract all of
 #                       the pgpkeys to standard out.  This output can then
 #                       be redirected into a file and distributed as a
 #                       public keyring of FreeBSD developers that can
 #                       easily be imported into PGP/GPG.
 #
 # ------------------------------------------------------------------------
 .PATH: ${.CURDIR}/../../share/sgml/glossary
 
 MAINTAINER=blackend@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split
 
 HAS_INDEX= true
+USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 IMAGES = advanced-networking/isdn-bus.eps
 IMAGES+= advanced-networking/isdn-twisted-pair.eps
 IMAGES+= advanced-networking/natd.eps
 IMAGES+= advanced-networking/net-routing.pic
 IMAGES_EN+= advanced-networking/static-routes.pic
 IMAGES_EN+= geom/striping.pic
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
 IMAGES_EN+= install/hdwrconf.scr
 IMAGES_EN+= install/probstart.scr
 IMAGES_EN+= install/main1.scr
 IMAGES_EN+= install/sysinstall-exit.scr
 IMAGES_EN+= install/main-doc.scr
 IMAGES_EN+= install/docmenu1.scr
 IMAGES_EN+= install/main-keymap.scr
 IMAGES_EN+= install/keymap.scr
 IMAGES_EN+= install/main-options.scr
 IMAGES_EN+= install/options.scr
 IMAGES_EN+= install/main-std.scr
 IMAGES_EN+= install/fdisk-drive1.scr
 IMAGES_EN+= install/fdisk-edit1.scr
 IMAGES_EN+= install/fdisk-edit2.scr
 IMAGES_EN+= install/boot-mgr.scr
 IMAGES_EN+= install/fdisk-drive2.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-root1.scr
 IMAGES_EN+= install/disklabel-root2.scr
 IMAGES_EN+= install/disklabel-fs.scr
 IMAGES_EN+= install/disklabel-root3.scr
 IMAGES_EN+= install/disklabel-ed2.scr
 IMAGES_EN+= install/dist-set.scr
 IMAGES_EN+= install/dist-set2.scr
 IMAGES_EN+= install/media.scr
 IMAGES_EN+= install/ed0-conf.scr
 IMAGES_EN+= install/ed0-conf2.scr
 IMAGES_EN+= install/ftp-anon1.scr
 IMAGES_EN+= install/ftp-anon2.scr
 IMAGES_EN+= install/nfs-server-edit.scr
 IMAGES_EN+= install/security.scr
 IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
 IMAGES_EN+= install/timezone1.scr
 IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/mouse1.scr
 IMAGES_EN+= install/mouse2.scr
 IMAGES_EN+= install/mouse3.scr
 IMAGES_EN+= install/mouse4.scr
 IMAGES_EN+= install/mouse5.scr
 IMAGES_EN+= install/mouse6.scr
 IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/pkg-cat.scr
 IMAGES_EN+= install/pkg-sel.scr
 IMAGES_EN+= install/pkg-install.scr
 IMAGES_EN+= install/pkg-confirm.scr
 IMAGES_EN+= install/adduser1.scr
 IMAGES_EN+= install/adduser2.scr
 IMAGES_EN+= install/adduser3.scr
 IMAGES_EN+= install/mainexit.scr
 IMAGES+= install/disk-layout.eps
 IMAGES_EN+= install/edit-inetd-conf.scr
 IMAGES_EN+= install/mta-main.scr
 IMAGES_EN+= install/net-config-menu1.scr
 IMAGES_EN+= install/net-config-menu2.scr
 IMAGES_EN+= install/ntp-config.scr
 IMAGES_EN+= install/routed.scr
 
 IMAGES+= install/example-dir1.eps
 IMAGES+= install/example-dir2.eps
 IMAGES+= install/example-dir3.eps
 IMAGES+= install/example-dir4.eps
 IMAGES+= install/example-dir5.eps
 
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
 IMAGES_EN+= mail/pine1.scr
 IMAGES_EN+= mail/pine2.scr
 IMAGES_EN+= mail/pine3.scr
 IMAGES_EN+= mail/pine4.scr
 IMAGES_EN+= mail/pine5.scr
 
 IMAGES_EN+= vinum/vinum-concat.pic
 IMAGES_EN+= vinum/vinum-mirrored-vol.pic
 IMAGES_EN+= vinum/vinum-raid10-vol.pic
 IMAGES_EN+= vinum/vinum-raid5-org.pic
 IMAGES_EN+= vinum/vinum-simple-vol.pic
 IMAGES_EN+= vinum/vinum-striped-vol.pic
 IMAGES_EN+= vinum/vinum-striped.pic
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png
 IMAGES_LIB+= callouts/2.png
 IMAGES_LIB+= callouts/3.png
 IMAGES_LIB+= callouts/4.png
 IMAGES_LIB+= callouts/5.png
 IMAGES_LIB+= callouts/6.png
 IMAGES_LIB+= callouts/7.png
 IMAGES_LIB+= callouts/8.png
 IMAGES_LIB+= callouts/9.png
 IMAGES_LIB+= callouts/10.png
 
 #
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
 #
 
 # SGML content
 SRCS+= book.sgml
 SRCS+= colophon.sgml
 SRCS+= freebsd-glossary.sgml
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
 SRCS+= boot/chapter.sgml
 SRCS+= config/chapter.sgml
 SRCS+= cutting-edge/chapter.sgml
 SRCS+= desktop/chapter.sgml
 SRCS+= disks/chapter.sgml
 SRCS+= eresources/chapter.sgml
 SRCS+= geom/chapter.sgml
 SRCS+= install/chapter.sgml
 SRCS+= introduction/chapter.sgml
 SRCS+= kernelconfig/chapter.sgml
 SRCS+= l10n/chapter.sgml
 SRCS+= linuxemu/chapter.sgml
 SRCS+= mac/chapter.sgml
 SRCS+= mail/chapter.sgml
 SRCS+= mirrors/chapter.sgml
 SRCS+= multimedia/chapter.sgml
 SRCS+= network-servers/chapter.sgml
 SRCS+= pgpkeys/chapter.sgml
 SRCS+= ports/chapter.sgml
 SRCS+= ppp-and-slip/chapter.sgml
 SRCS+= preface/preface.sgml
 SRCS+= printing/chapter.sgml
 SRCS+= security/chapter.sgml
 SRCS+= serialcomms/chapter.sgml
 SRCS+= users/chapter.sgml
 SRCS+= vinum/chapter.sgml
 SRCS+= x11/chapter.sgml
 
 # Entities
 SRCS+= chapters.ent
 
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
 # Turn on all the chapters.
 CHAPTERS?= ${SRCS:M*chapter.sgml}
 
 SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
 SGMLFLAGS+= -i chap.freebsd-glossary
 
-# XXX The Handbook build currently overflows some internal, hardcoded
-# limits in pdftex.  Until we split the Handbook up, build the PDF
-# version using ps2pdf instead of pdftex.
-
-PS2PDF?=	${PREFIX}/bin/ps2pdf
-
-book.tex-pdf:
-	${TOUCH} book.tex-pdf
-
-book.pdf: book.ps
-	${PS2PDF} book.ps book.pdf
-
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
 #
 # Handbook-specific variables
 #
 .if defined(WITH_PGPKEYS)
 JADEFLAGS+=	-V withpgpkeys
 .endif
 
 .for p in ftp cvsup
 SRCS+= mirrors.sgml.${p}.inc
 CLEANFILES+= mirrors.sgml.${p}.inc
 CLEANFILES+= mirrors.sgml.${p}.inc.tmp
 .endfor
 
 SRCS+= eresources.sgml.www.inc
 CLEANFILES+= eresources.sgml.www.inc
 CLEANFILES+= eresources.sgml.www.inc.tmp
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
 .for p in ftp cvsup
 mirrors.sgml.${p}.inc: ${XML_MIRRORS} ${XSL_MIRRORS}
 	${XSLTPROC} ${XSLTPROCOPTS} \
 	    -o $@.tmp \
 	    --param 'type' "'$p'" \
 	    --param 'proto' "'$p'" \
 	    --param 'target' "'handbook/mirrors/chapter.sgml'" \
 	    ${XSL_MIRRORS} ${XML_MIRRORS}
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
 	${RM} -f $@.tmp
 .endfor
 
 eresources.sgml.www.inc: ${XML_MIRRORS} ${XSL_MIRRORS}
 	${XSLTPROC} ${XSLTPROCOPTS} \
 	    -o $@.tmp \
 	    --param 'type' "'www'" \
 	    --param 'proto' "'http'" \
 	    --param 'target' "'handbook/eresources/chapter.sgml'" \
 	    ${XSL_MIRRORS} ${XML_MIRRORS}
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
 	${RM} -f $@.tmp
diff --git a/it_IT.ISO8859-15/books/handbook/Makefile b/it_IT.ISO8859-15/books/handbook/Makefile
index 27e2712365..ffaf685bfd 100644
--- a/it_IT.ISO8859-15/books/handbook/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/Makefile
@@ -1,261 +1,250 @@
 #
 # $FreeBSD$
 # Original revision: 1.95
 #
 # Crea il Manuale di FreeBSD.
 #
 
 # ------------------------------------------------------------------------
 #
 # Variabili specifiche del Manuale
 #
 #       WITH_PGPKEYS    La versione stampata del manuale riporta solo i
 #                       fingerprints PGP di base.  Se vuoi visualizzare
 #                       le chiavi intere, allora setta questa variabile.
 #                       Questa opzione non ha effetto sui formati HTML.
 #
 # Targets specifici del Manuale
 #
 #       pgpkeyring      Questo target leggerà il contenuto del file
 #                       pgpkeys/chapter.sgml ad estrarrà tutte le chiavi
 #                       pgp sullo standard output.  Questo output può
 #                       quindi essere rediretto su un file e distribuito
 #                       come un keyring pubblico degli sviluppatori di
 #                       FreeBSD che può essere facilmente importato in
 #                       PGP/GPG.
 #
 # ------------------------------------------------------------------------
 
 .PATH: ${.CURDIR}/../../share/sgml/glossary
 
 MAINTAINER= ale@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split
 
 HAS_INDEX= true
+USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 IMAGES_EN = advanced-networking/isdn-bus.eps
 IMAGES_EN+= advanced-networking/isdn-twisted-pair.eps
 IMAGES_EN+= advanced-networking/natd.eps
 IMAGES_EN+= advanced-networking/net-routing.pic
 IMAGES_EN+= advanced-networking/static-routes.pic
 IMAGES_EN+= geom/striping.pic
 IMAGES_EN+= install/adduser1.scr
 IMAGES_EN+= install/adduser2.scr
 IMAGES_EN+= install/adduser3.scr
 IMAGES_EN+= install/boot-mgr.scr
 IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
 IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
 IMAGES_EN+= install/disklabel-fs.scr
 IMAGES_EN+= install/disklabel-root1.scr
 IMAGES_EN+= install/disklabel-root2.scr
 IMAGES_EN+= install/disklabel-root3.scr
 IMAGES_EN+= install/disk-layout.eps
 IMAGES_EN+= install/dist-set.scr
 IMAGES_EN+= install/dist-set2.scr
 IMAGES_EN+= install/docmenu1.scr
 IMAGES_EN+= install/ed0-conf.scr
 IMAGES_EN+= install/ed0-conf2.scr
 IMAGES_EN+= install/edit-inetd-conf.scr
 IMAGES_EN+= install/example-dir1.eps
 IMAGES_EN+= install/example-dir2.eps
 IMAGES_EN+= install/example-dir3.eps
 IMAGES_EN+= install/example-dir4.eps
 IMAGES_EN+= install/example-dir5.eps
 IMAGES_EN+= install/fdisk-drive1.scr
 IMAGES_EN+= install/fdisk-drive2.scr
 IMAGES_EN+= install/fdisk-edit1.scr
 IMAGES_EN+= install/fdisk-edit2.scr
 IMAGES_EN+= install/ftp-anon1.scr
 IMAGES_EN+= install/ftp-anon2.scr
 IMAGES_EN+= install/hdwrconf.scr
 IMAGES_EN+= install/keymap.scr
 IMAGES_EN+= install/main1.scr
 IMAGES_EN+= install/mainexit.scr
 IMAGES_EN+= install/main-std.scr
 IMAGES_EN+= install/main-options.scr
 IMAGES_EN+= install/main-doc.scr
 IMAGES_EN+= install/main-keymap.scr
 IMAGES_EN+= install/media.scr
 IMAGES_EN+= install/mouse1.scr
 IMAGES_EN+= install/mouse2.scr
 IMAGES_EN+= install/mouse3.scr
 IMAGES_EN+= install/mouse4.scr
 IMAGES_EN+= install/mouse5.scr
 IMAGES_EN+= install/mouse6.scr
 IMAGES_EN+= install/mta-main.scr
 IMAGES_EN+= install/net-config-menu1.scr
 IMAGES_EN+= install/net-config-menu2.scr
 IMAGES_EN+= install/nfs-server-edit.scr
 IMAGES_EN+= install/ntp-config.scr
 IMAGES_EN+= install/options.scr
 IMAGES_EN+= install/pkg-cat.scr
 IMAGES_EN+= install/pkg-confirm.scr
 IMAGES_EN+= install/pkg-install.scr
 IMAGES_EN+= install/pkg-sel.scr
 IMAGES_EN+= install/probstart.scr
 IMAGES_EN+= install/routed.scr
 IMAGES_EN+= install/security.scr
 IMAGES_EN+= install/sysinstall-exit.scr
 IMAGES_EN+= install/timezone1.scr
 IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
 IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
 IMAGES_EN+= mail/pine1.scr
 IMAGES_EN+= mail/pine2.scr
 IMAGES_EN+= mail/pine3.scr
 IMAGES_EN+= mail/pine4.scr
 IMAGES_EN+= mail/pine5.scr
 IMAGES_EN+= security/ipsec-crypt-pkt.pic
 IMAGES_EN+= security/ipsec-encap-pkt.pic
 IMAGES_EN+= security/ipsec-network.pic
 IMAGES_EN+= security/ipsec-out-pkt.pic
 IMAGES_EN+= vinum/vinum-concat.pic
 IMAGES_EN+= vinum/vinum-mirrored-vol.pic
 IMAGES_EN+= vinum/vinum-raid10-vol.pic
 IMAGES_EN+= vinum/vinum-raid5-org.pic
 IMAGES_EN+= vinum/vinum-simple-vol.pic
 IMAGES_EN+= vinum/vinum-striped-vol.pic
 IMAGES_EN+= vinum/vinum-striped.pic
 
 # Immagini dalla libreria per tutti i documenti
 IMAGES_LIB = callouts/1.png
 IMAGES_LIB+= callouts/2.png
 IMAGES_LIB+= callouts/3.png
 IMAGES_LIB+= callouts/4.png
 IMAGES_LIB+= callouts/5.png
 IMAGES_LIB+= callouts/6.png
 IMAGES_LIB+= callouts/7.png
 IMAGES_LIB+= callouts/8.png
 IMAGES_LIB+= callouts/9.png
 IMAGES_LIB+= callouts/10.png
 
 #
 # SRCS lista i singoli files SGML che compongono il documento. Modifiche
 # a qualunque di questi files obbligano la ricreazione
 #
 
 # Contenuto SGML
 SRCS = book.sgml
 SRCS+= colophon.sgml
 SRCS+= freebsd-glossary.sgml
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= audit/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
 SRCS+= boot/chapter.sgml
 SRCS+= config/chapter.sgml
 SRCS+= cutting-edge/chapter.sgml
 SRCS+= desktop/chapter.sgml
 SRCS+= disks/chapter.sgml
 SRCS+= eresources/chapter.sgml
 SRCS+= firewalls/chapter.sgml
 SRCS+= geom/chapter.sgml
 SRCS+= install/chapter.sgml
 SRCS+= introduction/chapter.sgml
 SRCS+= kernelconfig/chapter.sgml
 SRCS+= l10n/chapter.sgml
 SRCS+= linuxemu/chapter.sgml
 SRCS+= mac/chapter.sgml
 SRCS+= mail/chapter.sgml
 SRCS+= mirrors/chapter.sgml
 SRCS+= multimedia/chapter.sgml
 SRCS+= network-servers/chapter.sgml
 SRCS+= pgpkeys/chapter.sgml
 SRCS+= ports/chapter.sgml
 SRCS+= ppp-and-slip/chapter.sgml
 SRCS+= preface/preface.sgml
 SRCS+= printing/chapter.sgml
 SRCS+= security/chapter.sgml
 SRCS+= serialcomms/chapter.sgml
 SRCS+= users/chapter.sgml
 SRCS+= vinum/chapter.sgml
 SRCS+= x11/chapter.sgml
 
 # Entities
 SRCS+= chapters.ent
 
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
 # Attiva tutti i capitoli.
 CHAPTERS?= ${SRCS:M*chapter.sgml}
 
 SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
 SGMLFLAGS+= -i chap.freebsd-glossary
 
-# XXX La creazione del Manuale attualmente sfora dei limiti interni,
-# codificati in pdftex.  Finché non dividiamo il Manuale, crea la versione
-# PDF usando ps2pdf invece di pdftex.
-
-PS2PDF?=	${PREFIX}/bin/ps2pdf
-
-book.tex-pdf:
-	${TOUCH} book.tex-pdf
-
-book.pdf: book.ps
-	${PS2PDF} book.ps book.pdf
-
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
 #
 # Variabili specifiche del Manuale
 #
 .if defined(WITH_PGPKEYS)
 JADEFLAGS+=	-V withpgpkeys
 .endif
 
 .for p in ftp cvsup
 SRCS+= mirrors.sgml.${p}.inc
 CLEANFILES+= mirrors.sgml.${p}.inc
 CLEANFILES+= mirrors.sgml.${p}.inc.tmp
 .endfor
 
 SRCS+= eresources.sgml.www.inc
 CLEANFILES+= eresources.sgml.www.inc
 CLEANFILES+= eresources.sgml.www.inc.tmp
 
 URL_RELPREFIX?= ../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
 .for p in ftp cvsup
 mirrors.sgml.${p}.inc: ${XML_MIRRORS} ${XSL_MIRRORS}
 	${XSLTPROC} ${XSLTPROCOPTS} \
 	    -o $@.tmp \
 	    --param 'type' "'$p'" \
 	    --param 'proto' "'$p'" \
 	    --param 'target' "'handbook/mirrors/chapter.sgml'" \
 	    ${XSL_MIRRORS} ${XML_MIRRORS}
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,' \
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
 	${RM} -f $@.tmp
 .endfor
 
 eresources.sgml.www.inc: ${XML_MIRRORS} ${XSL_MIRRORS}
 	${XSLTPROC} ${XSLTPROCOPTS} \
 	    -o $@.tmp \
 	    --param 'type' "'www'" \
 	    --param 'proto' "'http'" \
 	    --param 'target' "'handbook/eresources/chapter.sgml'" \
 	    ${XSL_MIRRORS} ${XML_MIRRORS}
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,' \
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
 	${RM} -f $@.tmp
diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile
index c196cc8aeb..3726e41db7 100644
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@@ -1,252 +1,241 @@
 # 
 # $FreeBSD$
 #
 # Build the FreeBSD Handbook (Japanese).
 #
 # Original revision: 1.74
 #
 
 # ------------------------------------------------------------------------
 #
 # Handbook-specific variables
 #
 #	WITH_PGPKEYS	The print version of the handbook only prints PGP
 #			fingerprints by default.  If you would like for the
 #			entire key to be displayed, then set this variable.
 #			This option has no affect on the HTML formats.
 #
 # Handbook-specific targets
 #
 #       pgpkeyring      This target will read the contents of
 #                       pgpkeys/chapter.sgml and will extract all of
 #                       the pgpkeys to standard out.  This output can then
 #                       be redirected into a file and distributed as a 
 #                       public keyring of FreeBSD developers that can
 #                       easily be imported into PGP/GPG.
 #
 # ------------------------------------------------------------------------
 
 MAINTAINER=	doc@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split
 
 HAS_INDEX= true
 WITH_GLOSSARY?=
+USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 IMAGES_EN = advanced-networking/isdn-bus.eps
 IMAGES_EN+= advanced-networking/isdn-twisted-pair.eps
 IMAGES_EN+= advanced-networking/natd.eps
 #IMAGES_EN+= install/adduser1.scr
 #IMAGES_EN+= install/adduser2.scr
 #IMAGES_EN+= install/adduser3.scr
 #IMAGES_EN+= install/boot-mgr.scr
 #IMAGES_EN+= install/console-saver1.scr
 #IMAGES_EN+= install/console-saver2.scr
 #IMAGES_EN+= install/console-saver3.scr
 #IMAGES_EN+= install/console-saver4.scr
 #IMAGES_EN+= install/desktop.scr
 #IMAGES_EN+= install/disklabel-auto.scr
 #IMAGES_EN+= install/disklabel-ed1.scr
 #IMAGES_EN+= install/disklabel-ed2.scr
 #IMAGES_EN+= install/disklabel-fs.scr
 #IMAGES_EN+= install/disklabel-root1.scr
 #IMAGES_EN+= install/disklabel-root2.scr
 #IMAGES_EN+= install/disklabel-root3.scr
 #IMAGES_EN+= install/disk-layout.eps
 #IMAGES_EN+= install/dist-set.scr
 #IMAGES_EN+= install/dist-set2.scr
 #IMAGES_EN+= install/docmenu1.scr
 #IMAGES_EN+= install/ed0-conf.scr
 #IMAGES_EN+= install/ed0-conf2.scr
 #IMAGES_EN+= install/edit-inetd-conf.scr
 #IMAGES_EN+= install/fdisk-drive1.scr
 #IMAGES_EN+= install/fdisk-drive2.scr
 #IMAGES_EN+= install/fdisk-edit1.scr
 #IMAGES_EN+= install/fdisk-edit2.scr
 #IMAGES_EN+= install/ftp-anon1.scr
 #IMAGES_EN+= install/ftp-anon2.scr
 #IMAGES_EN+= install/hdwrconf.scr
 #IMAGES_EN+= install/keymap.scr
 #IMAGES_EN+= install/main1.scr
 #IMAGES_EN+= install/mainexit.scr
 #IMAGES_EN+= install/main-std.scr
 #IMAGES_EN+= install/main-options.scr
 #IMAGES_EN+= install/main-doc.scr
 #IMAGES_EN+= install/main-keymap.scr
 #IMAGES_EN+= install/media.scr
 #IMAGES_EN+= install/mouse1.scr
 #IMAGES_EN+= install/mouse2.scr
 #IMAGES_EN+= install/mouse3.scr
 #IMAGES_EN+= install/mouse4.scr
 #IMAGES_EN+= install/mouse5.scr
 #IMAGES_EN+= install/mouse6.scr
 #IMAGES_EN+= install/mta-main.scr
 #IMAGES_EN+= install/net-config-menu1.scr
 #IMAGES_EN+= install/net-config-menu2.scr
 #IMAGES_EN+= install/nfs-server-edit.scr
 #IMAGES_EN+= install/ntp-config.scr
 #IMAGES_EN+= install/options.scr
 #IMAGES_EN+= install/pkg-cat.scr
 #IMAGES_EN+= install/pkg-confirm.scr
 #IMAGES_EN+= install/pkg-install.scr
 #IMAGES_EN+= install/pkg-sel.scr
 #IMAGES_EN+= install/probstart.scr
 #IMAGES_EN+= install/routed.scr
 #IMAGES_EN+= install/security.scr
 #IMAGES_EN+= install/sysinstall-exit.scr
 #IMAGES_EN+= install/timezone1.scr
 #IMAGES_EN+= install/timezone2.scr
 #IMAGES_EN+= install/timezone3.scr
 #IMAGES_EN+= install/userconfig.scr
 #IMAGES_EN+= install/userconfig2.scr
 #IMAGES_EN+= install/xf86setup.scr
 #
 #IMAGES_EN+= install/example-dir1.eps
 #IMAGES_EN+= install/example-dir2.eps
 #IMAGES_EN+= install/example-dir3.eps
 #IMAGES_EN+= install/example-dir4.eps
 #IMAGES_EN+= install/example-dir5.eps
 #IMAGES_EN+= security/ipsec-network.pic
 #IMAGES_EN+= security/ipsec-crypt-pkt.pic
 #IMAGES_EN+= security/ipsec-encap-pkt.pic
 #IMAGES_EN+= security/ipsec-out-pkt.pic
 #IMAGES_EN+= vinum/vinum-concat.pic
 #IMAGES_EN+= vinum/vinum-mirrored-vol.pic
 #IMAGES_EN+= vinum/vinum-raid10-vol.pic
 #IMAGES_EN+= vinum/vinum-raid5-org.pic
 #IMAGES_EN+= vinum/vinum-simple-vol.pic
 #IMAGES_EN+= vinum/vinum-striped-vol.pic
 #IMAGES_EN+= vinum/vinum-striped.pic
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png
 IMAGES_LIB+= callouts/2.png
 IMAGES_LIB+= callouts/3.png
 IMAGES_LIB+= callouts/4.png
 IMAGES_LIB+= callouts/5.png
 IMAGES_LIB+= callouts/6.png
 IMAGES_LIB+= callouts/7.png
 IMAGES_LIB+= callouts/8.png
 IMAGES_LIB+= callouts/9.png
 IMAGES_LIB+= callouts/10.png
 
 # 
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
 #
 
 # SGML content
 SRCS+= book.sgml
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
 SRCS+= config/chapter.sgml
 SRCS+= boot/chapter.sgml
 SRCS+= cutting-edge/chapter.sgml
 SRCS+= disks/chapter.sgml
 SRCS+= eresources/chapter.sgml
 SRCS+= install/chapter.sgml
 SRCS+= introduction/chapter.sgml
 SRCS+= kernelconfig/chapter.sgml
 SRCS+= l10n/chapter.sgml
 SRCS+= linuxemu/chapter.sgml
 SRCS+= mail/chapter.sgml
 SRCS+= mirrors/chapter.sgml
 SRCS+= multimedia/chapter.sgml
 SRCS+= desktop/chapter.sgml
 SRCS+= pgpkeys/chapter.sgml
 SRCS+= ppp-and-slip/chapter.sgml
 SRCS+= printing/chapter.sgml
 SRCS+= security/chapter.sgml
 SRCS+= serialcomms/chapter.sgml
 SRCS+= users/chapter.sgml
 #SRCS+= vinum/chapter.sgml
 SRCS+= x11/chapter.sgml
 SRCS+= ports/chapter.sgml
 SRCS+= preface/preface.sgml
 SRCS+= colophon.sgml
 
 # Entities
 SRCS+= chapters.ent 
 
 # Japanese only
 SRCS+=	jcontrib/chapter.sgml
 
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
 # Turn on all the chapters.
 CHAPTERS?= ${SRCS:M*chapter.sgml}
 
 SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
 .if defined(WITH_GLOSSARY) && !empty(WITH_GLOSSARY)
 SGMLFLAGS+= -i chap.freebsd-glossary
 .endif
 
-# XXX The Handbook build currently overflows some internal, hardcoded 
-# limits in pdftex.  Until we split the Handbook up, build the PDF 
-# version using ps2pdf instead of pdftex.
-
-PS2PDF?=	${PREFIX}/bin/ps2pdf
-
-book.tex-pdf:
-	${TOUCH} book.tex-pdf
-
-book.pdf: book.ps
-	${PS2PDF} book.ps book.pdf
-
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 #
 # Handbook-specific variables
 #
 .if defined(WITH_PGPKEYS)
 JADEFLAGS+=	-V withpgpkeys
 .endif
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .for p in ftp cvsup
 SRCS+= mirrors.sgml.${p}.inc
 CLEANFILES+= mirrors.sgml.${p}.inc
 CLEANFILES+= mirrors.sgml.${p}.inc.tmp
 .endfor
 
 SRCS+= eresources.sgml.www.inc
 CLEANFILES+= eresources.sgml.www.inc
 CLEANFILES+= eresources.sgml.www.inc.tmp
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
 .for p in ftp cvsup
 mirrors.sgml.${p}.inc: ${XML_MIRRORS} ${XSL_MIRRORS}
 	${XSLTPROC} ${XSLTPROCOPTS} \
 	    -o $@.tmp \
 	    --param 'transtable.xml' "'${XML_TRANSTABLE}'" \
 	    --param 'type' "'$p'" \
 	    --param 'proto' "'$p'" \
 	    --param 'target' "'handbook/mirrors/chapter.sgml'" \
 	    ${XSL_MIRRORS} ${XML_MIRRORS}
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
 	${RM} -f $@.tmp
 .endfor
 
 eresources.sgml.www.inc: ${XML_MIRRORS} ${XSL_MIRRORS}
 	${XSLTPROC} ${XSLTPROCOPTS} \
 	    -o $@.tmp \
 	    --param 'transtable.xml' "'${XML_TRANSTABLE}'" \
 	    --param 'type' "'www'" \
 	    --param 'proto' "'http'" \
 	    --param 'target' "'handbook/eresources/chapter.sgml'" \
 	    ${XSL_MIRRORS} ${XML_MIRRORS}
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
 	${RM} -f $@.tmp
diff --git a/nl_NL.ISO8859-1/books/handbook/Makefile b/nl_NL.ISO8859-1/books/handbook/Makefile
index b8106e2d9e..6cc75695de 100644
--- a/nl_NL.ISO8859-1/books/handbook/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/Makefile
@@ -1,268 +1,257 @@
 #
 # $FreeBSD$
 # $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.19 2006/01/03 21:17:07 siebrand Exp $
 # Gebaseerd op: 1.97
 #
 # Build the FreeBSD Dutch Handbook.
 #
 
 # ------------------------------------------------------------------------
 #
 # Handboekspecifieke variabelen
 #
 #	WITH_PGPKEYS	De gedrukte verie van het handboek geeft standaard
 #			alleen PGP vingerafdrukken weer.  Als het gewenst
 #			is dat de complete sleutel wordt weergegeven dan
 #			dient deze variabele insteld te worden.  De optie
 #			heeft geen invloed op de HTML formaten.
 #
 # Handboekspecifieke doelen
 #
 #       pgpkeyring      Dit doel leest de inhoud van pgpkeys/chapter.sgml
 #			en schrijft dan alle PGP sleutels naar stdout.
 #			De uitvoer kan omgeleid worden naar een bestand
 #			en verspreid worden als een publieke sleutelring
 #			van FreeBSD ontwikkelaars die eenvoudig in
 #			PGP/GPG ingelezen kan worden.
 #
 # ------------------------------------------------------------------------
 
 .PATH: ${.CURDIR}/../../share/sgml/glossary
 
 MAINTAINER=	remko@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split
 
 HAS_INDEX= true
+USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 IMAGES_EN = advanced-networking/isdn-bus.eps
 IMAGES_EN+= advanced-networking/isdn-twisted-pair.eps
 IMAGES_EN+= advanced-networking/natd.eps
 IMAGES_EN+= advanced-networking/net-routing.pic
 IMAGES_EN+= advanced-networking/static-routes.pic
 IMAGES_EN+= geom/striping.pic
 IMAGES_EN+= install/adduser1.scr
 IMAGES_EN+= install/adduser2.scr
 IMAGES_EN+= install/adduser3.scr
 IMAGES_EN+= install/boot-mgr.scr
 IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
 IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
 IMAGES_EN+= install/disklabel-fs.scr
 IMAGES_EN+= install/disklabel-root1.scr
 IMAGES_EN+= install/disklabel-root2.scr
 IMAGES_EN+= install/disklabel-root3.scr
 IMAGES_EN+= install/disk-layout.eps
 IMAGES_EN+= install/dist-set.scr
 IMAGES_EN+= install/dist-set2.scr
 IMAGES_EN+= install/docmenu1.scr
 IMAGES_EN+= install/ed0-conf.scr
 IMAGES_EN+= install/ed0-conf2.scr
 IMAGES_EN+= install/edit-inetd-conf.scr
 IMAGES_EN+= install/fdisk-drive1.scr
 IMAGES_EN+= install/fdisk-drive2.scr
 IMAGES_EN+= install/fdisk-edit1.scr
 IMAGES_EN+= install/fdisk-edit2.scr
 IMAGES_EN+= install/ftp-anon1.scr
 IMAGES_EN+= install/ftp-anon2.scr
 IMAGES_EN+= install/hdwrconf.scr
 IMAGES_EN+= install/keymap.scr
 IMAGES_EN+= install/main1.scr
 IMAGES_EN+= install/mainexit.scr
 IMAGES_EN+= install/main-std.scr
 IMAGES_EN+= install/main-options.scr
 IMAGES_EN+= install/main-doc.scr
 IMAGES_EN+= install/main-keymap.scr
 IMAGES_EN+= install/media.scr
 IMAGES_EN+= install/mouse1.scr
 IMAGES_EN+= install/mouse2.scr
 IMAGES_EN+= install/mouse3.scr
 IMAGES_EN+= install/mouse4.scr
 IMAGES_EN+= install/mouse5.scr
 IMAGES_EN+= install/mouse6.scr
 IMAGES_EN+= install/mta-main.scr
 IMAGES_EN+= install/net-config-menu1.scr
 IMAGES_EN+= install/net-config-menu2.scr
 IMAGES_EN+= install/nfs-server-edit.scr
 IMAGES_EN+= install/ntp-config.scr
 IMAGES_EN+= install/options.scr
 IMAGES_EN+= install/pkg-cat.scr
 IMAGES_EN+= install/pkg-confirm.scr
 IMAGES_EN+= install/pkg-install.scr
 IMAGES_EN+= install/pkg-sel.scr
 IMAGES_EN+= install/probstart.scr
 IMAGES_EN+= install/routed.scr
 IMAGES_EN+= install/security.scr
 IMAGES_EN+= install/sysinstall-exit.scr
 IMAGES_EN+= install/timezone1.scr
 IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
 IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
 IMAGES_EN+= mail/pine1.scr
 IMAGES_EN+= mail/pine2.scr
 IMAGES_EN+= mail/pine3.scr
 IMAGES_EN+= mail/pine4.scr
 IMAGES_EN+= mail/pine5.scr
 
 IMAGES_EN+= install/example-dir1.eps
 IMAGES_EN+= install/example-dir2.eps
 IMAGES_EN+= install/example-dir3.eps
 IMAGES_EN+= install/example-dir4.eps
 IMAGES_EN+= install/example-dir5.eps
 IMAGES_EN+= security/ipsec-network.pic
 IMAGES_EN+= security/ipsec-crypt-pkt.pic
 IMAGES_EN+= security/ipsec-encap-pkt.pic
 IMAGES_EN+= security/ipsec-out-pkt.pic
 IMAGES_EN+= vinum/vinum-concat.pic
 IMAGES_EN+= vinum/vinum-mirrored-vol.pic
 IMAGES_EN+= vinum/vinum-raid10-vol.pic
 IMAGES_EN+= vinum/vinum-raid5-org.pic
 IMAGES_EN+= vinum/vinum-simple-vol.pic
 IMAGES_EN+= vinum/vinum-striped-vol.pic
 IMAGES_EN+= vinum/vinum-striped.pic
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png
 IMAGES_LIB+= callouts/2.png
 IMAGES_LIB+= callouts/3.png
 IMAGES_LIB+= callouts/4.png
 IMAGES_LIB+= callouts/5.png
 IMAGES_LIB+= callouts/6.png
 IMAGES_LIB+= callouts/7.png
 IMAGES_LIB+= callouts/8.png
 IMAGES_LIB+= callouts/9.png
 IMAGES_LIB+= callouts/10.png
 
 # 
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
 #
 
 # SGML content
 SRCS+= audit/chapter.sgml
 SRCS+= book.sgml
 SRCS+= colophon.sgml
 SRCS+= freebsd-glossary.sgml
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
 SRCS+= boot/chapter.sgml
 SRCS+= config/chapter.sgml
 SRCS+= cutting-edge/chapter.sgml
 SRCS+= desktop/chapter.sgml
 SRCS+= disks/chapter.sgml
 SRCS+= eresources/chapter.sgml
 SRCS+= firewalls/chapter.sgml
 SRCS+= geom/chapter.sgml
 SRCS+= install/chapter.sgml
 SRCS+= introduction/chapter.sgml
 SRCS+= kernelconfig/chapter.sgml
 SRCS+= l10n/chapter.sgml
 SRCS+= linuxemu/chapter.sgml
 SRCS+= mac/chapter.sgml
 SRCS+= mail/chapter.sgml
 SRCS+= mirrors/chapter.sgml
 SRCS+= multimedia/chapter.sgml
 SRCS+= network-servers/chapter.sgml
 SRCS+= pgpkeys/chapter.sgml
 SRCS+= ports/chapter.sgml
 SRCS+= ppp-and-slip/chapter.sgml
 SRCS+= preface/preface.sgml
 SRCS+= printing/chapter.sgml
 SRCS+= security/chapter.sgml
 SRCS+= serialcomms/chapter.sgml
 SRCS+= users/chapter.sgml
 SRCS+= vinum/chapter.sgml
 SRCS+= x11/chapter.sgml
 
 # Entities
 SRCS+= chapters.ent 
 
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
 # Turn on all the chapters.
 CHAPTERS?= ${SRCS:M*chapter.sgml}
 
 SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
 SGMLFLAGS+= -i chap.freebsd-glossary
 
-# XXX The Handbook build currently overflows some internal, hardcoded 
-# limits in pdftex.  Until we split the Handbook up, build the PDF 
-# version using ps2pdf instead of pdftex.
-
-PS2PDF?=	${PREFIX}/bin/ps2pdf
-
-book.tex-pdf:
-	${TOUCH} book.tex-pdf
-
-book.pdf: book.ps
-	${PS2PDF} book.ps book.pdf
-
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
 #
 # Handbook-specific variables
 #
 .if defined(WITH_PGPKEYS)
 JADEFLAGS+=	-V withpgpkeys
 .endif
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
 
 #
 # rules generating lists of mirror site from XML database.
 #
 XMLDOCS=	mirrors-ftp:::mirrors.sgml.ftp.inc.tmp \
 		mirrors-cvsup:::mirrors.sgml.cvsup.inc.tmp \
 		eresources:::eresources.sgml.www.inc.tmp
 DEPENDSET.DEFAULT=	transtable mirror
 XSLT.DEFAULT=		${XSL_MIRRORS}
 XML.DEFAULT=		${XML_MIRRORS}
 NO_TIDY.DEFAULT=	yes
 
 PARAMS.mirrors-ftp+=	--param 'type' "'ftp'" \
 			--param 'proto' "'ftp'" \
 			--param 'target' "'handbook/mirrors/chapter.sgml'"
 PARAMS.mirrors-cvsup+=	--param 'type' "'cvsup'" \
 			--param 'proto' "'cvsup'" \
 			--param 'target' "'handbook/mirrors/chapter.sgml'"
 PARAMS.eresources+=	--param 'type' "'www'" \
 			--param 'proto' "'http'" \
 			--param 'target' "'handbook/eresources/chapter.sgml'"
 
 SRCS+=		mirrors.sgml.ftp.inc \
 		mirrors.sgml.cvsup.inc \
 		eresources.sgml.www.inc
 
 CLEANFILES+=	mirrors.sgml.ftp.inc mirrors.sgml.ftp.inc.tmp \
 		mirrors.sgml.cvsup.inc mirrors.sgml.cvsup.inc.tmp \
 		eresources.sgml.www.inc eresources.sgml.www.inc.tmp
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
 .for p in ftp cvsup
 mirrors.sgml.${p}.inc: mirrors.sgml.${p}.inc.tmp
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
 .endfor
 
 eresources.sgml.www.inc: eresources.sgml.www.inc.tmp
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
diff --git a/pt_BR.ISO8859-1/books/handbook/Makefile b/pt_BR.ISO8859-1/books/handbook/Makefile
index 8c1c2dbd21..a07137f94d 100644
--- a/pt_BR.ISO8859-1/books/handbook/Makefile
+++ b/pt_BR.ISO8859-1/books/handbook/Makefile
@@ -1,179 +1,170 @@
 # 
 # $FreeBSD$
 #
 # Build the FreeBSD Handbook (Brazilian Portuguese).
 #
 # The FreeBSD Documentation Project
 # The FreeBSD Brazilian Portuguese Documentation Project
 #
 # Original revision: 1.53
 #
 
 # ------------------------------------------------------------------------
 #
 # Handbook-specific variables
 #
 #	WITH_PGPKEYS	The print version of the handbook only prints PGP
 #			fingerprints by default.  If you would like for the
 #			entire key to be displayed, then set this variable.
 #			This option has no affect on the HTML formats.
 #			
 # Handbook-specific targets
 #
 #       pgpkeyring      This target will read the contents of
 #                       pgpkeys/chapter.sgml and will extract all of
 #                       the pgpkeys to standard out.  This output can then
 #                       be redirected into a file and distributed as a 
 #                       public keyring of FreeBSD developers that can
 #                       easily be imported into PGP/GPG.
 #
 # ------------------------------------------------------------------------
 
 MAINTAINER=lioux@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split
 
 HAS_INDEX= true
+USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 #IMAGES = advanced-networking/isdn-bus.eps
 #IMAGES+= advanced-networking/isdn-twisted-pair.eps
 #IMAGES+= advanced-networking/natd.eps
 #IMAGES+= install/userconfig.scr
 #IMAGES+= install/userconfig2.scr
 #IMAGES+= install/hdwrconf.scr
 #IMAGES+= install/probstart.scr
 #IMAGES+= install/main1.scr
 #IMAGES+= install/sysinstall-exit.scr
 #IMAGES+= install/main-doc.scr
 #IMAGES+= install/docmenu1.scr
 #IMAGES+= install/main-keymap.scr
 #IMAGES+= install/keymap.scr
 #IMAGES+= install/main-options.scr
 #IMAGES+= install/options.scr
 #IMAGES+= install/main-std.scr
 #IMAGES+= install/fdisk-drive1.scr
 #IMAGES+= install/fdisk-edit1.scr
 #IMAGES+= install/fdisk-edit2.scr
 #IMAGES+= install/boot-mgr.scr
 #IMAGES+= install/fdisk-drive2.scr
 #IMAGES+= install/disklabel-ed1.scr
 #IMAGES+= install/disklabel-auto.scr
 #IMAGES+= install/disklabel-root1.scr
 #IMAGES+= install/disklabel-root2.scr
 #IMAGES+= install/disklabel-fs.scr
 #IMAGES+= install/disklabel-root3.scr
 #IMAGES+= install/disklabel-ed2.scr
 #IMAGES+= install/dist-set.scr
 #IMAGES+= install/dist-set2.scr
 #IMAGES+= install/media.scr
 #IMAGES+= install/ed0-conf.scr
 #IMAGES+= install/ed0-conf2.scr
 #IMAGES+= install/ftp-anon1.scr
 #IMAGES+= install/ftp-anon2.scr
 #IMAGES+= install/nfs-server-edit.scr
 #IMAGES+= install/security.scr
 #IMAGES+= install/console-saver1.scr
 #IMAGES+= install/console-saver2.scr
 #IMAGES+= install/console-saver3.scr
 #IMAGES+= install/console-saver4.scr
 #IMAGES+= install/timezone1.scr
 #IMAGES+= install/timezone2.scr
 #IMAGES+= install/timezone3.scr
 #IMAGES+= install/mouse1.scr
 #IMAGES+= install/mouse2.scr
 #IMAGES+= install/mouse3.scr
 #IMAGES+= install/mouse4.scr
 #IMAGES+= install/mouse5.scr
 #IMAGES+= install/mouse6.scr
 #IMAGES+= install/xf86setup.scr
 #IMAGES+= install/desktop.scr
 #IMAGES+= install/pkg-cat.scr
 #IMAGES+= install/pkg-sel.scr
 #IMAGES+= install/pkg-install.scr
 #IMAGES+= install/pkg-confirm.scr
 #IMAGES+= install/adduser1.scr
 #IMAGES+= install/adduser2.scr
 #IMAGES+= install/adduser3.scr
 #IMAGES+= install/mainexit.scr
 #IMAGES+= install/disk-layout.eps
 #IMAGES+= install/edit-inetd-conf.scr
 
 # Images from the cross-document image library
 #IMAGES_LIB=  callouts/1.png
 #IMAGES_LIB+= callouts/2.png
 #IMAGES_LIB+= callouts/3.png
 #IMAGES_LIB+= callouts/4.png
 #IMAGES_LIB+= callouts/5.png
 
 # 
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
 #
 
 # SGML content
 SRCS=  book.sgml
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
 SRCS+= config/chapter.sgml
 SRCS+= boot/chapter.sgml
 SRCS+= cutting-edge/chapter.sgml
 SRCS+= disks/chapter.sgml
 SRCS+= eresources/chapter.sgml
 SRCS+= install/chapter.sgml
 SRCS+= introduction/chapter.sgml
 SRCS+= kernelconfig/chapter.sgml
 SRCS+= l10n/chapter.sgml
 SRCS+= linuxemu/chapter.sgml
 SRCS+= mail/chapter.sgml
 SRCS+= mirrors/chapter.sgml
 SRCS+= pgpkeys/chapter.sgml
 SRCS+= ppp-and-slip/chapter.sgml
 SRCS+= printing/chapter.sgml
 SRCS+= security/chapter.sgml
 SRCS+= serialcomms/chapter.sgml
 SRCS+= sound/chapter.sgml
 SRCS+= users/chapter.sgml
 SRCS+= x11/chapter.sgml
 SRCS+= ports/chapter.sgml
 SRCS+= preface/preface.sgml
 SRCS+= colophon.sgml
 
 # Entities
 SRCS+= chapters.ent 
 
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
 # Turn on all the chapters.
 CHAPTERS?= ${SRCS:M*chapter.sgml}
 
 SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
 
-# XXX The Handbook build currently overflows some internal, hardcoded 
-# limits in pdftex.  Until we split the Handbook up, build the PDF 
-# version using ps2pdf instead of pdftex.
-
-book.tex-pdf:
-	${TOUCH} book.tex-pdf
-
-book.pdf: book.ps
-	${PS2PDF} book.ps book.pdf
-
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 #
 # Handbook-specific variables
 #
 .if defined(WITH_PGPKEYS)
 JADEFLAGS+=	-V withpgpkeys
 .endif
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ru_RU.KOI8-R/books/handbook/Makefile b/ru_RU.KOI8-R/books/handbook/Makefile
index 0290688cbd..e9ce677af2 100644
--- a/ru_RU.KOI8-R/books/handbook/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/Makefile
@@ -1,271 +1,260 @@
 #
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSD$
 # $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/Makefile,v 1.45 2006/03/07 16:28:34 marck Exp $
 #
 # Original revision: 1.97
 #
 # Build the FreeBSD Handbook.
 #
 
 # ------------------------------------------------------------------------
 #
 # Handbook-specific variables
 #
 #      WITH_PGPKEYS    The print version of the handbook only prints PGP
 #                      fingerprints by default.  If you would like for the
 #                      entire key to be displayed, then set this variable.
 #                      This option has no affect on the HTML formats.
 #
 # Handbook-specific targets
 #
 #       pgpkeyring      This target will read the contents of
 #                       pgpkeys/chapter.sgml and will extract all of
 #                       the pgpkeys to standard out.  This output can then
 #                       be redirected into a file and distributed as a
 #                       public keyring of FreeBSD developers that can
 #                       easily be imported into PGP/GPG.
 #
 # ------------------------------------------------------------------------
 
 .PATH: ${.CURDIR}/../../share/sgml/glossary
 
 MAINTAINER=phantom@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split
 
 #HAS_INDEX= true
+USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 IMAGES_EN = advanced-networking/isdn-bus.eps
 IMAGES_EN+= advanced-networking/isdn-twisted-pair.eps
 IMAGES_EN+= advanced-networking/natd.eps
 IMAGES_EN+= advanced-networking/net-routing.pic
 IMAGES_EN+= advanced-networking/static-routes.pic
 IMAGES_EN+= install/adduser1.scr
 IMAGES_EN+= install/adduser2.scr
 IMAGES_EN+= install/adduser3.scr
 IMAGES_EN+= install/boot-mgr.scr
 IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
 IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
 IMAGES_EN+= install/disklabel-fs.scr
 IMAGES_EN+= install/disklabel-root1.scr
 IMAGES_EN+= install/disklabel-root2.scr
 IMAGES_EN+= install/disklabel-root3.scr
 IMAGES_EN+= install/disk-layout.eps
 IMAGES_EN+= install/dist-set.scr
 IMAGES_EN+= install/dist-set2.scr
 IMAGES_EN+= install/docmenu1.scr
 IMAGES_EN+= install/ed0-conf.scr
 IMAGES_EN+= install/ed0-conf2.scr
 IMAGES_EN+= install/edit-inetd-conf.scr
 IMAGES_EN+= install/fdisk-drive1.scr
 IMAGES_EN+= install/fdisk-drive2.scr
 IMAGES_EN+= install/fdisk-edit1.scr
 IMAGES_EN+= install/fdisk-edit2.scr
 IMAGES_EN+= install/ftp-anon1.scr
 IMAGES_EN+= install/ftp-anon2.scr
 IMAGES_EN+= install/hdwrconf.scr
 IMAGES_EN+= install/keymap.scr
 IMAGES_EN+= install/main1.scr
 IMAGES_EN+= install/mainexit.scr
 IMAGES_EN+= install/main-std.scr
 IMAGES_EN+= install/main-options.scr
 IMAGES_EN+= install/main-doc.scr
 IMAGES_EN+= install/main-keymap.scr
 IMAGES_EN+= install/media.scr
 IMAGES_EN+= install/mouse1.scr
 IMAGES_EN+= install/mouse2.scr
 IMAGES_EN+= install/mouse3.scr
 IMAGES_EN+= install/mouse4.scr
 IMAGES_EN+= install/mouse5.scr
 IMAGES_EN+= install/mouse6.scr
 IMAGES_EN+= install/mta-main.scr
 IMAGES_EN+= install/net-config-menu1.scr
 IMAGES_EN+= install/net-config-menu2.scr
 IMAGES_EN+= install/nfs-server-edit.scr
 IMAGES_EN+= install/ntp-config.scr
 IMAGES_EN+= install/options.scr
 IMAGES_EN+= install/pkg-cat.scr
 IMAGES_EN+= install/pkg-confirm.scr
 IMAGES_EN+= install/pkg-install.scr
 IMAGES_EN+= install/pkg-sel.scr
 IMAGES_EN+= install/probstart.scr
 IMAGES_EN+= install/routed.scr
 IMAGES_EN+= install/security.scr
 IMAGES_EN+= install/sysinstall-exit.scr
 IMAGES_EN+= install/timezone1.scr
 IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
 IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
 IMAGES_EN+= mail/pine1.scr
 IMAGES_EN+= mail/pine2.scr
 IMAGES_EN+= mail/pine3.scr
 IMAGES_EN+= mail/pine4.scr
 IMAGES_EN+= mail/pine5.scr
 
 
 IMAGES_EN+= geom/striping.pic
 IMAGES_EN+= install/example-dir1.eps
 IMAGES_EN+= install/example-dir2.eps
 IMAGES_EN+= install/example-dir3.eps
 IMAGES_EN+= install/example-dir4.eps
 IMAGES_EN+= install/example-dir5.eps
 IMAGES_EN+= security/ipsec-network.pic
 IMAGES_EN+= security/ipsec-crypt-pkt.pic
 IMAGES_EN+= security/ipsec-encap-pkt.pic
 IMAGES_EN+= security/ipsec-out-pkt.pic
 IMAGES_EN+= vinum/vinum-concat.pic
 IMAGES_EN+= vinum/vinum-mirrored-vol.pic
 IMAGES_EN+= vinum/vinum-raid10-vol.pic
 IMAGES_EN+= vinum/vinum-raid5-org.pic
 IMAGES_EN+= vinum/vinum-simple-vol.pic
 IMAGES_EN+= vinum/vinum-striped-vol.pic
 IMAGES_EN+= vinum/vinum-striped.pic
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png
 IMAGES_LIB+= callouts/2.png
 IMAGES_LIB+= callouts/3.png
 IMAGES_LIB+= callouts/4.png
 IMAGES_LIB+= callouts/5.png
 IMAGES_LIB+= callouts/6.png
 IMAGES_LIB+= callouts/7.png
 IMAGES_LIB+= callouts/8.png
 IMAGES_LIB+= callouts/9.png
 IMAGES_LIB+= callouts/10.png
 
 #
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
 #
 
 # SGML content
 SRCS+=  audit/chapter.sgml
 SRCS+=	book.sgml
 SRCS+=	colophon.sgml
 SRCS+=	freebsd-glossary.sgml
 SRCS+=	advanced-networking/chapter.sgml
 SRCS+=	basics/chapter.sgml
 SRCS+=	bibliography/chapter.sgml
 SRCS+=	boot/chapter.sgml
 SRCS+=	config/chapter.sgml
 SRCS+=	cutting-edge/chapter.sgml
 SRCS+=	desktop/chapter.sgml
 SRCS+=	disks/chapter.sgml
 SRCS+=	eresources/chapter.sgml
 SRCS+=	firewalls/chapter.sgml
 SRCS+=	geom/chapter.sgml
 SRCS+=	install/chapter.sgml
 SRCS+=	introduction/chapter.sgml
 SRCS+=	kernelconfig/chapter.sgml
 SRCS+=	l10n/chapter.sgml
 SRCS+=	linuxemu/chapter.sgml
 SRCS+=	mac/chapter.sgml
 SRCS+=	mail/chapter.sgml
 SRCS+=	mirrors/chapter.sgml
 SRCS+=	multimedia/chapter.sgml
 SRCS+=	network-servers/chapter.sgml
 SRCS+=	pgpkeys/chapter.sgml
 SRCS+=	ports/chapter.sgml
 SRCS+=	ppp-and-slip/chapter.sgml
 SRCS+=	preface/preface.sgml
 SRCS+=	printing/chapter.sgml
 SRCS+=	security/chapter.sgml
 SRCS+=	serialcomms/chapter.sgml
 SRCS+=	users/chapter.sgml
 SRCS+=	vinum/chapter.sgml
 SRCS+=	x11/chapter.sgml
 
 # Entities
 SRCS+=	chapters.ent
 
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
 # Turn on all the chapters.
 CHAPTERS?=	${SRCS:M*chapter.sgml}
 
 SGMLFLAGS+=	${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
 SGMLFLAGS+=	-i chap.freebsd-glossary
 
-# XXX The Handbook build currently overflows some internal, hardcoded
-# limits in pdftex.  Until we split the Handbook up, build the PDF
-# version using ps2pdf instead of pdftex.
-
-PS2PDF?=	${PREFIX}/bin/ps2pdf
-
-book.tex-pdf:
-	${TOUCH} book.tex-pdf
-
-book.pdf: book.ps
-	${PS2PDF} book.ps book.pdf
-
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
 #
 # Handbook-specific variables
 #
 .if defined(WITH_PGPKEYS)
 JADEFLAGS+=    -V withpgpkeys
 .endif
 
 url_relprEFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
 
 #
 # rules generating lists of mirror site from XML database.
 #
 XMLDOCS=	mirrors-ftp:::mirrors.sgml.ftp.inc.tmp \
 		mirrors-cvsup:::mirrors.sgml.cvsup.inc.tmp \
 		eresources:::eresources.sgml.www.inc.tmp
 DEPENDSET.DEFAULT=	transtable mirror
 XSLT.DEFAULT=		${XSL_MIRRORS}
 XML.DEFAULT=		${XML_MIRRORS}
 NO_TIDY.DEFAULT=	yes
 
 PARAMS.mirrors-ftp+=	--param 'type' "'ftp'" \
 			--param 'proto' "'ftp'" \
 			--param 'target' "'handbook/mirrors/chapter.sgml'"
 PARAMS.mirrors-cvsup+=	--param 'type' "'cvsup'" \
 			--param 'proto' "'cvsup'" \
 			--param 'target' "'handbook/mirrors/chapter.sgml'"
 PARAMS.eresources+=	--param 'type' "'www'" \
 			--param 'proto' "'http'" \
 			--param 'target' "'handbook/eresources/chapter.sgml'"
 
 SRCS+=		mirrors.sgml.ftp.inc \
 		mirrors.sgml.cvsup.inc \
 		eresources.sgml.www.inc
 
 CLEANFILES+=	mirrors.sgml.ftp.inc mirrors.sgml.ftp.inc.tmp \
 		mirrors.sgml.cvsup.inc mirrors.sgml.cvsup.inc.tmp \
 		eresources.sgml.www.inc eresources.sgml.www.inc.tmp
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
 .for p in ftp cvsup
 mirrors.sgml.${p}.inc: mirrors.sgml.${p}.inc.tmp
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
 .endfor
 
 eresources.sgml.www.inc: eresources.sgml.www.inc.tmp
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
diff --git a/share/mk/doc.project.mk b/share/mk/doc.project.mk
index 34d02c8e66..01ec603617 100644
--- a/share/mk/doc.project.mk
+++ b/share/mk/doc.project.mk
@@ -1,152 +1,153 @@
 #
 # $FreeBSD$
 #
 # This include file <doc.project.mk> is the FreeBSD Documentation Project
 # co-ordination make file.
 #
 # This file includes the other makefiles, which contain enough
 # knowledge to perform their duties without the system make files.
 #
 
 # ------------------------------------------------------------------------
 #
 # Document-specific variables:
 #
 #	DOC		This _must_ be set if there is a document to
 #			build.  It should be without prefix.
 #
 #	DOCFORMAT	Format of the document.  Defaults to docbook.
 #			docbook is also the only option currently.
 #
 # 	MAINTAINER	This denotes who is responsible for maintaining
 # 			this section of the project.  If unset, set to
 # 			doc@FreeBSD.org
 #
 
 # ------------------------------------------------------------------------
 #
 # User-modifiable variables:
 #
 #	PREFIX		Standard path to document-building applications
 #			installed to serve the documentation build
 #			process, usually by installing the docproj port
 #			or package.  Default is ${LOCALBASE} or /usr/local
 #
 #	NOINCLUDEMK	Whether to include the standard BSD make files,
 #			or just to emulate them poorly.  Set this if you
 #			aren't on FreeBSD, or a compatible sibling.  By
 #			default is not set.
 #
 
 # ------------------------------------------------------------------------
 #
 # Make files included:
 #
 #	doc.install.mk	Installation specific information, including
 #			ownership and permissions.
 #
 #	doc.subdir.mk	Subdirectory related configuration, including
 #			handling "obj" builds.
 #
 # 	doc.common.mk	targets and variables commonly used in doc/ and
 #			www/ tree.
 #
 # DOCFORMAT-specific make files, like:
 #
 #	doc.docbook.mk	Building and installing docbook documentation.
 #			Currently the only method.
 #
 
 # Document-specific defaults
 DOCFORMAT?=	docbook
 MAINTAINER?=	doc@FreeBSD.org
 
 # Master list of known target formats.  The doc.<format>.mk files implement
 # the code to convert from their source format to one or more of these target
 # formats
 ALL_FORMATS=	html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar pdb
 
 # User-modifiable
 LOCALBASE?=	/usr/local
 PREFIX?=	${LOCALBASE}
 PRI_LANG?=	en_US.ISO8859-1
 
 CP?=		/bin/cp
 CAT?=		/bin/cat
 ECHO_CMD?=	echo
 LN?=		/bin/ln
 MKDIR?=		/bin/mkdir
 RM?=		/bin/rm
 MV?=		/bin/mv
 HTML2TXT?=	${PREFIX}/bin/links
 HTML2TXTOPTS?=	-dump -width 72 ${HTML2TXTFLAGS}
 ISPELL?=	ispell
 ISPELLOPTS?=	-l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
 .if exists(/usr/bin/perl)
 PERL?=		/usr/bin/perl
 .elif exists(/usr/local/bin/perl)
 PERL?=		/usr/local/bin/perl
 .else
 PERL?=		perl
 .endif
 REALPATH?=	/bin/realpath
 SETENV?=	/usr/bin/env
 XSLTPROC?=	${PREFIX}/bin/xsltproc
 TIDY?=		${PREFIX}/bin/tidy
 #
 # In teTeX 3.0 and later, pdfetex(1) is used as the default TeX
 # engine for JadeTeX and tex(1) cannot be used as ${TEX_CMD} anymore
 # due to incompatibility of the format file.  Since the teTeX 3.0
 # distribution has "${PREFIX}/share/texmf-dist/LICENSE.texmf,"
 # it is checked here to determine which TeX engine should be used.
 .if exists(${PREFIX}/share/texmf-dist/LICENSE.texmf)
 TEX_CMD?=	${PREFIX}/bin/etex
 PDFTEX_CMD?=	${PREFIX}/bin/pdfetex
 .else
 TEX_CMD?=	${PREFIX}/bin/tex
 PDFTEX_CMD?=	${PREFIX}/bin/pdftex
 .endif
 LATEX_CMD?=	${PREFIX}/bin/latex
 JADETEX_CMD?=	${TEX_CMD} "&jadetex"
 JADETEX_PREPROCESS?=	/bin/cat
 PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex"
 PDFJADETEX_PREPROCESS?=	/bin/cat
+PS2PDF?=	${PREFIX}/bin/ps2pdf
 FOP_CMD?=	${PREFIX}/share/fop/fop.sh
 XEP_CMD?=	sh ${HOME}/XEP/xep.sh
 JAVA_CMD?=	${PREFIX}/bin/javavm
 SAXON_CMD?=	${JAVA_CMD} -jar ${PREFIX}/share/java/classes/saxon.jar
 
 # Image processing (contains code used by the doc.<format>.mk files, so must
 # be listed first).
 .include "doc.images.mk"
 
 # targets and variables commonly used in doc/ and www/ tree.
 .include "doc.common.mk"
 
 DOC_LOCAL_MK=	${DOC_PREFIX}/${LANGCODE}/share/mk/doc.local.mk
 
 .if exists(${DOC_LOCAL_MK})
 .include "${DOC_LOCAL_MK}"
 .endif
 
 # Ownership information.
 .include "doc.install.mk"
 
 # XML specific configuration
 .include "doc.xml.mk"
 
 # Format-specific configuration
 .if defined(DOC)
 .if ${DOCFORMAT} == "docbook"
 .include "doc.docbook.mk"
 .endif
 .if ${DOCFORMAT} == "slides"
 .include "doc.slides.mk"
 .endif
 .if ${DOCFORMAT} == "html"
 .include "doc.html.mk"
 .endif
 .endif
 
 # Subdirectory glue.
 .include "doc.subdir.mk"
diff --git a/zh_CN.GB2312/books/handbook/Makefile b/zh_CN.GB2312/books/handbook/Makefile
index e10f5e63cc..02ed925eb8 100644
--- a/zh_CN.GB2312/books/handbook/Makefile
+++ b/zh_CN.GB2312/books/handbook/Makefile
@@ -1,268 +1,257 @@
 #
 # $FreeBSD$
 #
 # Build the FreeBSD Handbook (Simplified Chinese).
 #
 # Original revision: 1.97
 
 # ------------------------------------------------------------------------
 #
 # Handbook-specific variables
 #
 #	WITH_PGPKEYS	The print version of the handbook only prints PGP
 #			fingerprints by default.  If you would like for the
 #			entire key to be displayed, then set this variable.
 #			This option has no affect on the HTML formats.
 #
 # Handbook-specific targets
 #
 #       pgpkeyring      This target will read the contents of
 #                       pgpkeys/chapter.sgml and will extract all of
 #                       the pgpkeys to standard out.  This output can then
 #                       be redirected into a file and distributed as a
 #                       public keyring of FreeBSD developers that can
 #                       easily be imported into PGP/GPG.
 #
 # ------------------------------------------------------------------------
 
 .PATH: ${.CURDIR}/../../share/sgml/glossary
 
 MAINTAINER=	doc@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split
 
 HAS_INDEX= true
+USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 IMAGES_EN = advanced-networking/isdn-bus.eps
 IMAGES_EN+= advanced-networking/isdn-twisted-pair.eps
 IMAGES_EN+= advanced-networking/natd.eps
 IMAGES_EN+= advanced-networking/net-routing.pic
 IMAGES_EN+= advanced-networking/static-routes.pic
 IMAGES_EN+= geom/striping.pic
 IMAGES_EN+= install/adduser1.scr
 IMAGES_EN+= install/adduser2.scr
 IMAGES_EN+= install/adduser3.scr
 IMAGES_EN+= install/boot-mgr.scr
 IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
 IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
 IMAGES_EN+= install/disklabel-fs.scr
 IMAGES_EN+= install/disklabel-root1.scr
 IMAGES_EN+= install/disklabel-root2.scr
 IMAGES_EN+= install/disklabel-root3.scr
 IMAGES_EN+= install/disk-layout.eps
 IMAGES_EN+= install/dist-set.scr
 IMAGES_EN+= install/dist-set2.scr
 IMAGES_EN+= install/docmenu1.scr
 IMAGES_EN+= install/ed0-conf.scr
 IMAGES_EN+= install/ed0-conf2.scr
 IMAGES_EN+= install/edit-inetd-conf.scr
 IMAGES_EN+= install/fdisk-drive1.scr
 IMAGES_EN+= install/fdisk-drive2.scr
 IMAGES_EN+= install/fdisk-edit1.scr
 IMAGES_EN+= install/fdisk-edit2.scr
 IMAGES_EN+= install/ftp-anon1.scr
 IMAGES_EN+= install/ftp-anon2.scr
 IMAGES_EN+= install/hdwrconf.scr
 IMAGES_EN+= install/keymap.scr
 IMAGES_EN+= install/main1.scr
 IMAGES_EN+= install/mainexit.scr
 IMAGES_EN+= install/main-std.scr
 IMAGES_EN+= install/main-options.scr
 IMAGES_EN+= install/main-doc.scr
 IMAGES_EN+= install/main-keymap.scr
 IMAGES_EN+= install/media.scr
 IMAGES_EN+= install/mouse1.scr
 IMAGES_EN+= install/mouse2.scr
 IMAGES_EN+= install/mouse3.scr
 IMAGES_EN+= install/mouse4.scr
 IMAGES_EN+= install/mouse5.scr
 IMAGES_EN+= install/mouse6.scr
 IMAGES_EN+= install/mta-main.scr
 IMAGES_EN+= install/net-config-menu1.scr
 IMAGES_EN+= install/net-config-menu2.scr
 IMAGES_EN+= install/nfs-server-edit.scr
 IMAGES_EN+= install/ntp-config.scr
 IMAGES_EN+= install/options.scr
 IMAGES_EN+= install/pkg-cat.scr
 IMAGES_EN+= install/pkg-confirm.scr
 IMAGES_EN+= install/pkg-install.scr
 IMAGES_EN+= install/pkg-sel.scr
 IMAGES_EN+= install/probstart.scr
 IMAGES_EN+= install/routed.scr
 IMAGES_EN+= install/security.scr
 IMAGES_EN+= install/sysinstall-exit.scr
 IMAGES_EN+= install/timezone1.scr
 IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
 IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
 IMAGES_EN+= mail/pine1.scr
 IMAGES_EN+= mail/pine2.scr
 IMAGES_EN+= mail/pine3.scr
 IMAGES_EN+= mail/pine4.scr
 IMAGES_EN+= mail/pine5.scr
 
 IMAGES_EN+= install/example-dir1.eps
 IMAGES_EN+= install/example-dir2.eps
 IMAGES_EN+= install/example-dir3.eps
 IMAGES_EN+= install/example-dir4.eps
 IMAGES_EN+= install/example-dir5.eps
 IMAGES_EN+= security/ipsec-network.pic
 IMAGES_EN+= security/ipsec-crypt-pkt.pic
 IMAGES_EN+= security/ipsec-encap-pkt.pic
 IMAGES_EN+= security/ipsec-out-pkt.pic
 IMAGES_EN+= vinum/vinum-concat.pic
 IMAGES_EN+= vinum/vinum-mirrored-vol.pic
 IMAGES_EN+= vinum/vinum-raid10-vol.pic
 IMAGES_EN+= vinum/vinum-raid5-org.pic
 IMAGES_EN+= vinum/vinum-simple-vol.pic
 IMAGES_EN+= vinum/vinum-striped-vol.pic
 IMAGES_EN+= vinum/vinum-striped.pic
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png
 IMAGES_LIB+= callouts/2.png
 IMAGES_LIB+= callouts/3.png
 IMAGES_LIB+= callouts/4.png
 IMAGES_LIB+= callouts/5.png
 IMAGES_LIB+= callouts/6.png
 IMAGES_LIB+= callouts/7.png
 IMAGES_LIB+= callouts/8.png
 IMAGES_LIB+= callouts/9.png
 IMAGES_LIB+= callouts/10.png
 
 #
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
 #
 
 # SGML content
 SRCS+= audit/chapter.sgml
 SRCS+= book.sgml
 SRCS+= colophon.sgml
 #SRCS+= freebsd-glossary.sgml
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
 SRCS+= boot/chapter.sgml
 SRCS+= config/chapter.sgml
 SRCS+= cutting-edge/chapter.sgml
 SRCS+= desktop/chapter.sgml
 SRCS+= disks/chapter.sgml
 SRCS+= eresources/chapter.sgml
 SRCS+= firewalls/chapter.sgml
 SRCS+= geom/chapter.sgml
 SRCS+= install/chapter.sgml
 SRCS+= introduction/chapter.sgml
 SRCS+= kernelconfig/chapter.sgml
 SRCS+= l10n/chapter.sgml
 SRCS+= linuxemu/chapter.sgml
 SRCS+= mac/chapter.sgml
 SRCS+= mail/chapter.sgml
 SRCS+= mirrors/chapter.sgml
 SRCS+= multimedia/chapter.sgml
 SRCS+= network-servers/chapter.sgml
 SRCS+= pgpkeys/chapter.sgml
 SRCS+= ports/chapter.sgml
 SRCS+= ppp-and-slip/chapter.sgml
 SRCS+= preface/preface.sgml
 SRCS+= printing/chapter.sgml
 SRCS+= security/chapter.sgml
 SRCS+= serialcomms/chapter.sgml
 SRCS+= users/chapter.sgml
 SRCS+= vinum/chapter.sgml
 SRCS+= x11/chapter.sgml
 
 # Entities
 SRCS+= chapters.ent
 
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
 # Turn on all the chapters.
 CHAPTERS?= ${SRCS:M*chapter.sgml}
 
 SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
 #SGMLFLAGS+= -i chap.freebsd-glossary
 
-# XXX The Handbook build currently overflows some internal, hardcoded
-# limits in pdftex.  Until we split the Handbook up, build the PDF
-# version using ps2pdf instead of pdftex.
-
-PS2PDF?=	${PREFIX}/bin/ps2pdf
-
-book.tex-pdf:
-	${TOUCH} book.tex-pdf
-
-book.pdf: book.ps
-	${PS2PDF} book.ps book.pdf
-
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 #
 # Handbook-specific variables
 #
 .if defined(WITH_PGPKEYS)
 JADEFLAGS+=	-V withpgpkeys
 .endif
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
 
 #
 # rules generating lists of mirror site from XML database.
 #
 XMLDOCS=	mirrors-ftp:::mirrors.sgml.ftp.inc.tmp \
 		mirrors-cvsup:::mirrors.sgml.cvsup.inc.tmp \
 		eresources:::eresources.sgml.www.inc.tmp
 DEPENDSET.DEFAULT=	transtable mirror
 XSLT.DEFAULT=		${XSL_MIRRORS}
 XML.DEFAULT=		${XML_MIRRORS}
 NO_TIDY.DEFAULT=	yes
 
 PARAMS.mirrors-ftp+=	--param 'type' "'ftp'" \
 			--param 'proto' "'ftp'" \
 			--param 'target' "'handbook/mirrors/chapter.sgml'"
 PARAMS.mirrors-cvsup+=	--param 'type' "'cvsup'" \
 			--param 'proto' "'cvsup'" \
 			--param 'target' "'handbook/mirrors/chapter.sgml'"
 PARAMS.eresources+=	--param 'type' "'www'" \
 			--param 'proto' "'http'" \
 			--param 'target' "'handbook/eresources/chapter.sgml'"
 
 SRCS+=		mirrors.sgml.ftp.inc \
 		mirrors.sgml.cvsup.inc \
 		eresources.sgml.www.inc
 
 CLEANFILES+=	mirrors.sgml.ftp.inc mirrors.sgml.ftp.inc.tmp \
 		mirrors.sgml.cvsup.inc mirrors.sgml.cvsup.inc.tmp \
 		eresources.sgml.www.inc eresources.sgml.www.inc.tmp
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
 .for p in ftp cvsup
 mirrors.sgml.${p}.inc: mirrors.sgml.${p}.inc.tmp
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
 .endfor
 
 eresources.sgml.www.inc: eresources.sgml.www.inc.tmp
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
diff --git a/zh_TW.Big5/books/handbook/Makefile b/zh_TW.Big5/books/handbook/Makefile
index 941da8b9a9..0f4c36edbc 100644
--- a/zh_TW.Big5/books/handbook/Makefile
+++ b/zh_TW.Big5/books/handbook/Makefile
@@ -1,266 +1,255 @@
 #
 # $FreeBSD$
 # Original revision: 1.97
 #
 # Build the FreeBSD Handbook.
 #
 
 # ------------------------------------------------------------------------
 #
 # Handbook-specific variables
 #
 #	WITH_PGPKEYS	The print version of the handbook only prints PGP
 #			fingerprints by default.  If you would like for the
 #			entire key to be displayed, then set this variable.
 #			This option has no affect on the HTML formats.
 #			
 # Handbook-specific targets
 #
 #       pgpkeyring      This target will read the contents of
 #                       pgpkeys/chapter.sgml and will extract all of
 #                       the pgpkeys to standard out.  This output can then
 #                       be redirected into a file and distributed as a 
 #                       public keyring of FreeBSD developers that can
 #                       easily be imported into PGP/GPG.
 #
 # ------------------------------------------------------------------------
 
 .PATH: ${.CURDIR}/../../share/sgml/glossary
 
 MAINTAINER=	doc@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split
 
 HAS_INDEX= true
+USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 IMAGES_EN = advanced-networking/isdn-bus.eps
 IMAGES_EN+= advanced-networking/isdn-twisted-pair.eps
 IMAGES_EN+= advanced-networking/natd.eps
 IMAGES_EN+= advanced-networking/net-routing.pic
 IMAGES_EN+= advanced-networking/static-routes.pic
 IMAGES_EN+= geom/striping.pic
 IMAGES_EN+= install/adduser1.scr
 IMAGES_EN+= install/adduser2.scr
 IMAGES_EN+= install/adduser3.scr
 IMAGES_EN+= install/boot-mgr.scr
 IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
 IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
 IMAGES_EN+= install/disklabel-fs.scr
 IMAGES_EN+= install/disklabel-root1.scr
 IMAGES_EN+= install/disklabel-root2.scr
 IMAGES_EN+= install/disklabel-root3.scr
 IMAGES_EN+= install/disk-layout.eps
 IMAGES_EN+= install/dist-set.scr
 IMAGES_EN+= install/dist-set2.scr
 IMAGES_EN+= install/docmenu1.scr
 IMAGES_EN+= install/ed0-conf.scr
 IMAGES_EN+= install/ed0-conf2.scr
 IMAGES_EN+= install/edit-inetd-conf.scr
 IMAGES_EN+= install/fdisk-drive1.scr
 IMAGES_EN+= install/fdisk-drive2.scr
 IMAGES_EN+= install/fdisk-edit1.scr
 IMAGES_EN+= install/fdisk-edit2.scr
 IMAGES_EN+= install/ftp-anon1.scr
 IMAGES_EN+= install/ftp-anon2.scr
 IMAGES_EN+= install/hdwrconf.scr
 IMAGES_EN+= install/keymap.scr
 IMAGES_EN+= install/main1.scr
 IMAGES_EN+= install/mainexit.scr
 IMAGES_EN+= install/main-std.scr
 IMAGES_EN+= install/main-options.scr
 IMAGES_EN+= install/main-doc.scr
 IMAGES_EN+= install/main-keymap.scr
 IMAGES_EN+= install/media.scr
 IMAGES_EN+= install/mouse1.scr
 IMAGES_EN+= install/mouse2.scr
 IMAGES_EN+= install/mouse3.scr
 IMAGES_EN+= install/mouse4.scr
 IMAGES_EN+= install/mouse5.scr
 IMAGES_EN+= install/mouse6.scr
 IMAGES_EN+= install/mta-main.scr
 IMAGES_EN+= install/net-config-menu1.scr
 IMAGES_EN+= install/net-config-menu2.scr
 IMAGES_EN+= install/nfs-server-edit.scr
 IMAGES_EN+= install/ntp-config.scr
 IMAGES_EN+= install/options.scr
 IMAGES_EN+= install/pkg-cat.scr
 IMAGES_EN+= install/pkg-confirm.scr
 IMAGES_EN+= install/pkg-install.scr
 IMAGES_EN+= install/pkg-sel.scr
 IMAGES_EN+= install/probstart.scr
 IMAGES_EN+= install/routed.scr
 IMAGES_EN+= install/security.scr
 IMAGES_EN+= install/sysinstall-exit.scr
 IMAGES_EN+= install/timezone1.scr
 IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
 IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
 IMAGES_EN+= mail/pine1.scr
 IMAGES_EN+= mail/pine2.scr
 IMAGES_EN+= mail/pine3.scr
 IMAGES_EN+= mail/pine4.scr
 IMAGES_EN+= mail/pine5.scr
 
 IMAGES_EN+= install/example-dir1.eps
 IMAGES_EN+= install/example-dir2.eps
 IMAGES_EN+= install/example-dir3.eps
 IMAGES_EN+= install/example-dir4.eps
 IMAGES_EN+= install/example-dir5.eps
 IMAGES_EN+= security/ipsec-network.pic
 IMAGES_EN+= security/ipsec-crypt-pkt.pic
 IMAGES_EN+= security/ipsec-encap-pkt.pic
 IMAGES_EN+= security/ipsec-out-pkt.pic
 IMAGES_EN+= vinum/vinum-concat.pic
 IMAGES_EN+= vinum/vinum-mirrored-vol.pic
 IMAGES_EN+= vinum/vinum-raid10-vol.pic
 IMAGES_EN+= vinum/vinum-raid5-org.pic
 IMAGES_EN+= vinum/vinum-simple-vol.pic
 IMAGES_EN+= vinum/vinum-striped-vol.pic
 IMAGES_EN+= vinum/vinum-striped.pic
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png
 IMAGES_LIB+= callouts/2.png
 IMAGES_LIB+= callouts/3.png
 IMAGES_LIB+= callouts/4.png
 IMAGES_LIB+= callouts/5.png
 IMAGES_LIB+= callouts/6.png
 IMAGES_LIB+= callouts/7.png
 IMAGES_LIB+= callouts/8.png
 IMAGES_LIB+= callouts/9.png
 IMAGES_LIB+= callouts/10.png
 
 # 
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
 #
 
 # SGML content
 SRCS+= audit/chapter.sgml
 SRCS+= book.sgml
 SRCS+= colophon.sgml
 SRCS+= freebsd-glossary.sgml
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
 SRCS+= boot/chapter.sgml
 SRCS+= config/chapter.sgml
 SRCS+= cutting-edge/chapter.sgml
 SRCS+= desktop/chapter.sgml
 SRCS+= disks/chapter.sgml
 SRCS+= eresources/chapter.sgml
 SRCS+= firewalls/chapter.sgml
 SRCS+= geom/chapter.sgml
 SRCS+= install/chapter.sgml
 SRCS+= introduction/chapter.sgml
 SRCS+= kernelconfig/chapter.sgml
 SRCS+= l10n/chapter.sgml
 SRCS+= linuxemu/chapter.sgml
 SRCS+= mac/chapter.sgml
 SRCS+= mail/chapter.sgml
 SRCS+= mirrors/chapter.sgml
 SRCS+= multimedia/chapter.sgml
 SRCS+= network-servers/chapter.sgml
 SRCS+= pgpkeys/chapter.sgml
 SRCS+= ports/chapter.sgml
 SRCS+= ppp-and-slip/chapter.sgml
 SRCS+= preface/preface.sgml
 SRCS+= printing/chapter.sgml
 SRCS+= security/chapter.sgml
 SRCS+= serialcomms/chapter.sgml
 SRCS+= users/chapter.sgml
 SRCS+= vinum/chapter.sgml
 SRCS+= x11/chapter.sgml
 
 # Entities
 SRCS+= chapters.ent 
 
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
 # Turn on all the chapters.
 CHAPTERS?= ${SRCS:M*chapter.sgml}
 
 SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
 SGMLFLAGS+= -i chap.freebsd-glossary
 
-# XXX The Handbook build currently overflows some internal, hardcoded 
-# limits in pdftex.  Until we split the Handbook up, build the PDF 
-# version using ps2pdf instead of pdftex.
-
-PS2PDF?=	${PREFIX}/bin/ps2pdf
-
-book.tex-pdf:
-	${TOUCH} book.tex-pdf
-
-book.pdf: book.ps
-	${PS2PDF} book.ps book.pdf
-
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
 #
 # Handbook-specific variables
 #
 .if defined(WITH_PGPKEYS)
 JADEFLAGS+=	-V withpgpkeys
 .endif
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
 
 #
 # rules generating lists of mirror site from XML database.
 #
 XMLDOCS=	mirrors-ftp:::mirrors.sgml.ftp.inc.tmp \
 		mirrors-cvsup:::mirrors.sgml.cvsup.inc.tmp \
 		eresources:::eresources.sgml.www.inc.tmp
 DEPENDSET.DEFAULT=	transtable mirror
 XSLT.DEFAULT=		${XSL_MIRRORS}
 XML.DEFAULT=		${XML_MIRRORS}
 NO_TIDY.DEFAULT=	yes
 
 PARAMS.mirrors-ftp+=	--param 'type' "'ftp'" \
 			--param 'proto' "'ftp'" \
 			--param 'target' "'handbook/mirrors/chapter.sgml'"
 PARAMS.mirrors-cvsup+=	--param 'type' "'cvsup'" \
 			--param 'proto' "'cvsup'" \
 			--param 'target' "'handbook/mirrors/chapter.sgml'"
 PARAMS.eresources+=	--param 'type' "'www'" \
 			--param 'proto' "'http'" \
 			--param 'target' "'handbook/eresources/chapter.sgml'"
 
 SRCS+=		mirrors.sgml.ftp.inc \
 		mirrors.sgml.cvsup.inc \
 		eresources.sgml.www.inc
 
 CLEANFILES+=	mirrors.sgml.ftp.inc mirrors.sgml.ftp.inc.tmp \
 		mirrors.sgml.cvsup.inc mirrors.sgml.cvsup.inc.tmp \
 		eresources.sgml.www.inc eresources.sgml.www.inc.tmp
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
 .for p in ftp cvsup
 mirrors.sgml.${p}.inc: mirrors.sgml.${p}.inc.tmp
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)
 .endfor
 
 eresources.sgml.www.inc: eresources.sgml.www.inc.tmp
 	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 	    < $@.tmp > $@ || (${RM} -f $@ && false)