Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andraž Levstik (d1fed37b4392305e5c6f53862b9a40a879afcca5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (d1fed37b4392305e5c6f53862b9a40a879afcca5)
  • Date: Mon, 26 Jan 2009 16:23:29 -0600

GIT changes to master grimoire by Andraž Levstik <ruskie AT codemages.net>:

audio-drivers/nas/DEPENDS |
27
audio-drivers/nas/DETAILS |
1
audio-drivers/nas/HISTORY |
5
audio-drivers/nas/PRE_BUILD |
3
dev/null
|binary
http/kompozer/DEPENDS |
11
http/kompozer/DETAILS |
1
http/kompozer/HISTORY |
4
xorg-app/bitmap/BUILD |
3
xorg-app/bitmap/DEPENDS |
13
xorg-app/bitmap/DETAILS |
1
xorg-app/bitmap/HISTORY |
5
xorg-app/editres/BUILD |
3
xorg-app/editres/CONFIGURE |
5
xorg-app/editres/DEPENDS |
2
xorg-app/editres/DETAILS |
1
xorg-app/editres/HISTORY |
6
xorg-app/listres/BUILD |
3
xorg-app/listres/CONFIGURE |
5
xorg-app/listres/DEPENDS |
2
xorg-app/listres/DETAILS |
3
xorg-app/listres/HISTORY |
6
xorg-app/viewres/BUILD |
3
xorg-app/viewres/CONFIGURE |
5
xorg-app/viewres/DEPENDS |
2
xorg-app/viewres/DETAILS |
3
xorg-app/viewres/HISTORY |
6
xorg-app/xbiff/BUILD |
3
xorg-app/xbiff/CONFIGURE |
5
xorg-app/xbiff/DEPENDS |
2
xorg-app/xbiff/DETAILS |
3
xorg-app/xbiff/HISTORY |
6
xorg-app/xcalc/BUILD |
3
xorg-app/xcalc/CONFIGURE |
5
xorg-app/xcalc/DEPENDS |
2
xorg-app/xcalc/DETAILS |
1
xorg-app/xcalc/HISTORY |
6
xorg-app/xclipboard/BUILD |
3
xorg-app/xclipboard/CONFIGURE |
5
xorg-app/xclipboard/DEPENDS |
2
xorg-app/xclipboard/DETAILS |
3
xorg-app/xclipboard/HISTORY |
6
xorg-app/xclock/BUILD |
5
xorg-app/xclock/CONFIGURE |
6
xorg-app/xclock/DEPENDS |
2
xorg-app/xclock/DETAILS |
1
xorg-app/xclock/HISTORY |
6
xorg-app/xconsole/BUILD |
3
xorg-app/xconsole/CONFIGURE |
5
xorg-app/xconsole/DEPENDS |
2
xorg-app/xconsole/DETAILS |
1
xorg-app/xconsole/HISTORY |
6
xorg-app/xdbedizzy/BUILD |
4
xorg-app/xdbedizzy/CONFIGURE |
5
xorg-app/xdbedizzy/DEPENDS |
2
xorg-app/xdbedizzy/DETAILS |
1
xorg-app/xdbedizzy/HISTORY |
6
xorg-app/xditview/BUILD |
3
xorg-app/xditview/CONFIGURE |
5
xorg-app/xditview/DEPENDS |
2
xorg-app/xditview/DETAILS |
3
xorg-app/xditview/HISTORY |
6
xorg-app/xdm/DEPENDS |
5
xorg-app/xdm/DETAILS |
1
xorg-app/xdm/HISTORY |
4
xorg-app/xdpyinfo/DEPENDS |
4
xorg-app/xdpyinfo/DETAILS |
1
xorg-app/xdpyinfo/HISTORY |
4
xorg-app/xedit/BUILD |
3
xorg-app/xedit/CONFIGURE |
5
xorg-app/xedit/DEPENDS |
3
xorg-app/xedit/DETAILS |
1
xorg-app/xedit/HISTORY |
6
xorg-app/xfd/BUILD |
3
xorg-app/xfd/CONFIGURE |
5
xorg-app/xfd/DEPENDS |
2
xorg-app/xfd/DETAILS |
3
xorg-app/xfd/HISTORY |
6
xorg-app/xfontsel/BUILD |
3
xorg-app/xfontsel/CONFIGURE |
5
xorg-app/xfontsel/DEPENDS |
2
xorg-app/xfontsel/DETAILS |
3
xorg-app/xfontsel/HISTORY |
6
xorg-app/xgc/BUILD |
3
xorg-app/xgc/CONFIGURE |
5
xorg-app/xgc/DEPENDS |
2
xorg-app/xgc/DETAILS |
3
xorg-app/xgc/HISTORY |
6
xorg-app/xkbutils/BUILD |
3
xorg-app/xkbutils/CONFIGURE |
5
xorg-app/xkbutils/DEPENDS |
2
xorg-app/xkbutils/DETAILS |
3
xorg-app/xkbutils/HISTORY |
6
xorg-app/xload/BUILD |
3
xorg-app/xload/CONFIGURE |
5
xorg-app/xload/DEPENDS |
2
xorg-app/xload/DETAILS |
1
xorg-app/xload/HISTORY |
6
xorg-app/xlogo/BUILD |
5
xorg-app/xlogo/CONFIGURE |
6
xorg-app/xlogo/DEPENDS |
4
xorg-app/xlogo/DETAILS |
3
xorg-app/xlogo/HISTORY |
6
xorg-app/xmag/BUILD |
3
xorg-app/xmag/CONFIGURE |
5
xorg-app/xmag/DEPENDS |
2
xorg-app/xmag/DETAILS |
1
xorg-app/xmag/HISTORY |
6
xorg-app/xman/BUILD |
3
xorg-app/xman/CONFIGURE |
5
xorg-app/xman/DEPENDS |
6
xorg-app/xman/DETAILS |
1
xorg-app/xman/HISTORY |
6
xorg-app/xmessage/BUILD |
3
xorg-app/xmessage/CONFIGURE |
5
xorg-app/xmessage/DEPENDS |
2
xorg-app/xmessage/DETAILS |
1
xorg-app/xmessage/HISTORY |
6
xorg-app/xmh/BUILD |
3
xorg-app/xmh/CONFIGURE |
5
xorg-app/xmh/DEPENDS |
2
xorg-app/xmh/DETAILS |
3
xorg-app/xmh/HISTORY |
6
xorg-app/xmore/BUILD |
3
xorg-app/xmore/CONFIGURE |
5
xorg-app/xmore/DEPENDS |
5
xorg-app/xmore/DETAILS |
11
xorg-app/xmore/HISTORY |
14
xorg-app/xmore/PRE_BUILD |
10
xorg-app/xmore/xmore-X11R7.0-1.0.1.tar.bz2.sig |
0
xorg-app/xmore/xmore-patch1.diff |
21
xorg-app/xmore/xmore-patch2.diff |
20
xorg-app/xmore/xmore-patch3.diff |
21
xorg-app/xmore/xmore-patch4.diff |
2216 ++++++++++
xorg-app/xmore/xmore-patch5.diff |
20
xorg-app/xmore/xmore-patch6.diff |
390 +
xorg-app/xmore/xmore-patch7.diff |
156
xorg-app/xphelloworld/BUILD |
1
xorg-app/xphelloworld/DEPENDS |
6
xorg-app/xphelloworld/DETAILS |
9
xorg-app/xphelloworld/HISTORY |
8
xorg-app/xphelloworld/INSTALL |
1
xorg-app/xphelloworld/PRE_BUILD |
1
xorg-app/xphelloworld/TRIGGERS |
3
xorg-app/xphelloworld/xphelloworld-X11R7.0-1.0.1.tar.bz2.sig |
0
xorg-app/xplsprinters/BUILD |
1
xorg-app/xplsprinters/DEPENDS |
4
xorg-app/xplsprinters/DETAILS |
9
xorg-app/xplsprinters/HISTORY |
8
xorg-app/xplsprinters/INSTALL |
1
xorg-app/xplsprinters/PRE_BUILD |
1
xorg-app/xplsprinters/TRIGGERS |
3
xorg-app/xplsprinters/xplsprinters-X11R7.0-1.0.1.tar.bz2.sig |
0
xorg-app/xprehashprinterlist/BUILD |
1
xorg-app/xprehashprinterlist/DEPENDS |
3
xorg-app/xprehashprinterlist/DETAILS |
9
xorg-app/xprehashprinterlist/HISTORY |
8
xorg-app/xprehashprinterlist/INSTALL |
1
xorg-app/xprehashprinterlist/PRE_BUILD |
1
xorg-app/xprehashprinterlist/TRIGGERS |
3
xorg-app/xprehashprinterlist/xprehashprinterlist-X11R7.0-1.0.1.tar.bz2.sig |
0
xorg-app/xrx/BUILD |
3
xorg-app/xrx/CONFIGURE |
6
xorg-app/xrx/DEPENDS |
1
xorg-app/xrx/DETAILS |
1
xorg-app/xrx/HISTORY |
6
xorg-app/xset/DEPENDS |
4
xorg-app/xset/DETAILS |
1
xorg-app/xset/HISTORY |
4
xorg-app/xsm/BUILD |
2
xorg-app/xsm/CONFIGURE |
5
xorg-app/xsm/DEPENDS |
2
xorg-app/xsm/DETAILS |
3
xorg-app/xsm/HISTORY |
6
xorg-app/xvidtune/BUILD |
2
xorg-app/xvidtune/CONFIGURE |
5
xorg-app/xvidtune/DEPENDS |
2
xorg-app/xvidtune/DETAILS |
3
xorg-app/xvidtune/HISTORY |
6
xorg-lib/libxaw/DEPENDS |
6
xorg-lib/libxaw/DETAILS |
1
xorg-lib/libxaw/HISTORY |
7
xorg-lib/libxaw/PRE_SUB_DEPENDS |
5
xorg-lib/libxaw/REPAIR^all^PRE_SUB_DEPENDS |
6
xorg-lib/libxaw/SUB_DEPENDS |
4
xorg-lib/libxp/BUILD |
1
xorg-lib/libxp/DEPENDS |
8
xorg-lib/libxp/DETAILS |
9
xorg-lib/libxp/HISTORY |
8
xorg-lib/libxp/INSTALL |
1
xorg-lib/libxp/PRE_BUILD |
1
xorg-lib/libxp/TRIGGERS |
1
xorg-lib/libxp/libXp-X11R7.0-1.0.0.tar.bz2.sig |
0
xorg-lib/libxprintapputil/BUILD |
1
xorg-lib/libxprintapputil/DEPENDS |
7
xorg-lib/libxprintapputil/DETAILS |
9
xorg-lib/libxprintapputil/HISTORY |
8
xorg-lib/libxprintapputil/INSTALL |
1
xorg-lib/libxprintapputil/PRE_BUILD |
1
xorg-lib/libxprintapputil/TRIGGERS |
2
xorg-lib/libxprintapputil/libXprintAppUtil-X11R7.0-1.0.1.tar.bz2.sig |
0
xorg-lib/libxprintutil/BUILD |
1
xorg-lib/libxprintutil/DEPENDS |
7
xorg-lib/libxprintutil/DETAILS |
9
xorg-lib/libxprintutil/HISTORY |
8
xorg-lib/libxprintutil/INSTALL |
1
xorg-lib/libxprintutil/PRE_BUILD |
1
xorg-lib/libxprintutil/TRIGGERS |
3
xorg-lib/libxprintutil/libXprintUtil-X11R7.0-1.0.1.tar.bz2.sig |
0
xorg-util/xorg-cf-files/05_xaw_without_xp.diff |
27
xorg-util/xorg-cf-files/DETAILS |
1
xorg-util/xorg-cf-files/HISTORY |
6
xorg-util/xorg-cf-files/PRE_BUILD |
1
xorg-xserver/xorg-server/DEPENDS |
10
xorg-xserver/xorg-server/HISTORY |
3
215 files changed, 3269 insertions(+), 418 deletions(-)

New commits:
commit 678cf3203944aeef6e4dcbe75c7843ddbf3d5d01
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

kompozer: xprint is dead

commit 97b9712173029977592b692f0a6906d9fb022904
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

nas: updates for XPrint death

commit 2e44a0c7f286ba7544b19c6c12587f2d2fb0ecb1
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xorg-cf-files: fixes for Xaw without Xp

commit e9d0aebbfea0ea6551076460e6d0fc10a4a1ff12
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

libxaw: no mote XAW8 and no more XPrint

commit d91a36dd3bb4419169388edf90cbe2c208f40e8f
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xplsprinters: no more XPrint

commit 3682e6ada43c8af237459e02510928bb63ea5171
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xprehashprinterlist: no more XPrint

commit fdf410bb3870a8325b65a2f571c827bf1612fedc
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xphelloworld: Xprint is dead

commit d0d3ddd94ee6de2fc210c3099fbac1f841dfd8ed
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

libxprintutil: Xprint is dead

commit 1eb33928808cda163083be2d72ae1f6709103aaa
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

libxprintapputil: it's dead Jim

commit 77ea51ef24ebf24fb1edb9cef97e5a16ce9004cd
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

libxp: killing this off finally upstream has made it dead

commit 7fe6ba469b3f3458b7315ad5ec4b6e655d3a3466
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xorg-server: killing off XPrint

commit 8c361fe2f5d4294492451d944eab61c9e4bdce99
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xsm: correction in DEPENDS

commit 93764ddc1e4dd53251519c9b2403a2e7802c2067
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xclock: killing off XPrint

commit a4df16288d65cd7b42345bc1ab5e816fc4426590
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

listres: killing off XPrint

commit 00f9c4b946b8f6b004ded9004e382e7c1750a6e8
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

viewres: killing off XPrint

commit 0cea3945e797874aa3a4d73d4fe1455ac3843303
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xbiff: killing off XPrint

commit 49f9a48872246fa5a2df75f88cbbdfbdfb922fde
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xcalc: killing off XPrint

commit 38446b79b8c7fd4216b76ef2b80ef72fa6c6ea80
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xclipboard: killing off XPrint

commit 7d8c892f151ae9e2d8f2df4be99f95afd0c62644
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

Revert "xclipboard: killing off XPrint"

This reverts commit fd5df532a72b67fd95c5226906cff7b72021f42c.

Wrong commit again

commit fd5df532a72b67fd95c5226906cff7b72021f42c
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xclipboard: killing off XPrint

commit 81ca58c14f9b095bce8ec5d900c821c1f6d93a6b
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xconsole: killing off XPrint

commit 7a26344476fece9c4118d9e9b043cf88d53f4398
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xdbedizzy: killing off XPrint

commit d1f047b96099282c11043b65e91b113c1b9ad7ae
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xditview: killing off XPrint

commit af1f7fe575a4604e90dbfb78fc43e3d804ef3a15
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xfd: killing off XPrint

commit 9eadca071b8c25bd6f8756c979d5c39c1485498f
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xfontsel: killing off XPrint

commit 48c5aec6dc690d1da96f01b04e76645b21b6ed5b
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xgc: killing off XPrint

commit a3827f4b90e8fab59c4dc11a0facaded13231eaa
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xkbutils: killing off XPrint

commit b2d7625c07c990717db3b92a8e8d982562719713
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xload: killing off XPrint

commit a40f5ce6626bf590c34ecc19e5ce9514e0385f87
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xmag: killing off XPrint

commit 467c375554184f3bd175dae230fd4581fc8de128
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xmessage: killing off XPrint

commit 364b8bd52fa8cf2888bb6b23252e9bc61df13a0f
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xmh: killing off XPrint

commit 82ff9f5293380f5b058486e1479b2f83679b4dcf
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xsm: fixing HISTORY

commit 9700ce8800a635cacd66a59e91f86e02537a931a
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xvidtune: fixing HISTORY

commit aa5607315f6467360414adb51f81ef81af2f3313
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

editres: fixing HISTORY

commit 90a0bd872e456a6ca3ded4f74d2c3ccbf76b96fe
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xrx: killing off XPrint

commit 134b138290d888265ed9d3a82727e5e9ab94eba8
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xsm: killing off XPrint

commit 4aed65133853e68d28d218f16c6509bb6ed58c85
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xvidtune: killing off XPrint

commit 2346ee77457c3fca1b56583aa86390c7c4ea6ca5
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

editres: killing off XPrint

commit 2c95ab7651925ff7432436c7a17966315d9f21a7
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

Revert "editres: killing off XPrint"

This reverts commit 4fe251204da94f22afacb6b6aac108fac6979ffc.
Mistaken commit

commit 4fe251204da94f22afacb6b6aac108fac6979ffc
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

editres: killing off XPrint

commit 88a13f1ab8b18dec7a960c22db82856d5a809f75
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xset: killing off XPrint

commit 592d57adef7e8a8623b3093383afbac3bef03f73
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xman: killing off XPrint

commit c22bfada9d9d27f3c262b6d025d5026e3526c8e4
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xlogo: no more XPrint

commit c5d34a3ae60ace41b76990747294461ac76f877a
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xedit: killed off XPrint

commit 965ddae08e3efd3a6895a65d4bccce621db75f9d
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xdpyinfo: killing XPrint

commit 562d9642286e0cecd0bcad692551a3d3b181496e
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xdm: killing XPrint

commit c52e203908c32204921d2c6a68f136ec6e7ec06a
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

bitmap: killing XAW8 and libxp

commit cf6622e2d369a6af16f064d8100883257ef6e43f
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xmore: removing Xprint support as per upstream

diff --git a/audio-drivers/nas/DEPENDS b/audio-drivers/nas/DEPENDS
index 7772ba0..528433a 100755
--- a/audio-drivers/nas/DEPENDS
+++ b/audio-drivers/nas/DEPENDS
@@ -1,17 +1,16 @@
depends xorg-server &&
depends rman &&
-
-if [[ "$(get_spell_provider xorg-server)" == "xorg-server" ]]; then
- depends gccmakedep &&
- depends libxt &&
- depends libsm &&
- depends libice &&
- depends libxext &&
- depends libx11 &&
- depends libxpm &&
- depends libxp &&
- depends libxmu &&
- depends libxaw &&
- depends imake
+depends gccmakedep &&
+depends libxt &&
+depends libsm &&
+depends libice &&
+depends libxext &&
+depends libx11 &&
+depends libxpm &&
+depends libxmu &&
+depends libxaw &&
+depends imake &&
+if [[ "$(gaze -g $GRIMOIRE_NAME -q patchlevels xorg-cf-files | cut -d "|" -f
3 | tail -n2 | head -n1)" -lt "1" ]]; then
+depends xorg-cf-files &&
+force_depends xorg-cf-files
fi
-
diff --git a/audio-drivers/nas/DETAILS b/audio-drivers/nas/DETAILS
index ea596f3..1ad37a5 100755
--- a/audio-drivers/nas/DETAILS
+++ b/audio-drivers/nas/DETAILS
@@ -12,6 +12,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
ENTERED=20030315
LICENSE[0]=GPL
KEYWORDS="drivers audio"
+ PATCHLEVEL=1
SHORT='The Network Audio System (NAS)'
cat << EOF
The Network Audio System is a network transparent, client/server audio
transport system.
diff --git a/audio-drivers/nas/HISTORY b/audio-drivers/nas/HISTORY
index a02f0e0..316ff3c 100644
--- a/audio-drivers/nas/HISTORY
+++ b/audio-drivers/nas/HISTORY
@@ -1,3 +1,8 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * PRE_BUILD: run xmkmf
+ * DEPENDS: check to see if xorg-cf-files is at patchlevel=1
+ * DETAILS: patchlevel++
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-SERVER to the one and only xorg-server
* PRE_BUILD, BUILD: xorg-server is the only provider of X11-SERVER
diff --git a/audio-drivers/nas/PRE_BUILD b/audio-drivers/nas/PRE_BUILD
index 00af8e2..7cc582c 100755
--- a/audio-drivers/nas/PRE_BUILD
+++ b/audio-drivers/nas/PRE_BUILD
@@ -4,4 +4,5 @@ cd ${SOURCE_DIRECTORY} &&
for FILE in $(grep -l -R X11R6 *)
do
sed -i "s:/X11R6::g" ${FILE}
-done
+done &&
+xmkmf
diff --git a/http/kompozer/DEPENDS b/http/kompozer/DEPENDS
index 54b1c99..4a82ef9 100755
--- a/http/kompozer/DEPENDS
+++ b/http/kompozer/DEPENDS
@@ -5,17 +5,16 @@ depends libpng '--with-system-png'
&&
depends libx11 &&
depends libxext &&
depends libxft &&
-depends libxprintutil &&
depends libxrender &&
depends nspr '--with-system-nspr' &&
depends perl &&
depends zip &&
depends zlib '--with-system-zlib' &&
-
-optional_depends nss \
- '--enable-crypto' \
- '--disable-crypto' \
- 'for encrypted communications support (e.g. https://)' &&
+# seems to be broken atm
+#optional_depends nss \
+# '--enable-crypto' \
+# '--disable-crypto' \
+# 'for encrypted communications support (e.g. https://)' &&

optional_depends libmng \
'--with-system-mng' \
diff --git a/http/kompozer/DETAILS b/http/kompozer/DETAILS
index 09db788..3a1dfdf 100755
--- a/http/kompozer/DETAILS
+++ b/http/kompozer/DETAILS
@@ -7,6 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.kompozer.net/
KEYWORDS="web http editors"
ENTERED=20080228
+ PATCHLEVEL=1
SHORT='GECKO-based web editing environment'
cat << EOF
KompoZer is a complete Web Authoring System that combines web file management
diff --git a/http/kompozer/HISTORY b/http/kompozer/HISTORY
index 12a357d..080cdf8 100644
--- a/http/kompozer/HISTORY
+++ b/http/kompozer/HISTORY
@@ -1,3 +1,7 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: nss doesn't seem to work atm
+ * DETAILS: patchlevel++
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: No need to check if using modular X as that's all that's
available now
diff --git a/xorg-app/bitmap/BUILD b/xorg-app/bitmap/BUILD
deleted file mode 100755
index 8571a21..0000000
--- a/xorg-app/bitmap/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$BITMAP_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/bitmap/DEPENDS b/xorg-app/bitmap/DEPENDS
index e6abb14..ea0598c 100755
--- a/xorg-app/bitmap/DEPENDS
+++ b/xorg-app/bitmap/DEPENDS
@@ -5,15 +5,4 @@ depends libx11 &&
depends libxmu &&
depends libxaw &&
depends xbitmaps &&
-
-optional_depends libxp \
- "--with-xprint" \
- "--disable-xprint" \
- "For printing support" &&
-
-# bitmap needs either Xaw7 or Xaw8. Xaw6 won't do
-if is_depends_enabled $SPELL libxp; then
- sub_depends libxaw XAW8
-else
- sub_depends libxaw XAW7
-fi
+sub_depends libxaw XAW7
diff --git a/xorg-app/bitmap/DETAILS b/xorg-app/bitmap/DETAILS
index 943ad3a..1709b38 100755
--- a/xorg-app/bitmap/DETAILS
+++ b/xorg-app/bitmap/DETAILS
@@ -8,6 +8,7 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
+ PATCHLEVEL=1
LICENSE[0]=XCL
SHORT="The X.Org bitmap file editor"
cat << EOF
diff --git a/xorg-app/bitmap/HISTORY b/xorg-app/bitmap/HISTORY
index 3aa5236..a5ffd73 100644
--- a/xorg-app/bitmap/HISTORY
+++ b/xorg-app/bitmap/HISTORY
@@ -1,3 +1,8 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: no more libxp support no more XAW8
+ * BUILD: removed
+ * DETAILS: patchelevl++
+
2008-09-17 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS,CONFIGURE: moved libxp to the proper place
* DEPENDS: added a sub_depends on xaw7 as an option
diff --git a/xorg-app/editres/BUILD b/xorg-app/editres/BUILD
deleted file mode 100755
index 995c7dd..0000000
--- a/xorg-app/editres/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$EDITRES_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/editres/CONFIGURE b/xorg-app/editres/CONFIGURE
deleted file mode 100755
index 6affac7..0000000
--- a/xorg-app/editres/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option EDITRES_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/editres/DEPENDS b/xorg-app/editres/DEPENDS
index b2964d2..0ccab0a 100755
--- a/xorg-app/editres/DEPENDS
+++ b/xorg-app/editres/DEPENDS
@@ -1,7 +1,7 @@
depends gawk &&
depends pkgconfig &&
depends util-macros &&
-depends libxaw &&
+depends -sub XAW7 libxaw &&
depends libx11 &&
depends libxt &&
depends libxmu
diff --git a/xorg-app/editres/DETAILS b/xorg-app/editres/DETAILS
index bc188c7..d9bc577 100755
--- a/xorg-app/editres/DETAILS
+++ b/xorg-app/editres/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="The X.Org dynamic resource editor"
cat << EOF
Editres is a tool that allows users and application developers to view
diff --git a/xorg-app/editres/HISTORY b/xorg-app/editres/HISTORY
index 56e9ec3..f58656e 100644
--- a/xorg-app/editres/HISTORY
+++ b/xorg-app/editres/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: killing off XPrint
+ * DETAILS: patchlevel++
+ * BUILD: removed
+ * CONFIGURE: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/listres/BUILD b/xorg-app/listres/BUILD
deleted file mode 100755
index 7f53bfa..0000000
--- a/xorg-app/listres/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$LISTRES_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/listres/CONFIGURE b/xorg-app/listres/CONFIGURE
deleted file mode 100755
index ccb8201..0000000
--- a/xorg-app/listres/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option LISTRES_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/listres/DEPENDS b/xorg-app/listres/DEPENDS
index c60f884..0385164 100755
--- a/xorg-app/listres/DEPENDS
+++ b/xorg-app/listres/DEPENDS
@@ -1,5 +1,5 @@
depends util-macros &&
-depends libxaw &&
+depends -sub XAW7 libxaw &&
depends libx11 &&
depends libxt &&
depends libxmu
diff --git a/xorg-app/listres/DETAILS b/xorg-app/listres/DETAILS
index 837e278..19a56fe 100755
--- a/xorg-app/listres/DETAILS
+++ b/xorg-app/listres/DETAILS
@@ -8,9 +8,8 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
+ PATCHLEVEL=1
SHORT="list resources in widgets "
cat << EOF
The listres program generates a list of a widget's resource database.
diff --git a/xorg-app/listres/HISTORY b/xorg-app/listres/HISTORY
index ac71aad..6884b48 100644
--- a/xorg-app/listres/HISTORY
+++ b/xorg-app/listres/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: patchlevel++
+ * DEPENDS: killing off XPrint
+ * BUILD: removed
+ * CONFIGURE: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/viewres/BUILD b/xorg-app/viewres/BUILD
deleted file mode 100755
index 4d2923d..0000000
--- a/xorg-app/viewres/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$VIEWRES_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/viewres/CONFIGURE b/xorg-app/viewres/CONFIGURE
deleted file mode 100755
index 840c0a0..0000000
--- a/xorg-app/viewres/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option VIEWRES_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/viewres/DEPENDS b/xorg-app/viewres/DEPENDS
index 7dc618a..340ffef 100755
--- a/xorg-app/viewres/DEPENDS
+++ b/xorg-app/viewres/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends libxaw
+depends -sub XAW7 libxaw
diff --git a/xorg-app/viewres/DETAILS b/xorg-app/viewres/DETAILS
index 950602d..08fe4a7 100755
--- a/xorg-app/viewres/DETAILS
+++ b/xorg-app/viewres/DETAILS
@@ -8,9 +8,8 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
+ PATCHLEVEL=1
SHORT="Module viewres for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/viewres/HISTORY b/xorg-app/viewres/HISTORY
index a464a8c..6ce547e 100644
--- a/xorg-app/viewres/HISTORY
+++ b/xorg-app/viewres/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: killing off XPrint
+ * DETAILS: patchlevel++
+ * BUILD: removed
+ * CONFIGURE: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xbiff/BUILD b/xorg-app/xbiff/BUILD
deleted file mode 100755
index 37f895d..0000000
--- a/xorg-app/xbiff/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XBIFF_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xbiff/CONFIGURE b/xorg-app/xbiff/CONFIGURE
deleted file mode 100755
index 43c5856..0000000
--- a/xorg-app/xbiff/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XBIFF_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xbiff/DEPENDS b/xorg-app/xbiff/DEPENDS
index 145ded8..d421872 100755
--- a/xorg-app/xbiff/DEPENDS
+++ b/xorg-app/xbiff/DEPENDS
@@ -1,3 +1,3 @@
depends util-macros &&
-depends libxaw &&
+depends -sub XAW7 libxaw &&
depends xbitmaps
diff --git a/xorg-app/xbiff/DETAILS b/xorg-app/xbiff/DETAILS
index d6aef5d..c002a83 100755
--- a/xorg-app/xbiff/DETAILS
+++ b/xorg-app/xbiff/DETAILS
@@ -8,9 +8,8 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
+ PATCHLEVEL=1
SHORT="Module xbiff for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xbiff/HISTORY b/xorg-app/xbiff/HISTORY
index a464a8c..6ce547e 100644
--- a/xorg-app/xbiff/HISTORY
+++ b/xorg-app/xbiff/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: killing off XPrint
+ * DETAILS: patchlevel++
+ * BUILD: removed
+ * CONFIGURE: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xcalc/BUILD b/xorg-app/xcalc/BUILD
deleted file mode 100755
index 5eaea41..0000000
--- a/xorg-app/xcalc/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XCALC_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xcalc/CONFIGURE b/xorg-app/xcalc/CONFIGURE
deleted file mode 100755
index d5eee66..0000000
--- a/xorg-app/xcalc/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XCALC_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xcalc/DEPENDS b/xorg-app/xcalc/DEPENDS
index 7dc618a..340ffef 100755
--- a/xorg-app/xcalc/DEPENDS
+++ b/xorg-app/xcalc/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends libxaw
+depends -sub XAW7 libxaw
diff --git a/xorg-app/xcalc/DETAILS b/xorg-app/xcalc/DETAILS
index 8107e96..0269c77 100755
--- a/xorg-app/xcalc/DETAILS
+++ b/xorg-app/xcalc/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="the X.Org calculator application"
cat << EOF
xcalc is a small X windows based calculator application.
diff --git a/xorg-app/xcalc/HISTORY b/xorg-app/xcalc/HISTORY
index e281755..797a2e7 100644
--- a/xorg-app/xcalc/HISTORY
+++ b/xorg-app/xcalc/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: killing off XPrint
+ * DETAILS: patchlevel++
+ * BUILD: removed
+ * CONFIGURE: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xclipboard/BUILD b/xorg-app/xclipboard/BUILD
deleted file mode 100755
index bf71452..0000000
--- a/xorg-app/xclipboard/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XCLIPBOARD_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xclipboard/CONFIGURE b/xorg-app/xclipboard/CONFIGURE
deleted file mode 100755
index 9e584e9..0000000
--- a/xorg-app/xclipboard/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XCLIPBOARD_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xclipboard/DEPENDS b/xorg-app/xclipboard/DEPENDS
index 7dc618a..340ffef 100755
--- a/xorg-app/xclipboard/DEPENDS
+++ b/xorg-app/xclipboard/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends libxaw
+depends -sub XAW7 libxaw
diff --git a/xorg-app/xclipboard/DETAILS b/xorg-app/xclipboard/DETAILS
index 13d8d8a..b496faa 100755
--- a/xorg-app/xclipboard/DETAILS
+++ b/xorg-app/xclipboard/DETAILS
@@ -8,9 +8,8 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
+ PATCHLEVEL=1
SHORT="Module xclipboard for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xclipboard/HISTORY b/xorg-app/xclipboard/HISTORY
index a464a8c..2243033 100644
--- a/xorg-app/xclipboard/HISTORY
+++ b/xorg-app/xclipboard/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: patchlevel++
+ * DEPENDS: killing off XPrint
+ * CONFIGURE: removed
+ * BUILD: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xclock/BUILD b/xorg-app/xclock/BUILD
index b029962..d6a87ae 100755
--- a/xorg-app/xclock/BUILD
+++ b/xorg-app/xclock/BUILD
@@ -1,8 +1,5 @@
-OPTS="$XCLOCK_OPTS $OPTS" &&
if [ "$XCLOCK_XFT" = "y" ]; then
- OPTS="$OPTS --enable-xft"
+ OPTS="--enable-xft $OPTS"
fi &&
-
-
default_build

diff --git a/xorg-app/xclock/CONFIGURE b/xorg-app/xclock/CONFIGURE
index 466cd24..88b796c 100755
--- a/xorg-app/xclock/CONFIGURE
+++ b/xorg-app/xclock/CONFIGURE
@@ -1,9 +1,3 @@
-config_query_option XCLOCK_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint' &&
-
config_query XCLOCK_XFT \
'Use Xft2 and Xrender for rendering?' \
y &&
diff --git a/xorg-app/xclock/DEPENDS b/xorg-app/xclock/DEPENDS
index b175af9..84d0f3b 100755
--- a/xorg-app/xclock/DEPENDS
+++ b/xorg-app/xclock/DEPENDS
@@ -1,5 +1,5 @@
depends util-macros &&
-depends libxaw &&
+depends -sub XAW7 libxaw &&

if [ "$XCLOCK_XFT" = "y" ]; then
depends libxft &&
diff --git a/xorg-app/xclock/DETAILS b/xorg-app/xclock/DETAILS
index a0aa938..39c8947 100755
--- a/xorg-app/xclock/DETAILS
+++ b/xorg-app/xclock/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="the X.Org xclock application"
cat << EOF
xclock is a small, simple X based clock application.
diff --git a/xorg-app/xclock/HISTORY b/xorg-app/xclock/HISTORY
index 57d157c..9816d72 100644
--- a/xorg-app/xclock/HISTORY
+++ b/xorg-app/xclock/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: cleaned up XPrint
+ * DEPENDS: killing off XPrint
+ * DETAILS: patchlevel++
+ * CONFIGURE: cleaned up XPrint
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xconsole/BUILD b/xorg-app/xconsole/BUILD
deleted file mode 100755
index 7c1a6bd..0000000
--- a/xorg-app/xconsole/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XCONSOLE_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xconsole/CONFIGURE b/xorg-app/xconsole/CONFIGURE
deleted file mode 100755
index 6725cfe..0000000
--- a/xorg-app/xconsole/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XCONSOLE_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xconsole/DEPENDS b/xorg-app/xconsole/DEPENDS
index 7dc618a..340ffef 100755
--- a/xorg-app/xconsole/DEPENDS
+++ b/xorg-app/xconsole/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends libxaw
+depends -sub XAW7 libxaw
diff --git a/xorg-app/xconsole/DETAILS b/xorg-app/xconsole/DETAILS
index 30aca4b..f531d00 100755
--- a/xorg-app/xconsole/DETAILS
+++ b/xorg-app/xconsole/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="monitor system console messages with X"
cat << EOF
The xconsole program displays messages which are usually sent to
/dev/console.
diff --git a/xorg-app/xconsole/HISTORY b/xorg-app/xconsole/HISTORY
index 3f050c0..29c8043 100644
--- a/xorg-app/xconsole/HISTORY
+++ b/xorg-app/xconsole/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: killing off XPrint
+ * DETAILS: patchlevel++
+ * CONFIGURE: removed
+ * BUILD: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xdbedizzy/BUILD b/xorg-app/xdbedizzy/BUILD
deleted file mode 100755
index 55fb01c..0000000
--- a/xorg-app/xdbedizzy/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-OPTS="$XDBEDIZZY_OPTS $OPTS" &&
-
-export PKG_CONFIG=/usr/bin/pkg-config &&
-default_build
diff --git a/xorg-app/xdbedizzy/CONFIGURE b/xorg-app/xdbedizzy/CONFIGURE
deleted file mode 100755
index 58882c2..0000000
--- a/xorg-app/xdbedizzy/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XDBEDIZZY_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xdbedizzy/DEPENDS b/xorg-app/xdbedizzy/DEPENDS
index 9b2a314..3e6e5f4 100755
--- a/xorg-app/xdbedizzy/DEPENDS
+++ b/xorg-app/xdbedizzy/DEPENDS
@@ -1,3 +1,3 @@
depends util-macros &&
depends libxext &&
-depends libxprintutil
+depends -sub XAW7 libxaw
diff --git a/xorg-app/xdbedizzy/DETAILS b/xorg-app/xdbedizzy/DETAILS
index 5f53a6d..454db24 100755
--- a/xorg-app/xdbedizzy/DETAILS
+++ b/xorg-app/xdbedizzy/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="a DBE sample application"
cat << EOF
xdbedizzy is a demo of DBE creating a double buffered spinning scene.
diff --git a/xorg-app/xdbedizzy/HISTORY b/xorg-app/xdbedizzy/HISTORY
index 38de054..bd8da70 100644
--- a/xorg-app/xdbedizzy/HISTORY
+++ b/xorg-app/xdbedizzy/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: killing off XPrint
+ * DETAILS: patchlevel++
+ * BUILD: removed
+ * CONFIGURE: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xditview/BUILD b/xorg-app/xditview/BUILD
deleted file mode 100755
index b52e479..0000000
--- a/xorg-app/xditview/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XDITVIEW_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xditview/CONFIGURE b/xorg-app/xditview/CONFIGURE
deleted file mode 100755
index 9914558..0000000
--- a/xorg-app/xditview/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XDITVIEW_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xditview/DEPENDS b/xorg-app/xditview/DEPENDS
index 7dc618a..340ffef 100755
--- a/xorg-app/xditview/DEPENDS
+++ b/xorg-app/xditview/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends libxaw
+depends -sub XAW7 libxaw
diff --git a/xorg-app/xditview/DETAILS b/xorg-app/xditview/DETAILS
index 6167e07..8e2ae20 100755
--- a/xorg-app/xditview/DETAILS
+++ b/xorg-app/xditview/DETAILS
@@ -8,9 +8,8 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
+ PATCHLEVEL=1
SHORT="Module xditview for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xditview/HISTORY b/xorg-app/xditview/HISTORY
index 82149f2..9ac793d 100644
--- a/xorg-app/xditview/HISTORY
+++ b/xorg-app/xditview/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: killing off XPrint
+ * DETAILS: patchlevel++
+ * CONFIGURE: removed
+ * BUILD: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xdm/DEPENDS b/xorg-app/xdm/DEPENDS
index c96c293..764cf7b 100755
--- a/xorg-app/xdm/DEPENDS
+++ b/xorg-app/xdm/DEPENDS
@@ -15,11 +15,6 @@ optional_depends libxinerama
\
"" \
"Someone needs to describe this nicely." &&

-optional_depends libxp \
- '--enable-xprint' \
- '--disable-xprint' \
- 'for XPrint support' &&
-
optional_depends libxpm \
"" \
"" \
diff --git a/xorg-app/xdm/DETAILS b/xorg-app/xdm/DETAILS
index 501feef..79a45d7 100755
--- a/xorg-app/xdm/DETAILS
+++ b/xorg-app/xdm/DETAILS
@@ -10,6 +10,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
LICENSE[0]=XCL
WEB_SITE=http://xorg.freedesktop.org/wiki
ENTERED=20051125
+ PATCHLEVEL=1
SHORT="The X Display Manager"
cat << EOF
xdm is the X Dispaly Manager and XDMCP server.
diff --git a/xorg-app/xdm/HISTORY b/xorg-app/xdm/HISTORY
index 637cca8..8b61296 100644
--- a/xorg-app/xdm/HISTORY
+++ b/xorg-app/xdm/HISTORY
@@ -1,3 +1,7 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: killing XPrint
+ * DETAILS: patchlevel++
+
2008-09-05 Robert Figura <template AT sourcemage.org>
* DEPENDS: removed stray && at eof

diff --git a/xorg-app/xdpyinfo/DEPENDS b/xorg-app/xdpyinfo/DEPENDS
index e907395..a60e248 100755
--- a/xorg-app/xdpyinfo/DEPENDS
+++ b/xorg-app/xdpyinfo/DEPENDS
@@ -17,6 +17,4 @@ optional_depends libxrender "" "" "Someone needs to
describe this nicely." &&
optional_depends xineramaproto "" "" "Someone needs to describe this
nicely." &&
optional_depends libxinerama "" "" "Someone needs to describe this nicely."
&&
optional_depends dmxproto "" "" "Someone needs to describe this nicely." &&
-optional_depends libdmx "" "" "Someone needs to describe this nicely." &&
-optional_depends printproto "" "" "Someone needs to describe this nicely." &&
-optional_depends libxp "" "" "Someone needs to describe this nicely."
+optional_depends libdmx "" "" "Someone needs to describe this nicely."
diff --git a/xorg-app/xdpyinfo/DETAILS b/xorg-app/xdpyinfo/DETAILS
index 9f0ca89..3522312 100755
--- a/xorg-app/xdpyinfo/DETAILS
+++ b/xorg-app/xdpyinfo/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="The X.Org display information application"
cat << EOF
xdpyinfo displays information about a particular tage display, inlcuding
diff --git a/xorg-app/xdpyinfo/HISTORY b/xorg-app/xdpyinfo/HISTORY
index 5ef3079..f2456ab 100644
--- a/xorg-app/xdpyinfo/HISTORY
+++ b/xorg-app/xdpyinfo/HISTORY
@@ -1,3 +1,7 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: no more libxp
+ * DETAILS: patchlevel++
+
2008-08-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: there is no xorg-modular grimoire

diff --git a/xorg-app/xedit/BUILD b/xorg-app/xedit/BUILD
deleted file mode 100755
index aa25e48..0000000
--- a/xorg-app/xedit/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XEDIT_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xedit/CONFIGURE b/xorg-app/xedit/CONFIGURE
deleted file mode 100755
index 87b0cb5..0000000
--- a/xorg-app/xedit/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XEDIT_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xedit/DEPENDS b/xorg-app/xedit/DEPENDS
index 8a1cfc8..95d4519 100755
--- a/xorg-app/xedit/DEPENDS
+++ b/xorg-app/xedit/DEPENDS
@@ -1,3 +1,2 @@
depends util-macros &&
-depends libxaw &&
-depends libxprintutil
+depends -sub XAW7 libxaw
diff --git a/xorg-app/xedit/DETAILS b/xorg-app/xedit/DETAILS
index 043269b..a69bdb6 100755
--- a/xorg-app/xedit/DETAILS
+++ b/xorg-app/xedit/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="the X.Org simple text editor"
cat << EOF
xedit is a simple text editor for X.Org.
diff --git a/xorg-app/xedit/HISTORY b/xorg-app/xedit/HISTORY
index 0fe619d..2b50856 100644
--- a/xorg-app/xedit/HISTORY
+++ b/xorg-app/xedit/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: removed
+ * DEPENDS: killed XPrint
+ * DETAILS: patchlevel++
+ * CONFIGURE: removed
+
2008-12-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.2

diff --git a/xorg-app/xfd/BUILD b/xorg-app/xfd/BUILD
deleted file mode 100755
index ad11e3f..0000000
--- a/xorg-app/xfd/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XFD_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xfd/CONFIGURE b/xorg-app/xfd/CONFIGURE
deleted file mode 100755
index 6a21894..0000000
--- a/xorg-app/xfd/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XFD_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xfd/DEPENDS b/xorg-app/xfd/DEPENDS
index 5e1183e..201472b 100755
--- a/xorg-app/xfd/DEPENDS
+++ b/xorg-app/xfd/DEPENDS
@@ -1,5 +1,5 @@
depends util-macros &&
-depends libxaw &&
+depends -sub XAW7 libxaw &&
depends libxft &&
depends freetype2 &&
depends fontconfig
diff --git a/xorg-app/xfd/DETAILS b/xorg-app/xfd/DETAILS
index 13e747f..882600a 100755
--- a/xorg-app/xfd/DETAILS
+++ b/xorg-app/xfd/DETAILS
@@ -8,9 +8,8 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
+ PATCHLEVEL=1
SHORT="Module xfd for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xfd/HISTORY b/xorg-app/xfd/HISTORY
index f58a459..acf253c 100644
--- a/xorg-app/xfd/HISTORY
+++ b/xorg-app/xfd/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: killing of XPrint
+ * DETAILS: patchlevel++
+ * CONFIGURE: removed
+ * BUILD: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xfontsel/BUILD b/xorg-app/xfontsel/BUILD
deleted file mode 100755
index 31ec479..0000000
--- a/xorg-app/xfontsel/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XFONTSEL_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xfontsel/CONFIGURE b/xorg-app/xfontsel/CONFIGURE
deleted file mode 100755
index fa1b098..0000000
--- a/xorg-app/xfontsel/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XFONTSEL_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xfontsel/DEPENDS b/xorg-app/xfontsel/DEPENDS
index 7dc618a..340ffef 100755
--- a/xorg-app/xfontsel/DEPENDS
+++ b/xorg-app/xfontsel/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends libxaw
+depends -sub XAW7 libxaw
diff --git a/xorg-app/xfontsel/DETAILS b/xorg-app/xfontsel/DETAILS
index 1049ccd..a956ca9 100755
--- a/xorg-app/xfontsel/DETAILS
+++ b/xorg-app/xfontsel/DETAILS
@@ -7,8 +7,9 @@

SOURCE_HASH=sha512:63195156352c969dc174065b9c32f05e17f5d2d61134eb1d9a9800d80ca8b5a8b3720fc189901a5c98bab39321f79635549e42a0bd0ce10967bbc8187352144a
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
- UPDATED=20051125
+ ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="Module xfontsel for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xfontsel/HISTORY b/xorg-app/xfontsel/HISTORY
index dbe76ea..aaf0b6c 100644
--- a/xorg-app/xfontsel/HISTORY
+++ b/xorg-app/xfontsel/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: killing off XPrint
+ * DETAILS: patchlevel++
+ * BUILD: removed
+ * CONFIGURE: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xgc/BUILD b/xorg-app/xgc/BUILD
deleted file mode 100755
index 7fb5d0d..0000000
--- a/xorg-app/xgc/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XGC_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xgc/CONFIGURE b/xorg-app/xgc/CONFIGURE
deleted file mode 100755
index 2c3897f..0000000
--- a/xorg-app/xgc/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XGC_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xgc/DEPENDS b/xorg-app/xgc/DEPENDS
index 7dc618a..340ffef 100755
--- a/xorg-app/xgc/DEPENDS
+++ b/xorg-app/xgc/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends libxaw
+depends -sub XAW7 libxaw
diff --git a/xorg-app/xgc/DETAILS b/xorg-app/xgc/DETAILS
index 451d8bb..8e1188c 100755
--- a/xorg-app/xgc/DETAILS
+++ b/xorg-app/xgc/DETAILS
@@ -8,9 +8,8 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
+ PATCHLEVEL=1
SHORT="Module xgc for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xgc/HISTORY b/xorg-app/xgc/HISTORY
index 5611754..c3b24aa 100644
--- a/xorg-app/xgc/HISTORY
+++ b/xorg-app/xgc/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: killing off XPrint
+ * DETAILS: patchlevel++
+ * BUILD: removed
+ * CONFIGURE: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xkbutils/BUILD b/xorg-app/xkbutils/BUILD
deleted file mode 100755
index 7d29c99..0000000
--- a/xorg-app/xkbutils/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XKBUTILS_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xkbutils/CONFIGURE b/xorg-app/xkbutils/CONFIGURE
deleted file mode 100755
index ec4f583..0000000
--- a/xorg-app/xkbutils/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XKBUTILS_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xkbutils/DEPENDS b/xorg-app/xkbutils/DEPENDS
index ec64a59..c4de0b2 100755
--- a/xorg-app/xkbutils/DEPENDS
+++ b/xorg-app/xkbutils/DEPENDS
@@ -1,4 +1,4 @@
depends util-macros &&
depends libxkbfile &&
-depends libxaw &&
+depends -sub XAW7 libxaw &&
depends inputproto
diff --git a/xorg-app/xkbutils/DETAILS b/xorg-app/xkbutils/DETAILS
index 2502eec..35ca9f2 100755
--- a/xorg-app/xkbutils/DETAILS
+++ b/xorg-app/xkbutils/DETAILS
@@ -8,9 +8,8 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
+ PATCHLEVEL=1
SHORT="additional keyboard utils"
cat << EOF
additional keyboard utils.
diff --git a/xorg-app/xkbutils/HISTORY b/xorg-app/xkbutils/HISTORY
index 57c36fc..b484dfc 100644
--- a/xorg-app/xkbutils/HISTORY
+++ b/xorg-app/xkbutils/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: patchlevel++
+ * DEPENDS: killing off XPrint
+ * BUILD: removed
+ * CONFIGURE: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xload/BUILD b/xorg-app/xload/BUILD
deleted file mode 100755
index cc3c8f3..0000000
--- a/xorg-app/xload/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XLOAD_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xload/CONFIGURE b/xorg-app/xload/CONFIGURE
deleted file mode 100755
index 1007845..0000000
--- a/xorg-app/xload/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XLOAD_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xload/DEPENDS b/xorg-app/xload/DEPENDS
index 7dc618a..340ffef 100755
--- a/xorg-app/xload/DEPENDS
+++ b/xorg-app/xload/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends libxaw
+depends -sub XAW7 libxaw
diff --git a/xorg-app/xload/DETAILS b/xorg-app/xload/DETAILS
index cb944c0..a7cb2f4 100755
--- a/xorg-app/xload/DETAILS
+++ b/xorg-app/xload/DETAILS
@@ -10,6 +10,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
ENTERED=20051125
SECURITY_PATCH=1
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="Module xload for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xload/HISTORY b/xorg-app/xload/HISTORY
index df6fa50..ce7c6f3 100644
--- a/xorg-app/xload/HISTORY
+++ b/xorg-app/xload/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: killing off XPrint
+ * DETAILS: patchlevel++
+ * BUILD: removed
+ * CONFIGURE: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xlogo/BUILD b/xorg-app/xlogo/BUILD
index e8ae8d8..3df9a2c 100755
--- a/xorg-app/xlogo/BUILD
+++ b/xorg-app/xlogo/BUILD
@@ -1,8 +1,5 @@
-OPTS="$XLOGO_OPTS $OPTS" &&
if [ "$XLOGO_XRENDER" = "y" ]; then
- OPTS="$OPTS --enable-xrender"
+ OPTS="--enable-xrender $OPTS"
fi &&
-
-
default_build

diff --git a/xorg-app/xlogo/CONFIGURE b/xorg-app/xlogo/CONFIGURE
index 0a6c343..18dbd6a 100755
--- a/xorg-app/xlogo/CONFIGURE
+++ b/xorg-app/xlogo/CONFIGURE
@@ -1,9 +1,3 @@
-config_query_option XLOGO_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint' &&
-
config_query XLOGO_XRENDER \
'Use Xrender and Xft2 to draw logo?' \
y
diff --git a/xorg-app/xlogo/DEPENDS b/xorg-app/xlogo/DEPENDS
index ec1e21d..d7a5696 100755
--- a/xorg-app/xlogo/DEPENDS
+++ b/xorg-app/xlogo/DEPENDS
@@ -1,7 +1,5 @@
depends util-macros &&
-depends libxaw &&
-depends libxprintutil &&
-
+depends -sub XAW7 libxaw &&
if [ "$XLOGO_XRENDER" = "y" ]; then
depends libxft &&
depends libxrender
diff --git a/xorg-app/xlogo/DETAILS b/xorg-app/xlogo/DETAILS
index f7d1970..70b0dbd 100755
--- a/xorg-app/xlogo/DETAILS
+++ b/xorg-app/xlogo/DETAILS
@@ -8,9 +8,8 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
+ PATCHLEVEL=1
SHORT="Module xlogo for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xlogo/HISTORY b/xorg-app/xlogo/HISTORY
index f43810a..ad02772 100644
--- a/xorg-app/xlogo/HISTORY
+++ b/xorg-app/xlogo/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: cleaned out
+ * CONFIGURE: no more XPrint
+ * DEPENDS: no more XPrint
+ * DETAILS: patchlevel++
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xmag/BUILD b/xorg-app/xmag/BUILD
deleted file mode 100755
index 37765ef..0000000
--- a/xorg-app/xmag/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XMAG_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xmag/CONFIGURE b/xorg-app/xmag/CONFIGURE
deleted file mode 100755
index 15af3bf..0000000
--- a/xorg-app/xmag/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XMAG_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xmag/DEPENDS b/xorg-app/xmag/DEPENDS
index 7dc618a..340ffef 100755
--- a/xorg-app/xmag/DEPENDS
+++ b/xorg-app/xmag/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends libxaw
+depends -sub XAW7 libxaw
diff --git a/xorg-app/xmag/DETAILS b/xorg-app/xmag/DETAILS
index 107a3fd..6d5c488 100755
--- a/xorg-app/xmag/DETAILS
+++ b/xorg-app/xmag/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="Module xmag for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xmag/HISTORY b/xorg-app/xmag/HISTORY
index e9f1f97..3609f51 100644
--- a/xorg-app/xmag/HISTORY
+++ b/xorg-app/xmag/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: patchlevel++
+ * DEPENDS: killing off XPrint
+ * BUILD: removed
+ * CONFIGURE: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xman/BUILD b/xorg-app/xman/BUILD
deleted file mode 100755
index ad941c5..0000000
--- a/xorg-app/xman/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XMAN_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xman/CONFIGURE b/xorg-app/xman/CONFIGURE
deleted file mode 100755
index 4f8af78..0000000
--- a/xorg-app/xman/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XMAN_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xman/DEPENDS b/xorg-app/xman/DEPENDS
index 6332363..340ffef 100755
--- a/xorg-app/xman/DEPENDS
+++ b/xorg-app/xman/DEPENDS
@@ -1,6 +1,2 @@
depends util-macros &&
-depends libxaw &&
-if list_find "$XMAN_OPTS" "--enable-xprint" ; then
- depends libxp &&
- depends libxprintutil
-fi
+depends -sub XAW7 libxaw
diff --git a/xorg-app/xman/DETAILS b/xorg-app/xman/DETAILS
index c6cd260..1a40692 100755
--- a/xorg-app/xman/DETAILS
+++ b/xorg-app/xman/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="Manual page display program for the X Window System"
cat << EOF
Xman is a manual page browser. The default size of the initial xman window is
diff --git a/xorg-app/xman/HISTORY b/xorg-app/xman/HISTORY
index 0a07182..d9a7b82 100644
--- a/xorg-app/xman/HISTORY
+++ b/xorg-app/xman/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: XPrint is dead
+ * DETAILS: patchlevel++
+ * BUILD: no longer needed
+ * CONFIGURE: no longer needed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xmessage/BUILD b/xorg-app/xmessage/BUILD
deleted file mode 100755
index 6b82c2b..0000000
--- a/xorg-app/xmessage/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XMESSAGE_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xmessage/CONFIGURE b/xorg-app/xmessage/CONFIGURE
deleted file mode 100755
index 059d2fa..0000000
--- a/xorg-app/xmessage/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XMESSAGE_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xmessage/DEPENDS b/xorg-app/xmessage/DEPENDS
index 80a4aca..28d407d 100755
--- a/xorg-app/xmessage/DEPENDS
+++ b/xorg-app/xmessage/DEPENDS
@@ -1,3 +1,3 @@
depends util-macros &&
depends libxaw &&
-sub_depends libxaw XAW8
+sub_depends libxaw XAW7
diff --git a/xorg-app/xmessage/DETAILS b/xorg-app/xmessage/DETAILS
index 8b80312..58ff8db 100755
--- a/xorg-app/xmessage/DETAILS
+++ b/xorg-app/xmessage/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="the X.Org xmessage application"
cat << EOF
xmessage displays a window containing a message from the command line,
diff --git a/xorg-app/xmessage/HISTORY b/xorg-app/xmessage/HISTORY
index 43a2c27..a91caaf 100644
--- a/xorg-app/xmessage/HISTORY
+++ b/xorg-app/xmessage/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: patchlevel++
+ * DEPENDS: killing off XPrint
+ * BUILD: removed
+ * CONFIGURE: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xmh/BUILD b/xorg-app/xmh/BUILD
deleted file mode 100755
index fb3c866..0000000
--- a/xorg-app/xmh/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XMH_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xmh/CONFIGURE b/xorg-app/xmh/CONFIGURE
deleted file mode 100755
index 2c5a2ca..0000000
--- a/xorg-app/xmh/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XMH_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xmh/DEPENDS b/xorg-app/xmh/DEPENDS
index 7dc618a..340ffef 100755
--- a/xorg-app/xmh/DEPENDS
+++ b/xorg-app/xmh/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends libxaw
+depends -sub XAW7 libxaw
diff --git a/xorg-app/xmh/DETAILS b/xorg-app/xmh/DETAILS
index 40faf6f..f9f5acb 100755
--- a/xorg-app/xmh/DETAILS
+++ b/xorg-app/xmh/DETAILS
@@ -8,9 +8,8 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
+ PATCHLEVEL=1
SHORT="send and read mail with an X interface to MH"
cat << EOF
The xmh program provides a graphical user interface to the MH Message
Handling
diff --git a/xorg-app/xmh/HISTORY b/xorg-app/xmh/HISTORY
index b01dc3d..2866578 100644
--- a/xorg-app/xmh/HISTORY
+++ b/xorg-app/xmh/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: killing XPrint
+ * DETAILS: patchlevel++
+ * BUILD: removed
+ * CONFIGURE: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xmore/BUILD b/xorg-app/xmore/BUILD
deleted file mode 100755
index 94fc1f9..0000000
--- a/xorg-app/xmore/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XMORE_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xmore/CONFIGURE b/xorg-app/xmore/CONFIGURE
deleted file mode 100755
index f1c46a7..0000000
--- a/xorg-app/xmore/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XMORE_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xmore/DEPENDS b/xorg-app/xmore/DEPENDS
index 8a1cfc8..f570a0e 100755
--- a/xorg-app/xmore/DEPENDS
+++ b/xorg-app/xmore/DEPENDS
@@ -1,3 +1,2 @@
-depends util-macros &&
-depends libxaw &&
-depends libxprintutil
+depends util-macros &&
+depends -sub XAW7 libxaw
diff --git a/xorg-app/xmore/DETAILS b/xorg-app/xmore/DETAILS
index b03b229..7fc5b0c 100755
--- a/xorg-app/xmore/DETAILS
+++ b/xorg-app/xmore/DETAILS
@@ -2,15 +2,14 @@
PKG=xmore
VERSION=1.0.1
XORG_VER=X11R7.0
- SOURCE=${PKG}-${XORG_VER}-${VERSION}.tar.bz2
-
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/${XORG_VER}/src/app/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
+ SOURCE=${PKG}-${VERSION}.tar.bz2
+
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
+
SOURCE_HASH=sha512:4264f711d252d5ef9b2eecb4cf07b6957288691261e725c16850c4bf51761682686d09ee5508974b8b223f0b79aa71fa0f63ef796be2738646b71e736b60e5ed
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
+ PATCHLEVEL=1
LICENSE[0]=XCL
- BUILD_API=2
SHORT="plain text display program for the X Window System"
cat << EOF
plain text display program for the X Window System
diff --git a/xorg-app/xmore/HISTORY b/xorg-app/xmore/HISTORY
index 49a3901..987aead 100644
--- a/xorg-app/xmore/HISTORY
+++ b/xorg-app/xmore/HISTORY
@@ -1,3 +1,17 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: no more xaw8 and no more xprint
+ * CONFIGURE: removed
+ * BUILD: removed, it's default now
+ * xmore-patch1.diff: official patches from commits to get rid of
xprint
+ * xmore-patch2.diff: official patches from commits to get rid of
xprint
+ * xmore-patch3.diff: official patches from commits to get rid of
xprint
+ * xmore-patch4.diff: official patches from commits to get rid of
xprint
+ * xmore-patch5.diff: official patches from commits to get rid of
xprint
+ * xmore-patch6.diff: official patches from commits to get rid of
xprint
+ * xmore-patch7.diff: official patches from commits to get rid of
xprint
+ * DETAILS: switched to individual releases
+ * PRE_BUILD: patch and some minor fixups for pre and post patchfest
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xmore/PRE_BUILD b/xorg-app/xmore/PRE_BUILD
new file mode 100755
index 0000000..9c67fcf
--- /dev/null
+++ b/xorg-app/xmore/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+local patches &&
+mkdir app-defaults &&
+mv XMore.ad app-defaults/XMore.ad &&
+for patches in $SPELL_DIRECTORY/xmore-patch*.diff ; do
+ patch -p1 < $patches
+done &&
+mv app-defaults/XMore.ad app-defaults/XMore &&
+autoreconf
diff --git a/xorg-app/xmore/xmore-X11R7.0-1.0.1.tar.bz2.sig
b/xorg-app/xmore/xmore-X11R7.0-1.0.1.tar.bz2.sig
deleted file mode 100644
index 18b25fd..0000000
Binary files a/xorg-app/xmore/xmore-X11R7.0-1.0.1.tar.bz2.sig and /dev/null
differ
diff --git a/xorg-app/xmore/xmore-patch1.diff
b/xorg-app/xmore/xmore-patch1.diff
new file mode 100644
index 0000000..adb2dcb
--- /dev/null
+++ b/xorg-app/xmore/xmore-patch1.diff
@@ -0,0 +1,21 @@
+From 8bd714835159aa32a64343a8dc41684d7c36ab43 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston<jeremyhu AT freedesktop.org>
+Date: Fri, 28 Mar 2008 03:07:52 +0000
+Subject: Build fix for file systems that are not case sensitive
+
+---
+diff --git a/Makefile.am b/Makefile.am
+index a2931af..007ade8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -48,7 +48,7 @@ appdefaultdir = @appdefaultdir@
+
+
+ APPDEFAULTFILES = \
+- XMore
++ app-defaults/XMore
+
+ SUFFIXES = .ad
+
+--
+cgit v0.8.1-24-ge5fb
diff --git a/xorg-app/xmore/xmore-patch2.diff
b/xorg-app/xmore/xmore-patch2.diff
new file mode 100644
index 0000000..8ae7397
--- /dev/null
+++ b/xorg-app/xmore/xmore-patch2.diff
@@ -0,0 +1,20 @@
+From a85334f153e05119f237ff412a2ff15dce95878d Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston<jeremyhu AT freedesktop.org>
+Date: Fri, 28 Mar 2008 03:29:51 +0000
+Subject: Added missing AM_PROG_CC_C_O
+
+---
+diff --git a/configure.ac b/configure.ac
+index 5c233b6..c07e54c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,6 +29,7 @@ AM_MAINTAINER_MODE
+ AM_CONFIG_HEADER(config.h)
+
+ AC_PROG_CC
++AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+
+ # Checks for pkg-config packages
+--
+cgit v0.8.1-24-ge5fb
diff --git a/xorg-app/xmore/xmore-patch3.diff
b/xorg-app/xmore/xmore-patch3.diff
new file mode 100644
index 0000000..c0eff93
--- /dev/null
+++ b/xorg-app/xmore/xmore-patch3.diff
@@ -0,0 +1,21 @@
+From 56ff9e213249bbdc0ecd3b5e7e4cffee60f46ef4 Mon Sep 17 00:00:00 2001
+From: James Cloos<cloos AT jhcloos.com>
+Date: Wed, 20 Aug 2008 14:32:52 +0000
+Subject: xaw8 is gone, use xaw7
+
+---
+diff --git a/configure.ac b/configure.ac
+index c07e54c..b67765c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+
+ # Checks for pkg-config packages
+-XAW_CHECK_XPRINT_SUPPORT(XMORE)
++PKG_CHECK_MODULES(XMORE, xaw7)
+ if test "x$xaw_use_xprint" = "xyes" ; then
+ PKG_CHECK_MODULES(XPRINT_UTIL, xprintutil xp)
+
+--
+cgit v0.8.1-24-ge5fb
diff --git a/xorg-app/xmore/xmore-patch4.diff
b/xorg-app/xmore/xmore-patch4.diff
new file mode 100644
index 0000000..f65b0e5
--- /dev/null
+++ b/xorg-app/xmore/xmore-patch4.diff
@@ -0,0 +1,2216 @@
+From 7739b19df6a7eba2c35fc34688c40d64a65b79f5 Mon Sep 17 00:00:00 2001
+From: Julien Cristau<jcristau AT debian.org>
+Date: Wed, 20 Aug 2008 22:42:51 +0000
+Subject: Build fix: remove xprint remnants
+
+---
+diff --git a/Makefile.am b/Makefile.am
+index 007ade8..d8aa027 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -28,17 +28,6 @@ xmore_SOURCES = \
+ xmore.c \
+ xmore.h
+
+-if XAW_USE_XPRINT
+-xmore_CFLAGS += -DUSE_XPRINT
+-
+-xmore_SOURCES += \
+- print.c \
+- printdialog.c \
+- printdialog.h \
+- printdialogprivates.h \
+- print.h
+-endif
+-
+ appman_PRE = \
+ xmore.man
+
+diff --git a/configure.ac b/configure.ac
+index b67765c..34d6aa6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,12 +34,6 @@ AC_PROG_INSTALL
+
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XMORE, xaw7)
+-if test "x$xaw_use_xprint" = "xyes" ; then
+- PKG_CHECK_MODULES(XPRINT_UTIL, xprintutil xp)
+-
+- XMORE_CFLAGS="$XMORE_CFLAGS $XPRINT_UTIL_CFLAGS"
+- XMORE_LIBS="$XMORE_LIBS $XPRINT_UTIL_LIBS"
+-fi
+
+ AC_SUBST(XMORE_CFLAGS)
+ AC_SUBST(XMORE_LIBS)
+diff --git a/print.c b/print.c
+deleted file mode 100644
+index fbb260b..0000000
+--- a/print.c
++++ b/dev/null
+@@ -1,435 +0,0 @@
+-/*
+- * $Xorg: print.c,v 1.1 2004/04/30 02:05:54 gisburn Exp $
+- *
+-Copyright 2004 Roland Mainz <roland.mainz AT nrubsig.org>
+-
+-Permission to use, copy, modify, distribute, and sell this software and its
+-documentation for any purpose is hereby granted without fee, provided that
+-the above copyright notice appear in all copies and that both that
+-copyright notice and this permission notice appear in supporting
+-documentation.
+-
+-The above copyright notice and this permission notice shall be included in
+-all copies or substantial portions of the Software.
+-
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-
+-Except as contained in this notice, the name of The Open Group shall not be
+-used in advertising or otherwise to promote the sale, use or other dealings
+-in this Software without prior written authorization from The Open Group.
+- *
+- */
+-
+-/* Turn a NULL pointer string into an empty string */
+-#define NULLSTR(x) (((x)!=NULL)?(x):(""))
+-
+-#define Error(x) { printf x ; exit(EXIT_FAILURE); }
+-#define Assertion(expr, msg) { if (!(expr)) { Error msg } }
+-#define Log(x) { if(True) printf x; }
+-
+-#ifdef XEDIT
+-#include "xedit.h"
+-#endif /* XEDIT */
+-#include "print.h"
+-#include <X11/Xaw/Form.h>
+-#include <X11/Xaw/Label.h>
+-#include <X11/Xaw/AsciiText.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-
+-static Widget
+-CreatePrintShell(Widget videoshell,
+- Screen *pscreen,
+- Visual *pvisual,
+- String printshell_name,
+- ArgList args,
+- Cardinal numargs)
+-{
+- String videoname,
+- videoclass;
+- Widget pappshell,
+- printshell;
+- Display *pdpy = XDisplayOfScreen(pscreen);
+- int dummyc = 0;
+- String dummys = "";
+- Cardinal shell_n;
+- Arg shell_args[5];
+-
+- XtGetApplicationNameAndClass(XtDisplay(videoshell),
+- &videoname, &videoclass);
+-
+- /* XXX: Why is the |dummyc|&&|dummys| stuff needed here ? */
+- XtDisplayInitialize(XtWidgetToApplicationContext(videoshell), pdpy,
+- videoname, videoclass,
+- NULL, 0,
+- &dummyc, &dummys);
+-
+- shell_n = 0;
+- XtSetArg(shell_args[shell_n], XtNscreen, pscreen); shell_n++;
+- if (pvisual) {
+- XtSetArg(shell_args[shell_n], XtNvisual, pvisual); shell_n++;
+- }
+- pappshell = XtAppCreateShell(videoname, videoclass,
+- applicationShellWidgetClass,
+- pdpy,
+- shell_args, shell_n);
+- printshell = XtCreatePopupShell(printshell_name,
+- xawPrintShellWidgetClass,
+- pappshell, args, numargs);
+-
+-
+- /* we're mapping/unmapping at start/end page time */
+- XtSetMappedWhenManaged(printshell, False);
+-
+- /* We realise the widget when we're done with building the widget
tree... */
+-
+- return printshell;
+-}
+-
+-typedef struct
+-{
+- const char *programname;
+- Widget toplevel;
+- Bool isPrinting;
+- Widget printshell;
+- struct
+- {
+- Widget form;
+- Widget pageheaderlabel;
+- Widget text;
+- } content; /* content to print */
+- int numpages;
+- Display *pdpy;
+- Screen *pscreen;
+- XPContext pcontext;
+- XtCallbackProc pdpyDestroyCallback;
+- void *printtofile_handle;
+- const char *jobtitle;
+-} AppPrintData;
+-
+-static AppPrintData apdx;
+-static AppPrintData *apd = &apdx;
+-
+-/* Count pages in a text widget
+- * WARNING: This will reset the current position of the text widget
+- * back to the beginning */
+-static
+-long CountPages(Widget textWidget)
+-{
+- long numpages = 0;
+-
+- XawTextPosition prevpagepos = -1,
+- currpos = 0;
+-
+- /* Move to the top of the file... */
+- XtCallActionProc(textWidget, "beginning-of-file", NULL, NULL, 0);
+-
+- /* ... count pages ...*/
+- do
+- {
+- prevpagepos = XawTextTopPosition(textWidget);
+- XtCallActionProc(textWidget, "next-page", NULL, NULL, 0);
+- currpos = XawTextTopPosition(textWidget);
+- numpages++;
+- } while(prevpagepos != currpos);
+-
+- /* ... and move to the top of the file... */
+- XtCallActionProc(textWidget, "beginning-of-file", NULL, NULL, 0);
+-
+- Log(("CountPages() found %ld pages.\n", numpages))
+-
+- return numpages;
+-}
+-
+-static void
+-PageSetupCB(Widget widget, XtPointer client_data, XtPointer call_data)
+-{
+- Widget pshell = widget;
+- XawPrintShellCallbackStruct *psp = (XawPrintShellCallbackStruct
*)call_data;
+- AppPrintData *p = (AppPrintData *)client_data;
+-
+- Log(("--> PageSetupCB\n"));
+-
+- if (!psp->last_page_in_job) {
+- int currpage;
+- char buffer[256];
+-
+- XtVaGetValues(pshell, XawNcurrPageNumInJob, &currpage, NULL);
+-
+- sprintf(buffer, "Title: %s / Page: %d/%d", p->jobtitle, currpage,
p->numpages);
+- XtVaSetValues(apd->content.pageheaderlabel, XtNlabel, buffer, NULL);
+-
+- /* Note: XawPrintShell's pagecount starts with '1'
+- * (=first page is page no. '1') */
+- if (currpage > 1) {
+- Log(("pagedown %d\n", currpage));
+- XtCallActionProc(p->content.text, "next-page", NULL, NULL, 0);
+- }
+- else
+- {
+- Log(("first page\n"));
+- }
+-
+- if (currpage >= p->numpages) {
+- psp->last_page_in_job = True;
+- }
+- }
+-}
+-
+-static
+-void FinishPrinting(AppPrintData *p)
+-{
+- char *scr;
+-
+- if (p->printtofile_handle) {
+- if (XpuWaitForPrintFileChild(p->printtofile_handle) !=
XPGetDocFinished) {
+- PrintMsg(("Error while printing to file.\n"));
+- }
+- p->printtofile_handle = NULL;
+- }
+-
+- /* Job completed, check if there are any messages from the spooler
command */
+- scr = XpGetOneAttribute(p->pdpy, p->pcontext, XPJobAttr,
"xp-spooler-command-results");
+- if( scr )
+- {
+- if( strlen(scr) > 0 )
+- {
+- const char *msg = XpuCompoundTextToXmb(p->pdpy, scr);
+- if( msg )
+- {
+- PrintMsg(("Spooler command returned:\n%s", msg));
+- XpuFreeXmbString(msg);
+- }
+- else
+- {
+- PrintMsg(("Spooler command returned (unconverted):\n%s", scr));
+- }
+- }
+-
+- XFree((void *)scr);
+- }
+-
+- if (p->printshell) {
+- XtDestroyWidget(p->printshell);
+- p->printshell = NULL;
+- }
+-
+- /* Two issues here:
+- * 1. The print display connection is owned by the print dialog
+- * To avoid any problems with that use a callback back to the main
+- * application which calls
+- * |XawPrintDialogClosePrinterConnection(w, False)| to ask the
+- * print dialog widget to close all print display resources and
+- * disown the object.
+- * 2. We have to use XpDestroyContext() and XtCloseDisplay()
+- * instead of XpuClosePrinterDisplay() to make libXt happy...
+- *
+- * Call callback... */
+- (*apd->pdpyDestroyCallback)(NULL, NULL, NULL); /* HACK! */
+-
+- /* ... and then get rid of the display */
+- if (p->pcontext != None) {
+- XpDestroyContext(p->pdpy, p->pcontext);
+- }
+- XtCloseDisplay(p->pdpy);
+-
+- p->toplevel = NULL;
+- p->isPrinting = False;
+- p->pdpy = NULL;
+- p->pscreen = NULL;
+- p->pcontext = None;
+-}
+-
+-static
+-void PrintEndJobCB(Widget pshell, XtPointer client_data, XtPointer
call_data)
+-{
+- AppPrintData *p = (AppPrintData *)client_data;
+-
+- Log(("--> PrintEndJobCB\n"));
+-
+- /* Finish printing and destroy print shell (it's legal to destroy Xt
+- * widgets from within it's own callbacks) */
+- FinishPrinting(p);
+-}
+-
+-static
+-XFontSet GetPrintTextFontSet(const char *appname, Display *pdpy, long
dpi_x, long dpi_y)
+-{
+- XFontSet fontset;
+- char fontname[1024];
+- char **missing_charset_list_return;
+- int missing_charset_count_return;
+- char *def_string_return;
+- int i;
+-
+- sprintf(fontname, /* Default font for CDE */
+- "-dt-interface
user-medium-r-normal-s*-*-120-%ld-%ld-*-*,"
+- /* Default font */
+- "-adobe-courier-medium-r-normal--*-120-%ld-%ld-*-*,"
+- /* Default font for Linux/Japanese locales
(ja_JP.SJIS) */
+- "-watanabe-mincho-medium-r-normal--*-120-%ld-%ld-*-*,"
+- "-wadalab-gothic-medium-r-normal--*-120-%ld-%ld-*-*,"
+- /* Fallback */
+- "-*-*-*-*-*--*-120-%ld-%ld-*-*",
+- dpi_x, dpi_y,
+- dpi_x, dpi_y,
+- dpi_x, dpi_y,
+- dpi_x, dpi_y,
+- dpi_x, dpi_y);
+- fontset = XCreateFontSet(pdpy, fontname,
+- &missing_charset_list_return,
+- &missing_charset_count_return,
+- &def_string_return);
+-
+- for( i=0 ; i < missing_charset_count_return ; i++ ) {
+- fprintf(stderr, "%s: warning: font for charset %s is lacking.\n",
+- appname, missing_charset_list_return[i]);
+- }
+-
+- if (!fontset)
+- Error(("GetPrintTextFontSet: XCreateFontSet() failure.\n"));
+- return fontset;
+-}
+-
+-void DoPrintTextSource(const char *programname,
+- Widget textsource, Widget toplevel,
+- Display *pdpy, XPContext pcontext,
+- XpuColorspaceRec *colorspace,
+- XtCallbackProc pdpyDestroyCB,
+- const char *jobtitle, const char *toFile)
+-{
+- long dpi_x = 0L,
+- dpi_y = 0L;
+- int n;
+- Arg args[20];
+- XFontSet textfontset = NULL;
+- XFontSetExtents *font_extents;
+-
+- apd->programname = programname;
+- apd->pdpyDestroyCallback = pdpyDestroyCB;
+-
+- if (apd->isPrinting) {
+- PrintMsg(("Already busy with printing.\n"));
+- return;
+- }
+-
+- /* Configure the print context (paper size, title etc.)
+- * We must do this before creating any Xt widgets - otherwise they will
+- * make wrong assuptions about fonts, resultions etc. ...
+- */
+- XpuSetJobTitle(pdpy, pcontext, jobtitle);
+-
+- /* Configuration done, set the context */
+- XpSetContext(pdpy, pcontext);
+-
+- /* Get default printer resolution */
+- if (XpuGetResolution(pdpy, pcontext, &dpi_x, &dpi_y) != 1) {
+- PrintMsg(("No default resolution for printer.\n"));
+- XpuClosePrinterDisplay(pdpy, pcontext);
+- return;
+- }
+-
+- apd->toplevel = toplevel;
+- apd->pdpy = pdpy;
+- apd->pcontext = pcontext;
+- apd->pscreen = XpGetScreenOfContext(pdpy, pcontext);
+- apd->jobtitle = jobtitle;
+-
+- n = 0;
+- /* Override any geometry resource settings as XawPrintShell adjusts
it's size
+- * to the current page siue when |XawPrintLAYOUTMODE_DRAWABLEAREA| or
+- * |XawPrintLAYOUTMODE_PAGESIZE| are used. */
+- XtSetArg(args[n], XtNgeometry, "+0+0"); n++;
+- XtSetArg(args[n], XawNlayoutMode, XawPrintLAYOUTMODE_DRAWABLEAREA); n++;
+- if (colorspace) {
+- printf("Setting visual to id=0x%lx.\n",
colorspace->visualinfo.visualid);
+- }
+- apd->printshell = CreatePrintShell(toplevel, apd->pscreen,
+-
(colorspace?(colorspace->visualinfo.visual):(NULL)),
+- "printshell", args, n);
+- n = 0;
+- XtSetArg(args[n], XtNresizable, True); n++;
+- XtSetArg(args[n], XtNright, XtChainRight); n++;
+- apd->content.form = XtCreateManagedWidget("form", formWidgetClass,
apd->printshell, args, n);
+-
+- textfontset = GetPrintTextFontSet(apd->programname, pdpy, dpi_x, dpi_y);
+-
+- n = 0;
+- XtSetArg(args[n], XtNinternational, True); n++;
+- XtSetArg(args[n], XtNfromHoriz, NULL); n++;
+- XtSetArg(args[n], XtNfromVert, NULL); n++;
+- XtSetArg(args[n], XtNtop, XtChainTop); n++;
+- XtSetArg(args[n], XtNright, XtChainRight); n++;
+- XtSetArg(args[n], XtNresizable, True); n++;
+- XtSetArg(args[n], XtNfontSet, textfontset); n++;
+- XtSetArg(args[n], XtNlabel, "Page: n/n"); n++;
+- XtSetArg(args[n], XtNjustify, XtJustifyRight); n++;
+- apd->content.pageheaderlabel = XtCreateManagedWidget("pageinfo",
labelWidgetClass, apd->content.form, args, n);
+-
+- font_extents = XExtentsOfFontSet(textfontset);
+-
+- n = 0;
+- XtSetArg(args[n], XtNinternational, True);
n++;
+- XtSetArg(args[n], XtNtextSource, textsource);
n++;
+- XtSetArg(args[n], XtNscrollHorizontal, XawtextScrollNever);
n++;
+- XtSetArg(args[n], XtNscrollVertical, XawtextScrollNever);
n++;
+-
+-/* Usually I would expect that using |XtNfromVert,
apd->content.pageheaderlabel|
+- * would be the correct way to place the text widget with the main content
below
+- * the page header widget - but for an unknown reason this doesn not work:
The
+- * text widget squishes itself into the bottom half of the page and only
occupies
+- * 1/2 of the page's with... ;-(( */
+-#define WORKAROUND_FOR_SOMETHING_IS_WRONG 1
+-#ifdef WORKAROUND_FOR_SOMETHING_IS_WRONG
+- XtSetArg(args[n], XtNtop, XtChainTop);
n++;
+- XtSetArg(args[n], XtNright, XtChainRight);
n++;
+- XtSetArg(args[n], XtNvertDistance,
(font_extents->max_logical_extent.height+2)*2); n++;
+-#else
+- XtSetArg(args[n], XtNfromHoriz, NULL);
n++;
+- XtSetArg(args[n], XtNfromVert, apd->content.pageheaderlabel);
n++;
+-#endif
+- XtSetArg(args[n], XtNfontSet, textfontset);
n++;
+- apd->content.text = XtCreateManagedWidget("text", asciiTextWidgetClass,
apd->content.form, args, n);
+-
+- /* Disable the caret - that is not needed for printing */
+- XawTextDisplayCaret(apd->content.text, False);
+-
+- XtAddCallback(apd->printshell, XawNpageSetupCallback, PageSetupCB,
(XtPointer)apd);
+- XtAddCallback(apd->printshell, XawNendJobCallback, PrintEndJobCB,
(XtPointer)apd);
+-
+- /* Realise print shell (which will set position+size of the child
+- * widgets based on the current page size) */
+- XtRealizeWidget(apd->printshell);
+-
+- /* Count number of pages in the text widget */
+- apd->numpages = CountPages(apd->content.text);
+-
+- /* Make sure that the Xt machinery is really using the right screen
(assertion) */
+- if (XpGetScreenOfContext(XtDisplay(apd->printshell), apd->pcontext) !=
XtScreen(apd->printshell))
+- Error(("Widget's screen != print screen. BAD.\n"));
+-
+- apd->isPrinting = True;
+-
+- if (toFile) {
+- PrintMsg(("Printing to file '%s'...\n", toFile));
+- apd->printtofile_handle = XpuStartJobToFile(pdpy, pcontext, toFile);
+- if (!apd->printtofile_handle) {
+- perror("XpuStartJobToFile failure");
+- PrintMsg(("Printing failed: XpuStartJobToFile\n"));
+- apd->isPrinting = False;
+- return;
+- }
+- }
+- else
+- {
+- PrintMsg(("Printing to printer...\n"));
+- XpuStartJobToSpooler(pdpy);
+- }
+-}
+-
+-
+diff --git a/print.h b/print.h
+deleted file mode 100644
+index a87779c..0000000
+--- a/print.h
++++ b/dev/null
+@@ -1,56 +0,0 @@
+-/*
+- * $Xorg: print.h,v 1.1 2004/04/30 02:05:54 gisburn Exp $
+- *
+-Copyright 2004 Roland Mainz <roland.mainz AT nrubsig.org>
+-
+-Permission to use, copy, modify, distribute, and sell this software and its
+-documentation for any purpose is hereby granted without fee, provided that
+-the above copyright notice appear in all copies and that both that
+-copyright notice and this permission notice appear in supporting
+-documentation.
+-
+-The above copyright notice and this permission notice shall be included in
+-all copies or substantial portions of the Software.
+-
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-
+-Except as contained in this notice, the name of The Open Group shall not be
+-used in advertising or otherwise to promote the sale, use or other dealings
+-in this Software without prior written authorization from The Open Group.
+- *
+- */
+-
+-#ifndef XMORE_PRINT_H
+-#define XMORE_PRINT_H 1
+-
+-#include <X11/Intrinsic.h>
+-#include <X11/StringDefs.h>
+-#include <X11/Shell.h>
+-#include <X11/Xaw/Print.h>
+-#include <X11/Xaw/Cardinals.h>
+-#include <X11/XprintUtil/xprintutil.h>
+-
+-#if defined(XMORE)
+-#define PrintMsg(x) { printf("xmore: "); printf x ; }
+-#elif defined(XEDIT)
+-#define PrintMsg(x) { XeditPrintf x ; }
+-#else
+-#error unknown application
+-#endif
+-
+-/* Prototypes */
+-void DoPrintTextSource(const char *programname,
+- Widget textsource,
+- Widget toplevel,
+- Display *pdpy, XPContext pcontext,
+- XpuColorspaceRec *colorspace,
+- XtCallbackProc printDisplayDestroyCallback,
+- const char *jobTitle,
+- const char *toFile);
+-
+-#endif /* !XMORE_PRINT_H */
+diff --git a/printdialog.c b/printdialog.c
+deleted file mode 100644
+index 50d2a88..0000000
+--- a/printdialog.c
++++ b/dev/null
+@@ -1,1396 +0,0 @@
+-/*
+- * $Xorg: printdialog.c,v 1.1 2004/05/12 02:05:54 gisburn Exp $
+- *
+-Copyright 2004 Roland Mainz <roland.mainz AT nrubsig.org>
+-
+-Permission to use, copy, modify, distribute, and sell this software and its
+-documentation for any purpose is hereby granted without fee, provided that
+-the above copyright notice appear in all copies and that both that
+-copyright notice and this permission notice appear in supporting
+-documentation.
+-
+-The above copyright notice and this permission notice shall be included in
+-all copies or substantial portions of the Software.
+-
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-
+-Except as contained in this notice, the name of The Open Group shall not be
+-used in advertising or otherwise to promote the sale, use or other dealings
+-in this Software without prior written authorization from The Open Group.
+- *
+- */
+-
+-/* Force ANSI C prototypes from X11 headers */
+-#ifndef FUNCPROTO
+-#define FUNCPROTO 15
+-#endif /* !FUNCPROTO */
+-
+-#include <X11/StringDefs.h>
+-#include <X11/Intrinsic.h>
+-#include <X11/Shell.h>
+-#include <X11/Xaw/Form.h>
+-#include <X11/Xaw/Toggle.h>
+-#include <X11/Xaw/List.h>
+-#include <X11/Xaw/Command.h>
+-#include <X11/Xaw/AsciiText.h>
+-#include <X11/Xaw/Dialog.h>
+-
+-#ifdef XKB
+-#include <X11/extensions/XKBbells.h>
+-#endif /* XKB */
+-
+-#ifdef XEDIT
+-#include "xedit.h"
+-#endif /* XEDIT */
+-#include "printdialog.h"
+-#include "printdialogprivates.h"
+-#include "print.h"
+-
+-#include <stdlib.h>
+-#include <ctype.h>
+-#include <stdio.h>
+-
+-/* Turn a NULL pointer string into an empty string */
+-#define NULLSTR(x) (((x)!=NULL)?(x):(""))
+-
+-#define Error(x) { printf x ; exit(EXIT_FAILURE); }
+-#define Assertion(expr, msg) { if (!(expr)) { Error msg } }
+-#ifdef DEBUG
+-# define Log(x) { if(True) printf x; }
+-#else
+-# define Log(x) { if(False) printf x; }
+-#endif /* DEBUG */
+-
+-/* Local prototypes */
+-static void do_beep(PrintDialogWidget pdw);
+-static void center_popup(Widget parent, Widget popup);
+-static void updateWidgetStates(PrintDialogWidget pdw);
+-static void printSetupClose(PrintDialogWidget pdw);
+-static void printSetupOKXtProc(Widget w, XtPointer client_data,
XtPointer callData);
+-static void printSetupCancelXtProc(Widget w, XtPointer client_data,
XtPointer callData);
+-static void printSetupJobCopiesXtProc(Widget w, XtPointer client_data,
XtPointer callData);
+-static void printDialogDestXtProc(Widget w, XtPointer client_data,
XtPointer callData);
+-static void printSelectFileXtProc(Widget w, XtPointer client_data,
XtPointer callData);
+-static void printOKXtProc(Widget w, XtPointer client_data, XtPointer
callData);
+-static void printSetupXtProc(Widget w, XtPointer client_data, XtPointer
callData);
+-static void printFileSelectedXtProc(Widget w, XtPointer client_data,
XtPointer callData);
+-static void buildFileDialog(PrintDialogWidget pdw);
+-static void closePrinterConnection(PrintDialogWidget pdw, Bool
closeDisplay);
+-static Bool openPrinterConnection(PrintDialogWidget pdw);
+-static void destroyPrintSetupDialog(PrintDialogWidget pdw);
+-static Widget buildPrintSetupDialog(PrintDialogWidget pdw);
+-static String *xpprinterlist_to_widget_printerlist(XPPrinterList
printerlist, int num_printers);
+-static String *xppaperlist_to_widget_paperlist(XpuMediumSourceSizeList
paperlist, int num_papers);
+-static String *xpresolutionlist_to_widget_resolutionlist(XpuResolutionList
reslist, int num_resolutions);
+-static String
*xporientationlist_to_widget_orientationlist(XpuOrientationList
orientationlist, int num_orientations);
+-static String *xpplexlist_to_widget_plexlist(XpuPlexList plexlist, int
num_plex);
+-static String *xpcolorspacelist_to_widget_colorspacelist(XpuColorspaceList
colorspacelist, int num_colorspaces);
+-static void printerSelectionPrinterSelectedXtProc(Widget w, XtPointer
client_data, XtPointer callData);
+-static void printSelectPrinterXtProc(Widget w, XtPointer client_data,
XtPointer callData);
+-static void printerSelectionClose(PrintDialogWidget pdw);
+-static void printerSelectionOKXtProc(Widget w, XtPointer client_data,
XtPointer callData);
+-static void printerSelectionCancelXtProc(Widget w, XtPointer
client_data, XtPointer callData);
+-static Bool buildPrinterSelectionDialog(PrintDialogWidget pdw);
+-static void destroyPrinterSelectionDialog(PrintDialogWidget pdw);
+-static void createprintdialogchildren(Widget w);
+-
+-static
+-void do_beep(PrintDialogWidget pdw)
+-{
+- Log(("*** Beep!\n"));
+-#ifdef XKB
+- XkbStdBell(XtDisplay((Widget)pdw), XtWindow((Widget)pdw), 0,
XkbBI_MinorError);
+-#else
+- XBell(XtDisplay((Widget)pdw), 0);
+-#endif /* XKB */
+-}
+-
+-/* Center popup (on parent, not on screen - which would be a bad idea
+- * in the Xinerama case) */
+-static
+-void center_popup(Widget parent, Widget popup)
+-{
+- Dimension width,
+- height;
+- Position x,
+- y;
+-
+- XtVaGetValues(parent,
+- XtNx, &x,
+- XtNy, &y,
+- NULL);
+- XtVaGetValues(popup,
+- XtNwidth, &width,
+- XtNheight, &height,
+- NULL);
+-
+- x += (Position)width / 2;
+- y += (Position)height / 3;
+-
+- XtVaSetValues(popup,
+- XtNx, x,
+- XtNy, y,
+- NULL);
+-}
+-
+-static
+-void updateWidgetStates(PrintDialogWidget pdw)
+-{
+- PrintDialogPart *pdp = &pdw->printdialog;
+-
+- /* Do not update anything if we will be destroyed */
+- if (pdw->core.being_destroyed)
+- return;
+-
+- if (pdp->printToFile == False) {
+- XtVaSetValues(pdp->main.printtoprinter, XtNstate, True, NULL);
+- XtVaSetValues(pdp->main.printtofile, XtNstate, False, NULL);
+- /* Disable the widgets which depend on print-to-file */
+- XtVaSetValues(pdp->main.filenamelabel, XtNsensitive, False, NULL);
+- XtVaSetValues(pdp->main.filename, XtNsensitive, False, NULL);
+- XtVaSetValues(pdp->main.selectfile, XtNsensitive, False, NULL);
+- }
+- else
+- {
+- XtVaSetValues(pdp->main.printtoprinter, XtNstate, False, NULL);
+- XtVaSetValues(pdp->main.printtofile, XtNstate, True, NULL);
+- /* Enable the widgets which depend on print-to-file */
+- XtVaSetValues(pdp->main.filenamelabel, XtNsensitive, True, NULL);
+- XtVaSetValues(pdp->main.filename, XtNsensitive, True, NULL);
+- XtVaSetValues(pdp->main.selectfile, XtNsensitive, True, NULL);
+- }
+-
+- /* Update file name */
+- XtVaSetValues(pdp->main.filename, XtNlabel,
pdp->filename?pdp->filename:"-", NULL);
+-
+- /* General check whether we can print... */
+- pdp->canPrint = True;
+- if (pdp->printer_name == NULL) {
+- pdp->canPrint = False;
+- }
+- else if (strlen(pdp->printer_name) == 0) {
+- pdp->canPrint = False;
+- }
+-
+- pdp->canReallyPrint = pdp->canPrint;
+-
+- /* Some extra checks for print-to-file */
+- if (pdp->printToFile) {
+- if (pdp->filename == NULL) {
+- pdp->canReallyPrint = False;
+- }
+- else if (strlen(pdp->filename) == 0) {
+- pdp->canReallyPrint = False;
+- }
+- }
+-
+- XtVaSetValues(pdp->main.ok, XtNsensitive, pdp->canReallyPrint, NULL);
+- XtVaSetValues(pdp->main.setup, XtNsensitive, pdp->canPrint, NULL);
+-}
+-
+-static void
+-printSetupClose(PrintDialogWidget pdw)
+-{
+- PrintDialogPart *pdp = &pdw->printdialog;
+- if (pdp->setup.popup) {
+- XtPopdown(pdp->setup.popup);
+- }
+-}
+-
+-static void
+-printSetupOKXtProc(Widget w, XtPointer client_data, XtPointer callData)
+-{
+- PrintDialogWidget pdw = (PrintDialogWidget)client_data;
+- PrintDialogPart *pdp = &pdw->printdialog;
+- char *s;
+- XawListReturnStruct *lrs;
+- Log(("## printSetupOK: closing print setup!\n"));
+-
+- /* Set copy count (if the value is invalid beep and return to the user
) */
+- XtVaGetValues(pdp->setup.jobcopies, XtNstring, &s, NULL);
+- if (s) {
+- int c = atoi(s);
+- if (c < 1 || c > 999) {
+- do_beep(pdw);
+- XtVaSetValues(pdp->setup.jobcopies, XtNstring, "1", NULL);
+- Log(("## printSetupOKXtProc: not a valid copy count value\n"));
+- return;
+- }
+-
+- /* Fix me: We should set the number of _job_ copies here, not _doc_
copies */
+- XpuSetDocumentCopies(pdp->pdpy, pdp->pcontext, c);
+- }
+-
+- /* Set paper size */
+- lrs = XawListShowCurrent(pdp->setup.paperlist);
+- if (lrs->list_index != XAW_LIST_NONE) {
+- Log(("selected paper is '%s'/'%d'\n", lrs->string,
lrs->list_index));
+- Assertion(lrs->list_index < pdp->num_papers, (("Error:
lrs->list_index < pdp->num_papers\n")));
+- XpuSetDocMediumSourceSize(pdp->pdpy, pdp->pcontext,
&pdp->paperlist[lrs->list_index]);
+- }
+- XtFree((char *)lrs);
+-
+- /* Set resolution */
+- lrs = XawListShowCurrent(pdp->setup.resolutionlist);
+- if (lrs->list_index != XAW_LIST_NONE) {
+- Log(("selected resolution is '%s'/'%d'\n", lrs->string,
lrs->list_index));
+- Assertion(lrs->list_index < pdp->num_resolutions, (("Error:
lrs->list_index < pdp->num_resolutions\n")));
+- XpuSetDocResolution(pdp->pdpy, pdp->pcontext,
&pdp->resolutionlist[lrs->list_index]);
+- }
+- XtFree((char *)lrs);
+-
+- /* Set orientation */
+- lrs = XawListShowCurrent(pdp->setup.orientationlist);
+- if (lrs->list_index != XAW_LIST_NONE) {
+- Log(("selected orientation is '%s'/'%d'\n", lrs->string,
lrs->list_index));
+- Assertion(lrs->list_index < pdp->num_orientations, (("Error:
lrs->list_index < pdp->num_orientations\n")));
+- XpuSetDocOrientation(pdp->pdpy, pdp->pcontext,
&pdp->orientationlist[lrs->list_index]);
+- }
+- XtFree((char *)lrs);
+-
+- /* Set plex mode */
+- lrs = XawListShowCurrent(pdp->setup.plexlist);
+- if (lrs->list_index != XAW_LIST_NONE) {
+- Log(("selected plex is '%s'/'%d'\n", lrs->string, lrs->list_index));
+- Assertion(lrs->list_index < pdp->num_plex, (("Error:
lrs->list_index < pdp->num_plex\n")));
+- XpuSetDocPlex(pdp->pdpy, pdp->pcontext,
&pdp->plexlist[lrs->list_index]);
+- }
+- XtFree((char *)lrs);
+-
+- /* Set colorspace */
+- lrs = XawListShowCurrent(pdp->setup.colorspacelist);
+- if (lrs->list_index != XAW_LIST_NONE) {
+- Log(("selected colorspace is '%s'/'%d'\n", lrs->string,
lrs->list_index));
+- Assertion(lrs->list_index < pdp->num_colorspaces, (("Error:
lrs->list_index < pdp->num_colorspaces\n")));
+- pdp->selected_colorspace = &pdp->colorspacelist[lrs->list_index];
+- }
+- XtFree((char *)lrs);
+-
+- printSetupClose(pdw);
+-}
+-
+-static void
+-printSetupCancelXtProc(Widget w, XtPointer client_data, XtPointer callData)
+-{
+- PrintDialogWidget pdw = (PrintDialogWidget)client_data;
+- Log(("## printSetupCancel: closing print setup!\n"));
+-
+- printSetupClose(pdw);
+-}
+-
+-static void
+-printSetupJobCopiesXtProc(Widget w, XtPointer client_data, XtPointer
callData)
+-{
+- PrintDialogWidget pdw = (PrintDialogWidget)client_data;
+- PrintDialogPart *pdp = &pdw->printdialog;
+- char *string = NULL;
+-
+- Log(("## printSetupJobCopiesXtProc!\n"));
+-
+- /* Check whether the input is a valid number - and in the case of
invalid input reset the value */
+- XtVaGetValues(pdp->setup.jobcopies, XtNstring, &string, NULL);
+- if (string) {
+- char *s;
+- int i;
+- Bool isValidNumber = True;
+-
+- /* First check for invalid characters... */
+- for( s = string ; *s != '\0' ; s++ ) {
+- if (!isdigit(*s)) {
+- isValidNumber = False;
+- break;
+- }
+- }
+-
+- /* .. and the do a range check... */
+- i = atoi(string);
+- if (i < 1 || i > 999) {
+- isValidNumber = False;
+- }
+-
+- if (!isValidNumber) {
+- do_beep(pdw);
+- XtVaSetValues(pdp->setup.jobcopies, XtNstring, "1", NULL);
+- Log(("## printSetupJobCopiesXtProc: not a valid number\n"));
+- }
+- }
+-}
+-
+-static void
+-printCancelXtProc(Widget w, XtPointer client_data, XtPointer callData)
+-{
+- PrintDialogWidget pdw = (PrintDialogWidget)client_data;
+- PrintDialogPart *pdp = &pdw->printdialog;
+-
+- printSetupClose(pdw);
+-
+- if (pdp->cancel_callback) {
+- Log(("printCancelXtProc: calling callback\n"));
+- XtCallCallbackList((Widget)pdw, pdp->cancel_callback, NULL);
+- }
+-}
+-
+-static void
+-printDialogDestXtProc(Widget w, XtPointer client_data, XtPointer callData)
+-{
+- PrintDialogWidget pdw = (PrintDialogWidget)client_data;
+- PrintDialogPart *pdp = &pdw->printdialog;
+-
+- if (w == pdp->main.printtoprinter) {
+- pdp->printToFile = False;
+- }
+- else if (w == pdp->main.printtofile) {
+- pdp->printToFile = True;
+- }
+- else
+- {
+- Log(("printDialogDestXtProc: ERROR: Unknown widget.\n"));
+- }
+-
+- updateWidgetStates(pdw);
+-}
+-
+-static void
+-printSelectFileXtProc(Widget w, XtPointer client_data, XtPointer callData)
+-{
+- PrintDialogWidget pdw = (PrintDialogWidget)client_data;
+- PrintDialogPart *pdp = &pdw->printdialog;
+-
+- Log(("## printSelectFileXtProc!\n"));
+-
+- if (!pdp->selectFile.shell) {
+- buildFileDialog(pdw);
+- }
+-
+- center_popup((Widget)pdw, pdp->selectFile.shell);
+-
+- XtPopup(pdp->selectFile.shell, XtGrabExclusive);
+-}
+-
+-static void
+-printOKXtProc(Widget w, XtPointer client_data, XtPointer callData)
+-{
+- PrintDialogWidget pdw = (PrintDialogWidget)client_data;
+- PrintDialogPart *pdp = &pdw->printdialog;
+- Log(("## printing!\n"));
+-
+- if (!pdp->pdpy) {
+- Log(("printOKXtProc: no printer connection, opening one....\n"));
+- openPrinterConnection(pdw);
+-
+- if (!pdp->pdpy) {
+- Log(("printOKXtProc: still no printer connection - BAD (this
should never happen).\n"));
+- do_beep(pdw);
+- return;
+- }
+- }
+-
+- if (pdp->ok_callback) {
+- XawPrintDialogCallbackStruct pdcs;
+-
+- Log(("printOKXtProc: calling callbacks...\n"));
+- memset(&pdcs, 0, sizeof(pdcs));
+- pdcs.pdpy = pdp->pdpy;
+- pdcs.pcontext = pdp->pcontext;
+- pdcs.printToFile = pdp->printToFile;
+- pdcs.printToFileName = (const char *)pdp->filename;
+- pdcs.colorspace = pdp->selected_colorspace;
+- XtCallCallbackList((Widget)pdw, pdp->ok_callback, &pdcs);
+- }
+-
+- printSetupClose(pdw);
+-}
+-
+-static void
+-printSetupXtProc(Widget w, XtPointer client_data, XtPointer callData)
+-{
+- PrintDialogWidget pdw = (PrintDialogWidget)client_data;
+- PrintDialogPart *pdp = &pdw->printdialog;
+-
+- Log(("## setup!\n"));
+-
+- if (!pdp->setup.popup) {
+- if (buildPrintSetupDialog(pdw) == NULL) {
+- Log(("printSetupXtProc: buildPrintSetupDialog failure.\n"));
+- return;
+- }
+- }
+-
+- center_popup((Widget)pdw, pdp->setup.popup);
+-
+- XtPopup(pdp->setup.popup, XtGrabExclusive);
+-}
+-
+-static void
+-printFileSelectedXtProc(Widget w, XtPointer client_data, XtPointer callData)
+-{
+- PrintDialogWidget pdw = (PrintDialogWidget)client_data;
+- PrintDialogPart *pdp = &pdw->printdialog;
+- const char *filename;
+-
+- Log(("printFileSelectedXtProc: User selected file.\n"));
+- filename = XawDialogGetValueString(pdp->selectFile.dialog);
+-
+- if (pdp->filename)
+- free(pdp->filename);
+- pdp->filename = strdup(filename);
+-
+- XtPopdown(pdp->selectFile.shell);
+-
+- updateWidgetStates(pdw);
+-}
+-
+-static
+-void buildFileDialog(PrintDialogWidget pdw)
+-{
+- PrintDialogPart *pdp = &pdw->printdialog;
+- int n;
+- Arg args[20];
+-
+- pdp->selectFile.shell = XtCreatePopupShell("selectfile",
+- transientShellWidgetClass,
+- (Widget)pdw, NULL, 0);
+- n = 0;
+- XtSetArg(args[n], XtNvalue, pdp->filename?pdp->filename:""); n++;
+- pdp->selectFile.dialog = XtCreateManagedWidget("dialog",
dialogWidgetClass,
+- pdp->selectFile.shell,
args, n);
+- XawDialogAddButton(pdp->selectFile.dialog, "Accept",
printFileSelectedXtProc, pdw);
+-
+- XtRealizeWidget(pdp->selectFile.shell);
+-}
+-
+-static
+-void closePrinterConnection(PrintDialogWidget pdw, Bool closeDisplay)
+-{
+- PrintDialogPart *pdp = &pdw->printdialog;
+-
+- Log(("# closePrinterConnection\n"));
+-
+- destroyPrintSetupDialog(pdw);
+-
+- if (pdp->paperlist) {
+- XpuFreeMediumSourceSizeList(pdp->paperlist);
+- pdp->paperlist = NULL;
+- }
+-
+- if (pdp->widget_paperlist) {
+- free(pdp->widget_paperlist);
+- pdp->widget_paperlist = NULL;
+- }
+-
+- if (pdp->resolutionlist) {
+- XpuFreeResolutionList(pdp->resolutionlist);
+- pdp->resolutionlist = NULL;
+- }
+-
+- if (pdp->widget_resolutionlist) {
+- free(pdp->widget_resolutionlist);
+- pdp->widget_resolutionlist = NULL;
+- }
+-
+-
+- if (pdp->orientationlist) {
+- XpuFreeOrientationList(pdp->orientationlist);
+- pdp->orientationlist = NULL;
+- }
+-
+- if (pdp->widget_orientationlist) {
+- free(pdp->widget_orientationlist);
+- pdp->widget_orientationlist = NULL;
+- }
+-
+- if (pdp->plexlist) {
+- XpuFreePlexList(pdp->plexlist);
+- pdp->plexlist = NULL;
+- }
+-
+- if (pdp->widget_plexlist) {
+- free(pdp->widget_plexlist);
+- pdp->widget_plexlist = NULL;
+- }
+-
+- if (pdp->colorspacelist) {
+- XpuFreeColorspaceList(pdp->colorspacelist);
+- pdp->colorspacelist = NULL;
+- }
+-
+- if (pdp->widget_colorspacelist) {
+- free(pdp->widget_colorspacelist);
+- pdp->widget_colorspacelist = NULL;
+- }
+- pdp->selected_colorspace = NULL;
+-
+- if (pdp->pdpy) {
+- if (closeDisplay) {
+- XpuClosePrinterDisplay(pdp->pdpy, pdp->pcontext);
+- }
+- pdp->pdpy = NULL;
+- pdp->pcontext = None;
+- }
+-
+- updateWidgetStates(pdw);
+-}
+-
+-static
+-Bool openPrinterConnection(PrintDialogWidget pdw)
+-{
+- PrintDialogPart *pdp = &pdw->printdialog;
+-
+- Log(("# openPrinterConnection\n"));
+-
+- /* Close any outstanding connection first... */
+- closePrinterConnection(pdw, True);
+-
+- if (!pdp->printer_name) {
+- Log(("# error: openPrinterConnection: No printer name.\n"));
+- return False;
+- }
+-
+- if (XpuGetPrinter(pdp->printer_name, &pdp->pdpy, &pdp->pcontext) ==
False) {
+- Log(("openPrinterConnection: could not open printer.\n"));
+- return False;
+- }
+-
+- pdp->paperlist = XpuGetMediumSourceSizeList(pdp->pdpy,
pdp->pcontext, &pdp->num_papers);
+- pdp->resolutionlist = XpuGetResolutionList(pdp->pdpy,
pdp->pcontext, &pdp->num_resolutions);
+- pdp->orientationlist = XpuGetOrientationList(pdp->pdpy,
pdp->pcontext, &pdp->num_orientations);
+- pdp->plexlist = XpuGetPlexList(pdp->pdpy,
pdp->pcontext, &pdp->num_plex);
+- pdp->colorspacelist = XpuGetColorspaceList(pdp->pdpy,
pdp->pcontext, &pdp->num_colorspaces);
+-
+- pdp->widget_paperlist =
xppaperlist_to_widget_paperlist(pdp->paperlist, pdp->num_papers);
+- pdp->widget_resolutionlist =
xpresolutionlist_to_widget_resolutionlist(pdp->resolutionlist,
pdp->num_resolutions);
+- pdp->widget_orientationlist =
xporientationlist_to_widget_orientationlist(pdp->orientationlist,
pdp->num_orientations);
+- pdp->widget_plexlist =
xpplexlist_to_widget_plexlist(pdp->plexlist, pdp->num_plex);
+- pdp->widget_colorspacelist =
xpcolorspacelist_to_widget_colorspacelist(pdp->colorspacelist,
pdp->num_colorspaces);
+-
+- updateWidgetStates(pdw);
+-
+- return True;
+-}
+-
+-#undef DEFAULT_WIDTH
+-#define DEFAULT_WIDTH 120
+-#undef DEFAULT_INFOLABEL_WIDTH
+-#define DEFAULT_INFOLABEL_WIDTH 250
+-
+-static
+-void destroyPrintSetupDialog(PrintDialogWidget pdw)
+-{
+- PrintDialogPart *pdp = &pdw->printdialog;
+-
+- if (pdp->setup.popup) {
+- XtDestroyWidget(pdp->setup.popup);
+- }
+-
+- /* |XtDestroyWidget(pdp->setup.popup);| above will recursively destroy
+- * all children so we only have to reset the pointers here... */
+- pdp->setup.popup = NULL;
+- pdp->setup.form = NULL;
+- pdp->setup.paperlist = NULL;
+- pdp->setup.resolutionlist = NULL;
+- pdp->setup.orientationlist = NULL;
+- pdp->setup.plexlist = NULL;
+- pdp->setup.colorspacelist = NULL;
+- pdp->setup.ok = NULL;
+- pdp->setup.cancel = NULL;
+-}
+-
+-static
+-Widget buildPrintSetupDialog(PrintDialogWidget pdw)
+-{
+- PrintDialogPart *pdp = &pdw->printdialog;
+- int n;
+- Arg args[20];
+- Widget listform;
+- XpuSupportedFlags jobflags,
+- docflags;
+- Bool canChangeJobCopies,
+- canChangePaperSize,
+- canChangeResolution,
+- canChangeOrientation,
+- canChangePlex;
+-
+- if (!pdp->pdpy) {
+- Log(("buildPrintSetupDialog: no printer connection, opening
one....\n"));
+- openPrinterConnection(pdw);
+-
+- if (!pdp->pdpy) {
+- Log(("buildPrintSetupDialog: still no printer connection -
BAD.\n"));
+- do_beep(pdw);
+- return NULL;
+- }
+- }
+-
+- /* Get flags which types of attributes can be modified */
+- jobflags = XpuGetSupportedDocAttributes(pdp->pdpy, pdp->pcontext);
+- docflags = XpuGetSupportedDocAttributes(pdp->pdpy, pdp->pcontext);
+- canChangeJobCopies = (jobflags & XPUATTRIBUTESUPPORTED_COPY_COUNT) ==
XPUATTRIBUTESUPPORTED_COPY_COUNT;
+- canChangePaperSize = (docflags &
XPUATTRIBUTESUPPORTED_DEFAULT_MEDIUM) == XPUATTRIBUTESUPPORTED_DEFAULT_MEDIUM;
+- canChangeResolution = (docflags &
XPUATTRIBUTESUPPORTED_DEFAULT_PRINTER_RESOLUTION) ==
XPUATTRIBUTESUPPORTED_DEFAULT_PRINTER_RESOLUTION;
+- canChangeOrientation = (docflags &
XPUATTRIBUTESUPPORTED_CONTENT_ORIENTATION) ==
XPUATTRIBUTESUPPORTED_CONTENT_ORIENTATION;
+- canChangePlex = (docflags & XPUATTRIBUTESUPPORTED_PLEX) ==
XPUATTRIBUTESUPPORTED_PLEX;
+-
+- n = 0;
+- XtSetArg(args[n], XtNallowShellResize, True); n++;
+- pdp->setup.popup = XtCreatePopupShell("setup",
transientShellWidgetClass, (Widget)pdw, args, n);
+-
+- n = 0;
+- pdp->setup.form = XtCreateManagedWidget("form", formWidgetClass,
pdp->setup.popup, args, n);
+-
+- n = 0;
+- listform = XtCreateManagedWidget("list", formWidgetClass,
pdp->setup.form, args, n);
+-
+- n = 0;
+- XtSetArg(args[n], XtNresizable, True);
n++;
+- XtSetArg(args[n], XtNforceColumns, True);
n++;
+- XtSetArg(args[n], XtNdefaultColumns, 1);
n++;
+- XtSetArg(args[n], XtNsensitive, canChangePaperSize);
n++;
+- XtSetArg(args[n], XtNlist, pdp->widget_paperlist);
n++;
+- XtSetArg(args[n], XtNwidth, DEFAULT_WIDTH);
n++;
+- pdp->setup.paperlist = XtCreateManagedWidget("paperlist",
listWidgetClass, listform, args, n);
+-
+- n = 0;
+- XtSetArg(args[n], XtNresizable, True);
n++;
+- XtSetArg(args[n], XtNforceColumns, True);
n++;
+- XtSetArg(args[n], XtNdefaultColumns, 1);
n++;
+- XtSetArg(args[n], XtNsensitive, canChangeResolution);
n++;
+- XtSetArg(args[n], XtNlist, pdp->widget_resolutionlist);
n++;
+- XtSetArg(args[n], XtNwidth, DEFAULT_WIDTH);
n++;
+- pdp->setup.resolutionlist = XtCreateManagedWidget("resolutionlist",
listWidgetClass, listform, args, n);
+-
+- n = 0;
+- XtSetArg(args[n], XtNresizable, True);
n++;
+- XtSetArg(args[n], XtNforceColumns, True);
n++;
+- XtSetArg(args[n], XtNdefaultColumns, 1);
n++;
+- XtSetArg(args[n], XtNsensitive, canChangeOrientation);
n++;
+- XtSetArg(args[n], XtNlist, pdp->widget_orientationlist);
n++;
+- XtSetArg(args[n], XtNwidth, DEFAULT_WIDTH);
n++;
+- pdp->setup.orientationlist = XtCreateManagedWidget("orientationlist",
listWidgetClass, listform, args, n);
+-
+- n = 0;
+- XtSetArg(args[n], XtNresizable, True);
n++;
+- XtSetArg(args[n], XtNforceColumns, True);
n++;
+- XtSetArg(args[n], XtNdefaultColumns, 1);
n++;
+- XtSetArg(args[n], XtNsensitive, canChangePlex);
n++;
+- XtSetArg(args[n], XtNlist, pdp->widget_plexlist);
n++;
+- XtSetArg(args[n], XtNwidth, DEFAULT_WIDTH);
n++;
+- pdp->setup.plexlist = XtCreateManagedWidget("plexlist",
listWidgetClass, listform, args, n);
+-
+- n = 0;
+- XtSetArg(args[n], XtNresizable, True);
n++;
+- XtSetArg(args[n], XtNforceColumns, True);
n++;
+- XtSetArg(args[n], XtNdefaultColumns, 1);
n++;
+- XtSetArg(args[n], XtNsensitive, True);
n++;
+- XtSetArg(args[n], XtNlist, pdp->widget_colorspacelist);
n++;
+- XtSetArg(args[n], XtNwidth, DEFAULT_WIDTH);
n++;
+- pdp->setup.colorspacelist = XtCreateManagedWidget("colorspacelist",
listWidgetClass, listform, args, n);
+-
+- n = 0;
+- XtSetArg(args[n], XtNborderWidth, 0);
n++;
+- XtSetArg(args[n], XtNresizable, False);
n++;
+- XtSetArg(args[n], XtNjustify, XtJustifyRight);
n++;
+- XtSetArg(args[n], XtNwidth, DEFAULT_WIDTH);
n++;
+- XtSetArg(args[n], XtNsensitive, canChangeJobCopies);
n++;
+- pdp->setup.jobcopieslabel = XtCreateManagedWidget("jobcopieslabel",
labelWidgetClass, listform, args, n);
+-
+- n = 0;
+- XtSetArg(args[n], XtNstring, "1");
n++;
+- XtSetArg(args[n], XtNresizable, True);
n++;
+- XtSetArg(args[n], XtNeditType, XawtextEdit);
n++;
+- XtSetArg(args[n], XtNsensitive, canChangeJobCopies);
n++;
+- pdp->setup.jobcopies = XtCreateManagedWidget("jobcopies",
asciiTextWidgetClass, listform, args, n);
+- XtAddCallback(pdp->setup.jobcopies, XtNpositionCallback,
printSetupJobCopiesXtProc, pdw);
+-
+- n = 0;
+- pdp->setup.ok = XtCreateManagedWidget("ok", commandWidgetClass,
pdp->setup.form, args, n);
+- XtAddCallback(pdp->setup.ok, XtNcallback, printSetupOKXtProc, pdw);
+-
+- n = 0;
+- pdp->setup.cancel = XtCreateManagedWidget("cancel", commandWidgetClass,
pdp->setup.form, args, n);
+- XtAddCallback(pdp->setup.cancel, XtNcallback, printSetupCancelXtProc,
pdw);
+-
+- XtRealizeWidget(pdp->setup.popup);
+-
+- return pdp->setup.popup;
+-}
+-
+-#undef DEFAULT_WIDTH
+-#define DEFAULT_WIDTH 150
+-
+-static
+-String *xpprinterlist_to_widget_printerlist(XPPrinterList printerlist, int
num_printers)
+-{
+- int i;
+- String *names;
+-
+- names = malloc(sizeof(String *) * (num_printers+1));
+- if(!names)
+- return NULL;
+-
+- for(i = 0 ; i < num_printers ; i++)
+- names[i] = printerlist[i].name;
+-
+- names[i] = NULL; /* Terminate the list */
+-
+- return names;
+-}
+-
+-static
+-String *xppaperlist_to_widget_paperlist(XpuMediumSourceSizeList paperlist,
int num_papers)
+-{
+- int i;
+- String *names;
+-
+- names = malloc(sizeof(String *) * (num_papers+1));
+- if (!names)
+- return NULL;
+-
+- for(i = 0 ; i < num_papers ; i++)
+- names[i] = (char *)paperlist[i].medium_name; /* FixMe: tray
selection missing */
+-
+- names[i] = NULL; /* Terminate the list */
+-
+- return names;
+-}
+-
+-static
+-String *xpresolutionlist_to_widget_resolutionlist(XpuResolutionList
reslist, int num_resolutions)
+-{
+- int i;
+- String *names;
+-
+- names = malloc(sizeof(String *) * (num_resolutions+1));
+- if (!names)
+- return NULL;
+-
+- for(i = 0 ; i < num_resolutions ; i++)
+- names[i] = (char *)reslist[i].name;
+-
+- names[i] = NULL; /* Terminate the list */
+-
+- return names;
+-}
+-
+-static
+-String *xporientationlist_to_widget_orientationlist(XpuOrientationList
orientationlist, int num_orientations)
+-{
+- int i;
+- String *names;
+-
+- names = malloc(sizeof(String *) * (num_orientations+1));
+- if (!names)
+- return NULL;
+-
+- for(i = 0 ; i < num_orientations ; i++)
+- names[i] = (char *)orientationlist[i].orientation;
+-
+- names[i] = NULL; /* Terminate the list */
+-
+- return names;
+-}
+-
+-static
+-String *xpplexlist_to_widget_plexlist(XpuPlexList plexlist, int num_plex)
+-{
+- int i;
+- String *names;
+-
+- names = malloc(sizeof(String *) * (num_plex+1));
+- if(!names)
+- return NULL;
+-
+- for(i = 0 ; i < num_plex ; i++)
+- names[i] = (char *)plexlist[i].plex;
+-
+- names[i] = NULL; /* Terminate the list */
+-
+- return names;
+-}
+-
+-static
+-String *xpcolorspacelist_to_widget_colorspacelist(XpuColorspaceList
colorspacelist, int num_colorspaces)
+-{
+- int i;
+- String *names;
+-
+- names = malloc(sizeof(String *) * (num_colorspaces+1));
+- if(!names)
+- return NULL;
+-
+- for(i = 0 ; i < num_colorspaces ; i++)
+- names[i] = (char *)colorspacelist[i].name;
+-
+- names[i] = NULL; /* Terminate the list */
+-
+- return names;
+-}
+-
+-static void
+-printerSelectionPrinterSelectedXtProc(Widget w, XtPointer client_data,
XtPointer callData)
+-{
+- PrintDialogWidget pdw = (PrintDialogWidget)client_data;
+- PrintDialogPart *pdp = &pdw->printdialog;
+- XawListReturnStruct *lrs = (XawListReturnStruct *)callData;
+- int list_index;
+-
+- Log(("## user selected a printer\n"));
+-
+- list_index = lrs->list_index;
+- if (list_index == XAW_LIST_NONE) {
+- Log(("printerSelectionPrinterSelectedXtProc: Nothing selected.\n"));
+- return;
+- }
+-
+- Log(("selected printer is '%d'/'%s'/'%s'\n",
+- list_index, lrs->string,
NULLSTR(pdp->printerlist[list_index].name)));
+-
+- /* Enable OK button */
+- XtVaSetValues(pdp->selectPrinter.ok, XtNsensitive, True, NULL);
+-}
+-
+-static void
+-printSelectPrinterXtProc(Widget w, XtPointer client_data, XtPointer
callData)
+-{
+- PrintDialogWidget pdw = (PrintDialogWidget)client_data;
+- PrintDialogPart *pdp = &pdw->printdialog;
+-
+- Log(("## select printer!\n"));
+-
+- if (!pdp->selectPrinter.popup) {
+- if (!buildPrinterSelectionDialog(pdw)) {
+- Log(("printSelectPrinterXtProc: buildPrinterSelectionDialog
failure.\n"));
+- return;
+- }
+- }
+-
+- center_popup((Widget)pdw, pdp->selectPrinter.popup);
+-
+- XtPopup(pdp->selectPrinter.popup, XtGrabExclusive);
+-}
+-
+-static void
+-printerSelectionClose(PrintDialogWidget pdw)
+-{
+- PrintDialogPart *pdp = &pdw->printdialog;
+-
+- if (pdp->selectPrinter.popup) {
+- XtPopdown(pdp->selectPrinter.popup);
+- }
+-}
+-
+-static void
+-printerSelectionOKXtProc(Widget w, XtPointer client_data, XtPointer
callData)
+-{
+- PrintDialogWidget pdw = (PrintDialogWidget)client_data;
+- PrintDialogPart *pdp = &pdw->printdialog;
+- XawListReturnStruct *lrs;
+- int list_index;
+-
+- Log(("## printerSelectionOKXtProc: closing printer selection!\n"));
+-
+- /* Copy current selection in printer list widget and open a printer
connection */
+- lrs = XawListShowCurrent(pdp->selectPrinter.list);
+- if (!lrs) {
+- Log(("printerSelectionOKXtProc: |lrs|==NULL\n"));
+- return;
+- }
+-
+- list_index = lrs->list_index;
+- if (lrs->list_index == XAW_LIST_NONE) {
+- Log(("printerSelectionOKXtProc: rs->list_index ==
XAW_LIST_NONE\n"));
+- XtFree((char *)lrs);
+- return;
+- }
+-
+- /* Set printer name and description in main dialog */
+- XtVaSetValues(pdp->main.name, XtNlabel,
NULLSTR(pdp->printerlist[list_index].name), NULL);
+- XtVaSetValues(pdp->main.desc, XtNlabel,
NULLSTR(pdp->printerlist[list_index].desc), NULL);
+-
+- if (pdp->printer_name)
+- free(pdp->printer_name);
+- pdp->printer_name = strdup(lrs->string);
+-
+- /* Close any outstanding printer connection since user has selected
+- * a different printer */
+- closePrinterConnection(pdw, True);
+-
+- printerSelectionClose(pdw);
+-
+- XtFree((char *)lrs);
+-}
+-
+-static void
+-printerSelectionCancelXtProc(Widget w, XtPointer client_data, XtPointer
callData)
+-{
+- PrintDialogWidget pdw = (PrintDialogWidget)client_data;
+- Log(("## printerSelectionCancelXtProc: closing printer selection!\n"));
+-
+- printerSelectionClose(pdw);
+-}
+-
+-static
+-Bool buildPrinterSelectionDialog(PrintDialogWidget pdw)
+-{
+- PrintDialogPart *pdp = &pdw->printdialog;
+-
+- int n;
+- Arg args[20];
+-
+- n = 0;
+- XtSetArg(args[n], XtNallowShellResize, True); n++;
+- pdp->selectPrinter.popup = XtCreatePopupShell("printerselection",
transientShellWidgetClass, (Widget)pdw, args, n);
+-
+- n = 0;
+- pdp->selectPrinter.form = XtCreateManagedWidget("form",
formWidgetClass, pdp->selectPrinter.popup, args, n);
+-
+- n = 0;
+- XtSetArg(args[n], XtNresizable, True); n++;
+- XtSetArg(args[n], XtNforceColumns, True); n++;
+- XtSetArg(args[n], XtNdefaultColumns, 1); n++;
+- XtSetArg(args[n], XtNlist, pdp->widget_printerlist); n++;
+- XtSetArg(args[n], XtNwidth, DEFAULT_WIDTH); n++;
+- pdp->selectPrinter.list = XtCreateManagedWidget("list",
listWidgetClass, pdp->selectPrinter.form, args, n);
+- XtAddCallback(pdp->selectPrinter.list, XtNcallback,
printerSelectionPrinterSelectedXtProc, pdw);
+-
+- n = 0;
+- XtSetArg(args[n], XtNsensitive, False); n++;
+- pdp->selectPrinter.ok = XtCreateManagedWidget("ok", commandWidgetClass,
pdp->selectPrinter.form, args, n);
+- XtAddCallback(pdp->selectPrinter.ok, XtNcallback,
printerSelectionOKXtProc, pdw);
+-
+- n = 0;
+- pdp->selectPrinter.cancel = XtCreateManagedWidget("cancel",
commandWidgetClass, pdp->selectPrinter.form, args, n);
+- XtAddCallback(pdp->selectPrinter.cancel, XtNcallback,
printerSelectionCancelXtProc, pdw);
+-
+- XtRealizeWidget(pdp->selectPrinter.popup);
+-
+- return True;
+-}
+-
+-static
+-void destroyPrinterSelectionDialog(PrintDialogWidget pdw)
+-{
+- PrintDialogPart *pdp = &pdw->printdialog;
+-
+- if (pdp->selectPrinter.popup) {
+- XtDestroyWidget(pdp->selectPrinter.popup);
+- }
+-
+- /* |XtDestroyWidget(pdp->setup.popup);| above will recursively destroy
+- * all children so we only have to reset the pointers here... */
+- pdp->selectPrinter.popup = NULL;
+- pdp->selectPrinter.form = NULL;
+- pdp->selectPrinter.list = NULL;
+- pdp->selectPrinter.popup = NULL;
+- pdp->selectPrinter.cancel = NULL;
+-}
+-
+-/*
+- * Function:
+- * createprintdialogchildren
+- *
+- * Parameters:
+- * w - print dialog widget
+- *
+- * Description:
+- * Creates the print dialog widgets.
+- *
+- * Note
+- * -
+- */
+-static void
+-createprintdialogchildren(Widget w)
+-{
+- int n;
+- Arg args[20];
+- PrintDialogWidget pdw = (PrintDialogWidget)w;
+- PrintDialogPart *pdp = &pdw->printdialog;
+- const char *default_printername = NULL,
+- *default_printerdesc = NULL;
+- Bool has_default_printer = False;
+-
+- pdp->printerlist = XpuGetPrinterList(NULL, &pdp->num_printers);
+- pdp->widget_printerlist =
xpprinterlist_to_widget_printerlist(pdp->printerlist, pdp->num_printers);
+-
+- if (pdp->num_printers > 0) {
+- if (pdp->printerlist[0].name && strlen(pdp->printerlist[0].name)) {
+- /* XprintUtils moves the default printer to the top */
+- default_printername = pdp->printerlist[0].name;
+- default_printerdesc = pdp->printerlist[0].desc;
+- pdp->printer_name = strdup(pdp->printerlist[0].name);
+- has_default_printer = True;
+- }
+- }
+- else
+- {
+- PrintMsg(("No Xprint servers could be found.\n"
+- "Check whether the XPSERVERLIST environment variable
contains any valid Xprint server(s).\n"));
+- }
+-
+- n = 0;
+- XtSetArg(args[n], XtNborderWidth, 0); n++;
+- pdp->main.form = XtCreateManagedWidget("main", formWidgetClass,
(Widget)pdw, args, n);
+-
+- n = 0;
+- pdp->main.innerform = XtCreateManagedWidget("innerform",
formWidgetClass, pdp->main.form, args, n);
+-
+- n = 0;
+- XtSetArg(args[n], XtNborderWidth, 0); n++;
+- XtSetArg(args[n], XtNresizable, False); n++;
+- XtSetArg(args[n], XtNjustify, XtJustifyRight); n++;
+- XtSetArg(args[n], XtNwidth, DEFAULT_WIDTH); n++;
+- pdp->main.desclabel = XtCreateManagedWidget("desclabel",
labelWidgetClass, pdp->main.innerform, args, n);
+-
+- n = 0;
+- XtSetArg(args[n], XtNborderWidth, 0); n++;
+- XtSetArg(args[n], XtNresizable, False); n++;
+- XtSetArg(args[n], XtNjustify, XtJustifyLeft); n++;
+- XtSetArg(args[n], XtNwidth, DEFAULT_INFOLABEL_WIDTH); n++;
+- XtSetArg(args[n], XtNlabel,
default_printerdesc?default_printerdesc:"-"); n++;
+- pdp->main.desc = XtCreateManagedWidget("desc", labelWidgetClass,
pdp->main.innerform, args, n);
+-
+- n = 0;
+- XtSetArg(args[n], XtNsensitive, has_default_printer); n++;
+- pdp->main.info = XtCreateManagedWidget("info", commandWidgetClass,
pdp->main.innerform, args, n);
+- /*
+- XtAddCallback(pdp->main.info, XtNcallback, printerInfoXtProc, pdw);
+- */
+- n = 0;
+- XtSetArg(args[n], XtNborderWidth, 0); n++;
+- XtSetArg(args[n], XtNresizable, False); n++;
+- XtSetArg(args[n], XtNjustify, XtJustifyRight); n++;
+- XtSetArg(args[n], XtNwidth, DEFAULT_WIDTH); n++;
+- pdp->main.namelabel = XtCreateManagedWidget("namelabel",
labelWidgetClass, pdp->main.innerform, args, n);
+-
+- n = 0;
+- XtSetArg(args[n], XtNborderWidth, 0); n++;
+- XtSetArg(args[n], XtNresizable, False); n++;
+- XtSetArg(args[n], XtNjustify, XtJustifyLeft); n++;
+- XtSetArg(args[n], XtNlabel,
default_printername?default_printername:"-"); n++;
+- XtSetArg(args[n], XtNwidth, DEFAULT_INFOLABEL_WIDTH); n++;
+- pdp->main.name = XtCreateManagedWidget("name", labelWidgetClass,
pdp->main.innerform, args, n);
+-
+- n = 0;
+- pdp->main.selectprinter = XtCreateManagedWidget("selectprinter",
commandWidgetClass, pdp->main.innerform, args, n);
+- XtAddCallback(pdp->main.selectprinter, XtNcallback,
printSelectPrinterXtProc, pdw);
+-
+- /* Line: "File selection" */
+-
+- n = 0;
+- XtSetArg(args[n], XtNborderWidth, 0); n++;
+- XtSetArg(args[n], XtNresizable, False); n++;
+- XtSetArg(args[n], XtNjustify, XtJustifyRight); n++;
+- XtSetArg(args[n], XtNwidth, DEFAULT_WIDTH); n++;
+- XtSetArg(args[n], XtNsensitive, False); n++;
+- pdp->main.filenamelabel = XtCreateManagedWidget("filenamelabel",
labelWidgetClass, pdp->main.innerform, args, n);
+-
+- n = 0;
+- XtSetArg(args[n], XtNborderWidth, 0); n++;
+- XtSetArg(args[n], XtNresizable, False); n++;
+- XtSetArg(args[n], XtNjustify, XtJustifyLeft); n++;
+- XtSetArg(args[n], XtNlabel, "-"); n++;
+- XtSetArg(args[n], XtNwidth, DEFAULT_INFOLABEL_WIDTH); n++;
+- XtSetArg(args[n], XtNsensitive, False); n++;
+- pdp->main.filename = XtCreateManagedWidget("filename",
labelWidgetClass, pdp->main.innerform, args, n);
+-
+- n = 0;
+- XtSetArg(args[n], XtNsensitive, False); n++;
+- pdp->main.selectfile = XtCreateManagedWidget("selectfile",
commandWidgetClass, pdp->main.innerform, args, n);
+- XtAddCallback(pdp->main.selectfile, XtNcallback, printSelectFileXtProc,
pdw);
+-
+- /* Line: Misc (Print destination toggles, copy-count etc.)*/
+- n = 0;
+- XtSetArg(args[n], XtNstate, True); n++;
+- pdp->main.printtoprinter = XtCreateManagedWidget("printtoprinter",
toggleWidgetClass, pdp->main.innerform, args, n);
+- XtAddCallback(pdp->main.printtoprinter, XtNcallback,
printDialogDestXtProc, pdw);
+-
+- n = 0;
+- XtSetArg(args[n], XtNstate, False); n++;
+- pdp->main.printtofile = XtCreateManagedWidget("printtofile",
toggleWidgetClass, pdp->main.innerform, args, n);
+- XtAddCallback(pdp->main.printtofile, XtNcallback,
printDialogDestXtProc, pdw);
+-
+- /* End-of-Inner-Form-Content */
+-
+- n = 0;
+- XtSetArg(args[n], XtNsensitive, has_default_printer); n++;
+- pdp->main.ok = XtCreateManagedWidget("ok", commandWidgetClass,
pdp->main.form, args, n);
+- XtAddCallback(pdp->main.ok, XtNcallback, printOKXtProc, pdw);
+-
+- n = 0;
+- XtSetArg(args[n], XtNsensitive, has_default_printer); n++;
+- pdp->main.setup = XtCreateManagedWidget("setup", commandWidgetClass,
pdp->main.form, args, n);
+- XtAddCallback(pdp->main.setup, XtNcallback, printSetupXtProc, pdw);
+-
+- n = 0;
+- pdp->main.cancel = XtCreateManagedWidget("cancel", commandWidgetClass,
pdp->main.form, args, n);
+- XtAddCallback(pdp->main.cancel, XtNcallback, printCancelXtProc, pdw);
+-}
+-
+-/*
+- * Class Methods
+- */
+-static void XawPrintDialogConstraintInitialize(Widget, Widget, ArgList,
Cardinal *);
+-static void XawPrintDialogGetValuesHook(Widget, ArgList, Cardinal*);
+-static void XawPrintDialogInitialize(Widget, Widget, ArgList, Cardinal*);
+-static void XawPrintDialogDestroy(Widget);
+-static Boolean XawPrintDialogSetValues(Widget, Widget, Widget, ArgList,
Cardinal *);
+-
+-/*
+- * Initialization
+- */
+-static XtResource resources[] = {
+- {
+- XtNicon,
+- XtCIcon,
+- XtRBitmap,
+- sizeof(Pixmap),
+- XtOffsetOf(PrintDialogRec, printdialog.icon),
+- XtRImmediate,
+- 0
+- },
+- {
+- XawNOkCallback, XtCCallback, XtRCallback,
+- sizeof(XtCallbackList), XtOffsetOf(PrintDialogRec,
printdialog.ok_callback),
+- XtRImmediate, (XtPointer)NULL
+- },
+- {
+- XawNCancelCallback, XtCCallback, XtRCallback,
+- sizeof(XtCallbackList), XtOffsetOf(PrintDialogRec,
printdialog.cancel_callback),
+- XtRImmediate, (XtPointer)NULL
+- },
+-};
+-
+-PrintDialogClassRec printdialogClassRec = {
+- /* core */
+- {
+- (WidgetClass)&formClassRec, /* superclass */
+- "PrintDialog", /* class_name */
+- sizeof(PrintDialogRec), /* widget_size */
+- XawInitializeWidgetSet, /* class_initialize */
+- NULL, /* class_part init */
+- False, /* class_inited */
+- XawPrintDialogInitialize, /* initialize */
+- NULL, /* initialize_hook */
+- XtInheritRealize, /* realize */
+- NULL, /* actions */
+- 0, /* num_actions */
+- resources, /* resources */
+- XtNumber(resources), /* num_resources */
+- NULLQUARK, /* xrm_class */
+- True, /* compress_motion */
+- True, /* compress_exposure */
+- True, /* compress_enterleave */
+- False, /* visible_interest */
+- XawPrintDialogDestroy, /* destroy */
+- XtInheritResize, /* resize */
+- XtInheritExpose, /* expose */
+- XawPrintDialogSetValues, /* set_values */
+- NULL, /* set_values_hook */
+- XtInheritSetValuesAlmost, /* set_values_almost */
+- XawPrintDialogGetValuesHook, /* get_values_hook */
+- NULL, /* accept_focus */
+- XtVersion, /* version */
+- NULL, /* callback_private */
+- NULL, /* tm_table */
+- XtInheritQueryGeometry, /* query_geometry */
+- XtInheritDisplayAccelerator, /* display_accelerator */
+- NULL, /* extension */
+- },
+- /* composite */
+- {
+- XtInheritGeometryManager, /* geometry_manager */
+- XtInheritChangeManaged, /* change_managed */
+- XtInheritInsertChild, /* insert_child */
+- XtInheritDeleteChild, /* delete_child */
+- NULL, /* extension */
+- },
+- /* constraint */
+- {
+- NULL, /* subresourses */
+- 0, /* subresource_count */
+- sizeof(PrintDialogConstraintsRec), /* constraint_size */
+- XawPrintDialogConstraintInitialize, /* initialize */
+- NULL, /* destroy */
+- NULL, /* set_values */
+- NULL, /* extension */
+- },
+- /* form */
+- {
+- XtInheritLayout, /* layout */
+- },
+- /* printdialog */
+- {
+- NULL, /* extension */
+- }
+-};
+-
+-WidgetClass printDialogWidgetClass = (WidgetClass)&printdialogClassRec;
+-
+-/*
+- * Implementation
+- */
+-/*ARGSUSED*/
+-static void
+-XawPrintDialogInitialize(Widget request, Widget cnew, ArgList args,
Cardinal *num_args)
+-{
+- PrintDialogWidget dw = (PrintDialogWidget)cnew;
+- Arg arglist[9];
+- Cardinal arg_cnt = 0;
+-
+- XtSetArg(arglist[arg_cnt], XtNborderWidth, 0); arg_cnt++;
+- XtSetArg(arglist[arg_cnt], XtNleft, XtChainLeft); arg_cnt++;
+-
+- if (dw->printdialog.icon != (Pixmap)0) {
+- XtSetArg(arglist[arg_cnt], XtNbitmap, dw->printdialog.icon);
arg_cnt++;
+- XtSetArg(arglist[arg_cnt], XtNright, XtChainLeft);
arg_cnt++;
+- dw->printdialog.iconW = XtCreateManagedWidget("icon",
labelWidgetClass,
+- cnew, arglist,
arg_cnt);
+- arg_cnt = 2;
+- XtSetArg(arglist[arg_cnt], XtNfromHoriz, dw->printdialog.iconW);
arg_cnt++;
+- }
+- else {
+- dw->printdialog.iconW = NULL;
+- }
+-
+- createprintdialogchildren((Widget)dw);
+-}
+-
+-/*ARGSUSED*/
+-static void
+-XawPrintDialogConstraintInitialize(Widget request, Widget cnew,
+- ArgList args, Cardinal *num_args)
+-{
+- PrintDialogWidget dw = (PrintDialogWidget)cnew->core.parent;
+- PrintDialogConstraints constraint =
(PrintDialogConstraints)cnew->core.constraints;
+-
+- if (!XtIsSubclass(cnew, commandWidgetClass)) /* if not a button */
+- return; /* then just use defaults
*/
+-
+- constraint->form.left = constraint->form.right = XtChainLeft;
+- constraint->form.vert_base = dw->printdialog.main.form;
+-
+- if (dw->composite.num_children > 1) {
+- WidgetList children = dw->composite.children;
+- Widget *childP;
+-
+- for (childP = children + dw->composite.num_children - 1;
+- childP >= children; childP-- ) {
+- if (*childP == dw->printdialog.main.form)
+- break;
+- if (XtIsManaged(*childP) &&
+- XtIsSubclass(*childP, commandWidgetClass)) {
+- constraint->form.horiz_base = *childP;
+- break;
+- }
+- }
+- }
+-}
+-
+-#define ICON 0
+-#define NUM_CHECKS 1
+-/*ARGSUSED*/
+-static Boolean
+-XawPrintDialogSetValues(Widget current, Widget request, Widget cnew,
+- ArgList in_args, Cardinal *in_num_args)
+-{
+- PrintDialogWidget w = (PrintDialogWidget)cnew;
+- PrintDialogWidget old = (PrintDialogWidget)current;
+- Arg args[5];
+- unsigned int i;
+- Bool checks[NUM_CHECKS];
+-
+- for (i = 0; i < NUM_CHECKS; i++)
+- checks[i] = False;
+-
+- for (i = 0; i < *in_num_args; i++) {
+- if (!strcmp(XtNicon, in_args[i].name))
+- checks[ICON] = True;
+- }
+-
+- if (checks[ICON]) {
+- if (w->printdialog.icon != 0) {
+- XtSetArg(args[0], XtNbitmap, w->printdialog.icon);
+- if (old->printdialog.iconW != NULL) {
+- XtSetValues(old->printdialog.iconW, args, 1);
+- }
+- else {
+- XtSetArg(args[1], XtNborderWidth, 0);
+- XtSetArg(args[2], XtNleft, XtChainLeft);
+- XtSetArg(args[3], XtNright, XtChainLeft);
+- w->printdialog.iconW = XtCreateWidget("icon",
labelWidgetClass,
+- cnew, args, 4);
+- XtManageChild(w->printdialog.iconW);
+- }
+- }
+- else if (old->printdialog.icon != 0) {
+- XtDestroyWidget(old->printdialog.iconW);
+- w->printdialog.iconW = NULL;
+- }
+- }
+-
+- return True;
+-}
+-
+-/*
+- * Function:
+- * XawPrintDialogGetValuesHook
+- *
+- * Parameters:
+- * w - Print Dialog Widget
+- * args - argument list
+- * num_args - number of args
+- *
+- * Description:
+- * This is a get values hook routine that gets the values in the
dialog.
+- */
+-static void
+-XawPrintDialogGetValuesHook(Widget w, ArgList args, Cardinal *num_args)
+-{
+- /* NO-OP for now */
+-}
+-
+-static void
+-XawPrintDialogDestroy(Widget w)
+-{
+- PrintDialogWidget pdw = (PrintDialogWidget)w;
+- Log(("# XawPrintDialogDestroy: start.\n"));
+-
+- destroyPrintSetupDialog(pdw);
+- destroyPrinterSelectionDialog(pdw);
+- closePrinterConnection(pdw, True);
+-
+- Log(("# XawPrintDialogDestroy: done.\n"));
+-}
+-
+-/*
+- * Function:
+- * XawPrintDialogClosePrinterConnection
+- *
+- * Parameters:
+- * w - Print Dialog Widget
+- * closeDisplay - Boolean which decides whether |Display *|
+- * and |XPContext| should be disposed, too.
+- *
+- * Description:
+- * The print display connection is owned by the print dialog
+- * by default.
+- * If the application wishes to close the display connection
+- * to the print server, either to close it itself or force
+- * a disconnection for other reasons this function can be used.
+- *
+- * Notes
+- * 1. PUBLIC API
+- * 2. After this function returns all resources returned by the
+- * print dialog which are related to the status of the printer
+- * connection are stale.
+- */
+-void
+-XawPrintDialogClosePrinterConnection(Widget w, Bool closeDisplay)
+-{
+- closePrinterConnection((PrintDialogWidget)w, closeDisplay);
+-}
+-
+diff --git a/printdialog.h b/printdialog.h
+deleted file mode 100644
+index f166a27..0000000
+--- a/printdialog.h
++++ b/dev/null
+@@ -1,70 +0,0 @@
+-/*
+- * $Xorg: printdialog.h,v 1.1 2004/04/30 02:05:54 gisburn Exp $
+- *
+-Copyright 2004 Roland Mainz <roland.mainz AT nrubsig.org>
+-
+-Permission to use, copy, modify, distribute, and sell this software and its
+-documentation for any purpose is hereby granted without fee, provided that
+-the above copyright notice appear in all copies and that both that
+-copyright notice and this permission notice appear in supporting
+-documentation.
+-
+-The above copyright notice and this permission notice shall be included in
+-all copies or substantial portions of the Software.
+-
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-
+-Except as contained in this notice, the name of The Open Group shall not be
+-used in advertising or otherwise to promote the sale, use or other dealings
+-in this Software without prior written authorization from The Open Group.
+- *
+- */
+-
+-#ifndef XMORE_PRINTDIALOG_H
+-#define XMORE_PRINTDIALOG_H 1
+-
+-#include <X11/Intrinsic.h>
+-#include <X11/StringDefs.h>
+-#include <X11/Shell.h>
+-#include <X11/Xaw/Print.h>
+-#include <X11/Xaw/Cardinals.h>
+-#include <X11/Xaw/Form.h>
+-#include <X11/XprintUtil/xprintutil.h>
+-
+-/* Resources:
+- NOT WRITTEN YET
+-*/
+-
+-#define XtCIcon "Icon"
+-#define XtNicon "icon"
+-
+-#define XawNOkCallback "okCallback"
+-#define XawNCancelCallback "cancelCallback"
+-
+-typedef struct
+-{
+- Display *pdpy;
+- XPContext pcontext;
+- const char *printToFileName;
+- Boolean printToFile;
+- XpuColorspaceRec *colorspace;
+-} XawPrintDialogCallbackStruct;
+-
+-typedef struct _PrintDialogClassRec *PrintDialogWidgetClass;
+-typedef struct _PrintDialogRec *PrintDialogWidget;
+-
+-extern WidgetClass printDialogWidgetClass;
+-
+-_XFUNCPROTOBEGIN
+-
+-/* Prototypes */
+-void XawPrintDialogClosePrinterConnection(Widget w, Bool closeDisplay);
+-
+-_XFUNCPROTOEND
+-
+-#endif /* !XMORE_PRINTDIALOG_H */
+diff --git a/printdialogprivates.h b/printdialogprivates.h
+deleted file mode 100644
+index 1e66eb8..0000000
+--- a/printdialogprivates.h
++++ b/dev/null
+@@ -1,182 +0,0 @@
+-/*
+- * $Xorg: printdialogprivates.h,v 1.1 2004/05/12 02:05:54 gisburn Exp $
+- *
+-Copyright 2004 Roland Mainz <roland.mainz AT nrubsig.org>
+-
+-Permission to use, copy, modify, distribute, and sell this software and its
+-documentation for any purpose is hereby granted without fee, provided that
+-the above copyright notice appear in all copies and that both that
+-copyright notice and this permission notice appear in supporting
+-documentation.
+-
+-The above copyright notice and this permission notice shall be included in
+-all copies or substantial portions of the Software.
+-
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-
+-Except as contained in this notice, the name of The Open Group shall not be
+-used in advertising or otherwise to promote the sale, use or other dealings
+-in this Software without prior written authorization from The Open Group.
+- *
+- */
+-
+-#ifndef _XawPrintDialogP_h
+-#define _XawPrintDialogP_h 1
+-
+-#include <X11/IntrinsicP.h>
+-#include <X11/StringDefs.h>
+-#include <X11/Xos.h>
+-#include <X11/Xmu/Misc.h>
+-#include <X11/CoreP.h>
+-#include <X11/Xaw/AsciiText.h>
+-#include <X11/Xaw/Cardinals.h>
+-#include <X11/Xaw/Command.h>
+-#include <X11/Xaw/Label.h>
+-#include <X11/Xaw/DialogP.h>
+-#include <X11/Xaw/XawInit.h>
+-#include <X11/Xaw/Dialog.h>
+-#include <X11/Xaw/FormP.h>
+-
+-/* From Xaw/Privates.h */
+-#ifndef XtWidth
+-#define XtWidth(w) (((RectObj)w)->rectangle.width)
+-#endif
+-#ifndef XtHeight
+-#define XtHeight(w) (((RectObj)w)->rectangle.height)
+-#endif
+-
+-
+-typedef struct {
+- XtPointer extension;
+-} PrintDialogClassPart;
+-
+-typedef struct _PrintDialogClassRec {
+- CoreClassPart core_class;
+- CompositeClassPart composite_class;
+- ConstraintClassPart constraint_class;
+- FormClassPart form_class;
+- PrintDialogClassPart print_dialog_class;
+-} PrintDialogClassRec;
+-
+-extern PrintDialogClassRec printDialogClassRec;
+-
+-typedef struct _PrintDialogPart {
+- /* resources */
+- String label; /* description of the dialog */
+- String value; /* for the user response */
+- Pixmap icon; /* icon bitmap */
+- XtCallbackList ok_callback,
+- cancel_callback;
+-
+- /* private */
+- Widget iconW; /* widget to display the icon */
+-
+- struct
+- {
+- Widget form,
+- innerform,
+- desclabel,
+- desc,
+- info,
+- namelabel,
+- name,
+- selectprinter,
+- filenamelabel,
+- filename,
+- selectfile,
+- printtoprinter,
+- printtofile,
+- ok,
+- setup,
+- cancel;
+- } main;
+-
+- Bool printToFile;
+- char *filename;
+- Bool canPrint, /* can we print ? */
+- canReallyPrint; /* is it really save to print ? */
+- XpuColorspaceRec *selected_colorspace;
+-
+- struct
+- {
+- Widget popup,
+- form,
+- list,
+- ok,
+- cancel;
+- } selectPrinter;
+-
+- struct
+- {
+- Widget popup,
+- form,
+- paperlist,
+- resolutionlist,
+- orientationlist,
+- plexlist,
+- colorspacelist,
+- jobcopieslabel,
+- jobcopies,
+- ok,
+- cancel;
+- } setup;
+-
+- struct
+- {
+- Widget dialog,
+- shell;
+- } selectFile;
+-
+- XPPrinterList printerlist;
+- int num_printers;
+- String *widget_printerlist;
+-
+- String printer_name;
+- Display *pdpy;
+- XPContext pcontext;
+-
+- XpuMediumSourceSizeList paperlist;
+- int num_papers;
+- String *widget_paperlist;
+-
+- XpuResolutionList resolutionlist;
+- int num_resolutions;
+- String *widget_resolutionlist;
+-
+- XpuOrientationList orientationlist;
+- int num_orientations;
+- String *widget_orientationlist;
+-
+- XpuPlexList plexlist;
+- int num_plex;
+- String *widget_plexlist;
+-
+- XpuColorspaceList colorspacelist;
+- int num_colorspaces;
+- String *widget_colorspacelist;
+-} PrintDialogPart;
+-
+-typedef struct _PrintDialogRec {
+- CorePart core;
+- CompositePart composite;
+- ConstraintPart constraint;
+- FormPart form;
+- PrintDialogPart printdialog;
+-} PrintDialogRec;
+-
+-typedef struct {
+- XtPointer extension;
+-} PrintDialogConstraintsPart;
+-
+-typedef struct _PrintDialogConstraintsRec {
+- FormConstraintsPart form;
+- PrintDialogConstraintsPart printdialog;
+-} PrintDialogConstraintsRec, *PrintDialogConstraints;
+-
+-#endif /* !_XawPrintDialogP_h */
+-
+--
+cgit v0.8.1-24-ge5fb
diff --git a/xorg-app/xmore/xmore-patch5.diff
b/xorg-app/xmore/xmore-patch5.diff
new file mode 100644
index 0000000..0570b15
--- /dev/null
+++ b/xorg-app/xmore/xmore-patch5.diff
@@ -0,0 +1,20 @@
+From d9b5448a77ff3ee06f6128faa69f43066cd16fe1 Mon Sep 17 00:00:00 2001
+From: Julien Cristau<jcristau AT debian.org>
+Date: Wed, 20 Aug 2008 22:46:51 +0000
+Subject: Fix build outside of source dir
+
+---
+diff --git a/Makefile.am b/Makefile.am
+index d8aa027..3ba5868 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -42,6 +42,7 @@ APPDEFAULTFILES = \
+ SUFFIXES = .ad
+
+ .ad:
++ $(mkdir_p) app-defaults
+ cp $< $@
+
+ appdefault_DATA = $(APPDEFAULTFILES)
+--
+cgit v0.8.1-24-ge5fb
diff --git a/xorg-app/xmore/xmore-patch6.diff
b/xorg-app/xmore/xmore-patch6.diff
new file mode 100644
index 0000000..0b8578d
--- /dev/null
+++ b/xorg-app/xmore/xmore-patch6.diff
@@ -0,0 +1,390 @@
+From 747f76737a8e7a7f50bd06fd111e5ada8305884d Mon Sep 17 00:00:00 2001
+From: Julien Cristau<jcristau AT debian.org>
+Date: Sun, 16 Nov 2008 20:49:56 +0000
+Subject: More xprint pruning
+
+---
+diff --git a/app-defaults/XMore.ad b/app-defaults/XMore.ad
+index 98704d9..78b1e0a 100644
+--- a/app-defaults/XMore.ad
++++ b/app-defaults/XMore.ad
+@@ -13,7 +13,6 @@
+ <Key>Return: scroll-one-line-up()\n\
+ <Key>J: scroll-one-line-up()\n\
+ <Key>E: scroll-one-line-up()\n\
+- <Key>p: print()\n\
+ <Key>q: quit()\n
+ *text.baseTranslations: #override\n\
+ <Key>space: next-page()\n\
+@@ -24,107 +23,9 @@
+ <Key>Return: scroll-one-line-up()\n\
+ <Key>J: scroll-one-line-up()\n\
+ <Key>E: scroll-one-line-up()\n\
+- <Key>p: print()\n\
+ <Key>q: quit()\n
+
+ ! tip messages
+ *quit.tip: Quit application
+-*print.tip: Print file
+-
+-! Use "white" as background for printing
+-*printshell*background: white
+-
+-! Print dialog
+-*printdialogshell*geometry: 600x120
+-*printdialogshell*title: Print
+-*printdialogshell*main*ok.fromVert: innerform
+-*printdialogshell*main*ok.label: Print
+-*printdialogshell*main*ok.tip: Print
+-*printdialogshell*main*setup.fromHoriz: ok
+-*printdialogshell*main*setup.fromVert: innerform
+-*printdialogshell*main*setup.label: Setup...
+-*printdialogshell*main*setup.tip: Configure print job
options (page size, orientation, etc.)
+-*printdialogshell*main*cancel.fromHoriz: setup
+-*printdialogshell*main*cancel.fromVert: innerform
+-*printdialogshell*main*cancel.label: Cancel
+-*printdialogshell*main*cancel.tip: Cancel printing
+-*printdialogshell*main*desclabel.label: Printer Description:
+-*printdialogshell*main*desclabel.tip: Short description of
printer
+-*printdialogshell*main*desc.fromHoriz: desclabel
+-*printdialogshell*main*desc.tip: Short description of
printer
+-*printdialogshell*main*info.fromHoriz: desc
+-*printdialogshell*main*info.label: Printer info...
+-*printdialogshell*main*info.tip: Display additional
information about this printer
+-*printdialogshell*main*namelabel.fromVert: desclabel
+-*printdialogshell*main*namelabel.label: Printer Name:
+-*printdialogshell*main*namelabel.tip: Name of selected printer
+-*printdialogshell*main*name.fromHoriz: namelabel
+-*printdialogshell*main*name.fromVert: desclabel
+-*printdialogshell*main*name.tip: Name of selected printer
+-*printdialogshell*main*selectprinter.fromHoriz: name
+-*printdialogshell*main*selectprinter.fromVert: desclabel
+-*printdialogshell*main*selectprinter.label: Select Printer...
+-*printdialogshell*main*selectprinter.label: Select Printer...
+-*printdialogshell*main*selectprinter.tip: Select a different printer
+-*printdialogshell*main*filenamelabel.fromVert: namelabel
+-*printdialogshell*main*filenamelabel.label: File Name:
+-*printdialogshell*main*filenamelabel.tip: File where the output
should be stored
+-*printdialogshell*main*filename.fromHoriz: filenamelabel
+-*printdialogshell*main*filename.fromVert: namelabel
+-*printdialogshell*main*filename.tip: File where the output
should be stored
+-*printdialogshell*main*selectfile.fromHoriz: filename
+-*printdialogshell*main*selectfile.fromVert: namelabel
+-*printdialogshell*main*selectfile.label: Select File...
+-*printdialogshell*main*selectfile.tip: Select file where the
output should be stored
+-*printdialogshell*main*printtoprinter.fromVert: filenamelabel
+-*printdialogshell*main*printtoprinter.label: Print to Printer
+-*printdialogshell*main*printtoprinter.tip: Send print job to printer
+-*printdialogshell*main*printtofile.fromVert: filenamelabel
+-*printdialogshell*main*printtofile.fromHoriz: printtoprinter
+-*printdialogshell*main*printtofile.label: Print to File
+-*printdialogshell*main*printtofile.tip: Save print job in a file
+-
+-! Print job options dialog
+-*printdialogshell*setup*geometry: 600x400
+-*printdialogshell*setup*title: Print: Print job
options
+-*printdialogshell*setup*ok.fromVert: list
+-*printdialogshell*setup*ok.label: OK
+-*printdialogshell*setup*ok.tip: Commit changes
+-*printdialogshell*setup*cancel.fromHoriz: ok
+-*printdialogshell*setup*cancel.fromVert: list
+-*printdialogshell*setup*cancel.label: Cancel
+-*printdialogshell*setup*cancel.tip: Cancel and reset to
defaults
+-*printdialogshell*setup*paperlist.tip: Select paper size
+-*printdialogshell*setup*resolutionlist.fromHoriz: paperlist
+-*printdialogshell*setup*resolutionlist.tip: Select page resolution
+-*printdialogshell*setup*orientationlist.fromHoriz: resolutionlist
+-*printdialogshell*setup*orientationlist.tip: Select page
orientation
+-*printdialogshell*setup*plexlist.fromHoriz: orientationlist
+-*printdialogshell*setup*plexlist.tip: Select page plex mode
(simplex, duplex, etc.)
+-*printdialogshell*setup*colorspacelist.fromHoriz: plexlist
+-*printdialogshell*setup*colorspacelist.tip: Select color space
(color, grayscale, CYMK, etc.)
+-*printdialogshell*setup*jobcopieslabel.fromVert: paperlist
+-*printdialogshell*setup*jobcopieslabel.tip: Set number of job
copies
+-*printdialogshell*setup*jobcopieslabel.label: Job Copies:
+-*printdialogshell*setup*jobcopies.fromHoriz: jobcopieslabel
+-*printdialogshell*setup*jobcopies.fromVert: paperlist
+-*printdialogshell*setup*jobcopies.tip: Set number of job
copies
+-
+-! Printer selection
+-*printdialogshell*printerselection*geometry: 400x150
+-*printdialogshell*printerselection*title: Print: Select printer
+-*printdialogshell*printerselection*ok.fromVert: list
+-*printdialogshell*printerselection*ok.label: OK
+-*printdialogshell*printerselection*ok.tip: Switch printer
+-*printdialogshell*printerselection*cancel.fromHoriz: ok
+-*printdialogshell*printerselection*cancel.fromVert: list
+-*printdialogshell*printerselection*cancel.label: Cancel
+-*printdialogshell*printerselection*cancel.tip: Cancel printer
selection
+-*printdialogshell*printerselection*list.tip: Select printer name
from list
+-
+-! Select job file
+-*printdialogshell*selectfile*geometry: 400x80
+-*printdialogshell*selectfile*title: Print: Select job file
+-*printdialogshell*selectfile*dialog.label: Select Filename:
+
+ ! EOF.
+diff --git a/xmore.c b/xmore.c
+index 4ed6e23..ff8c299 100644
+--- a/xmore.c
++++ b/xmore.c
+@@ -41,13 +41,6 @@ in this Software without prior written authorization from
The Open Group.
+
+ #include "xmore.h"
+
+-#ifdef USE_XPRINT
+-
+-#include "printdialog.h"
+-#include "print.h"
+-
+-#endif
+-
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <limits.h>
+@@ -60,21 +53,14 @@ in this Software without prior written authorization
from The Open Group.
+ #define Log(x) { if (userOptions.verbose) printf x; }
+
+ /* Global vars */
+-static Widget printdialog_shell = NULL;
+-static Widget printdialog = NULL;
+ static Widget toplevel = NULL;
+ static Widget text = NULL;
+-static char printJobNameBuffer[PATH_MAX+256];
+ static const char *ProgramName; /* program name (from argv[0]) */
+ static const char *viewFileName; /* file to browse (from argv[1]) */
+
+ /* prototypes */
+ static void quitAction(Widget w, XEvent *event, String *params, Cardinal
*num_params);
+ static void quitXtProc(Widget w, XtPointer client_data, XtPointer callData);
+-#ifdef USE_XPRINT
+-static void printAction(Widget w, XEvent *event, String *params, Cardinal
*num_params);
+-static void printXtProc(Widget w, XtPointer client_data, XtPointer
callData);
+-#endif
+
+ static XrmOptionDescRec options[] = {
+ {
+@@ -84,9 +70,6 @@ static XrmOptionDescRec options[] = {
+
+ static XtActionsRec actions[] = {
+ { "quit", quitAction },
+-#ifdef USE_XPRINT
+- { "print", printAction }
+-#endif
+ };
+
+ /* See xmore.h */
+@@ -119,7 +102,6 @@ String fallback_resources[] = {
+ "\t<Key>Return: scroll-one-line-up()\\n\\"
+ "\t<Key>J: scroll-one-line-up()\\n\\"
+ "\t<Key>E: scroll-one-line-up()\\n\\"
+- "\t<Key>p: print()\\n\\"
+ "\t<Key>q: quit()\\n",
+ "*text.baseTranslations: #override \\n\\"
+ "\t<Key>space: next-page()\\n\\"
+@@ -130,7 +112,6 @@ String fallback_resources[] = {
+ "\t<Key>Return: scroll-one-line-up()\\n\\"
+ "\t<Key>J: scroll-one-line-up()\\n\\"
+ "\t<Key>E: scroll-one-line-up()\\n\\"
+- "\t<Key>p: print()\\n\\"
+ "\t<Key>q: quit()\\n",
+ NULL,
+ };
+@@ -147,114 +128,10 @@ quitXtProc(Widget w, XtPointer client_data, XtPointer
callData)
+ XtCallActionProc(w, "quit", NULL, NULL, 0);
+ }
+
+-static void
+-printshellDestroyXtProc(Widget w, XtPointer client_data, XtPointer callData)
+-{
+- XawPrintDialogClosePrinterConnection(printdialog, False);
+-}
+-
+-#ifdef USE_XPRINT
+-
+-static void
+-printOKXtProc(Widget w, XtPointer client_data, XtPointer callData)
+-{
+- XawPrintDialogCallbackStruct *pdcs = (XawPrintDialogCallbackStruct
*)callData;
+- Cardinal n;
+- Arg args[2];
+- Widget textsource;
+-
+- Log(("printOKXtProc: OK.\n"));
+-
+- /* Get TextSource object */
+- n = 0;
+- XtSetArg(args[n], XtNtextSource, &textsource); n++;
+- XtGetValues(text, args, n);
+-
+- Assertion(textsource != NULL, (("printOKXtProc: textsource ==
NULL.\n")));
+-
+- /* ||printJobNameBuffer| must live as long the print job prints
+- * because it is used for the job title AND the page headers... */
+- sprintf(printJobNameBuffer, "XMore print job %s", viewFileName);
+-
+- DoPrintTextSource(ProgramName,
+- textsource, toplevel,
+- pdcs->pdpy, pdcs->pcontext, pdcs->colorspace,
+- printshellDestroyXtProc,
+- printJobNameBuffer,
+- pdcs->printToFile?pdcs->printToFileName:NULL);
+-
+- XtPopdown(printdialog_shell);
+-}
+-
+-static void
+-printCancelXtProc(Widget w, XtPointer client_data, XtPointer callData)
+-{
+- Log(("printCancelXtProc: cancel.\n"));
+- XtPopdown(printdialog_shell);
+-
+- Log(("destroying print dialog shell...\n"));
+- XtDestroyWidget(printdialog_shell);
+- printdialog_shell = NULL;
+- printdialog = NULL;
+- Log(("... done\n"));
+-}
+-
+-static void
+-printXtProc(Widget w, XtPointer client_data, XtPointer callData)
+-{
+- XtCallActionProc(toplevel, "print", NULL, NULL, 0);
+-}
+-
+-static void
+-printAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
+-{
+- Dimension width, height;
+- Position x, y;
+- Widget parent = toplevel;
+- Log(("print!\n"));
+-
+- if (!printdialog) {
+- int n;
+- Arg args[20];
+-
+- n = 0;
+- XtSetArg(args[n], XtNallowShellResize, True); n++;
+- printdialog_shell = XtCreatePopupShell("printdialogshell",
+- transientShellWidgetClass,
+- toplevel, args, n);
+- n = 0;
+- printdialog = XtCreateManagedWidget("printdialog",
printDialogWidgetClass,
+- printdialog_shell, args, n);
+- XtAddCallback(printdialog, XawNOkCallback, printOKXtProc, NULL);
+- XtAddCallback(printdialog, XawNCancelCallback, printCancelXtProc, NULL);
+-
+- XtRealizeWidget(printdialog_shell);
+- }
+-
+- /* Center dialog */
+- XtVaGetValues(printdialog_shell,
+- XtNwidth, &width,
+- XtNheight, &height,
+- NULL);
+-
+- x = (Position)(XWidthOfScreen( XtScreen(parent)) - width) / 2;
+- y = (Position)(XHeightOfScreen(XtScreen(parent)) - height) / 3;
+-
+- XtVaSetValues(printdialog_shell,
+- XtNx, x,
+- XtNy, y,
+- NULL);
+-
+- XtPopup(printdialog_shell, XtGrabNonexclusive);
+-}
+-
+-#endif
+-
+ int main( int argc, char *argv[] )
+ {
+ XtAppContext app;
+ Widget form;
+- Widget printbutton;
+ Widget quitbutton;
+ int n;
+ Arg args[8];
+@@ -292,25 +169,13 @@ int main( int argc, char *argv[] )
+ XtSetArg(args[n], XtNfontSet, userOptions.textfont); n++;
+ text = XtCreateManagedWidget("text", asciiTextWidgetClass, form, args, n);
+
+-#ifdef USE_XPRINT
+ n = 0;
+- XtSetArg(args[n], XtNfromHoriz, NULL); n++;
+- XtSetArg(args[n], XtNfromVert, text); n++;
+- XtSetArg(args[n], XtNlabel, "Print..."); n++;
+- printbutton = XtCreateManagedWidget("print", commandWidgetClass, form,
args, n);
+- XtAddCallback(printbutton, XtNcallback, printXtProc, 0);
+-#endif
+-
+- n = 0;
+- XtSetArg(args[n], XtNfromHoriz, printbutton); n++;
++ XtSetArg(args[n], XtNfromHoriz, NULL); n++;
+ XtSetArg(args[n], XtNfromVert, text); n++;
+ XtSetArg(args[n], XtNlabel, "Quit"); n++;
+ quitbutton = XtCreateManagedWidget("quit", commandWidgetClass, form,
args, n);
+ XtAddCallback(quitbutton, XtNcallback, quitXtProc, 0);
+
+- printdialog_shell = NULL;
+- printdialog = NULL;
+-
+ XtRealizeWidget(toplevel);
+
+ XtAppMainLoop(app);
+diff --git a/xmore.man b/xmore.man
+index 2936397..6475822 100644
+--- a/xmore.man
++++ b/xmore.man
+@@ -12,12 +12,5 @@ xmore \- plain text display program for the X Window
System
+ .ad b
+ .SH DESCRIPTION
+ xmore is a plain text browser.
+-.SH ENVIRONMENT
+-.TP
+-\fBXPSERVERLIST\fR
+-\fB${XPSERVERLIST}\fR must be set,
+-identifying the available Xprint servers.
+-See \fBXprint\fR(__miscmansuffix__)
+-for more details.
+ .SH "SEE ALSO"
+ \fBX11\fR(__miscmansuffix__), \fBxman\fR(__appmansuffix__)
+diff --git a/xmore.sgml b/xmore.sgml
+index ec766c0..a92b317 100644
+--- a/xmore.sgml
++++ b/xmore.sgml
+@@ -38,24 +38,6 @@ manual volume numbers.
+
+ </refsect1>
+
+- <refsect1>
+- <title>ENVIRONMENT</title>
+- <variablelist>
+- <varlistentry>
+- <term><envar>XPSERVERLIST</envar>
+- </term>
+- <listitem>
+- <para>
+- <envar>${XPSERVERLIST}</envar> must be set,
+- identifying the available Xprint servers.
+- See
<citerefentry><refentrytitle>Xprint</refentrytitle><manvolnum>__miscmansuffix__</manvolnum></citerefentry>
+- for more details.
+- </para>
+- </listitem>
+- </varlistentry>
+- </variablelist>
+- </refsect1>
+-
+ <!-- not yet
+ <refsect1>
+ <title>KNOWN BUGS</title>
+@@ -71,7 +53,6 @@ manual volume numbers.
+ <!-- specific references -->
+ <!-- none -->
+
+- <!-- Xprint general references -->
+
<member><citerefentry><refentrytitle>X11</refentrytitle><manvolnum>__miscmansuffix__</manvolnum></citerefentry></member>
+
<member><citerefentry><refentrytitle>xman</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
+ </simplelist>
+--
+cgit v0.8.1-24-ge5fb
diff --git a/xorg-app/xmore/xmore-patch7.diff
b/xorg-app/xmore/xmore-patch7.diff
new file mode 100644
index 0000000..239a8a5
--- /dev/null
+++ b/xorg-app/xmore/xmore-patch7.diff
@@ -0,0 +1,156 @@
+From ab8110b8978cb965d49e0c2e9c1cb7e7608c185e Mon Sep 17 00:00:00 2001
+From: Paulo Cesar Pereira de Andrade<pcpa AT mandriva.com.br>
+Date: Thu, 22 Jan 2009 18:49:25 +0000
+Subject: Correct make distcheck and sparse warnings.
+
+---
+diff --git a/Makefile.am b/Makefile.am
+index 3ba5868..63e18dc 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -21,7 +21,7 @@
+
+ bin_PROGRAMS = xmore
+
+-xmore_CFLAGS = $(XMORE_CFLAGS) -DXMORE
++AM_CFLAGS = $(XMORE_CFLAGS) -DXMORE
+ xmore_LDADD = $(XMORE_LIBS)
+
+ xmore_SOURCES = \
+@@ -31,34 +31,22 @@ xmore_SOURCES = \
+ appman_PRE = \
+ xmore.man
+
+-# App default files (*.ad)
++# App default files
++DISTCHECK_CONFIGURE_FLAGS =
--with-appdefaultdir=\$${datadir}/X11/app-defaults
+
+ appdefaultdir = @appdefaultdir@
+
+-
+-APPDEFAULTFILES = \
++dist_appdefault_DATA = \
+ app-defaults/XMore
+
+-SUFFIXES = .ad
+-
+-.ad:
+- $(mkdir_p) app-defaults
+- cp $< $@
+-
+-appdefault_DATA = $(APPDEFAULTFILES)
+-
+-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad)
+-
+-CLEANFILES = $(APPDEFAULTFILES)
+-
+-EXTRA_DIST += xmore.sgml
++EXTRA_DIST = xmore.sgml
+
+ appmandir = $(APP_MAN_DIR)
+
+ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+
+ EXTRA_DIST += $(appman_PRE)
+-CLEANFILES += $(appman_DATA)
++CLEANFILES = $(appman_DATA)
+
+ SED = sed
+
+@@ -79,7 +67,7 @@ MAN_SUBSTS = \
+ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+-SUFFIXES += .$(APP_MAN_SUFFIX) .man
++SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+ .man.$(APP_MAN_SUFFIX):
+ sed $(MAN_SUBSTS) < $< > $@
+diff --git a/app-defaults/XMore.ad b/app-defaults/XMore.ad
+index 78b1e0a..9227efa 100644
+--- a/app-defaults/XMore.ad
++++ b/app-defaults/XMore.ad
+@@ -28,4 +28,6 @@
+ ! tip messages
+ *quit.tip: Quit application
+
++*international: True
++
+ ! EOF.
+diff --git a/configure.ac b/configure.ac
+index 34d6aa6..a427a9c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,23 +26,34 @@ AC_INIT(xmore,[1.0.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+
++# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
++m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or
later before running autoconf/autogen])])
++XORG_MACROS_VERSION(1.2)
++
+ AM_CONFIG_HEADER(config.h)
+
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+
++XORG_CWARNFLAGS
++
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XMORE, xaw7)
+-
++XMORE_CFLAGS="$CWARNFLAGS $XMORE_CFLAGS"
+ AC_SUBST(XMORE_CFLAGS)
+ AC_SUBST(XMORE_LIBS)
+
+ PKG_CHECK_MODULES(APPDEFS, xt)
+-appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
++xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
++AC_ARG_WITH(appdefaultdir,
++ AC_HELP_STRING([--with-appdefaultdir=<pathname>],
++ [specify directory for app-defaults files (default is
autodetected)]),
++ [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
+ AC_SUBST(appdefaultdir)
+
+ XORG_MANPAGE_SECTIONS
+ XORG_RELEASE_VERSION
++XORG_CHANGELOG
+
+ AC_OUTPUT([Makefile])
+diff --git a/xmore.c b/xmore.c
+index ff8c299..ed6be29 100644
+--- a/xmore.c
++++ b/xmore.c
+@@ -73,17 +73,17 @@ static XtActionsRec actions[] = {
+ };
+
+ /* See xmore.h */
+-XMoreResourceData userOptions;
++static XMoreResourceData userOptions;
+
+ #define Offset(field) XtOffsetOf(XMoreResourceData, field)
+
+-XtResource resources[] = {
++static XtResource resources[] = {
+ {"verbose", "Verbose", XtRBoolean, sizeof(Boolean), Offset(verbose),
XtRImmediate, (XtPointer)False},
+ {"textfont", XtCFont, XtRFontSet, sizeof(XFontSet), Offset(textfont),
XtRString, STANDARDFONT},
+ };
+
+
+-String fallback_resources[] = {
++static String fallback_resources[] = {
+ #ifdef NOTYET
+ "*iconPixmap: xmore32",
+ "*iconMask: xmore32",
+@@ -174,7 +174,7 @@ int main( int argc, char *argv[] )
+ XtSetArg(args[n], XtNfromVert, text); n++;
+ XtSetArg(args[n], XtNlabel, "Quit"); n++;
+ quitbutton = XtCreateManagedWidget("quit", commandWidgetClass, form,
args, n);
+- XtAddCallback(quitbutton, XtNcallback, quitXtProc, 0);
++ XtAddCallback(quitbutton, XtNcallback, quitXtProc, NULL);
+
+ XtRealizeWidget(toplevel);
+
+--
+cgit v0.8.1-24-ge5fb
diff --git a/xorg-app/xphelloworld/BUILD b/xorg-app/xphelloworld/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-app/xphelloworld/BUILD
@@ -0,0 +1 @@
+true
diff --git a/xorg-app/xphelloworld/DEPENDS b/xorg-app/xphelloworld/DEPENDS
deleted file mode 100755
index a1b8062..0000000
--- a/xorg-app/xphelloworld/DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-depends util-macros &&
-depends libx11 &&
-depends libxaw &&
-depends libxprintutil &&
-depends libxprintapputil &&
-depends libxt
diff --git a/xorg-app/xphelloworld/DETAILS b/xorg-app/xphelloworld/DETAILS
index 2fe9e9d..142de95 100755
--- a/xorg-app/xphelloworld/DETAILS
+++ b/xorg-app/xphelloworld/DETAILS
@@ -1,16 +1,9 @@
SPELL=xphelloworld
PKG=xphelloworld
- VERSION=1.0.1
- XORG_VER=X11R7.0
- SOURCE=${PKG}-${XORG_VER}-${VERSION}.tar.bz2
-
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/${XORG_VER}/src/app/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
+ VERSION=DEAD
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
SHORT="Module xphelloworld for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xphelloworld/HISTORY b/xorg-app/xphelloworld/HISTORY
index aac3e9a..4f590cd 100644
--- a/xorg-app/xphelloworld/HISTORY
+++ b/xorg-app/xphelloworld/HISTORY
@@ -1,3 +1,11 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * TRIGGERS: dispel_self
+ * INSTALL: noop
+ * PRE_BUILD: noop
+ * BUILD: noop
+ * DEPENDS: removed
+ * DETAILS: noop
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xphelloworld/INSTALL b/xorg-app/xphelloworld/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-app/xphelloworld/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/xorg-app/xphelloworld/PRE_BUILD b/xorg-app/xphelloworld/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-app/xphelloworld/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/xorg-app/xphelloworld/TRIGGERS b/xorg-app/xphelloworld/TRIGGERS
new file mode 100755
index 0000000..8da5091
--- /dev/null
+++ b/xorg-app/xphelloworld/TRIGGERS
@@ -0,0 +1,3 @@
+on_cast libxp dispel_self
+on_cast xphelloworld dispel_self
+
diff --git a/xorg-app/xphelloworld/xphelloworld-X11R7.0-1.0.1.tar.bz2.sig
b/xorg-app/xphelloworld/xphelloworld-X11R7.0-1.0.1.tar.bz2.sig
deleted file mode 100644
index db180b0..0000000
Binary files a/xorg-app/xphelloworld/xphelloworld-X11R7.0-1.0.1.tar.bz2.sig
and /dev/null differ
diff --git a/xorg-app/xplsprinters/BUILD b/xorg-app/xplsprinters/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-app/xplsprinters/BUILD
@@ -0,0 +1 @@
+true
diff --git a/xorg-app/xplsprinters/DEPENDS b/xorg-app/xplsprinters/DEPENDS
deleted file mode 100755
index 53c9387..0000000
--- a/xorg-app/xplsprinters/DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-depends util-macros &&
-depends libx11 &&
-depends libxprintutil &&
-depends libxt
diff --git a/xorg-app/xplsprinters/DETAILS b/xorg-app/xplsprinters/DETAILS
index 611fb2b..06e9617 100755
--- a/xorg-app/xplsprinters/DETAILS
+++ b/xorg-app/xplsprinters/DETAILS
@@ -1,16 +1,9 @@
SPELL=xplsprinters
PKG=xplsprinters
- VERSION=1.0.1
- XORG_VER=X11R7.0
- SOURCE=${PKG}-${XORG_VER}-${VERSION}.tar.bz2
-
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/${XORG_VER}/src/app/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
+ VERSION=DEAD
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
SHORT="shows a list of Xprint printers and it's attributes"
cat << EOF
xplsprinters is a utility for Xprint, the printing system for the X Window
diff --git a/xorg-app/xplsprinters/HISTORY b/xorg-app/xplsprinters/HISTORY
index 1de1cdc..1b4b8e9 100644
--- a/xorg-app/xplsprinters/HISTORY
+++ b/xorg-app/xplsprinters/HISTORY
@@ -1,3 +1,11 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: noop
+ * DEPENDS: removed
+ * DETAILS: noop
+ * INSTALL: noop
+ * PRE_BUILD: noop
+ * TRIGGERS: dispel_self
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xplsprinters/INSTALL b/xorg-app/xplsprinters/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-app/xplsprinters/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/xorg-app/xplsprinters/PRE_BUILD b/xorg-app/xplsprinters/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-app/xplsprinters/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/xorg-app/xplsprinters/TRIGGERS b/xorg-app/xplsprinters/TRIGGERS
new file mode 100755
index 0000000..e0074f7
--- /dev/null
+++ b/xorg-app/xplsprinters/TRIGGERS
@@ -0,0 +1,3 @@
+on_cast libxp dispel_self
+on_cast xplsprinters dispel_self
+
diff --git a/xorg-app/xplsprinters/xplsprinters-X11R7.0-1.0.1.tar.bz2.sig
b/xorg-app/xplsprinters/xplsprinters-X11R7.0-1.0.1.tar.bz2.sig
deleted file mode 100644
index f10071a..0000000
Binary files a/xorg-app/xplsprinters/xplsprinters-X11R7.0-1.0.1.tar.bz2.sig
and /dev/null differ
diff --git a/xorg-app/xprehashprinterlist/BUILD
b/xorg-app/xprehashprinterlist/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-app/xprehashprinterlist/BUILD
@@ -0,0 +1 @@
+true
diff --git a/xorg-app/xprehashprinterlist/DEPENDS
b/xorg-app/xprehashprinterlist/DEPENDS
deleted file mode 100755
index cd676e7..0000000
--- a/xorg-app/xprehashprinterlist/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-depends util-macros &&
-depends libx11 &&
-depends libxp
diff --git a/xorg-app/xprehashprinterlist/DETAILS
b/xorg-app/xprehashprinterlist/DETAILS
index 49d6e0e..d0132de 100755
--- a/xorg-app/xprehashprinterlist/DETAILS
+++ b/xorg-app/xprehashprinterlist/DETAILS
@@ -1,16 +1,9 @@
SPELL=xprehashprinterlist
PKG=xprehashprinterlist
- VERSION=1.0.1
- XORG_VER=X11R7.0
- SOURCE=${PKG}-${XORG_VER}-${VERSION}.tar.bz2
-
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/${XORG_VER}/src/app/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
+ VERSION=DEAD
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
SHORT="Module xprehashprinterlist for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xprehashprinterlist/HISTORY
b/xorg-app/xprehashprinterlist/HISTORY
index 6dfee7b..cec0b4c 100644
--- a/xorg-app/xprehashprinterlist/HISTORY
+++ b/xorg-app/xprehashprinterlist/HISTORY
@@ -1,3 +1,11 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: noop
+ * INSTALL: noop
+ * PRE_BUILD: noop
+ * TRIGGERS: dispel_self
+ * DETAILS: noop
+ * DEPENDS: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xprehashprinterlist/INSTALL
b/xorg-app/xprehashprinterlist/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-app/xprehashprinterlist/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/xorg-app/xprehashprinterlist/PRE_BUILD
b/xorg-app/xprehashprinterlist/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-app/xprehashprinterlist/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/xorg-app/xprehashprinterlist/TRIGGERS
b/xorg-app/xprehashprinterlist/TRIGGERS
new file mode 100755
index 0000000..17190c4
--- /dev/null
+++ b/xorg-app/xprehashprinterlist/TRIGGERS
@@ -0,0 +1,3 @@
+on_cast libxp dispel_self
+on_cast xprehashprinterlist dispel_self
+
diff --git
a/xorg-app/xprehashprinterlist/xprehashprinterlist-X11R7.0-1.0.1.tar.bz2.sig
b/xorg-app/xprehashprinterlist/xprehashprinterlist-X11R7.0-1.0.1.tar.bz2.sig
deleted file mode 100644
index 25b3074..0000000
Binary files
a/xorg-app/xprehashprinterlist/xprehashprinterlist-X11R7.0-1.0.1.tar.bz2.sig
and /dev/null differ
diff --git a/xorg-app/xrx/BUILD b/xorg-app/xrx/BUILD
deleted file mode 100755
index d0067e7..0000000
--- a/xorg-app/xrx/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XRX_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-app/xrx/CONFIGURE b/xorg-app/xrx/CONFIGURE
deleted file mode 100755
index f0a3070..0000000
--- a/xorg-app/xrx/CONFIGURE
+++ /dev/null
@@ -1,6 +0,0 @@
-config_query_option XRX_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
-
diff --git a/xorg-app/xrx/DEPENDS b/xorg-app/xrx/DEPENDS
index febf06f..fd58761 100755
--- a/xorg-app/xrx/DEPENDS
+++ b/xorg-app/xrx/DEPENDS
@@ -3,4 +3,5 @@ depends libx11 &&
depends libxt &&
depends libxext &&
depends xtrans &&
+depends -sub XAW7 libxaw &&
depends xproxymanagementprotocol
diff --git a/xorg-app/xrx/DETAILS b/xorg-app/xrx/DETAILS
index 281aa12..8ba4419 100755
--- a/xorg-app/xrx/DETAILS
+++ b/xorg-app/xrx/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="Module xrx for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xrx/HISTORY b/xorg-app/xrx/HISTORY
index b71b4dc..bdbf52f 100644
--- a/xorg-app/xrx/HISTORY
+++ b/xorg-app/xrx/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: missing dep on xaw
+ * DETAILS: patchlevel++
+ * CONFIGURE: removed
+ * BUILD: removed
+
2009-01-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 1.0.2
diff --git a/xorg-app/xset/DEPENDS b/xorg-app/xset/DEPENDS
index 52f6220..0a8a08f 100755
--- a/xorg-app/xset/DEPENDS
+++ b/xorg-app/xset/DEPENDS
@@ -7,6 +7,4 @@ optional_depends libx11 "" "" "Someone needs to describe this
nicely." &&
optional_depends xf86miscproto "" "" "Someone needs to describe this
nicely." &&
optional_depends libxxf86misc "" "" "Someone needs to describe this nicely."
&&
optional_depends fontcacheproto "" "" "Someone needs to describe this
nicely." &&
-optional_depends libxfontcache "" "" "Someone needs to describe this
nicely." &&
-optional_depends printproto "" "" "Someone needs to describe this nicely."
&&
-optional_depends libxp "" "" "Someone needs to describe this nicely."
+optional_depends libxfontcache "" "" "Someone needs to describe this
nicely."
diff --git a/xorg-app/xset/DETAILS b/xorg-app/xset/DETAILS
index e15fbcd..a2a7163 100755
--- a/xorg-app/xset/DETAILS
+++ b/xorg-app/xset/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org/wiki
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="user preference utility for X"
cat << EOF
This program is used to set various user preference options of the
diff --git a/xorg-app/xset/HISTORY b/xorg-app/xset/HISTORY
index 63e401d..759cd64 100644
--- a/xorg-app/xset/HISTORY
+++ b/xorg-app/xset/HISTORY
@@ -1,3 +1,7 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: no more XPrint
+ * DETAILS: patchlevel++
+
2008-08-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: there is no xorg-modular grimoire

diff --git a/xorg-app/xsm/BUILD b/xorg-app/xsm/BUILD
deleted file mode 100755
index 3d81dd8..0000000
--- a/xorg-app/xsm/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTS="$XSM_OPTS $OPTS" &&
-default_build
diff --git a/xorg-app/xsm/CONFIGURE b/xorg-app/xsm/CONFIGURE
deleted file mode 100755
index e1b7539..0000000
--- a/xorg-app/xsm/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XSM_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xsm/DEPENDS b/xorg-app/xsm/DEPENDS
index 6174b20..d915201 100755
--- a/xorg-app/xsm/DEPENDS
+++ b/xorg-app/xsm/DEPENDS
@@ -1,3 +1,3 @@
depends util-macros &&
-depends libxaw &&
+depends -sub XAW7 libxaw &&
depends RSH
diff --git a/xorg-app/xsm/DETAILS b/xorg-app/xsm/DETAILS
index 5d7933b..ce15f0d 100755
--- a/xorg-app/xsm/DETAILS
+++ b/xorg-app/xsm/DETAILS
@@ -8,9 +8,8 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
+ PATCHLEVEL=1
SHORT="Module xsm for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xsm/HISTORY b/xorg-app/xsm/HISTORY
index 4ddbba8..80adb4b 100644
--- a/xorg-app/xsm/HISTORY
+++ b/xorg-app/xsm/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: killing of XPrint, correction
+ * DETAILS: patchlevel++
+ * BUILD: removed
+ * CONFIGURE: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-app/xvidtune/BUILD b/xorg-app/xvidtune/BUILD
deleted file mode 100755
index d903019..0000000
--- a/xorg-app/xvidtune/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTS="$XVIDTUNE_OPTS $OPTS" &&
-default_build
diff --git a/xorg-app/xvidtune/CONFIGURE b/xorg-app/xvidtune/CONFIGURE
deleted file mode 100755
index 5ae6c59..0000000
--- a/xorg-app/xvidtune/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XVIDTUNE_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/xvidtune/DEPENDS b/xorg-app/xvidtune/DEPENDS
index cee096f..77c2e98 100755
--- a/xorg-app/xvidtune/DEPENDS
+++ b/xorg-app/xvidtune/DEPENDS
@@ -1,3 +1,3 @@
depends util-macros &&
-depends libxaw &&
+depends -sub XAW7 libxaw &&
depends libxxf86vm
diff --git a/xorg-app/xvidtune/DETAILS b/xorg-app/xvidtune/DETAILS
index bef3ced..512e519 100755
--- a/xorg-app/xvidtune/DETAILS
+++ b/xorg-app/xvidtune/DETAILS
@@ -8,9 +8,8 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
+ PATCHLEVEL=1
SHORT="Module xvidtune for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-app/xvidtune/HISTORY b/xorg-app/xvidtune/HISTORY
index 2319700..fcd8b18 100644
--- a/xorg-app/xvidtune/HISTORY
+++ b/xorg-app/xvidtune/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: patchlevel++
+ * DEPENDS: killing of XPrint
+ * CONFIGURE: removed
+ * BUILD: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-lib/libxaw/DEPENDS b/xorg-lib/libxaw/DEPENDS
index f09cef6..8c2d23d 100755
--- a/xorg-lib/libxaw/DEPENDS
+++ b/xorg-lib/libxaw/DEPENDS
@@ -7,8 +7,4 @@ depends libx11 &&
depends libxext &&
depends libxt &&
depends libxmu &&
-depends libxpm &&
-optional_depends libxp \
- "--enable-xaw8" \
- "--disable-xaw8" \
- "Build libxaw.so.8"
+depends libxpm
diff --git a/xorg-lib/libxaw/DETAILS b/xorg-lib/libxaw/DETAILS
index 36f9ced..241dd1f 100755
--- a/xorg-lib/libxaw/DETAILS
+++ b/xorg-lib/libxaw/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="X Athena Widgets"
cat << EOF
Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library.
diff --git a/xorg-lib/libxaw/HISTORY b/xorg-lib/libxaw/HISTORY
index da95c5b..ccbcfea 100644
--- a/xorg-lib/libxaw/HISTORY
+++ b/xorg-lib/libxaw/HISTORY
@@ -1,3 +1,10 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: xprint no longer supported
+ * PRE_SUB_DEPENDS: no more XAW8
+ * SUB_DEPENDS: no more XAW8
+ * REPAIR^all^PRE_SUB_DEPENDS: added noop to XAW8
+ * DETAILS: patchlevel++
+
2009-01-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 1.0.5

diff --git a/xorg-lib/libxaw/PRE_SUB_DEPENDS b/xorg-lib/libxaw/PRE_SUB_DEPENDS
index b349d9f..98672ab 100755
--- a/xorg-lib/libxaw/PRE_SUB_DEPENDS
+++ b/xorg-lib/libxaw/PRE_SUB_DEPENDS
@@ -1,7 +1,6 @@
case $THIS_SUB_DEPENDS in
XAW7) [ -f $INSTALL_ROOT/usr/lib/libXaw7.so ] ;;
- XAW8) [ -f $INSTALL_ROOT/usr/lib/libXaw8.so ] ||
- is_depends_enabled $SPELL libxp ;;
-*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ XAW8) true ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/xorg-lib/libxaw/REPAIR^all^PRE_SUB_DEPENDS
b/xorg-lib/libxaw/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..98672ab
--- /dev/null
+++ b/xorg-lib/libxaw/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ XAW7) [ -f $INSTALL_ROOT/usr/lib/libXaw7.so ] ;;
+ XAW8) true ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/xorg-lib/libxaw/SUB_DEPENDS b/xorg-lib/libxaw/SUB_DEPENDS
index 3f9c586..c58d5fb 100755
--- a/xorg-lib/libxaw/SUB_DEPENDS
+++ b/xorg-lib/libxaw/SUB_DEPENDS
@@ -1,7 +1,7 @@
case "$THIS_SUB_DEPENDS" in
XAW7) list_remove LIBXAW_OPTS "--disable-xaw7"
list_add LIBXAW_OPTS "--enable-xaw7";;
- XAW8) depends libxp "--enable-xaw8" ;;
-*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ XAW8) true ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/xorg-lib/libxp/BUILD b/xorg-lib/libxp/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-lib/libxp/BUILD
@@ -0,0 +1 @@
+true
diff --git a/xorg-lib/libxp/DEPENDS b/xorg-lib/libxp/DEPENDS
deleted file mode 100755
index 155adb2..0000000
--- a/xorg-lib/libxp/DEPENDS
+++ /dev/null
@@ -1,8 +0,0 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends printproto &&
-depends libxau &&
-depends libx11 &&
-depends libxext
diff --git a/xorg-lib/libxp/DETAILS b/xorg-lib/libxp/DETAILS
index 1c18045..6b3ba95 100755
--- a/xorg-lib/libxp/DETAILS
+++ b/xorg-lib/libxp/DETAILS
@@ -1,16 +1,9 @@
SPELL=libxp
PKG=libXp
- VERSION=1.0.0
- XORG_VER=X11R7.0
- SOURCE=${PKG}-${XORG_VER}-${VERSION}.tar.bz2
-
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/${XORG_VER}/src/lib/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
+ VERSION=DEAD
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
SHORT="Xprint client library"
cat << EOF
libXp is an Xprint client library, it provides public APIs to allow client
diff --git a/xorg-lib/libxp/HISTORY b/xorg-lib/libxp/HISTORY
index 1488078..de386fe 100644
--- a/xorg-lib/libxp/HISTORY
+++ b/xorg-lib/libxp/HISTORY
@@ -1,3 +1,11 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: removed
+ * BUILD: noop
+ * INSTALL: noop
+ * PRE_BUILD: noop
+ * TRIGGERS: kill self off
+ * DETAILS: noop
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-lib/libxp/INSTALL b/xorg-lib/libxp/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-lib/libxp/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/xorg-lib/libxp/PRE_BUILD b/xorg-lib/libxp/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-lib/libxp/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/xorg-lib/libxp/TRIGGERS b/xorg-lib/libxp/TRIGGERS
new file mode 100755
index 0000000..6588270
--- /dev/null
+++ b/xorg-lib/libxp/TRIGGERS
@@ -0,0 +1 @@
+on_cast libxp dispel_self
diff --git a/xorg-lib/libxp/libXp-X11R7.0-1.0.0.tar.bz2.sig
b/xorg-lib/libxp/libXp-X11R7.0-1.0.0.tar.bz2.sig
deleted file mode 100644
index 1b04ecb..0000000
Binary files a/xorg-lib/libxp/libXp-X11R7.0-1.0.0.tar.bz2.sig and /dev/null
differ
diff --git a/xorg-lib/libxprintapputil/BUILD b/xorg-lib/libxprintapputil/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-lib/libxprintapputil/BUILD
@@ -0,0 +1 @@
+true
diff --git a/xorg-lib/libxprintapputil/DEPENDS
b/xorg-lib/libxprintapputil/DEPENDS
deleted file mode 100755
index 2c96099..0000000
--- a/xorg-lib/libxprintapputil/DEPENDS
+++ /dev/null
@@ -1,7 +0,0 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends libxprintutil &&
-depends libx11 &&
-depends libxp
diff --git a/xorg-lib/libxprintapputil/DETAILS
b/xorg-lib/libxprintapputil/DETAILS
index 2a2413d..ad95873 100755
--- a/xorg-lib/libxprintapputil/DETAILS
+++ b/xorg-lib/libxprintapputil/DETAILS
@@ -1,16 +1,9 @@
SPELL=libxprintapputil
PKG=libXprintAppUtil
- VERSION=1.0.1
- XORG_VER=X11R7.0
- SOURCE=${PKG}-${XORG_VER}-${VERSION}.tar.bz2
-
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/${XORG_VER}/src/lib/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
+ VERSION=DEAD
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
SHORT="Module libxprintapputil for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-lib/libxprintapputil/HISTORY
b/xorg-lib/libxprintapputil/HISTORY
index 510fbe7..f435905 100644
--- a/xorg-lib/libxprintapputil/HISTORY
+++ b/xorg-lib/libxprintapputil/HISTORY
@@ -1,3 +1,11 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: noop
+ * DETAILS: noop
+ * INSTALL: noop
+ * PRE_BUILD: noop
+ * TRIGGERS: dispel_self
+ * DEPENDS: removed
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-lib/libxprintapputil/INSTALL
b/xorg-lib/libxprintapputil/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-lib/libxprintapputil/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/xorg-lib/libxprintapputil/PRE_BUILD
b/xorg-lib/libxprintapputil/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-lib/libxprintapputil/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/xorg-lib/libxprintapputil/TRIGGERS
b/xorg-lib/libxprintapputil/TRIGGERS
new file mode 100755
index 0000000..761357f
--- /dev/null
+++ b/xorg-lib/libxprintapputil/TRIGGERS
@@ -0,0 +1,2 @@
+on_cast libxp dispel_self
+on_cast libxprintapputil dispel_self
diff --git
a/xorg-lib/libxprintapputil/libXprintAppUtil-X11R7.0-1.0.1.tar.bz2.sig
b/xorg-lib/libxprintapputil/libXprintAppUtil-X11R7.0-1.0.1.tar.bz2.sig
deleted file mode 100644
index ce69f7a..0000000
Binary files
a/xorg-lib/libxprintapputil/libXprintAppUtil-X11R7.0-1.0.1.tar.bz2.sig and
/dev/null differ
diff --git a/xorg-lib/libxprintutil/BUILD b/xorg-lib/libxprintutil/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-lib/libxprintutil/BUILD
@@ -0,0 +1 @@
+true
diff --git a/xorg-lib/libxprintutil/DEPENDS b/xorg-lib/libxprintutil/DEPENDS
deleted file mode 100755
index d750d5a..0000000
--- a/xorg-lib/libxprintutil/DEPENDS
+++ /dev/null
@@ -1,7 +0,0 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends libx11 &&
-depends libxp &&
-depends libxt
diff --git a/xorg-lib/libxprintutil/DETAILS b/xorg-lib/libxprintutil/DETAILS
index 3a9d6cb..e513432 100755
--- a/xorg-lib/libxprintutil/DETAILS
+++ b/xorg-lib/libxprintutil/DETAILS
@@ -1,16 +1,9 @@
SPELL=libxprintutil
PKG=libXprintUtil
- VERSION=1.0.1
- XORG_VER=X11R7.0
- SOURCE=${PKG}-${XORG_VER}-${VERSION}.tar.bz2
-
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/${XORG_VER}/src/lib/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
+ VERSION=DEAD
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- UPDATED=20051125
LICENSE[0]=XCL
- BUILD_API=2
SHORT="Module libxprintutil for xorg"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-lib/libxprintutil/HISTORY b/xorg-lib/libxprintutil/HISTORY
index 14e8517..d965152 100644
--- a/xorg-lib/libxprintutil/HISTORY
+++ b/xorg-lib/libxprintutil/HISTORY
@@ -1,3 +1,11 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: noop
+ * TRIGGERS: dispel_self
+ * PRE_BUILD: noop
+ * INSTALL: noop
+ * DEPENDS: removed
+ * BUILD: noop
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-lib/libxprintutil/INSTALL b/xorg-lib/libxprintutil/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-lib/libxprintutil/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/xorg-lib/libxprintutil/PRE_BUILD
b/xorg-lib/libxprintutil/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xorg-lib/libxprintutil/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/xorg-lib/libxprintutil/TRIGGERS b/xorg-lib/libxprintutil/TRIGGERS
new file mode 100755
index 0000000..6490258
--- /dev/null
+++ b/xorg-lib/libxprintutil/TRIGGERS
@@ -0,0 +1,3 @@
+on_cast libxp dispel_self
+on_cast libxprintutil dispel_self
+
diff --git a/xorg-lib/libxprintutil/libXprintUtil-X11R7.0-1.0.1.tar.bz2.sig
b/xorg-lib/libxprintutil/libXprintUtil-X11R7.0-1.0.1.tar.bz2.sig
deleted file mode 100644
index 8f37340..0000000
Binary files a/xorg-lib/libxprintutil/libXprintUtil-X11R7.0-1.0.1.tar.bz2.sig
and /dev/null differ
diff --git a/xorg-util/xorg-cf-files/05_xaw_without_xp.diff
b/xorg-util/xorg-cf-files/05_xaw_without_xp.diff
new file mode 100644
index 0000000..d327c45
--- /dev/null
+++ b/xorg-util/xorg-cf-files/05_xaw_without_xp.diff
@@ -0,0 +1,27 @@
+---
+ xorg-cf-files/FreeBSD.cf | 10 ++++++++++
+ xorg-cf-files/gnu.cf | 10 ++++++++++
+ xorg-cf-files/linux.cf | 10 ++++++++++
+ 3 files changed, 30 insertions(+)
+
+Index: xutils-dev/xorg-cf-files/linux.cf
+===================================================================
+--- xutils-dev.orig/xorg-cf-files/linux.cf 2008-06-01 18:36:51.000000000
+0200
++++ xutils-dev/xorg-cf-files/linux.cf 2008-06-01 18:36:51.000000000 +0200
+@@ -1153,6 +1153,16 @@
+ #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
+ #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
+
++#ifndef ExtraXawClientLibs
++# define ExtraXawClientLibs /**/
++#endif
++#ifndef ExtraXawClientDepLibs
++# define ExtraXawClientDepLibs /**/
++#endif
++#ifndef ExtraXawReqs
++# define ExtraXawReqs /**/
++#endif
++
+ #if HaveLib64
+ # ifndef LibDirName
+ # define LibDirName lib64
diff --git a/xorg-util/xorg-cf-files/DETAILS b/xorg-util/xorg-cf-files/DETAILS
index 766f0fd..e0357b3 100755
--- a/xorg-util/xorg-cf-files/DETAILS
+++ b/xorg-util/xorg-cf-files/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
+ PATCHLEVEL=1
SHORT="host.def files for X window"
cat << EOF
host.def files for X window.
diff --git a/xorg-util/xorg-cf-files/HISTORY b/xorg-util/xorg-cf-files/HISTORY
index 99af86b..2f961bd 100644
--- a/xorg-util/xorg-cf-files/HISTORY
+++ b/xorg-util/xorg-cf-files/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * PRE_BUILD: patch added
+ * 05_xaw_without_xp.diff: debian patch to fix:
+
http://www.mail-archive.com/blfs-dev AT linuxfromscratch.org/msg08933.html
+ * DETAILS: patchlevel++
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-util/xorg-cf-files/PRE_BUILD
b/xorg-util/xorg-cf-files/PRE_BUILD
index 75fb56a..2a50af8 100755
--- a/xorg-util/xorg-cf-files/PRE_BUILD
+++ b/xorg-util/xorg-cf-files/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch -Np0 < "$SCRIPT_DIRECTORY/lib64.patch" &&
+patch -p2 < $SPELL_DIRECTORY/05_xaw_without_xp.diff &&
sedit "s:/X11R6::" $SOURCE_DIRECTORY/site.def
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index 50edaf2..c4e4afd 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -36,16 +36,6 @@ optional_depends hal \
"--disable-config-hal" \
"Enable HAL support" &&

-message "To enable print support, you need both libxp and xprintproto" &&
-optional_depends libxp \
- "" \
- "--disable-xprint" \
- "Build Xprint extension and server" &&
-optional_depends printproto \
- "" \
- "" \
- "Build Xprint extension and server" &&
-
#optional_depends libdmx \
# "--enable-dmx" \
# "--disable-dmx" \
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 81e2a81..2c59d19 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: no more XPrint
+
2009-01-23 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated MesaLib to 7.3
PATCHLEVEL++



  • [SM-Commit] GIT changes to master grimoire by Andraž Levstik (d1fed37b4392305e5c6f53862b9a40a879afcca5), Andraž Levstik, 01/26/2009

Archive powered by MHonArc 2.6.24.

Top of Page