From 9d6083e9a2498e11ba4f8db1cb968af523ab137e Mon Sep 17 00:00:00 2001 From: "Justin C. Sherrill" Date: Sun, 6 Aug 2006 20:58:06 +0000 Subject: [PATCH] Update to doc to make it build using pkgsrc tools instead of FreeBSD ports. This also makes the arch-handbook build again, and, as a side effect, incorporates some bug fixes by bringing in updates to some of the doc/share/mk/* files, taken from FreeBSD equivalents. Credits: me, "Victor Balada Diaz" , FreeBSD doc contributors. --- en/books/Makefile | 4 +- en/books/handbook/Makefile | 18 +- en/share/sgml/authors.ent | 10 +- en/share/sgml/mailing-lists.ent | 5 +- .../advanced-networking/net-routing.eps | 228 +++++++++--------- share/mk/doc.docbook.mk | 159 ++++++++---- share/mk/doc.html.mk | 4 +- share/mk/doc.images.mk | 64 +++-- share/mk/doc.project.mk | 48 +++- 9 files changed, 334 insertions(+), 206 deletions(-) diff --git a/en/books/Makefile b/en/books/Makefile index bfa11d6815..02b71fe115 100644 --- a/en/books/Makefile +++ b/en/books/Makefile @@ -1,6 +1,6 @@ -# $DragonFly: doc/en/books/Makefile,v 1.1.1.1 2004/04/02 09:35:47 hmp Exp $ +# $DragonFly: doc/en/books/Makefile,v 1.2 2006/08/06 20:58:05 justin Exp $ -SUBDIR = arch-handbook +SUBDIR = handbook arch-handbook # # ROOT_SYMLINKS allow one to add symlinks at the root of the diff --git a/en/books/handbook/Makefile b/en/books/handbook/Makefile index d2f16f89de..1a035ba2d2 100644 --- a/en/books/handbook/Makefile +++ b/en/books/handbook/Makefile @@ -1,6 +1,6 @@ # # $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.81 2004/05/11 05:52:39 den Exp $ -# $DragonFly: doc/en/books/handbook/Makefile,v 1.5 2006/07/12 04:00:59 justin Exp $ +# $DragonFly: doc/en/books/handbook/Makefile,v 1.6 2006/08/06 20:58:05 justin Exp $ # # Build the DragonFlyBSD Handbook. # @@ -42,14 +42,14 @@ IMAGES_EN+= advanced-networking/isdn-twisted-pair.eps IMAGES_EN+= advanced-networking/natd.eps IMAGES_EN+= advanced-networking/net-routing.pic -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+= mail/mutt1.png +IMAGES_EN+= mail/mutt2.png +IMAGES_EN+= mail/mutt3.png +IMAGES_EN+= mail/pine1.png +IMAGES_EN+= mail/pine2.png +IMAGES_EN+= mail/pine3.png +IMAGES_EN+= mail/pine4.png +IMAGES_EN+= mail/pine5.png IMAGES_EN+= install/example-dir1.eps IMAGES_EN+= install/example-dir2.eps diff --git a/en/share/sgml/authors.ent b/en/share/sgml/authors.ent index c8bf1425a0..c7216c8bde 100644 --- a/en/share/sgml/authors.ent +++ b/en/share/sgml/authors.ent @@ -9,7 +9,7 @@ NOTE: Make use of `foo at bar.com' e-mail format!! - $DragonFly: doc/en/share/sgml/authors.ent,v 1.2 2005/09/05 21:15:08 reed Exp $ + $DragonFly: doc/en/share/sgml/authors.ent,v 1.3 2006/08/06 20:58:06 justin Exp $ --> asmodai at dragonflybsd.org"> @@ -22,3 +22,11 @@ joerg at dragonflybsd.org"> justin at dragonflybsd.org"> rob at dragonflybsd.org"> + + +murray@FreeBSD.org"> +babkin@FreeBSD.org"> +wylie@magnesium.net"> +n_hibma@FreeBSD.org"> +cg@FreeBSD.org"> +logo@FreeBSD.org"> diff --git a/en/share/sgml/mailing-lists.ent b/en/share/sgml/mailing-lists.ent index e2b9f92cdc..c40bcece70 100644 --- a/en/share/sgml/mailing-lists.ent +++ b/en/share/sgml/mailing-lists.ent @@ -1,7 +1,7 @@ @@ -77,3 +77,6 @@ NetBSD pkgsrc users mailing list"> tech-pkgsrc"> + +FreeBSD symmetric multiprocessing mailing list"> + diff --git a/share/images/books/handbook/advanced-networking/net-routing.eps b/share/images/books/handbook/advanced-networking/net-routing.eps index 9a4514f6d5..b6da412db5 100644 --- a/share/images/books/handbook/advanced-networking/net-routing.eps +++ b/share/images/books/handbook/advanced-networking/net-routing.eps @@ -2,6 +2,9 @@ %%Pages: 1 %%DocumentFonts: %%BoundingBox: 71 743 447 781 +%%EndComments + +%%BeginProlog %%BeginPreview: 376 38 8 380 % 11444444444444444444444444444444444444444444444444444444444444444444444444444444 % 44444444444444444444444444444411000000000000000000000000000000000000000000000000 @@ -84,134 +87,134 @@ % 00880000000000000000000000000000000000000000000000000000000000000000000000000000 % 00000000000000000000000000000088 % 44440000000000000000000000000000000000000000000000000000000000000000000000000000 -% 0000000000000000000000000000444400000000000000000000000000000055bb00000000000000 +% 0000000000000000000000000000444400000000000000000000000000000044bb00000000000000 % 00000000000000000000000000000000000000000000000000880000000000000000000000000000 % 00000000000000000000000000000000000000000000000000000000000000000000000000000088 -% 000000000000000000000000000000000000000088ffffdd5588ffffdd550088ffffdd5500000000 +% 0000000000000000000000000000000000000000bbffffdd66bbffffdd6600bbffffdd6600000000 % 00000000000000000000000000000000444400000000000000000000000000000000000000000000 % 00000000000000000000000000000000000000000000000000000000000044440000000000000000 -% 0000000000000055bb00000000000000000000000000000000000000000000000000000000000000 +% 0000000000000044bb00000000000000000000000000000000000000000000000000000000000000 % 00880000000000000000000000000000000000000000000000000000000000000000000000000000 % 00000000000000000000000000000088 % 44440000000000000000000000000000000000000000000000000000000000000000000000000000 -% 0000000000000000000000000000444400000000000000000000000000009900ff00000000000000 -% 00000000000000000000000000000099000000000000000000880000000000000000000000000000 +% 0000000000000000000000000000444400000000000000000000000000004400ff00000000000000 +% 00000000000000000000000000000044000000000000000000880000000000000000000000000000 % 00000000000000000000000000000000000000000000000000000000000000000000000000000088 -% 000000000000000000000000000000000000000000ff0044ff00ff0044ff0000ff0044ff00000000 +% 000000000000000000000000000000000000000011ff0044ee11ff0044ee0011ff0044ee00000000 % 00000000000000000000000000000000444400000000000000000000000000000000000000000000 % 00000000000000000000000000000000000000000000000000000000000044440000000000000000 -% 0000000000009900ff00000000000000000000000000000000000000000000990000000000000000 +% 0000000000004400ff00000000000000000000000000000000000000000000440000000000000000 % 00880000000000000000000000000000000000000000000000000000000000000000000000000000 % 00000000000000000000000000000088 % 44440000000000000000000000000000000000000000000000000000000000000000000000000000 -% 000000000000000000000000000044440000000000000000000000220088ff00ff00000000000022 -% 003388003388000000000000220088ff000000000000000000880000000000000000000000000000 +% 000000000000000000000000000044440000000000000000000000000000cc00ff00000000000000 +% 000000000000000000000000000000cc000000000000000000880000000000000000000000000000 % 00000000000000000000000000000000000000000000000000000000000000000000000000000088 -% 000000000000000000000000000000000000000000ff0011ff00ff0011ff0000ff0011ff00000000 +% 000000000000000000000000000000000000000000ff0044ee00ff0044ee0000ff0044ee00000000 % 00000000000000000000000000000000444400000000000000000000000000000000000000000000 % 00000000000000000000000000000000000000000000000000000000000044440000000000000000 -% 000000220088ff00ff00000000000022003388003388000000000000220088ff0000000000000000 +% 000000000000cc00ff00000000000000000000000000000000000000000000cc0000000000000000 % 00880000000000000000000000000000000000000000000000000000000000000000000000000000 % 00000000000000000000000000000088 % 44440000000000000000000000000000000000000000000000000000000000000000000000000000 -% 00000000000000000000000000004444000000000000000077ddffcc00bbff88ffbbee0077ddffcc -% 0088ff8850ffaaee0077ddffcc00bbff880000000000000000880000000000000000000000000000 +% 00000000000000000000000000004444000000000000000033ddff770088ff88ffeecc0033ddff77 +% 0044ee6669eeffcc0033ddff770088ff880000000000000000880000000000000000000000000000 % 00000000000000000000000000000000000000000000000000000000000000000000000000000088 -% 000000000000000000000000000000000000000000ffddffaa00ffddffaa0000ffddffaa00000000 +% 000000000000000000000000000000000000000000ffffee6600ffffee660000ffffee6600000000 % 00000000000000000000000000000000444400000000000000000000000000000000000000000000 % 00000000000000000000000000000000000000000000000000000000000044440000000000000000 -% 77ddffcc00bbff88ffbbee0077ddffcc0088ff8850ffaaee0077ddffcc00bbff8800000000000000 +% 33ddff770088ff88ffeecc0033ddff770044ee6669eeffcc0033ddff770088ff8800000000000000 % 00880000000000000000000000000000000000000000000000000000000000000000000000000000 % 00000000000000000000000000000088 % 44440000000000000000000000000000000000000000000000000000000000000000000000000000 -% 000000000000000000000000000044440000000000000000bbffffff0000ff00ff00ff00bbffffff -% 0000ff0000ff00ff00bbffffff0000ff000000000000000000880000000000000000000000000000 +% 000000000000000000000000000044440000000000000000aaffffff0000ff00ff11ff00aaffffff +% 0000ff0000ff11ff00aaffffff0000ff000000000000000000880000000000000000000000000000 % 00000000000000000000000000000000000000000000000000000000000000000000000000000088 % 000000000000000000000000000000000000000000ff00000000ff0000000000ff00000000000000 % 00000000000000000000000000000000444400000000000000000000000000000000000000000000 % 00000000000000000000000000000000000000000000000000000000000044440000000000000000 -% bbffffff0000ff00ff00ff00bbffffff0000ff0000ff00ff00bbffffff0000ff0000000000000000 +% aaffffff0000ff00ff11ff00aaffffff0000ff0000ff11ff00aaffffff0000ff0000000000000000 % 00880000000000000000000000000000000000000000000000000000000000000000000000000000 % 00000000000000000000000000000088 % 44440000000000000000000000000000000000000000000000000000000000000000000000000000 -% 000000000000000000000000000044440000000000000000aa4400221100ff00ff00ff00aa440022 -% 1100ff0000ff00ff00aa4400221100ff000000000000000000880000000000000000000000000000 +% 000000000000000000000000000044440000000000000000bb4400441100ff11ff00ff11bb440044 +% 1111ff0011ff00ff11bb4400441100ff000000000000000000880000000000000000000000000000 % 00000000000000000000000000000000000000000000000000000000000000000000000000000088 -% 000000000000000000000000000000000000000000ff00000000ff0000000000ff00000000000000 +% 000000000000000000000000000000000000000011ff11000011ff1100000011ff11000000000000 % 00000000000000000000000000000000444400000000000000000000000000000000000000000000 % 00000000000000000000000000000000000000000000000000000000000044440000000000000000 -% aa4400221100ff00ff00ff00aa4400221100ff0000ff00ff00aa4400221100ff0000000000000000 +% bb4400441100ff11ff00ff11bb4400441111ff0011ff00ff11bb4400441100ff0000000000000000 % 00880000000000000000000000000000000000000000000000000000000000000000000000000000 % 00000000000000000000000000000088 -% 444400000000000000000000000099ff99000000000000000000000000000000000033bb000099ff -% 66000000000000000000000000004444000000000000000033ddee770000eea4ff22ff4433ddee77 -% 0055ff8833ff22ff4433ddee770000ee770000000000000000880000000000000000000000000099 -% ff99000000000000000000000000000000000033bb00118800000000000000000000000000000088 -% 000000000000000000000000000000000000000044ffff000044ffff00000044ffff000000000000 -% 0000000000000000000000000000000044440000000000000000bbff992288ee99770088ffffdd55 -% 000000000088ee997700000000000000000000000000000000000000000044440000000000000000 -% 33ddee770000eea4ff22ff4433ddee770055ff8833ff22ff4433ddee770000ee7700000000000000 -% 00880000000000000000000000bbffffffffee00118800000000000044ccffbb880000bbee44bbff -% aa0077ee220000000000000000000088 -% 444400000000000000000000000000ff00000000000000000000000000000000000000ff00551133 -% ee000000000000000000000000004444000000000000000000000000000000000000000000000000 -% 00000000000000000000000000000000000000000000000000880000000000000000000000000000 -% ff00000000000000000000000000000000000000ff0011ff00000000000000000000000000000088 +% 4444000000000000000000000000ffffff000000000000000000000000000000000033bb0011bbff +% 66000000000000000000000000004444000000000000000033eeee770000eeffff88ffbb33eeee77 +% 00ffff88bbff88ffbb33eeee770000ee8800000000000000008800000000000000000000000000ff +% ffff0000000000000000000000000000000033bb0000339900000000000000000000000000000088 +% 0000000000000000000000000000000000000000bbffff0000bbffff000000bbffff000000000000 +% 0000000000000000000000000000000044440000000000000000bbffff4488ffcc7700bbffffdd66 +% 000000000088ffcc7700000000000000000000000000000000000000000044440000000000000000 +% 33eeee770000eeffff88ffbb33eeee7700ffff88bbff88ffbb33eeee770000ee8800000000000000 +% 00880000000000000000000000bbffffffffee00339900000000000055ddffeebb4400ffff88bbff +% bb00bbff440000000000000000000088 +% 444400000000000000000000000011ff11000000000000000000000000000000000000ff00551155 +% ff000000000000000000000000004444000000000000000000000000000000000000000000000000 +% 00000000000000000000000000000000000000000000000000880000000000000000000000000011 +% ff110000000000000000000000000000000000ff000011ff00000000000000000000000000000088 % 00000000000000000000000000000000000000000000000000000000000000000000000000000000 -% 000000000000000000000000000000004444000000000000000000ff0000ff1122770000ff0044ff -% 0000000000ff11227700000000000000000000000000000000000000000044440000000000000000 +% 000000000000000000000000000000004444000000000000000011ff1100ff3333880011ff0044ee +% 0000000000ff33338800000000000000000000000000000000000000000044440000000000000000 % 00000000000000000000000000000000000000000000000000000000000000000000000000000000 -% 00880000000000000000000000770000ff00880011ff000000000044ee33000066000011ee1111dd -% 33001166000000000000000000000088 -% 444400000000000000000000000000ff00000000000000000000000000000000002200ff00110000 -% ff000000000000000000000000004444000000000000000000000000000000000000000000000000 +% 00880000000000000000000000881100ff00880011ff000000000055cc440022cc440044ee0011ee +% 22000088000000000000000000000088 +% 444400000000000000000000000000ff00000000000000000000000000000000000000ff00110000 +% dd000000000000000000000000004444000000000000000000000000000000000000000000000000 % 00000000000000000000000000000000000000000000000000880000000000000000000000000000 -% ff00000000000000000000000000000000220000ff0000ff00000000000000000000000000000088 -% 00000000000000000000000000000000000000000000000000000000000000000000000000000000 -% 000000000000000000000000000000004444000000000000000000ff0000ee4400770000ff0011ff -% 0000000000ee44007700000022003388000011111111000000000000000044440000000000000000 -% 00000000000000000000000000000000000000000000000000000000000000000000000000000000 -% 00880000000000000000000000000000ff00000000ff0000000000cc550000001100000099660099 -% 99006611000000000000000000000088 -% 444400000000000000000000000000ff0000000055aaffee7788dddd990000aaeeee00ff00000033 -% 9900000000000000000000000000444400003392c9dda00000000000000000000000000000000000 -% 000000000000000000000000000000000000e8c8b050000000880000000000000000000000000000 -% ff0000000055aaffee7788dddd9900aaeeee0000ff0000ff00000000000000000000000000000088 -% 0000116cb8d0d0000000000000000000000000000000000000000000000000000000000000000000 -% 000000000000000000a0ddc9923300004444000000000000000000ff000044ee88110000ffddffaa -% 000000000044ee881177ddffcc0088ff88cdcc0055220000000000000000444400003392c9dda000 -% 00000000000000000000000000000000000000000000000000000000000000000000e8c8b0500000 -% 00880000000000000000000000000000ff00000000ff0000000000ff00000066eecc000055cc1177 -% ee117700000000000000000000000088 -% 444400000000000000000000000000ff00000000ee000044ffee00000000004422ff00ff00000077 -% 110000000000000000000000000050afc9ddf6ffffffa80000000000000000000000000000000000 -% 000000000000000000000000000000000000e0ffffffe8c8b09f0000000000000000000000000000 -% ff00000000ee000044ffee000000004422ff0000ff0000ff000000000000000000000000000000b4 -% b8d0f0ffffffe0000000000000000000000000000000000000000000000000000000000000000000 -% 000000000000000000a8fffffff6ddc9af50000000000000000000ff00000011ccbb0000ff000000 -% 88ffbb00000011ccbbbbffffff0000ff000099446600000000000000000050afc9ddf6ffffffa800 -% 00000000000000000000000000000000000000000000000000000000000000000000e0ffffffe8c8 -% b09f0000000000000000000000000000ff00000000ff000088ffbbee33000000ff00000000dd8822 -% 99885500000000000000000000000088 -% 444400000000000000000000000000ff00000044dd550011bbee88003300992200ff00ff00003311 -% 002200000000000000000000000050dbe6f0f9ffffffd78888440000888888884400008888884400 -% 008888888844000088888888440000888888e8fffffff5e6dabe0000000000000000000000000000 -% ff00000044dd550011bbee880033992200ff0000ff0000ff000000000000000000000000000000dd -% dee9f8ffffffe0888888440000000088888844000000888888884400000088888888440000008888 -% 884400000088888888bffffffffcf0e6db7f000000000000000000ff0077440011ff0000ff000000 -% 0000000077440011ffaa4400221100ff000033aa5500000000000000000050dbe6f0f9ffffffd788 -% 88440000888888884400008888884400008888888844000088888888440000888888e8fffffff5e6 -% dabe0000000000000000000000000000ff00000000ff000000000066dd550000ff0000000088aa00 +% ff000000000000000000000000000000000000ff000000ff00000000000000000000000000000088 +% 00000000000000000000000000000000000000000000000000000000000000000000000000000000 +% 000000000000000000000000000000004444000000000000000000ff0000995500660000ff0044ee +% 00000000009955006600000000000000000000000000000000000000000044440000000000000000 +% 00000000000000000000000000000000000000000000000000000000000000000000000000000000 +% 00880000000000000000000000000000ff00000000ff0000000000dd3300000022440000bb550099 +% 88005522000000000000000000000088 +% 444400000000000000000000000000ff0000000044ddffdd5533bbff880099ffffbb00ff00000044 +% 6600000000000000000000000000444400001177aecc690000000000000000000000000000000000 +% 000000000000000000000000000000000000c8c0a440000000880000000000000000000000000000 +% ff0000000044ddffdd5533bbff8899ffffbb00ff000000ff00000000000000000000000000000088 +% 0000005daec9c8000000000000000000000000000000000000000000000000000000000000000000 +% 00000000000000000069ccae771100004444000000000000000000ff0000006688110000ffffee66 +% 00000000000066881133ddff770044ee66cdff4488bb0000000000000000444400001177aecc6900 +% 00000000000000000000000000000000000000000000000000000000000000000000c8c0a4400000 +% 00880000000000000000000000000000ff00000000ff0000000000ff00000088ffff000066bb0066 +% dd007700000000000000000000000088 +% 444400000000000000000000000000ff00000000ee330066eedd44000000004499ff00ff00000066 +% 0000000000000000000000000000509baeccf4ffffff760000000000000000000000000000000000 +% 000000000000000000000000000000000000cdffffffe4c0a49f0000000000000000000000000000 +% ff00000000ee330066eedd440000004499ff00ff000000ff000000000000000000000000000000ad +% aec9edffffffcd000000000000000000000000000000000000000000000000000000000000000000 +% 00000000000000000076fffffff4ccae9b44000000000000000000ff0000000033bb0000ff000000 +% 88ffbb0000000033bbaaffffff0000ff0033cc0066330000000000000000509baeccf4ffffff7600 +% 00000000000000000000000000000000000000000000000000000000000000000000cdffffffe4c0 +% a49f0000000000000000000000000000ff00000000ff000088ffbbee22000000ff11000000ee8822 +% 99886600000000000000000000000088 +% 444400000000000000000000000011ff00001177ee660033ddee44004400556633ff11ff00004400 +% 0033000000000000000000000000509baeccf4ffffffbf8888884400888888884400008888888844 +% 008888888844000088888844000088888888dbffffffe4c0a49f0000000000000000000000000011 +% ff00001177ee660033ddee440044556633ff11ff000011ff110000000000000000000000000000ad +% aec9edffffffe8888888440000008888888844000000888888884400000088888888440000008888 +% 888844000000888888bffffffff4ccae9b44000000000000000011ff1166440033ff0011ff110000 +% 0000000066440033ffbb4400441111ff0000889988000000000000000000509baeccf4ffffffbf88 +% 88884400888888884400008888888844008888888844000088888844000088888888dbffffffe4c0 +% a49f0000000000000000000000000011ff11000011ff110000000088cc330011ff0000000099aa00 % 55dd0000000000000000000000000088 -% 444400000000000000000000000055ffffffdd8833ccffbb3366eeff6600bbff66ff69ff2266ffff -% ff66000000000000000000000000444400003392c9dda00000000000000000000000000000000000 -% 000000000000000000000000000000000000e8c8b050000000880000000000000000000000000055 -% ffffffdd8833ccffbb3366eeff66bbff66ff4433ff2288ffff000000000000000000000000000088 -% 0000116cb8d0d0000000000000000000000000000000000000000000000000000000000000000000 -% 000000000000000000a0ddc9923300004444000000000000000044ffff82eeffee660044ffff0000 -% 0000000055eeffee6633ddee770055ff8800009900000000000000000000444400003392c9dda000 -% 00000000000000000000000000000000000000000000000000000000000000000000e8c8b0500000 -% 00880000000000000000000000002255ff88000088ffff000000000055ccffddaa00000000336600 +% 4444000000000000000000000000ffffffffff9933ddffcc3366eeee6600ccff99eecdff8866ffff +% ff66000000000000000000000000444400001177aecc690000000000000000000000000000000000 +% 000000000000000000000000000000000000c8c0a4400000008800000000000000000000000000ff +% ffffffff9933ddffcc3366eeee66ccff99eecdff8800bbffff000000000000000000000000000088 +% 0000005daec9c8000000000000000000000000000000000000000000000000000000000000000000 +% 00000000000000000069ccae7711000044440000000000000000bbffff5daaaaee6600bbffff0000 +% 0000000022aaaaee6633eeee7700ffff880000cc11000000000000000000444400001177aecc6900 +% 00000000000000000000000000000000000000000000000000000000000000000000c8c0a4400000 +% 008800000000000000000000000088ffff880000bbffff000000000088ddffee9900000000336600 % 00880000000000000000000000000088 % 44440000000000000000000000000000000000000000000000000000000000000000000000000000 % 00000000000000000000000000004444000000000000000000000000000000000000000000000000 @@ -388,7 +391,7 @@ save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def %%EndProlog %%Page: 1 1 -%%BeginDocument: /usr/home/justin/dfcvs/doc/en/books/handbook/../../../share/images/books/handbook/advanced-networking/net-routing.ps +%%BeginDocument: /home/justin/docwork/doc/en/books/handbook/../../../share/images/books/handbook/advanced-networking/net-routing.ps /setpacking where{ pop currentpacking @@ -456,7 +459,7 @@ LS{ /EP{ level0 restore showpage -}bind def +}def /DA{ newpath arcn stroke }bind def @@ -489,16 +492,22 @@ TM setmatrix /Fr{ setrgbcolor fill }bind def +/setcmykcolor where{ +pop /Fk{ setcmykcolor fill }bind def +}if /Fg{ setgray fill }bind def /FL/fill load def /LW/setlinewidth load def /Cr/setrgbcolor load def +/setcmykcolor where{ +pop /Ck/setcmykcolor load def +}if /Cg/setgray load def /RE{ findfont @@ -541,9 +550,9 @@ newpath /CNT countdictstack def userdict begin /showpage{}def +/setpagedevice{}def }bind def /PEND{ -clear countdictstack CNT sub{end}repeat level1 restore }bind def @@ -552,6 +561,7 @@ end def pop setpacking }if +<< /PageSize [ 612 792 ] /ImagingBBox null >> setpagedevice grops begin/DEFS 1 dict def DEFS begin/u{.001 mul}bind def end/RES 72 def/PL 792 def/LS false def/ENC0[/asciicircum/asciitilde/Scaron/Zcaron /scaron/zcaron/Ydieresis/trademark/quotesingle/Euro/.notdef/.notdef @@ -583,26 +593,24 @@ def/PL 792 def/LS false def/ENC0[/asciicircum/asciitilde/Scaron/Zcaron /Times-Roman@0 ENC0/Times-Roman RE BP 126 48 MT 0 -36 RL -54 0 RL 0 36 RL CL .4 LW ST/F0 10/Times-Roman@0 SF -(Local2)85.115 32.2 Q 129.6 30 126 30 DL 136.296 30 132.696 30 DL -142.992 30 139.392 30 DL 149.688 30 146.088 30 DL 156.312 30 152.712 30 -DL 163.008 30 159.408 30 DL 169.704 30 166.104 30 DL 176.4 30 172.8 30 -DL 126 30 MT 7.2 -1.8 RL 0 3.6 RL CL 0 Fg 126 30 MT 7.2 -1.8 RL 0 3.6 RL -CL 0 Cg ST 176.4 30 MT -7.2 1.8 RL 0 -3.6 RL CL 0 Fg 176.4 30 MT -7.2 -1.8 RL 0 -3.6 RL CL 0 Cg ST(ethernet)135.095 26.2 Q 230.4 48 MT 0 -36 RL --54 0 RL 0 36 RL CL ST(Local1)189.515 32.2 Q 234 30 230.4 30 DL 241.704 -30 238.104 30 DL 249.408 30 245.808 30 DL 257.112 30 253.512 30 DL -264.888 30 261.288 30 DL 272.592 30 268.992 30 DL 280.296 30 276.696 30 -DL 288 30 284.4 30 DL 230.4 30 MT 7.2 -1.8 RL 0 3.6 RL CL 0 Fg 230.4 30 -MT 7.2 -1.8 RL 0 3.6 RL CL 0 Cg ST 288 30 MT -7.2 1.8 RL 0 -3.6 RL CL 0 -Fg 288 30 MT -7.2 1.8 RL 0 -3.6 RL CL 0 Cg ST(PPP)250.86 26.2 Q 342 48 -MT 0 -36 RL -54 0 RL 0 36 RL CL ST(ISP-Serv)296.945 32.2 Q 345.6 30 342 -30 DL 352.296 30 348.696 30 DL 358.992 30 355.392 30 DL 365.688 30 -362.088 30 DL 372.312 30 368.712 30 DL 379.008 30 375.408 30 DL 385.704 -30 382.104 30 DL 392.4 30 388.8 30 DL 342 30 MT 7.2 -1.8 RL 0 3.6 RL CL -0 Fg 342 30 MT 7.2 -1.8 RL 0 3.6 RL CL 0 Cg ST 392.4 30 MT -7.2 1.8 RL 0 --3.6 RL CL 0 Fg 392.4 30 MT -7.2 1.8 RL 0 -3.6 RL CL 0 Cg ST(ethernet) -351.095 26.2 Q 446.4 48 MT 0 -36 RL -54 0 RL 0 36 RL CL ST(T1-GW)403.85 -32.2 Q 0 Cg EP +(Local2)85.115 32.2 Q 126 30 MT 7.2 -1.8 RL 0 3.6 RL CL 0 Fg 126 30 MT +7.2 -1.8 RL 0 3.6 RL CL .1 LW 0 Cg ST 176.4 30 MT -7.2 1.8 RL 0 -3.6 RL +CL 0 Fg 176.4 30 MT -7.2 1.8 RL 0 -3.6 RL CL 0 Cg ST .4 LW 136.8 30 +133.2 30 DL 143.28 30 139.68 30 DL 149.76 30 146.16 30 DL 156.24 30 +152.64 30 DL 162.72 30 159.12 30 DL 169.2 30 165.6 30 DL(ethernet) +135.095 26.2 Q 230.4 48 MT 0 -36 RL -54 0 RL 0 36 RL CL ST(Local1) +189.515 32.2 Q 230.4 30 MT 7.2 -1.8 RL 0 3.6 RL CL 0 Fg 230.4 30 MT 7.2 +-1.8 RL 0 3.6 RL CL .1 LW 0 Cg ST 288 30 MT -7.2 1.8 RL 0 -3.6 RL CL 0 +Fg 288 30 MT -7.2 1.8 RL 0 -3.6 RL CL 0 Cg ST .4 LW 241.2 30 237.6 30 DL +249.12 30 245.52 30 DL 257.04 30 253.44 30 DL 264.96 30 261.36 30 DL +272.88 30 269.28 30 DL 280.8 30 277.2 30 DL(PPP)250.86 26.2 Q 342 48 MT +0 -36 RL -54 0 RL 0 36 RL CL ST(ISP-Serv)296.945 32.2 Q 342 30 MT 7.2 +-1.8 RL 0 3.6 RL CL 0 Fg 342 30 MT 7.2 -1.8 RL 0 3.6 RL CL .1 LW 0 Cg ST +392.4 30 MT -7.2 1.8 RL 0 -3.6 RL CL 0 Fg 392.4 30 MT -7.2 1.8 RL 0 -3.6 +RL CL 0 Cg ST .4 LW 352.8 30 349.2 30 DL 359.28 30 355.68 30 DL 365.76 +30 362.16 30 DL 372.24 30 368.64 30 DL 378.72 30 375.12 30 DL 385.2 30 +381.6 30 DL(ethernet)351.095 26.2 Q 446.4 48 MT 0 -36 RL -54 0 RL 0 36 +RL CL ST(T1-GW)403.85 32.2 Q 0 Cg EP end %%EndDocument %%Trailer diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk index 5e5d507311..10063fb16a 100644 --- a/share/mk/doc.docbook.mk +++ b/share/mk/doc.docbook.mk @@ -1,5 +1,7 @@ # -# $DragonFly: doc/share/mk/doc.docbook.mk,v 1.2 2005/08/14 08:04:56 asmodai Exp $ +# $DragonFly: doc/share/mk/doc.docbook.mk,v 1.3 2006/08/06 20:58:06 justin Exp $ +# matches with: +# $FreeBSD: doc/share/mk/doc.docbook.mk,v 1.117 2004/09/02 17:12:14 murray Exp $ # # This include file handles building and installing of # DocBook documentation in the DragonFlyBSD Documentation Project. @@ -13,7 +15,7 @@ # Document-specific variables # # DOC This should be set to the name of the DocBook -# marked-up file, without the .sgml or .docb suffix. +# marked-up file, without the .sgml suffix. # # It also determins the name of the output files - # ${DOC}.html. @@ -58,6 +60,12 @@ # CSS_SHEET Full path to a CSS stylesheet suitable for DocBook. # Default is ${DOC_PREFIX}/share/misc/docbook.css # +# +# SPELLCHECK Use the special spellcheck.dsl stylesheet to render +# HTML that is suitable for processing through a +# spellchecker. For example, PGP keys and filenames +# will be ommitted from this output. +# # Print-output options : # # NICE_HEADERS If defined, customized chapter headers will be created @@ -97,6 +105,13 @@ # GREYSCALE_IMAGES Convert the screenshots to greyscale before # embedding them into the PostScript output. # +# Package building options: +# +# BZIP2_PACKAGE Use bzip2(1) utility to compress package tarball +# instead of gzip(1). It results packages to have +# suffix .tbz instead of .tgz. Using bzip2(1) +# provides better compression, but requires longer +# time and utilizes more CPU resources than gzip(1). # # Documents should use the += format to access these. @@ -106,6 +121,9 @@ DOCBOOKSUFFIX?= sgml MASTERDOC?= ${.CURDIR}/${DOC}.${DOCBOOKSUFFIX} +# List of supported SP_ENCODINGs +SP_ENCODING_LIST?= ISO-8859-2 KOI8-R + # Which stylesheet type to use. 'dsssl' or 'xsl' STYLESHEET_TYPE?= dsssl @@ -113,6 +131,10 @@ STYLESHEET_TYPE?= dsssl OPENJADE= yes .endif +.if defined(SPELLCHECK) +DSLHTML?= ${DOC_PREFIX}/share/sgml/spellcheck.dsl +.endif + .if defined(OPENJADE) JADE?= ${PREFIX}/bin/openjade JADECATALOG?= ${PREFIX}/share/sgml/openjade/catalog @@ -127,6 +149,11 @@ NSGMLSWARNINGS= -wempty -wunclosed SX?= ${PREFIX}/bin/sx .endif +.if defined(SP_ENCODING) +JADE_ENV+= SP_ENCODING=${SP_ENCODING} +.endif +JADE_CMD= ${SETENV} ${JADE_ENV} ${JADE} + DSLHTML?= ${DOC_PREFIX}/share/sgml/default.dsl DSLPRINT?= ${DOC_PREFIX}/share/sgml/default.dsl DSLPGP?= ${DOC_PREFIX}/share/sgml/pgp.dsl @@ -136,17 +163,17 @@ LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog ISO8879CATALOG= ${PREFIX}/share/sgml/iso8879/catalog .if ${STYLESHEET_TYPE} == "dsssl" -DOCBOOKCATALOG= ${PREFIX}/share/sgml/docbook/catalog +DOCBOOKCATALOG= ${PREFIX}/share/sgml/docbook/4.1/catalog .elif ${STYLESHEET_TYPE} == "xsl" DOCBOOKCATALOG= ${PREFIX}/share/xml/docbook/catalog .endif -CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog DSSSLCATALOG= ${PREFIX}/share/sgml/docbook/dsssl/modular/catalog COLLATEINDEX= ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl -XSLTPROC?= ${PREFIX}/bin/xsltproc +XSLTPROCFLAGS?= --nonet XSLHTML?= ${DOC_PREFIX}/share/xsl/dragonfly-html.xsl XSLHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/dragonfly-html-chunk.xsl XSLFO?= ${DOC_PREFIX}/share/xsl/dragonfly-fo.xsl @@ -164,7 +191,7 @@ JADEOPTS= ${JADEFLAGS} ${SGMLFLAGS} ${CATALOGS} XSLTPROCOPTS= ${XSLTPROCFLAGS} KNOWN_FORMATS= html html.tar html-split html-split.tar \ - txt rtf ps pdf tex dvi tar pdb + txt rtf rtf.tar ps pdf tex dvi tar pdb CSS_SHEET?= ${DOC_PREFIX}/share/misc/docbook.css PDFTEX_DEF?= ${DOC_PREFIX}/share/web2c/pdftex.def @@ -172,6 +199,8 @@ PDF_GENINFO?= ${DOC_PREFIX}/share/web2c/pdf_geninfo.sh HTMLOPTS?= -ioutput.html -d ${DSLHTML} ${HTMLFLAGS} +HTMLTXTOPTS?= -ioutput.html -d ${DSLHTML} ${HTMLTXTFLAGS} + PRINTOPTS?= -ioutput.print -d ${DSLPRINT} ${PRINTFLAGS} .if defined(BOOK_OUTPUT) @@ -183,12 +212,12 @@ JUSTIFY=1 #GEN_INDEX=1 .endif .if defined(JUSTIFY) -TEXCMDS+= \RequirePackage{url} +TEX_CMDSEQ+= \RequirePackage{url} PRINTOPTS+= -ioutput.print.justify .endif .if defined(TWO_SIDE) PRINTOPTS+= -V %two-side% -ioutput.print.twoside -TEXCMDS+= \def\PageTwoSide{1} +TEX_CMDSEQ+= \def\PageTwoSide{1} .endif .if defined(NICE_HEADERS) PRINTOPTS+= -ioutput.print.niceheaders @@ -197,7 +226,7 @@ PRINTOPTS+= -ioutput.print.niceheaders PRINTOPTS+= -V minimal-section-labels .endif .if defined(TRACE) -TEXCMDS+= \tracingstats=${TRACE} +TEX_CMDSEQ+= \tracingstats=${TRACE} .endif .if defined(RLE) PNMTOPSFLAGS+= -rle @@ -224,20 +253,14 @@ HTMLFLAGS+= -V %show-all-trademark-symbols% PRINTFLAGS+= -V %show-all-trademark-symbols% .endif -PERL?= /usr/bin/perl +PERL?= ${PREFIX}/bin/perl PKG_CREATE?= /usr/sbin/pkg_create SORT?= /usr/bin/sort TAR?= /usr/bin/tar TOUCH?= /usr/bin/touch XARGS?= /usr/bin/xargs -TEX?= ${PREFIX}/bin/tex -LATEX?= ${PREFIX}/bin/latex -PDFTEX?= ${PREFIX}/bin/pdflatex -JADETEX?= ${TEX} "&jadetex" -PDFJADETEX?= ${PDFTEX} "&pdfjadetex" GROFF?= groff -TIDY?= ${PREFIX}/bin/tidy TIDYOPTS?= -wrap 90 -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS} HTML2TXT?= ${PREFIX}/bin/links HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS} @@ -245,8 +268,9 @@ HTML2PDB?= ${PREFIX}/bin/iSiloBSD HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS} DVIPS?= ${PREFIX}/bin/dvips .if defined(PAPERSIZE) -DVIPSOPTS?= -t ${PAPERSIZE:L} ${DVIPSFLAGS} +DVIPSOPTS?= -t ${PAPERSIZE:L} .endif +DVIPSOPTS+= ${DVIPSFLAGS} GZIP?= -9 GZIP_CMD?= gzip -qf ${GZIP} @@ -255,6 +279,13 @@ BZIP2_CMD?= bzip2 -qf ${BZIP2} ZIP?= -9 ZIP_CMD?= ${PREFIX}/bin/zip -j ${ZIP} +# +# Instruction for bsd.subdir.mk to not to process SUBDIR directive. +# It is not neccessary since doc.docbook.mk do it too. +# +NO_SUBDIR= YES + + # ------------------------------------------------------------------------ # # Look at ${FORMATS} and work out which documents need to be generated. @@ -431,7 +462,7 @@ all: ${_docs} .if !defined(CUSTOMIZED_XML) ${DOC}.xml: ${SRCS} - echo '' > ${DOC}.xml + echo '' > ${DOC}.xml ${SX} -xlower -xndata ${MASTERDOC} 2> .sxerr | tail -n +2 >> ${DOC}.xml @-grep -v 'reference to internal SDATA entity' .sxerr .endif @@ -447,7 +478,7 @@ XSLTPROCFLAGS?= .if ${STYLESHEET_TYPE} == "dsssl" index.html HTML.manifest: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ${LOCAL_IMAGES_TXT} ${INDEX_SGML} ${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET} - ${JADE} -V html-manifest ${HTMLOPTS} -ioutput.html.images \ + ${JADE_CMD} -V html-manifest ${HTMLOPTS} -ioutput.html.images \ ${JADEOPTS} -t sgml ${MASTERDOC} .elif ${STYLESHEET_TYPE} == "xsl" index.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ @@ -464,7 +495,7 @@ index.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ .if ${STYLESHEET_TYPE} == "dsssl" ${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ${LOCAL_IMAGES_TXT} ${INDEX_SGML} ${HTML_INDEX} ${LOCAL_CSS_SHEET} - ${JADE} -V nochunks ${HTMLOPTS} -ioutput.html.images \ + ${JADE_CMD} -V nochunks ${HTMLOPTS} -ioutput.html.images \ ${JADEOPTS} -t sgml ${MASTERDOC} > ${.TARGET} || \ (${RM} -f ${.TARGET} && false) .elif ${STYLESHEET_TYPE} == "xsl" @@ -482,7 +513,7 @@ ${DOC}.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ # Special target to produce HTML with no images in it. .if ${STYLESHEET_TYPE} == "dsssl" ${DOC}.html-text: ${SRCS} ${INDEX_SGML} ${HTML_INDEX} ${LOCAL_IMAGES_TXT} - ${JADE} -V nochunks ${HTMLOPTS} \ + ${JADE_CMD} -V nochunks ${HTMLTXTOPTS} \ ${JADEOPTS} -t sgml ${MASTERDOC} > ${.TARGET} || \ (${RM} -f ${.TARGET} && false) .elif ${STYLESHEET_TYPE} == "xsl" @@ -530,9 +561,16 @@ ${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb.${_curcomp} # RTF -------------------------------------------------------------------- ${DOC}.rtf: ${SRCS} ${LOCAL_IMAGES_EPS} ${LOCAL_IMAGES_TXT} - ${JADE} -V rtf-backend ${PRINTOPTS} \ + ${JADE_CMD} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \ ${JADEOPTS} -t rtf -o ${.TARGET} ${MASTERDOC} +${DOC}.rtf.tar: ${DOC}.rtf ${LOCAL_IMAGES_PNG} + ${TAR} cf ${.TARGET} ${DOC}.rtf ${IMAGES_PNG:N*share*} +.for _curimage in ${IMAGES_PNG:M*share*} + ${TAR} rf ${.TARGET} -C ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} \ + ${_curimage:S|${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T}/||} +.endfor + # # This sucks, but there's no way round it. The PS and PDF formats need # to use different image formats, which are chosen at the .tex stage. So, @@ -542,7 +580,7 @@ ${DOC}.rtf: ${SRCS} ${LOCAL_IMAGES_EPS} ${LOCAL_IMAGES_TXT} ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${INDEX_SGML} ${PRINT_INDEX} \ ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} - ${JADE} -V tex-backend ${PRINTOPTS} \ + ${JADE_CMD} -V tex-backend ${PRINTOPTS} \ ${JADEOPTS} -t tex -o ${.TARGET} ${MASTERDOC} ${DOC}.tex-ps: ${DOC}.tex @@ -554,7 +592,7 @@ ${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${INDEX_SGML} ${PRINT_INDEX} \ ${RM} -f ${.TARGET} ${CAT} ${PDFTEX_DEF} > ${.TARGET} /bin/sh ${PDF_GENINFO} >> ${.TARGET} - ${JADE} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \ + ${JADE_CMD} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \ ${JADEOPTS} -t tex -o /dev/stdout ${MASTERDOC} >> ${.TARGET} .endif @@ -563,11 +601,11 @@ ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS} ${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||} .endfor @${ECHO} "==> TeX pass 1/3" - -${JADETEX} '${TEXCMDS} \nonstopmode\input{${DOC}.tex}' + -${JADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex}' @${ECHO} "==> TeX pass 2/3" - -${JADETEX} '${TEXCMDS} \nonstopmode\input{${DOC}.tex}' + -${JADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex}' @${ECHO} "==> TeX pass 3/3" - -${JADETEX} '${TEXCMDS} \nonstopmode\input{${DOC}.tex}' + -${JADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex}' .if !target(${DOC}.pdf) ${DOC}.pdf: ${DOC}.tex-pdf ${IMAGES_PDF} @@ -575,11 +613,11 @@ ${DOC}.pdf: ${DOC}.tex-pdf ${IMAGES_PDF} ${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||} .endfor @${ECHO} "==> PDFTeX pass 1/3" - -${PDFJADETEX} '${TEXCMDS} \nonstopmode\input{${DOC}.tex-pdf}' + -${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf}' @${ECHO} "==> PDFTeX pass 2/3" - -${PDFJADETEX} '${TEXCMDS} \nonstopmode\input{${DOC}.tex-pdf}' + -${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf}' @${ECHO} "==> PDFTeX pass 3/3" - ${PDFJADETEX} '${TEXCMDS} \nonstopmode\input{${DOC}.tex-pdf}' + ${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf}' .endif ${DOC}.ps: ${DOC}.dvi @@ -611,7 +649,7 @@ ${DOC}.${_curformat}: # lint validate: - ${NSGMLS} ${NSGMLSWARNINGS} -s ${SGMLFLAGS} ${CATALOGS} ${MASTERDOC} + ${NSGMLS} ${NSGMLSWARNINGS} -s ${NSGMLSFLAGS} ${SGMLFLAGS} ${CATALOGS} ${MASTERDOC} # ------------------------------------------------------------------------ @@ -630,12 +668,12 @@ ${INDEX_SGML}: ${PERL} ${COLLATEINDEX} -N -o ${.TARGET} ${HTML_INDEX}: - ${JADE} -V html-index -V nochunks ${HTMLOPTS} -ioutput.html.images \ + ${JADE_CMD} -V html-index -V nochunks ${HTMLOPTS} -ioutput.html.images \ ${JADEOPTS} -t sgml ${MASTERDOC} > /dev/null ${PERL} ${COLLATEINDEX} -g -o ${INDEX_SGML} ${.TARGET} ${HTML_SPLIT_INDEX}: - ${JADE} -V html-index ${HTMLOPTS} -ioutput.html.images \ + ${JADE_CMD} -V html-index ${HTMLOPTS} -ioutput.html.images \ ${JADEOPTS} -t sgml ${MASTERDOC} > /dev/null ${PERL} ${COLLATEINDEX} -g -o ${INDEX_SGML} ${.TARGET} @@ -831,6 +869,19 @@ install-${_curformat}: ${DOC}.${_curformat} .endfor .elif ${_cf} == "pdb" ${LN} -f ${DESTDIR}/${.ALLSRC} ${DESTDIR}/${.CURDIR:T}.${_curformat} + +.elif ${_cf} == "rtf" +.for _curimage in ${IMAGES_PNG:M*/*:M*share*} + ${MKDIR} -p ${DESTDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||} + ${INSTALL_DOCS} ${_curimage} ${DESTDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||} +.endfor +.for _curimage in ${IMAGES_PNG:M*/*:N*share*} + ${MKDIR} -p ${DESTDIR}/${_curimage:H} + ${INSTALL_DOCS} ${_curimage} ${DESTDIR}/${_curimage:H} +.endfor +.for _curimage in ${IMAGES_PNG:N*/*} + ${INSTALL_DOCS} ${_curimage} ${DESTDIR}/${_curimage} +.endfor .endif .if ${_cf} == "html-split" @@ -895,31 +946,33 @@ packagelist: # target depends on the corresponding install target running. # -.for _curformat in ${KNOWN_FORMATS} -_cf=${_curformat} -.if ${_cf} == "html-split" -PLIST.${_curformat}: index.html - @${SORT} HTML.manifest > PLIST.${_curformat} +.if defined(BZIP2_PACKAGE) +PKG_SUFFIX= tbz .else -PLIST.${_curformat}: ${DOC}.${_curformat} - @${ECHO_CMD} ${DOC}.${_curformat} > PLIST.${_curformat} -.endif -.if (${_cf} == "html-split" || ${_cf} == "html") && \ - (!empty(LOCAL_IMAGES_LIB) || !empty(IMAGES_PNG) || !empty(CSS_SHEET)) - @${ECHO_CMD} ${LOCAL_IMAGES_LIB} ${IMAGES_PNG} ${LOCAL_CSS_SHEET} | \ - ${XARGS} -n1 >> PLIST.${_curformat} -.elif (${_cf} == "tex" || ${_cf} == "dvi") && !empty(IMAGES_EPS) - @${ECHO_CMD} ${IMAGES_EPS} | ${XARGS} -n1 >> PLIST.${_curformat} -.elif ${_cf} == "pdb" - @${ECHO_CMD} ${.CURDIR:T}.${_curformat} >> PLIST.${_curformat} +PKG_SUFFIX= tgz .endif -${PACKAGES}/${.CURDIR:T}.${LANGCODE}.${_curformat}.tgz: PLIST.${_cf} - @${PKG_CREATE} -v -f ${.ALLSRC} -p ${DESTDIR} -s ${.OBJDIR} \ +PKGDOCPFX!= realpath ${DOC_PREFIX} + +.for _curformat in ${KNOWN_FORMATS} + +${PACKAGES}/${.CURDIR:T}.${LANGCODE}.${_curformat}.${PKG_SUFFIX}: + ${MKDIR} -p ${.OBJDIR}/pkg; \ + (cd ${.CURDIR} && \ + ${MAKE} FORMATS=${_curformat} \ + DOCDIR=${.OBJDIR}/pkg \ + ${PKGMAKEFLAGS} \ + install); \ + PKGSRCDIR=${.OBJDIR}/pkg/${.CURDIR:S/${PKGDOCPFX}\///}; \ + /bin/ls -1 $$PKGSRCDIR > ${.OBJDIR}/PLIST.${_curformat}; \ + ${PKG_CREATE} -v -f ${.OBJDIR}/PLIST.${_curformat} \ + -p ${DESTDIR} -s $$PKGSRCDIR \ -c -"FDP ${.CURDIR:T} ${_curformat} package" \ - -d -"FDP ${.CURDIR:T} ${_curformat} package" ${.TARGET} + -d -"FDP ${.CURDIR:T} ${_curformat} package" ${.TARGET} || \ + (${RM} -fr ${.TARGET} PLIST.${_curformat} && false); \ + ${RM} -rf ${.OBJDIR}/pkg -package-${_curformat}: ${PACKAGES}/${.CURDIR:T}.${LANGCODE}.${_curformat}.tgz +package-${_curformat}: ${PACKAGES}/${.CURDIR:T}.${LANGCODE}.${_curformat}.${PKG_SUFFIX} .endfor .if ${LOCAL_CSS_SHEET} != ${CSS_SHEET} diff --git a/share/mk/doc.html.mk b/share/mk/doc.html.mk index 0524e3f75f..863e887b6b 100644 --- a/share/mk/doc.html.mk +++ b/share/mk/doc.html.mk @@ -1,5 +1,5 @@ # -# $DragonFly: doc/share/mk/doc.html.mk,v 1.1.1.1 2004/04/02 09:36:34 hmp Exp $ +# $DragonFly: doc/share/mk/doc.html.mk,v 1.2 2006/08/06 20:58:06 justin Exp $ # # This include file handles building and installing of # HTML documentation in the DragonFlyBSD Documentation Project. @@ -67,6 +67,8 @@ PKG_CREATE?= /usr/sbin/pkg_create TAR?= /usr/bin/tar XARGS?= /usr/bin/xargs +# for now disable TIDY for compatibility reasons +NO_TIDY= YES TIDY?= ${PREFIX}/bin/tidy TIDYOPTS?= -i -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS} HTML2PDB?= ${PREFIX}/bin/iSiloBSD diff --git a/share/mk/doc.images.mk b/share/mk/doc.images.mk index 8e500c0bb9..84af45446c 100644 --- a/share/mk/doc.images.mk +++ b/share/mk/doc.images.mk @@ -1,5 +1,5 @@ # -# $DragonFly: doc/share/mk/doc.images.mk,v 1.2 2005/08/14 08:04:56 asmodai Exp $ +# $DragonFly: doc/share/mk/doc.images.mk,v 1.3 2006/08/06 20:58:06 justin Exp $ # # This include file handles image processing. # @@ -122,20 +122,31 @@ LOCAL_IMAGES_TXT+= ${IMAGES_SCR_TXT} # low for the typical monitor in use today. The resolution of 100 looks # much better on these monitors without making the image too large for # a 640x480 monitor. -EPS2PNG_RES?= 100 +EPS2PNM_RES?= 100 -# We only need to list ${IMAGES_GEN_PDF} here. If all the source files are -# EPS then they'll be in this variable; if any of the source files are PNG -# then we can use them directly, and don't need to list them. -IMAGES_PDF=${IMAGES_GEN_PDF} +# We need to list ${_IMAGES_PNG} here since the images might be in a +# shared image directory. +IMAGES_PDF= ${IMAGES_GEN_PDF} ${_IMAGES_PNG} SCR2PNG?= ${PREFIX}/bin/scr2png SCR2PNGOPTS?= ${SCR2PNGFLAGS} SCR2TXT?= ${PREFIX}/bin/scr2txt SCR2TXTOPTS?= -l ${SCR2TXTFLAGS} SED?= /usr/bin/sed -EPS2PNG?= ${PREFIX}/bin/peps -EPS2PNGOPTS?= -p -r ${EPS2PNG_RES} ${EPS2PNGFLAGS} +EPS2PNM?= ${PREFIX}/bin/gs +EPS2PNMOPTS?= -q -dBATCH -dGraphicsAlphaBits=4 -dTextAlphaBits=4 \ + -dEPSCrop -r${EPS2PNM_RES}x${EPS2PNM_RES} \ + -dNOPAUSE -dSAFER -sDEVICE=pnm -sOutputFile=- + +# epsgeom is a perl script for 1) extracting geometry information +# from a .eps file and 2) arrange it for ghostscript's pnm driver. +# +EPSGEOM?= ${PERL} ${DOC_PREFIX}/share/misc/epsgeom +EPSGEOMOPTS?= ${EPS2PNM_RES} ${EPS2PNM_RES} +PNMTOPNG?= ${PREFIX}/bin/pnmtopng +PNMTOPNGOPTS?= ${PNGTOPNGFLAGS} + + PNGTOPNM?= ${PREFIX}/bin/pngtopnm PNGTOPNMOPTS?= ${PNGTOPNMFLAGS} PPMTOPGM?= ${PREFIX}/bin/ppmtopgm @@ -152,9 +163,6 @@ PS2EPSOPTS?= -q -dNOPAUSE -dSAFER -dDELAYSAFER \ -sPAPERSIZE=letter -r72 -sDEVICE=bit \ -sOutputFile=/dev/null ${PS2EPSFLAGS} ps2epsi.ps # -SETENV?= /usr/bin/env -REALPATH?= /bin/realpath - # Use suffix rules to convert .scr files to other formats .SUFFIXES: .scr .pic .png .ps .eps .txt @@ -181,12 +189,12 @@ REALPATH?= /bin/realpath .scr.txt: ${SCR2TXT} ${SCR2TXTOPTS} < ${.IMPSRC} | ${SED} -E -e 's/ +$$//' > ${.TARGET} -# Some versions of ghostscript (7.04) have problems with the use of -# relative path when the arguments are passed by peps; realpath will -# correct the problem. .pic.png: ${.TARGET:S/.png$/.eps/} - ${EPS2PNG} ${EPS2PNGOPTS} -o ${.TARGET} \ - `${REALPATH} ${.TARGET:S/.png$/.eps/}` + ${EPSGEOM} -offset ${EPSGEOMOPTS} ${.TARGET:S/.png$/.eps/} \ + | ${EPS2PNM} ${EPS2PNMOPTS} \ + -g`${EPSGEOM} -geom ${EPSGEOMOPTS} ${.TARGET:S/.png$/.eps/}` - \ + | ${PNMTOPNG} > ${.TARGET} + .pic.ps: ${PIC2PS} ${.ALLSRC} > ${.TARGET} @@ -199,18 +207,21 @@ REALPATH?= /bin/realpath # bounding box. .ps.eps: ${SETENV} outfile=${.TARGET} ${PS2EPS} ${PS2EPSOPTS} < ${.ALLSRC} 1>&2 - echo "save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def" >> ${.TARGET} - echo "%%EndProlog" >> ${.TARGET} - echo "%%Page: 1 1" >> ${.TARGET} - echo "%%BeginDocument: ${.ALLSRC}" >> ${.TARGET} + (echo "save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def";\ + echo "%%EndProlog";\ + echo "%%Page: 1 1";\ + echo "%%BeginDocument: ${.ALLSRC}";\ + ) >> ${.TARGET} ${SED} -e '/^%%BeginPreview:/,/^%%EndPreview[^!-~]*$$/d' \ -e '/^%!PS-Adobe/d' \ -e '/^%%[A-Za-z][A-Za-z]*[^!-~]*$$/d'\ -e '/^%%[A-Za-z][A-Za-z]*: /d' < ${.ALLSRC} >> ${.TARGET} - echo "%%EndDocument" >> ${.TARGET} - echo "%%Trailer" >> ${.TARGET} - echo "cleartomark countdictstack exch sub { end } repeat restore" >> ${.TARGET} - echo "%%EOF" >> ${.TARGET} + (echo "%%EndDocument";\ + echo "%%Trailer";\ + echo "cleartomark countdictstack exch sub { end } repeat restore";\ + echo "%%EOF";\ + ) >> ${.TARGET} + # We can't use suffix rules to generate the rules to convert EPS to PNG and # PNG to EPS. This is because a .png file can depend on a .eps file, and @@ -219,7 +230,10 @@ REALPATH?= /bin/realpath .for _curimage in ${IMAGES_GEN_PNG} ${_curimage}: ${_curimage:S/.png$/.eps/} - ${EPS2PNG} ${EPS2PNGOPTS} -o ${.TARGET} `${REALPATH} ${.ALLSRC}` + ${EPSGEOM} -offset ${EPSGEOMOPTS} ${.ALLSRC} \ + | ${EPS2PNM} ${EPS2PNMOPTS} \ + -g`${EPSGEOM} -geom ${EPSGEOMOPTS} ${.ALLSRC}` - \ + | ${PNMTOPNG} > ${.TARGET} .endfor .for _curimage in ${IMAGES_GEN_EPS} diff --git a/share/mk/doc.project.mk b/share/mk/doc.project.mk index 4c993ef27e..ffd8c659f9 100644 --- a/share/mk/doc.project.mk +++ b/share/mk/doc.project.mk @@ -1,6 +1,7 @@ # -# $DragonFly: doc/share/mk/doc.project.mk,v 1.2 2005/08/14 08:04:56 asmodai Exp $ -# +# $DragonFly: doc/share/mk/doc.project.mk,v 1.3 2006/08/06 20:58:06 justin Exp $ +# Matches with: +# $FreeBSD: doc/share/mk/doc.project.mk,v 1.26 2005/02/20 17:14:25 hrs Exp $ # This file includes the other makefiles, which contain enough # knowledge to perform their duties without the system make files. # @@ -64,7 +65,7 @@ MAINTAINER?= doc-team@DragonFlyBSD.org ALL_FORMATS= html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar pdb # User-modifiable -LOCALBASE?= /usr/local +LOCALBASE?= /usr/pkg PREFIX?= ${LOCALBASE} PRI_LANG?= en @@ -76,10 +77,43 @@ MKDIR?= /bin/mkdir RM?= /bin/rm MV?= /bin/mv HTML2TXT?= ${PREFIX}/bin/links -HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS} +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({$PREFIX}/bin/perl) +PERL?= {$PREFIX}/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" +PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex" +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..mk files, so must # be listed first). .include "doc.images.mk" @@ -87,6 +121,12 @@ ISPELLOPTS?= -l -p /usr/share/dict/freebsd ${ISPELLFLAGS} # 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" -- 2.41.0