Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz (0cb68d53f55139076c7af362c8a66af8e70ef21a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Arwed v. Merkatz" <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz (0cb68d53f55139076c7af362c8a66af8e70ef21a)
  • Date: Sat, 17 Jun 2006 08:31:59 -0500

GIT changes to test grimoire by Arwed v. Merkatz <v.merkatz AT gmx.net>:

dev/null |binary
disk/API_VERSION | 1
disk/arson/BUILD | 4
disk/arson/DEPENDS | 3
disk/arson/HISTORY | 12
disk/arson/PRE_BUILD | 6
disk/arson/gcc41.patch | 11
disk/audio_burn/DEPENDS | 4
disk/audio_burn/DETAILS | 2
disk/audio_burn/HISTORY | 8
disk/audio_burn/audio_burn-0.0.9.tar.gz.sig |binary
disk/bashburn/BashBurn-1.8.0.tar.gz.sig |binary
disk/bashburn/DEPENDS | 2
disk/bashburn/DETAILS | 4
disk/bashburn/HISTORY | 7
disk/bonfire/DEPENDS | 8
disk/bonfire/DETAILS | 17
disk/bonfire/HISTORY | 6
disk/bonfire/bonfire-0.3.1.tar.bz2.sig |binary
disk/burncenter/DEPENDS | 2
disk/burncenter/HISTORY | 4
disk/captive/CONFIGURE | 1
disk/captive/DEPENDS | 6
disk/captive/DETAILS | 5
disk/captive/HISTORY | 10
disk/captive/PRE_BUILD | 3
disk/captive/captive-1.1.7.tar.gz.sig |binary
disk/captive/prompt-removal.patch | 17
disk/cdbkup/BUILD | 2
disk/cdbkup/HISTORY | 3
disk/cdrdao/DETAILS | 8
disk/cdrdao/HISTORY | 3
disk/cdrtools/DETAILS | 7
disk/cdrtools/HISTORY | 9
disk/cdrtools/cdrtools-2.01.01a10.tar.bz2.sig |binary
disk/coda-lwp/DETAILS | 5
disk/coda-lwp/HISTORY | 3
disk/coda-lwp/lwp-2.2.tar.gz.sig |binary
disk/coda-rpc2/DETAILS | 5
disk/coda-rpc2/HISTORY | 3
disk/coda-rpc2/rpc2-2.0.tar.gz.sig |binary
disk/coda-rvm/DETAILS | 5
disk/coda-rvm/HISTORY | 3
disk/coda-rvm/rvm-1.12.tar.gz.sig |binary
disk/coda/DETAILS | 5
disk/coda/HISTORY | 3
disk/coda/coda-6.0.15.tar.gz.sig |binary
disk/disktype/DETAILS | 4
disk/disktype/HISTORY | 3
disk/disktype/disktype-9.tar.gz.sig |binary
disk/dump/BUILD | 2
disk/dump/DETAILS | 2
disk/dump/HISTORY | 3
disk/dump/dump-0.4b40.tar.gz.sig |binary
disk/dvd+rw-tools/BUILD | 4
disk/dvd+rw-tools/DETAILS | 4
disk/dvd+rw-tools/HISTORY | 4
disk/e2fsprogs/DETAILS | 4
disk/e2fsprogs/HISTORY | 3
disk/e2fsprogs/e2fsprogs-1.39.tar.gz.sig |binary
disk/fuse/DETAILS | 8
disk/fuse/HISTORY | 3
disk/gnomebaker/HISTORY | 5
disk/gnomebaker/PRE_BUILD | 5
disk/gnomebaker/dvdrtools.patch | 19
disk/gparted/DEPENDS | 1
disk/gparted/DETAILS | 6
disk/gparted/HISTORY | 9
disk/gparted/gparted-0.2.5.tar.bz2.sig |binary
disk/gradm/DETAILS | 2
disk/gradm/HISTORY | 3
disk/graveman/DEPENDS | 3
disk/graveman/DETAILS | 4
disk/graveman/HISTORY | 11
disk/graveman/graveman-0.3.12-5.tar.bz2.sig |binary
disk/gxiso/DETAILS | 1
disk/gxiso/HISTORY | 3
disk/ivman/DETAILS | 4
disk/ivman/HISTORY | 3
disk/ivman/ivman-0.6.12.tar.bz2.sig |binary
disk/jfsutils/DETAILS | 4
disk/jfsutils/HISTORY | 3
disk/jfsutils/jfsutils-1.1.11.tar.gz.sig |binary
disk/libburn/DETAILS | 1
disk/libburn/HISTORY | 3
disk/lufs-captive/DETAILS | 1
disk/lufs-captive/HISTORY | 3
disk/mac-fdisk/BUILD | 1
disk/mac-fdisk/DETAILS | 3
disk/mac-fdisk/HISTORY | 7
disk/mac-fdisk/PRE_BUILD | 4
disk/mac-fdisk/mac-fdisk_0.1-13.diff | 1951
++++++++++++++++++++++++++
disk/mac-fdisk/mac-fdisk_0.1.orig.tar.gz.sig |binary
disk/mac-fdisk/patch.diff | 1869 ------------------------
disk/mdadm/DETAILS | 4
disk/mdadm/HISTORY | 3
disk/mdadm/mdadm-2.5.tgz.sig |binary
disk/mount-iso/DEPENDS | 5
disk/mount-iso/DETAILS | 5
disk/mount-iso/HISTORY | 5
disk/parted/BUILD | 4
disk/parted/DETAILS | 2
disk/parted/HISTORY | 22
disk/parted/PRE_BUILD | 6
disk/parted/UP_TRIGGERS | 16
disk/pmount/BUILD | 6
disk/pmount/DETAILS | 3
disk/pmount/HISTORY | 4
disk/pmount/pmount-0.9.11.tar.gz.sig |binary
disk/pmount/pmount-0.9.3.tar.gz.sig | 0
disk/sfs/BUILD | 8
disk/sfs/DEPENDS | 2
disk/sfs/DETAILS | 27
disk/sfs/FINAL | 14
disk/sfs/HISTORY | 16
disk/sfs/POST_INSTALL | 11
disk/sfs/PREPARE | 2
disk/sfs/PRE_BUILD | 3
disk/sfs/sfs-gcc41.patch | 36
disk/simplecdrx/DEPENDS | 2
disk/simplecdrx/DETAILS | 2
disk/simplecdrx/HISTORY | 3
disk/simplecdrx/simplecdrx-1.3.3.tar.bz2.sig |binary
disk/udev/50-default.rules | 111 -
disk/udev/50-default.rules-hotplug | 110 -
disk/udev/52-modules.rules | 35
disk/udev/52-modules.rules-hotplug | 5
disk/udev/DEPENDS | 3
disk/udev/DETAILS | 6
disk/udev/HISTORY | 56
disk/udev/INSTALL | 18
disk/udev/modprobe.aliases | 9
disk/udev/rules/05-udev-early.rules | 4
disk/udev/rules/50-default.rules | 224 ++
disk/udev/rules/README | 4
disk/udftools/DEPENDS | 3
disk/udftools/DETAILS | 3
disk/udftools/HISTORY | 6
disk/udftools/PRE_BUILD | 3
disk/udftools/udftools-1.0.0b3-gcc4.diff | 11
disk/udftools/udftools-1.0.0b3.tar.gz.sig |binary
disk/vamps/DETAILS | 1
disk/vamps/HISTORY | 3
disk/xcdroast/DEPENDS | 2
disk/xcdroast/HISTORY | 4
video/API_VERSION | 1
video/camstream/DEPENDS | 2
video/camstream/HISTORY | 3
video/cinelerra/HISTORY | 6
video/cinelerra/PRE_BUILD | 8
video/cinelerra/make-compat.patch | 126 +
video/drip/DEPENDS | 2
video/drip/HISTORY | 3
video/ffmpeg-cvs/BUILD | 13
video/ffmpeg-cvs/DEPENDS | 34
video/ffmpeg-cvs/DETAILS | 21
video/ffmpeg-cvs/EXPORTS | 1
video/ffmpeg-cvs/HISTORY | 16
video/ffmpeg-cvs/INSTALL | 6
video/ffmpeg-cvs/PREPARE | 1
video/ffmpeg-cvs/PRE_BUILD | 1
video/ffmpeg-cvs/PROVIDES | 1
video/ffmpeg-cvs/REPAIR^none^EXPORTS | 1
video/ffmpeg-cvs/TRIGGERS | 1
video/ffmpeg-svn/BUILD | 13
video/ffmpeg-svn/CONFLICTS | 2
video/ffmpeg-svn/DEPENDS | 37
video/ffmpeg-svn/DETAILS | 23
video/ffmpeg-svn/DOWNLOAD | 43
video/ffmpeg-svn/HISTORY | 182 ++
video/ffmpeg-svn/INSTALL | 5
video/ffmpeg-svn/PREPARE | 2
video/ffmpeg-svn/PROVIDES | 1
video/ffmpeg/BUILD | 1
video/ffmpeg/DEPENDS | 6
video/ffmpeg/HISTORY | 5
video/gxine/DETAILS | 2
video/gxine/HISTORY | 6
video/gxine/gxine-0.5.3.tar.bz2.sig | 0
video/gxine/gxine-0.5.6.tar.bz2.sig |binary
video/kaffeine/DETAILS | 2
video/kaffeine/HISTORY | 4
video/kaffeine/kaffeine-0.8.1.tar.bz2.sig |binary
video/kino/BUILD | 7
video/kino/DEPENDS | 6
video/kino/DETAILS | 4
video/kino/HISTORY | 15
video/kino/PREPARE | 2
video/kino/kino-0.9.0.tar.gz.sig |binary
video/kmplayer/BUILD | 8
video/kmplayer/CONFIGURE | 7
video/kmplayer/DEPENDS | 25
video/kmplayer/HISTORY | 9
video/mlt/DEPENDS | 9
video/mlt/DETAILS | 10
video/mlt/HISTORY | 11
video/mlt/PREPARE | 1
video/mlt/PRE_BUILD | 3
video/mlt/buildsystem.patch | 50
video/mplayer/BUILD | 13
video/mplayer/CONFIGURE | 6
video/mplayer/DEPENDS | 19
video/mplayer/DETAILS | 18
video/mplayer/DOWNLOAD | 47
video/mplayer/HISTORY | 40
video/mplayer/MPlayer-1.0pre8.tar.bz2.sig |binary
video/mplayer/Makefile.patch | 16
video/mplayer/PREPARE | 13
video/mplayer/PRE_BUILD | 15
video/mplayer/cvs.Makefile.patch | 14
video/mplayer/mplayer-headers.patch | 12
video/mythtv/BUILD | 6
video/mythtv/DEPENDS | 3
video/mythtv/DETAILS | 1
video/mythtv/HISTORY | 8
video/subrip/DETAILS | 4
video/subrip/HISTORY | 3
video/tcvp/DEPENDS | 2
video/tcvp/HISTORY | 3
video/totem/DEPENDS | 14
video/totem/DETAILS | 2
video/totem/HISTORY | 12
video/totem/UP_TRIGGERS | 2
video/totem/totem-1.4.0.tar.bz2.sig | 0
video/totem/totem-1.4.1.tar.bz2.sig |binary
video/transcode/03_imagemagick.dpatch | 49
video/transcode/DETAILS | 9
video/transcode/HISTORY | 5
video/transcode/PRE_BUILD | 3
video/vlc/DEPENDS | 5
video/vlc/DETAILS | 2
video/vlc/HISTORY | 8
video/vlc/PRE_BUILD | 2
video/vlc/desktop/vlc.desktop | 11
video/vlc/gcc41.patch | 26
video/vlc/vlc-0.8.4a.tar.bz2.sig | 0
video/vlc/vlc-0.8.5.tar.bz2.sig |binary
video/xvattr/BUILD | 3
video/xvattr/HISTORY | 4
video/xvattr/INSTALL | 5
240 files changed, 3654 insertions(+), 2511 deletions(-)

New commits:
commit 0cb68d53f55139076c7af362c8a66af8e70ef21a
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

sync from svk

commit ba322ce7b9505f6745972fe00876f89d401dcd33
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

xcdroast: sync from svk

commit 8180b8bca5972899b8f1dcbe98b3f49963f95f8f
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

vamps: sync from svk

commit 4a357f0dee4a80363441c06366a81d1403dcb8c4
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

udftools: sync from svk

commit f72b0e2f206fc4e3777e41a82383bf145ca32a3b
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

udev: sync from svk

commit 4f2e77007dbca5640f56899e708a43860ceddf2f
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

simplecdrx: sync from svk

commit dbafa69122f0bdf75279886ced7c40b144ce3dd2
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

sfs: sync from svk

commit 5dc46376134c12713d6f24a9905bebd9ab4d3baf
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

pmount: sync from svk

commit 17a8d146147a4101db377dde43480db36f0577bd
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

parted: sync from svk

commit a90eccb596d6f54d4e2c11c88abe56aed9ca1bf5
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

mount-iso: sync from svk

commit f01cda48622cf35b4a5ef17c69f5578f38c75c23
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

mdadm: sync from svk

commit 208a1f7012aaa2f39c50b1b7a5a6ea0c958ff4eb
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

mac-fdisk: sync from svk

commit ec06133506535b4d150d2366da98585f5831ffbe
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

lufs-captive: sync from svk

commit 8ce66aa08e0945ba449679fbf49f42b65fd32aec
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

libburn: sync from svk

commit 6dd5848c94bd294198ed1ec15032dbe8ba3a926b
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

jfsutils: sync from svk

commit 891823ad986649cf46e198a2b2ceb6adabe42a2d
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

ivman: sync from svk

commit 6b3112ce0b8e915ac9b01f197f04673a858c1e1c
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

gxiso: sync from svk

commit 91c8ec927d888118be8bc584e9bf19d0796de237
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

graveman: sync from svk

commit 9686e062253a923e03992e1a49fe3106017d4a5e
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

gradm: sync from svk

commit a35e5f549039a11fcdd24283942deef2ab328a2e
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

gparted: sync from svk

commit 48865b7c75f59620697ee48426d449c7da3c0990
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

gnomebaker: sync from svk

commit e16ccf6bf74e7bbcc508e74d1f50af4662835390
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

fuse: sync from svk

commit 6354bfebc1b18935ac5cb7a222702bf72bb11e2c
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

e2fsprogs: sync from svk

commit 24c34dab96c04a3efc00e4fa13d964e50d408e5f
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

dvd+rw-tools: sync from svk

commit 741956d384196ad11f51669942d8dd3ae8eb9a62
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

dump: sync from svk

commit 70fcfe2bcc51b1c6a68f87dd0487e43473784160
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

disktype: sync from svk

commit ea631a15ab0fd3a321bd6ff39c7dab97b447e937
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

coda-rvm: sync from svk

commit 028b3363ff7c6decde426492ac79adc48613a3ac
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

coda-rpc2: sync from svk

commit 395161964f579377e1a16d656f04ab25ec207c97
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

coda-lwp: sync from svk

commit 08a4b903ca1becf6b92a68f0dd893b621dcd806a
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

coda: sync from svk

commit f8e2fc43608401dd5f4b90c9028ab99d354c6bcf
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

cdrtools: sync from svk

commit 63563f745049f1d55534666fb7ebcba467215528
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

cdrdao: sync from svk

commit 910701037c6b62d92ca7053c3222a5d78c90904b
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

cdbkup: sync from svk

commit 8fbf2eccf8e884fb3c7b4ee6aea3946a609b7a4a
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

captive: sync from svk

commit 152915e6a0552858f00114565ee6fe7ed29d0403
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

burncenter: sync from svk

commit fc0a437384966b9a4a77df374a9d51f89bf23c9b
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

bonfire: sync from svk

commit 589cd72c60d9faf854e3784bebf1b1fa767ae610
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

bashburn: sync from svk

commit 8cbae8ddbcf8ed63579d7711085f782e012d5438
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

audio_burn: sync from svk

commit 07bd93bb6129d6bbbd0b86321d06470277aabb72
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

arson: sync from svk

commit a40c425f41cdda90414cc5e29995738aad2d26b3
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

sync from svk

commit 21f8b94effc2be16425fc4e9f780318185714cb4
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

xvattr: sync from svk

commit 91a37c5ab3a2645227e21d7d5e9ebc78eac1e1ad
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

vlc: sync from svk

commit 98542c3b4add383d80eada6dddc394bbdcdb9a1d
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

transcode: sync from svk

commit 577e7f70c59a7065c3b85fa9d892417feebe7705
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

totem: sync from svk

commit 7e35dc6bff1e9d4d6fecfde5803d9b0270156157
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

tcvp: sync from svk

commit ab3c9f9f770d6f3dbb3f06b4d10455261129bbbe
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

subrip: sync from svk

commit 1a31c8f802d27c0da72b882aaefe71cf8fb1eb17
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

mythtv: sync from svk

commit 16edcfdbee0129f593438195b066bae9fcd8eb51
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

mplayer: sync from svk

commit bdaab50339ee2870c88f1d6fcc5b8b247e7bd35a
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

mlt: sync from svk

commit 03f6d84911466bc26cc188290ea14be712721907
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

kmplayer: sync from svk

commit b605e5ebff94e754932100ca4672d13fbf460969
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

kino: sync from svk

commit da2f6ba505c99bc63f7dc604266c6245f723d4c9
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

kaffeine: sync from svk

commit 3757c97f8b4e196f1fa0c11c81803835e1c8831f
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

gxine: sync from svk

commit 7ca2c8b2ca9ebe899fd0c06c9d4ba24595f6da75
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

ffmpeg-svn: sync from svk

commit 267845fc3943ca5e5a59beff99c581986af46bb4
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

ffmpeg-cvs: sync from svk

commit 995f09f643f4723206b380d26dc3e1609bed83e9
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

ffmpeg: sync from svk

commit bfce4e0ec4021ed85ac122d2551f32b8f1c9ad5f
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

drip: sync from svk

commit a42873a943e5915f6795ff9a7da3e7fa159ad60b
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

cinelerra: sync from svk

commit 2646e65c02a9933d46eb66fb1762093c965a7aea
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

camstream: sync from svk

diff --git a/disk/API_VERSION b/disk/API_VERSION
deleted file mode 100755
index 844885a..0000000
--- a/disk/API_VERSION
+++ /dev/null
@@ -1 +0,0 @@
-BUILD_API=2
diff --git a/disk/arson/BUILD b/disk/arson/BUILD
deleted file mode 100755
index db25bb9..0000000
--- a/disk/arson/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-patch -p0 < ${SCRIPT_DIRECTORY}/startup.patch &&
-patch -p0 < ${SCRIPT_DIRECTORY}/iso2cd.patch &&
-patch -p0 < ${SCRIPT_DIRECTORY}/programpage.patch &&
-default_build
diff --git a/disk/arson/DEPENDS b/disk/arson/DEPENDS
index b68f0e4..18ff234 100755
--- a/disk/arson/DEPENDS
+++ b/disk/arson/DEPENDS
@@ -1,6 +1,7 @@
-depends CD-BURN-UTILITY &&
+depends cdrtools &&
depends qt-x11 &&
depends kdelibs &&
+depends arts &&
depends cdrdao &&
depends autoconf &&

diff --git a/disk/arson/HISTORY b/disk/arson/HISTORY
index b0b95a3..a8ca17a 100644
--- a/disk/arson/HISTORY
+++ b/disk/arson/HISTORY
@@ -1,3 +1,15 @@
+2006-06-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: doesn't work with dvdrtools, only depends on
+ cdrtools (bug #10535)
+
+2006-05-30 Flavien Bridault <disk AT sourcemage.org>
+ * BUILD: Removed, don't apply patches here
+ * PRE_BUILD: Apply patches there
+ * gcc41.patch: fixes compiling
+
+2006-05-30 Flavien Bridault <disk AT sourcemage.org>
+ * DEPENDS: Added arts (bug #12402)
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/arson/PRE_BUILD b/disk/arson/PRE_BUILD
new file mode 100755
index 0000000..949e777
--- /dev/null
+++ b/disk/arson/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < ${SCRIPT_DIRECTORY}/startup.patch &&
+patch -p0 < ${SCRIPT_DIRECTORY}/iso2cd.patch &&
+patch -p0 < ${SCRIPT_DIRECTORY}/programpage.patch &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc41.patch
diff --git a/disk/arson/gcc41.patch b/disk/arson/gcc41.patch
new file mode 100644
index 0000000..826d2ee
--- /dev/null
+++ b/disk/arson/gcc41.patch
@@ -0,0 +1,11 @@
+--- arson-0.9.7-kde3.old/src/process.h 2006-05-30 00:14:44.000000000 +0200
++++ arson-0.9.7-kde3/src/process.h 2006-05-30 00:16:00.000000000 +0200
+@@ -253,7 +253,7 @@
+ const char *oper = NULL,
+ const QString &type = QString::null);
+
+- static uint ArsonCdrdaoProcess::calcTime(
++ static uint calcTime(
+ uint hrs, uint mins, uint secs);
+
+ private:
diff --git a/disk/audio_burn/DEPENDS b/disk/audio_burn/DEPENDS
index 0afa0bc..57a381b 100755
--- a/disk/audio_burn/DEPENDS
+++ b/disk/audio_burn/DEPENDS
@@ -1,5 +1,5 @@
-depends CD-BURN-UTILITY &&
-optional_depends "vorbis-tools" "" "--disable-oggdec" "for ogg/vorbis
support" &&
+depends cdrtools &&
+depends vorbis-tools &&
optional_depends "mpg321" "" "--disable-mpg321" "for mp3 support" &&
optional_depends "sox" "" "--disable-sox" "for resampling support" &&
optional_depends "normalize" "" "--disable-normalize" "for normalize
support"
diff --git a/disk/audio_burn/DETAILS b/disk/audio_burn/DETAILS
index 403b689..25cae5e 100755
--- a/disk/audio_burn/DETAILS
+++ b/disk/audio_burn/DETAILS
@@ -3,8 +3,8 @@
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.thecodefactory.org/audio_burn/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://www.thecodefactory.org/audio_burn/
-
SOURCE_HASH=sha512:13c44e89ab401e616b9a57728e25f78b79f7b832f74e7286a17e43ab929e477afcb671b6a734888c0ed3a92e4704acc4fd0575f29bd32ea7070f4a0af53ed2fa
LICENSE[0]=GPL
ENTERED=20040919
UPDATED=20040919
diff --git a/disk/audio_burn/HISTORY b/disk/audio_burn/HISTORY
index 874e873..c9b4830 100644
--- a/disk/audio_burn/HISTORY
+++ b/disk/audio_burn/HISTORY
@@ -1,3 +1,11 @@
+2006-06-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: doesn't work with dvdrtools, only depends on
+ cdrtools (bug #10535)
+
+2006-04-30 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: vorbis-tools is not an optional dependency (bug #11523)
+ * DETAILS: sha512->GPG
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/audio_burn/audio_burn-0.0.9.tar.gz.sig
b/disk/audio_burn/audio_burn-0.0.9.tar.gz.sig
new file mode 100644
index 0000000..4c3d6b3
Binary files /dev/null and b/disk/audio_burn/audio_burn-0.0.9.tar.gz.sig
differ
diff --git a/disk/bashburn/BashBurn-1.8.0.tar.gz.sig
b/disk/bashburn/BashBurn-1.8.0.tar.gz.sig
new file mode 100644
index 0000000..0d958c8
Binary files /dev/null and b/disk/bashburn/BashBurn-1.8.0.tar.gz.sig differ
diff --git a/disk/bashburn/DEPENDS b/disk/bashburn/DEPENDS
index 6b7c422..1f6295b 100755
--- a/disk/bashburn/DEPENDS
+++ b/disk/bashburn/DEPENDS
@@ -1,5 +1,5 @@
depends cdrdao &&
-depends cdrtools &&
+depends CD-BURN-UTILITY &&
depends sed &&
optional_depends "lame" \
"" \
diff --git a/disk/bashburn/DETAILS b/disk/bashburn/DETAILS
index 0bbb645..a493fcc 100755
--- a/disk/bashburn/DETAILS
+++ b/disk/bashburn/DETAILS
@@ -1,12 +1,12 @@
SPELL=bashburn
- VERSION=1.7.1
+ VERSION=1.8.0
SOURCE=BashBurn-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/BashBurn-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://bashburn.sourceforge.net/
ENTERED=20040809
UPDATED=20040809
-
SOURCE_HASH=sha512:d6ebba124fbd71cf7378f9778116bbbf8c45df57485494207d89c468ba87fb73a5639b73d7e1a765a2b92be4c8e661311e2740139025e422707c8545cec87d9d
LICENSE[0]=GPL
DOCS="README* FAQ* COPYING HOWTO"
KEYWORDS="bash burning disk"
diff --git a/disk/bashburn/HISTORY b/disk/bashburn/HISTORY
index e4dd416..05d63b5 100644
--- a/disk/bashburn/HISTORY
+++ b/disk/bashburn/HISTORY
@@ -1,3 +1,10 @@
+2006-06-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: replaced cdrtools by CD-BURN-UTILITY, because
+ it works with dvdrtools (bug #10535)
+
+2006-05-10 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 1.8.0
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/bonfire/DEPENDS b/disk/bonfire/DEPENDS
new file mode 100755
index 0000000..51b90d1
--- /dev/null
+++ b/disk/bonfire/DEPENDS
@@ -0,0 +1,8 @@
+depends nautilus-cd-burner &&
+depends gnome-vfs2 &&
+depends gst-plugins-good &&
+depends hal &&
+optional_depends totem "--enable-playlist" "--disable-playlist" "For
playlist pane" &&
+optional_depends beagle "--enable-search" "--disable-search" "For search
pane" &&
+optional_depends gdl "--enable-gdl" "--disable-gdl" "For a customizable GUI"
&&
+optional_depends libnotify "--enable-libnotify" "--disable-libnotify"
"Enable notifications"
diff --git a/disk/bonfire/DETAILS b/disk/bonfire/DETAILS
new file mode 100755
index 0000000..e7fea4d
--- /dev/null
+++ b/disk/bonfire/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=bonfire
+ VERSION=0.3.1
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=http://perso.wanadoo.fr/$SPELL/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ WEB_SITE=http://perso.wanadoo.fr/bonfire/
+ ENTERED=20060517
+ LICENSE[0]=GPL
+ SHORT="Yet another gnome frontend for burning CDs and DVDs"
+cat << EOF
+Bonfire is yet another application to burn CD/DVD for the gnome desktop. It
is
+designed to be as simple as possible and has some unique features to enable
+users to create their discs easily and quickly. It supports data CD/DVD
+writing, Audio CD writing, CD/DVD copy, iso, cue/bin image files burning,
+etc... It provides also a previewer for all kinds of multimedia files.
+EOF
diff --git a/disk/bonfire/HISTORY b/disk/bonfire/HISTORY
new file mode 100644
index 0000000..49a7d53
--- /dev/null
+++ b/disk/bonfire/HISTORY
@@ -0,0 +1,6 @@
+2006-05-19 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: removed BUILD_API=2, not needed in this section
+
+2006-05-17 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS, DEPENDS, HISTORY: created spell
+
diff --git a/disk/bonfire/bonfire-0.3.1.tar.bz2.sig
b/disk/bonfire/bonfire-0.3.1.tar.bz2.sig
new file mode 100644
index 0000000..1d7a5c0
Binary files /dev/null and b/disk/bonfire/bonfire-0.3.1.tar.bz2.sig differ
diff --git a/disk/burncenter/DEPENDS b/disk/burncenter/DEPENDS
index 34d7d5f..1572ca5 100755
--- a/disk/burncenter/DEPENDS
+++ b/disk/burncenter/DEPENDS
@@ -1,5 +1,5 @@
depends perl &&
-depends cdrtools &&
+depends CD-BURN-UTILITY &&

optional_depends MPG123 \
"" \
diff --git a/disk/burncenter/HISTORY b/disk/burncenter/HISTORY
index 245706a..19a9e3a 100644
--- a/disk/burncenter/HISTORY
+++ b/disk/burncenter/HISTORY
@@ -1,3 +1,7 @@
+2006-06-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: replaced cdrtools by CD-BURN-UTILITY, because
+ it works with dvdrtools (bug #10535)
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/captive/CONFIGURE b/disk/captive/CONFIGURE
new file mode 100755
index 0000000..2e49589
--- /dev/null
+++ b/disk/captive/CONFIGURE
@@ -0,0 +1 @@
+config_query GNOME_HELPER "Do you want to build a Gnome helper?" n
diff --git a/disk/captive/DEPENDS b/disk/captive/DEPENDS
new file mode 100755
index 0000000..1a4644d
--- /dev/null
+++ b/disk/captive/DEPENDS
@@ -0,0 +1,6 @@
+depends fuse &&
+if [ "$GNOME_HELPER" == "y" ]; then
+ depends ntfsprogs &&
+ depends libgnomeui
+fi
+optional_depends gnome-vfs2 "" "" "For a Gnome VFS module"
diff --git a/disk/captive/DETAILS b/disk/captive/DETAILS
index fdcc061..a7980c4 100755
--- a/disk/captive/DETAILS
+++ b/disk/captive/DETAILS
@@ -1,14 +1,13 @@
SPELL=captive
- VERSION=1.1.5
+ VERSION=1.1.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.jankratochvil.net/project/captive/dist/$SOURCE
-
SOURCE_HASH=sha512:fe661d67fbe62216ba3160912aade4ce97407b3d2fb904e31e679cddd3425b99a7fbc35e0e3a367bf5995bd4f27086a6adcfc7954bc89c74ccd7e7f01f64ef6a
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://www.jankratochvil.net/project/captive/
ENTERED=20051215
UPDATED=20051215
LICENSE[0]=GPL
- BUILD_API=2
KEYWORDS="disk"
SHORT="Access ntfs filesystems using native windows driver"
cat << EOF
diff --git a/disk/captive/HISTORY b/disk/captive/HISTORY
index 7b6089c..7df30b1 100644
--- a/disk/captive/HISTORY
+++ b/disk/captive/HISTORY
@@ -1,3 +1,13 @@
+2006-06-03 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 1.1.7 (bug #10899)
+ * CONFIGURE: Added, prompt for gnome helper
+ * DEPENDS: Added
+ * prompt-removal.patch: Added, remove a prompt in 'install' target
+ * PRE_BUILD: Added, apply patch
+
+2006-05-26 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Removed useless BUILD_API
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/captive/PRE_BUILD b/disk/captive/PRE_BUILD
new file mode 100755
index 0000000..3c7de84
--- /dev/null
+++ b/disk/captive/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/prompt-removal.patch
diff --git a/disk/captive/captive-1.1.7.tar.gz.sig
b/disk/captive/captive-1.1.7.tar.gz.sig
new file mode 100644
index 0000000..bd63af3
Binary files /dev/null and b/disk/captive/captive-1.1.7.tar.gz.sig differ
diff --git a/disk/captive/prompt-removal.patch
b/disk/captive/prompt-removal.patch
new file mode 100644
index 0000000..d572f01
--- /dev/null
+++ b/disk/captive/prompt-removal.patch
@@ -0,0 +1,17 @@
+diff -uNr captive-1.1.7.old/src/libcaptive/Makefile.in
captive-1.1.7/src/libcaptive/Makefile.in
+--- captive-1.1.7.old/src/libcaptive/Makefile.in 2006-06-03
01:27:58.000000000 +0200
++++ captive-1.1.7/src/libcaptive/Makefile.in 2006-06-03 01:28:29.000000000
+0200
+@@ -1051,12 +1051,7 @@
+ @HAVE_POD2MAN_TRUE@ $(POD2MAN) --section=8 $< >$@
+
+ install-exec-hook:
+- if test `id -u` -eq 0 -a -z "$(DESTDIR)";then \
+- if test x$(libdir) != x/lib -a x$(libdir) != x/usr/lib && !
grep -q '^$(libdir)$$' /etc/ld.so.conf;then \
+- echo -n "WARNING: Add '$(libdir)' to your
'/etc/ld.so.conf' and run ldconfig(8)! Press ENTER...";read; \
+- fi; \
+- ldconfig || echo -n "WARNING: Failed to run ldconfig(8) - run
manually! Press ENTER...";read; \
+- fi
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/disk/cdbkup/BUILD b/disk/cdbkup/BUILD
new file mode 100755
index 0000000..a1aa285
--- /dev/null
+++ b/disk/cdbkup/BUILD
@@ -0,0 +1,2 @@
+OPTS="$OPTS --with-dumpgrp=burning" &&
+default_build
diff --git a/disk/cdbkup/HISTORY b/disk/cdbkup/HISTORY
index a9ec9fe..f2d952c 100644
--- a/disk/cdbkup/HISTORY
+++ b/disk/cdbkup/HISTORY
@@ -1,3 +1,6 @@
+2006-06-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * BUILD: use burning group as the dumping group, fix installing
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/cdrdao/DETAILS b/disk/cdrdao/DETAILS
index c7a4028..5fdd886 100755
--- a/disk/cdrdao/DETAILS
+++ b/disk/cdrdao/DETAILS
@@ -1,11 +1,11 @@
SPELL=cdrdao
VERSION=${VERSION:=1.2.1}
if [ "$CVS" == "y" ]; then
- VERSION=cvs
+ VERSION=sfcvs
FORCE_DOWNLOAD=1
- SOURCE=$SPELL.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/cdrdao:cdrdao
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_URL[0]=cvs://:pserver:anonymous AT cdrdao.cvs.sourceforge.net:/cvsroot/cdrdao:cdrdao
SOURCE_IGNORE=volatile
else
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/disk/cdrdao/HISTORY b/disk/cdrdao/HISTORY
index 2873a16..5e8ac13 100644
--- a/disk/cdrdao/HISTORY
+++ b/disk/cdrdao/HISTORY
@@ -1,3 +1,6 @@
+2006-05-26 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Corrected sourceforge cvs url (bug #11880)
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/cdrtools/DETAILS b/disk/cdrtools/DETAILS
index 29f8449..bcfc218 100755
--- a/disk/cdrtools/DETAILS
+++ b/disk/cdrtools/DETAILS
@@ -1,13 +1,12 @@
SPELL=cdrtools
- VERSION=2.01.01a07
-
SOURCE_HASH=sha512:c83c8e67291e0e52c04077207c78c25b0e51df5619e5f86600dff6b1fb031afaa820d8b7bfcef7e5f41d9f3486e8fe786a3d3729f5319a2fa7d76184b25e7ed8
+ VERSION=2.01.01a10
ALPHA=$([ "${VERSION//a/}" != "$VERSION" ] && echo 1)
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION%a*}
SOURCE_URL[0]=ftp://ftp.berlios.de/pub/cdrecord/${ALPHA:+alpha/}${SOURCE}
-
WEB_SITE=http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+ WEB_SITE=http://cdrecord.berlios.de/old/private/cdrecord.html
ENTERED=20010922
- UPDATED=20051025
LICENSE[0]=GPL
KEYWORDS="disk"
SHORT="Create home-burned CDs with a CD-R/CD-RW recorder"
diff --git a/disk/cdrtools/HISTORY b/disk/cdrtools/HISTORY
index 1f8aa2e..d1bd6b8 100644
--- a/disk/cdrtools/HISTORY
+++ b/disk/cdrtools/HISTORY
@@ -1,3 +1,12 @@
+2006-06-06 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 2.01.01a10
+
+2006-05-16 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 2.01.01a09, removed UPDATED, updated WEB_SITE
+
+2006-05-08 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 2.01.01a08
+
2006-04-06 Flavien Bridault <disk AT sourcemage.org>
* POST_REMOVE: call persistent_load to get $IDE_SCSI
moved the main code in FUNCTIONS
diff --git a/disk/cdrtools/cdrtools-2.01.01a10.tar.bz2.sig
b/disk/cdrtools/cdrtools-2.01.01a10.tar.bz2.sig
new file mode 100644
index 0000000..cab8682
Binary files /dev/null and b/disk/cdrtools/cdrtools-2.01.01a10.tar.bz2.sig
differ
diff --git a/disk/coda-lwp/DETAILS b/disk/coda-lwp/DETAILS
index f5d2ebd..cd210aa 100755
--- a/disk/coda-lwp/DETAILS
+++ b/disk/coda-lwp/DETAILS
@@ -1,15 +1,14 @@
SPELL=coda-lwp
- VERSION=2.1
+ VERSION=2.2
SOURCE=lwp-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/lwp-$VERSION
SOURCE_URL[0]=http://www.coda.cs.cmu.edu/pub/lwp/src/$SOURCE
SOURCE_URL[1]=ftp://ftp.wu-wien.ac.at/pub/systems/lwp/src/$SOURCE
SOURCE_URL[2]=ftp://ftp.planetmirror.com/pub/lwp/src/$SOURCE
SOURCE_URL[3]=ftp://ftp.co.it.pt/pub/lwp/src/$SOURCE
-
SOURCE_HASH[0]=sha512:8eb8be6a7faca24307e45cd21f72d5c4e15c3853813093c4c6096a11b11762e45e29ba6c25a33c607a3386b2de64a4d00f8db6a209eb90b287f8f4800e1fb473
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://www.coda.cs.cmu.edu/
ENTERED=20020731
- UPDATED=20020731
LICENSE[0]=GPL
KEYWORDS="filesystem disk"
SHORT="Coda is an advanced networked filesystem."
diff --git a/disk/coda-lwp/HISTORY b/disk/coda-lwp/HISTORY
index 2db3896..0a44dc3 100644
--- a/disk/coda-lwp/HISTORY
+++ b/disk/coda-lwp/HISTORY
@@ -1,3 +1,6 @@
+2006-06-02 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 2.2
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/coda-lwp/lwp-2.2.tar.gz.sig
b/disk/coda-lwp/lwp-2.2.tar.gz.sig
new file mode 100644
index 0000000..90454b0
Binary files /dev/null and b/disk/coda-lwp/lwp-2.2.tar.gz.sig differ
diff --git a/disk/coda-rpc2/DETAILS b/disk/coda-rpc2/DETAILS
index 264a66b..23192f0 100755
--- a/disk/coda-rpc2/DETAILS
+++ b/disk/coda-rpc2/DETAILS
@@ -1,15 +1,14 @@
SPELL=coda-rpc2
- VERSION=1.28
+ VERSION=2.0
SOURCE=rpc2-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/rpc2-$VERSION
SOURCE_URL[0]=http://www.coda.cs.cmu.edu/pub/rpc2/src/$SOURCE
SOURCE_URL[1]=ftp://ftp.wu-wien.ac.at/pub/systems/rpc2/src/$SOURCE
SOURCE_URL[2]=ftp://ftp.planetmirror.com/pub/rpc2/src/$SOURCE
SOURCE_URL[3]=ftp://ftp.co.it.pt/pub/rpc2/src/$SOURCE
-
SOURCE_HASH[0]=sha512:098bc1319d66eadbf3318f7c667b057e891a6959c66183dbb1ec021fdbd7efcd78d7d435c3b5315bdb8e00bbb1b86ebf89b4978b1c34e1bb664b097e2ea3b7e0
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://www.coda.cs.cmu.edu/
ENTERED=20020731
- UPDATED=20020731
LICENSE[0]=GPL
KEYWORDS="disk"
SHORT="Remote Procedure Call v2 library for Coda"
diff --git a/disk/coda-rpc2/HISTORY b/disk/coda-rpc2/HISTORY
index adb812e..7cc4bc7 100644
--- a/disk/coda-rpc2/HISTORY
+++ b/disk/coda-rpc2/HISTORY
@@ -1,3 +1,6 @@
+2006-06-02 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 2.0
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/coda-rpc2/rpc2-2.0.tar.gz.sig
b/disk/coda-rpc2/rpc2-2.0.tar.gz.sig
new file mode 100644
index 0000000..a2acb02
Binary files /dev/null and b/disk/coda-rpc2/rpc2-2.0.tar.gz.sig differ
diff --git a/disk/coda-rvm/DETAILS b/disk/coda-rvm/DETAILS
index 7de4c7f..9835e66 100755
--- a/disk/coda-rvm/DETAILS
+++ b/disk/coda-rvm/DETAILS
@@ -1,15 +1,14 @@
SPELL=coda-rvm
- VERSION=1.11
+ VERSION=1.12
SOURCE=rvm-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/rvm-$VERSION
SOURCE_URL[0]=http://www.coda.cs.cmu.edu/pub/rvm/src/$SOURCE
SOURCE_URL[1]=ftp://ftp.wu-wien.ac.at/pub/systems/rvm/src/$SOURCE
SOURCE_URL[2]=ftp://ftp.planetmirror.com/pub/rvm/src/$SOURCE
SOURCE_URL[3]=ftp://ftp.co.it.pt/pub/rvm/src/$SOURCE
-
SOURCE_HASH=sha512:b31489be6dbce7743ceebc854a03c9efcda2cb4b0227d245b3442e7f4641c8a86213ce256553a1d685bbf11b07ae76250382e1f59cba7b27bb4212ae748b28ac
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://www.coda.cs.cmu.edu/
ENTERED=20020731
- UPDATED=20020731
LICENSE[0]=GPL
KEYWORDS="disk"
SHORT="Recoverable Virtual Memory library for Coda"
diff --git a/disk/coda-rvm/HISTORY b/disk/coda-rvm/HISTORY
index 81238f8..dec4d66 100644
--- a/disk/coda-rvm/HISTORY
+++ b/disk/coda-rvm/HISTORY
@@ -1,3 +1,6 @@
+2006-06-02 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 1.12
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/coda-rvm/rvm-1.12.tar.gz.sig
b/disk/coda-rvm/rvm-1.12.tar.gz.sig
new file mode 100644
index 0000000..3927646
Binary files /dev/null and b/disk/coda-rvm/rvm-1.12.tar.gz.sig differ
diff --git a/disk/coda/DETAILS b/disk/coda/DETAILS
index 1452f21..05be264 100755
--- a/disk/coda/DETAILS
+++ b/disk/coda/DETAILS
@@ -1,15 +1,14 @@
SPELL=coda
- VERSION=6.0.14
+ VERSION=6.0.15
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://www.coda.cs.cmu.edu/pub/coda/src/${SOURCE}
SOURCE_URL[1]=ftp://ftp.wu-wien.ac.at/pub/systems/coda/src/${SOURCE}
SOURCE_URL[2]=ftp://ftp.planetmirror.com/pub/coda/src/${SOURCE}
SOURCE_URL[3]=ftp://ftp.co.it.pt/pub/coda/src/${SOURCE}
-
SOURCE_HASH[0]=sha512:34d6cb9fe5e35332c3ddc1f01cb023262c42b0b332c06af4a18bfd3962340fd27c448918a9f64c23f1f19525c1d064aacffbc3e4c42e0c320cb15285efca5c48
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://www.coda.cs.cmu.edu/
ENTERED=20020731
- UPDATED=20040312
LICENSE[0]=GPL
KEYWORDS="filesystem disk"
SHORT="Advanced networked filesystem."
diff --git a/disk/coda/HISTORY b/disk/coda/HISTORY
index b252e4a..18b0b34 100644
--- a/disk/coda/HISTORY
+++ b/disk/coda/HISTORY
@@ -1,3 +1,6 @@
+2006-06-02 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 6.0.15
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/coda/coda-6.0.15.tar.gz.sig
b/disk/coda/coda-6.0.15.tar.gz.sig
new file mode 100644
index 0000000..2d05d24
Binary files /dev/null and b/disk/coda/coda-6.0.15.tar.gz.sig differ
diff --git a/disk/disktype/DETAILS b/disk/disktype/DETAILS
index 38cd5e9..a04309d 100755
--- a/disk/disktype/DETAILS
+++ b/disk/disktype/DETAILS
@@ -1,9 +1,9 @@
SPELL=disktype
- VERSION=8
+ VERSION=9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- MD5[0]=0b893e722c7e99c0a641c0046a44fdfa
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://disktype.sourceforge.net/
ENTERED=20030624
UPDATED=20030624
diff --git a/disk/disktype/HISTORY b/disk/disktype/HISTORY
index a10d5cc..52ba461 100644
--- a/disk/disktype/HISTORY
+++ b/disk/disktype/HISTORY
@@ -1,3 +1,6 @@
+2006-06-05 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 9
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/disktype/disktype-9.tar.gz.sig
b/disk/disktype/disktype-9.tar.gz.sig
new file mode 100644
index 0000000..aa99214
Binary files /dev/null and b/disk/disktype/disktype-9.tar.gz.sig differ
diff --git a/disk/dump/BUILD b/disk/dump/BUILD
index 24f941f..8f4a19f 100755
--- a/disk/dump/BUILD
+++ b/disk/dump/BUILD
@@ -1,5 +1,5 @@
message "${MESSAGE_COLOR}If this spell complains that e2fsprogs"
message "is not installed simply: cast e2fsprogs dump${DEFAULT_COLOR}"

-OPTS="--enable-largefile --enable-rmt ${OPTS} " &&
+OPTS="--enable-largefile --enable-rmt ${OPTS} --with-manowner=root
--with-mangrp=root" &&
default_build
diff --git a/disk/dump/DETAILS b/disk/dump/DETAILS
index 597782e..02e8455 100755
--- a/disk/dump/DETAILS
+++ b/disk/dump/DETAILS
@@ -3,7 +3,7 @@
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:afa29ee992f33c3b2129cb57e04b99d7d23337fc167a2a294024fb13025777698da9f4791505b3272480098f622b52165b70f99128b3daf41d9b16c79628e45e
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://sourceforge.net/projects/dump/
ENTERED=20020201
UPDATED=20020218
diff --git a/disk/dump/HISTORY b/disk/dump/HISTORY
index 3d9373b..77229ae 100644
--- a/disk/dump/HISTORY
+++ b/disk/dump/HISTORY
@@ -1,3 +1,6 @@
+2006-05-10 Flavien Bridault <vlaaad AT sourcemage.org>
+ * BUILD: made root as the owner and the group for man pages (bug
#11706)
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/dump/dump-0.4b40.tar.gz.sig
b/disk/dump/dump-0.4b40.tar.gz.sig
new file mode 100644
index 0000000..fb4bc31
Binary files /dev/null and b/disk/dump/dump-0.4b40.tar.gz.sig differ
diff --git a/disk/dvd+rw-tools/BUILD b/disk/dvd+rw-tools/BUILD
index de1aeaa..3568894 100755
--- a/disk/dvd+rw-tools/BUILD
+++ b/disk/dvd+rw-tools/BUILD
@@ -1,2 +1,4 @@
sedit "s:/local::;s/-O2//" Makefile.m4 &&
- make
+ make &&
+ make rpl8 &&
+ make btcflash
diff --git a/disk/dvd+rw-tools/DETAILS b/disk/dvd+rw-tools/DETAILS
index 4c5fdaf..20ca6fd 100755
--- a/disk/dvd+rw-tools/DETAILS
+++ b/disk/dvd+rw-tools/DETAILS
@@ -1,11 +1,11 @@
SPELL=dvd+rw-tools
- VERSION=5.21.4.10.8
+ VERSION=6.1
+
SOURCE_HASH=sha512:e25c86da94cd174f2e1cbb752540863780426c23d36a827fd1341c19a433afe042f3f23f513df193479bd40ceb7aaaf216ad475ce943afef5333fef1fc96b026
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//-1/}
SOURCE_URL[0]=http://fy.chalmers.se/~appro/linux/DVD+RW/tools/$SOURCE
WEB_SITE=http://fy.chalmers.se/~appro/linux/DVD+RW/
LICENSE=GPL
-
SOURCE_HASH=sha512:416880c2cdbbc6ad62bdf25306c753fd31a370152657dbe1f59e557d41bf92124bfe1347982dec3caedf0e8c1054f6ff38de24f5264afdd514045c432b5b8983
ENTERED=20031014
UPDATED=20040724
KEYWORDS="dvd disk"
diff --git a/disk/dvd+rw-tools/HISTORY b/disk/dvd+rw-tools/HISTORY
index 25eb953..97f49ec 100644
--- a/disk/dvd+rw-tools/HISTORY
+++ b/disk/dvd+rw-tools/HISTORY
@@ -1,3 +1,7 @@
+2006-04-25 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 6.1
+ * BUILD: add additional make targets, otherwise install fails
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/e2fsprogs/DETAILS b/disk/e2fsprogs/DETAILS
index 7cb7c96..c536f86 100755
--- a/disk/e2fsprogs/DETAILS
+++ b/disk/e2fsprogs/DETAILS
@@ -1,11 +1,11 @@
SPELL=e2fsprogs
- VERSION=1.38
+ VERSION=1.39
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"

SOURCE_URL[1]=http://linux4u.jinr.ru/LinuxArchive/Ftp/kernel/${SPELL}/${SOURCE}
SOURCE_URL[2]=http://www.ing-steen.se/share/unix/raid/${SOURCE}
-
SOURCE_HASH=sha512:0f04aaa6bf285e9df17f8d4127930ed21afd942b8687514fbbc247d0e17b312254a33d49097914bdd260e4c61d036d69ecb3f0ed9b3a02d5244f3af503321a37
WEB_SITE=http://e2fsprogs.sourceforge.net
LICENSE[0]=GPL
LICENSE[1]=LGPL
diff --git a/disk/e2fsprogs/HISTORY b/disk/e2fsprogs/HISTORY
index 7839088..27d94ff 100644
--- a/disk/e2fsprogs/HISTORY
+++ b/disk/e2fsprogs/HISTORY
@@ -1,3 +1,6 @@
+2006-05-30 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 1.39
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/e2fsprogs/e2fsprogs-1.39.tar.gz.sig
b/disk/e2fsprogs/e2fsprogs-1.39.tar.gz.sig
new file mode 100644
index 0000000..4af61f5
Binary files /dev/null and b/disk/e2fsprogs/e2fsprogs-1.39.tar.gz.sig differ
diff --git a/disk/fuse/DETAILS b/disk/fuse/DETAILS
index 7ca7fee..61aa2b9 100755
--- a/disk/fuse/DETAILS
+++ b/disk/fuse/DETAILS
@@ -9,13 +9,13 @@ else
if [ "$FUSE_CVS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
- VERSION=cvs
+ VERSION=sfcvs
fi
- SOURCE=$SPELL-cvs.tar.bz2
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/fuse:fuse
+ SOURCE=$SPELL-sfcvs.tar.bz2
+
SOURCE_URL[0]=cvs://:pserver:anonymous AT fuse.cvs.sourceforge.net:/cvsroot/fuse:fuse
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-sfcvs
fi
WEB_SITE=http://fuse.sourceforge.net/
ENTERED=20040209
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 99d5001..08a2495 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,6 @@
+2006-05-26 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Corrected sourceforge cvs url (bug #11880)
+
2006-04-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.5.3

diff --git a/disk/gnomebaker/HISTORY b/disk/gnomebaker/HISTORY
index 908b046..8edaeed 100644
--- a/disk/gnomebaker/HISTORY
+++ b/disk/gnomebaker/HISTORY
@@ -1,3 +1,8 @@
+2006-06-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * dvdrtools.patch: Added to allow the use of dvdrtools, thanks
+ to Pieter Lenaerts
+ * PRE_BUILD: Added to apply patch
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/gnomebaker/PRE_BUILD b/disk/gnomebaker/PRE_BUILD
new file mode 100755
index 0000000..5f878a7
--- /dev/null
+++ b/disk/gnomebaker/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+if spell_installed dvdrtools; then
+ patch -p1 < $SPELL_DIRECTORY/dvdrtools.patch
+fi
diff --git a/disk/gnomebaker/dvdrtools.patch b/disk/gnomebaker/dvdrtools.patch
new file mode 100644
index 0000000..181f7f9
--- /dev/null
+++ b/disk/gnomebaker/dvdrtools.patch
@@ -0,0 +1,19 @@
+diff -urNp gnomebaker-0.5.1.orig/src/execfunctions.c
gnomebaker-0.5.1/src/execfunctions.c
+--- gnomebaker-0.5.1.orig/src/execfunctions.c 2006-05-23 13:37:04.000000000
+0200
++++ gnomebaker-0.5.1/src/execfunctions.c 2006-05-23 13:47:42.000000000
+0200
+@@ -236,7 +236,6 @@ cdrecord_add_common_args(ExecCmd* cdBurn
+ if(preferences_get_bool(GB_CDRECORD_FORCE))
+ exec_cmd_add_arg(cdBurn, "-force");
+
+- exec_cmd_add_arg(cdBurn, "gracetime=5");
+ exec_cmd_add_arg(cdBurn, "speed=%d",
preferences_get_int(GB_CDWRITE_SPEED));
+ exec_cmd_add_arg(cdBurn, "-v");
+
+@@ -385,7 +384,6 @@ cdrecord_add_blank_args(ExecCmd* cdBurn)
+ if(preferences_get_bool(GB_EJECT))
+ exec_cmd_add_arg(cdBurn, "-eject");
+
+- exec_cmd_add_arg(cdBurn, "gracetime=5");
+ exec_cmd_add_arg(cdBurn, "blank=%s",
preferences_get_bool(GB_FAST_BLANK) ? "fast" : "all");
+ }
+
diff --git a/disk/gparted/DEPENDS b/disk/gparted/DEPENDS
index ee629d8..8c03ea2 100755
--- a/disk/gparted/DEPENDS
+++ b/disk/gparted/DEPENDS
@@ -1,3 +1,4 @@
depends g++ &&
+depends xml-parser-expat &&
depends parted &&
depends gtkmm2
diff --git a/disk/gparted/DETAILS b/disk/gparted/DETAILS
index ad3f16f..4bb7a5f 100755
--- a/disk/gparted/DETAILS
+++ b/disk/gparted/DETAILS
@@ -1,14 +1,12 @@
SPELL=gparted
- VERSION=0.2.4
-
SOURCE_HASH[0]=sha512:de5940dcdcbf19334f546aa753bacd2fc5512ec2e101e7b09b4a7fd35f72509fa941cc99e483171b527f2d844314ea3fb1faf8d076b6b36848f7bdc889793a8d
+ VERSION=0.2.5
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://gparted.sourceforge.net
ENTERED=20051031
- UPDATED=20051031
LICENSE[0]=GPL
- BUILD_API=2
KEYWORDS="gnome disk editors"
SHORT="Gnome Partition Editor, frontend to parted."
cat << EOF
diff --git a/disk/gparted/HISTORY b/disk/gparted/HISTORY
index 0834ea1..5aa6d12 100644
--- a/disk/gparted/HISTORY
+++ b/disk/gparted/HISTORY
@@ -1,3 +1,12 @@
+2006-05-26 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Removed useless BUILD_API
+
+2006-05-24 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: added xml-parser-expat (bug #12021)
+
+2006-05-13 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 0.2.5
+
2006-04-04 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: updated to version 0.2.4

diff --git a/disk/gparted/gparted-0.2.5.tar.bz2.sig
b/disk/gparted/gparted-0.2.5.tar.bz2.sig
new file mode 100644
index 0000000..111caf1
Binary files /dev/null and b/disk/gparted/gparted-0.2.5.tar.bz2.sig differ
diff --git a/disk/gradm/DETAILS b/disk/gradm/DETAILS
index 24564e9..b830726 100755
--- a/disk/gradm/DETAILS
+++ b/disk/gradm/DETAILS
@@ -1,5 +1,5 @@
SPELL=gradm
- VERSION=2.1.6-200506131347
+ VERSION=2.1.8-200601212342
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}2
diff --git a/disk/gradm/HISTORY b/disk/gradm/HISTORY
index 7aab077..f6a85a9 100644
--- a/disk/gradm/HISTORY
+++ b/disk/gradm/HISTORY
@@ -1,3 +1,6 @@
+2006-06-03 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 2.1.8-200601212342
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/graveman/DEPENDS b/disk/graveman/DEPENDS
index b5880c7..9034118 100755
--- a/disk/graveman/DEPENDS
+++ b/disk/graveman/DEPENDS
@@ -1,4 +1,5 @@
-depends CD-BURN-UTILITY &&
+depends xml-parser-expat &&
+depends cdrtools &&
depends cdrdao &&
depends libmng &&
depends libglade2 &&
diff --git a/disk/graveman/DETAILS b/disk/graveman/DETAILS
index e3de512..7faa436 100755
--- a/disk/graveman/DETAILS
+++ b/disk/graveman/DETAILS
@@ -1,8 +1,8 @@
SPELL=graveman
- VERSION=0.3.12-4
+ VERSION=0.3.12-5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://graveman.tuxfamily.org/sources/$SOURCE
-
SOURCE_HASH=sha512:9ad23e1c14ba461f105387f3273aa649f8b743bb748a374cbe260e645fcdbbe708b825af0d96e2206114d3d5f9b5c8950a8d140e859adb3f7118f33e3d83b056
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://graveman.tuxfamily.org/
ENTERED=20050304
diff --git a/disk/graveman/HISTORY b/disk/graveman/HISTORY
index ba80a7b..53680c7 100644
--- a/disk/graveman/HISTORY
+++ b/disk/graveman/HISTORY
@@ -1,3 +1,14 @@
+2006-06-06 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 0.3.12-5
+
+2006-06-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: doesn't work with dvdrtools, only depends on
+ cdrtools (bug #10535)
+
+2006-05-01 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: added xml-parser-expat (bug #11705)
+ * DETAILS: sha512->GPG
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/graveman/graveman-0.3.12-5.tar.bz2.sig
b/disk/graveman/graveman-0.3.12-5.tar.bz2.sig
new file mode 100644
index 0000000..4981abc
Binary files /dev/null and b/disk/graveman/graveman-0.3.12-5.tar.bz2.sig
differ
diff --git a/disk/gxiso/DETAILS b/disk/gxiso/DETAILS
index c1851bb..4075094 100755
--- a/disk/gxiso/DETAILS
+++ b/disk/gxiso/DETAILS
@@ -4,7 +4,6 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.berlios.de/gxiso/$SOURCE
WEB_SITE=http://gxiso.berlios.de/
- BUILD_API=2
ENTERED=20050523
UPDATED=20050523

SOURCE_HASH=sha512:55ef309ee2ec11adfa5102f9dab9b2a7130217000cf98a4c8f8589476f05d161ef349269b01cfa4648cf161e01287ad68f2919725cdf373aa2f383a12df10713

diff --git a/disk/gxiso/HISTORY b/disk/gxiso/HISTORY
index 22ca7c1..814f32d 100644
--- a/disk/gxiso/HISTORY
+++ b/disk/gxiso/HISTORY
@@ -1,3 +1,6 @@
+2006-05-26 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Removed useless BUILD_API
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/ivman/DETAILS b/disk/ivman/DETAILS
index 913644d..3d8122f 100755
--- a/disk/ivman/DETAILS
+++ b/disk/ivman/DETAILS
@@ -1,9 +1,9 @@
SPELL=ivman
- VERSION=0.6.11
+ VERSION=0.6.12
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/ivman/$SOURCE
-
SOURCE_HASH=sha512:d85c004c88efcf2a0fa19a2e47f228199162a2d1ba8c7d3e33be8c83bc3fd0440ee963ad81c82168b2fead81cd118c78e3829e954a266db6c7789862bc3a4ef4
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://ivman.sourceforge.net/
ENTERED=20041219
UPDATED=20050523
diff --git a/disk/ivman/HISTORY b/disk/ivman/HISTORY
index 6d174c9..60220c3 100644
--- a/disk/ivman/HISTORY
+++ b/disk/ivman/HISTORY
@@ -1,3 +1,6 @@
+2006-05-12 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 0.6.12
+
2006-04-19 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated to 0.6.11

diff --git a/disk/ivman/ivman-0.6.12.tar.bz2.sig
b/disk/ivman/ivman-0.6.12.tar.bz2.sig
new file mode 100644
index 0000000..9169b3d
Binary files /dev/null and b/disk/ivman/ivman-0.6.12.tar.bz2.sig differ
diff --git a/disk/jfsutils/DETAILS b/disk/jfsutils/DETAILS
index a813334..d538eb3 100755
--- a/disk/jfsutils/DETAILS
+++ b/disk/jfsutils/DETAILS
@@ -1,9 +1,9 @@
SPELL=jfsutils
- VERSION=1.1.10
+ VERSION=1.1.11
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://jfs.sourceforge.net/project/pub/$SOURCE
-
SOURCE_HASH[0]=sha512:58c9053b12b98c8f0c105ca4e34fb0b850edf97f6bf64314e5bb66f586700b23ac1592cf9752fe878baa7559a9d1fe7bebc618036cc224a0eae098c3dd0ed1fc
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://jfs.sourceforge.net/
ENTERED=20020821
UPDATED=20020821
diff --git a/disk/jfsutils/HISTORY b/disk/jfsutils/HISTORY
index 0ed9472..72d7bf9 100644
--- a/disk/jfsutils/HISTORY
+++ b/disk/jfsutils/HISTORY
@@ -1,3 +1,6 @@
+2006-06-05 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 1.1.11
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/jfsutils/jfsutils-1.1.11.tar.gz.sig
b/disk/jfsutils/jfsutils-1.1.11.tar.gz.sig
new file mode 100644
index 0000000..9b47c78
Binary files /dev/null and b/disk/jfsutils/jfsutils-1.1.11.tar.gz.sig differ
diff --git a/disk/libburn/DETAILS b/disk/libburn/DETAILS
index 15ca543..7d8c2f2 100755
--- a/disk/libburn/DETAILS
+++ b/disk/libburn/DETAILS
@@ -14,7 +14,6 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SP
ENTERED=20060407
UPDATED=20060407
LICENSE[0]=GPL
- BUILD_API=2
SHORT="Libburn is an open-source library for reading, mastering
and writing optical discs."
cat << EOF
Libburn is an open-source library for reading, mastering and writing optical
diff --git a/disk/libburn/HISTORY b/disk/libburn/HISTORY
index 37a436d..76e209a 100644
--- a/disk/libburn/HISTORY
+++ b/disk/libburn/HISTORY
@@ -1,2 +1,5 @@
+2006-05-26 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Removed useless BUILD_API
+
2006-04-07 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* PREPARE, DETAILS, PRE_BUILD, HISTORY: created spell
diff --git a/disk/lufs-captive/DETAILS b/disk/lufs-captive/DETAILS
index 3d53ef8..7752efe 100755
--- a/disk/lufs-captive/DETAILS
+++ b/disk/lufs-captive/DETAILS
@@ -9,7 +9,6 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/lufs
ENTERED=20051215
UPDATED=20051215
LICENSE[0]=GPL
- BUILD_API=2
KEYWORDS="disk"
SHORT="Lufs access to captive"
cat << EOF
diff --git a/disk/lufs-captive/HISTORY b/disk/lufs-captive/HISTORY
index 823c664..6c36096 100644
--- a/disk/lufs-captive/HISTORY
+++ b/disk/lufs-captive/HISTORY
@@ -1,3 +1,6 @@
+2006-05-26 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Removed useless BUILD_API
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/mac-fdisk/BUILD b/disk/mac-fdisk/BUILD
index 8051671..8f58e6d 100755
--- a/disk/mac-fdisk/BUILD
+++ b/disk/mac-fdisk/BUILD
@@ -1,2 +1 @@
-patch -p1 < $SPELL_DIRECTORY/patch.diff &&
make
diff --git a/disk/mac-fdisk/DETAILS b/disk/mac-fdisk/DETAILS
index 8498d4c..3955970 100755
--- a/disk/mac-fdisk/DETAILS
+++ b/disk/mac-fdisk/DETAILS
@@ -3,11 +3,10 @@
SOURCE=${SPELL}_${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/m/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:1263e60a18111162f5ef439b5f9615cef9de94e7836cb998782a6e6d3bcf92a69e49566b33c7330bdea05de5e6ca83f7920c6707f342ce515440160695f07120
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
LICENSE[0]=GPL

WEB_SITE=http://penguinppc.org/projects/yaboot/doc/mac-fdisk-basics.shtml
ENTERED=20040102
- UPDATED=20040102
KEYWORDS="disk"
SHORT="mac-fdisk is the fdisk version for ppc"
cat << EOF
diff --git a/disk/mac-fdisk/HISTORY b/disk/mac-fdisk/HISTORY
index f523fc0..01f5519 100644
--- a/disk/mac-fdisk/HISTORY
+++ b/disk/mac-fdisk/HISTORY
@@ -1,3 +1,10 @@
+2006-05-30 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: removed UPDATED
+ * patch.diff: removed
+ * mac-fdisk_0.1-13.diff: added (solve bug#12384)
+ * PRE_BUILD: added to apply patch
+ * BUILD: removed patch applying from there
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/mac-fdisk/PRE_BUILD b/disk/mac-fdisk/PRE_BUILD
new file mode 100755
index 0000000..d5416eb
--- /dev/null
+++ b/disk/mac-fdisk/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+#patch -p1 < $SPELL_DIRECTORY/patch.diff &&
+patch -p1 < $SPELL_DIRECTORY/mac-fdisk_0.1-13.diff
diff --git a/disk/mac-fdisk/mac-fdisk_0.1-13.diff
b/disk/mac-fdisk/mac-fdisk_0.1-13.diff
new file mode 100644
index 0000000..ab7c304
--- /dev/null
+++ b/disk/mac-fdisk/mac-fdisk_0.1-13.diff
@@ -0,0 +1,1951 @@
+--- mac-fdisk-0.1.orig/dpme.h
++++ mac-fdisk-0.1/dpme.h
+@@ -124,6 +124,7 @@
+ };
+ typedef struct dpme DPME;
+
++#define dpme_automount_set(p, v) bitfield_set(&p->dpme_flags,
30, 1, v) /* MSch */
+ #define dpme_os_specific_1_set(p, v) bitfield_set(&p->dpme_flags,
8, 1, v)
+ #define dpme_os_specific_2_set(p, v) bitfield_set(&p->dpme_flags,
7, 1, v)
+ #define dpme_os_pic_code_set(p, v) bitfield_set(&p->dpme_flags,
6, 1, v)
+@@ -134,6 +135,7 @@
+ #define dpme_allocated_set(p, v) bitfield_set(&p->dpme_flags,
1, 1, v)
+ #define dpme_valid_set(p, v) bitfield_set(&p->dpme_flags,
0, 1, v)
+
++#define dpme_automount_get(p) bitfield_get(p->dpme_flags,
30, 1) /* MSch */
+ #define dpme_os_specific_1_get(p) bitfield_get(p->dpme_flags,
8, 1)
+ #define dpme_os_specific_2_get(p) bitfield_get(p->dpme_flags,
7, 1)
+ #define dpme_os_pic_code_get(p) bitfield_get(p->dpme_flags,
6, 1)
+--- mac-fdisk-0.1.orig/dump.c
++++ mac-fdisk-0.1/dump.c
+@@ -3,7 +3,11 @@
+ //
+ // Written by Eryk Vershen (eryk AT apple.com)
+ //
+-
++/*
++ * Linux/m68k version by Christiaan Welvaart
++ * minor fixes and glibc change by Michael Schmitz
++ */
++
+ /*
+ * Copyright 1996,1997 by Apple Computer, Inc.
+ * All Rights Reserved
+@@ -60,6 +64,7 @@
+ //
+ NAMES plist[] = {
+ "Drvr", "Apple_Driver",
++ "Dr43", "Apple_Driver43",
+ "Free", "Apple_Free",
+ " HFS", "Apple_HFS",
+ " MFS", "Apple_MFS",
+@@ -83,7 +88,7 @@
+ // Forward declarations
+ //
+ void dump_block_zero(partition_map_header *map);
+-void dump_partition_entry(partition_map *entry, int digits);
++void dump_partition_entry(partition_map *entry, int digits, char *dev);
+
+
+ //
+@@ -119,6 +124,7 @@
+ }
+ printf("\nBlock size=%u, Number of Blocks=%u\n",
+ p->sbBlkSize, p->sbBlkCount);
++#ifndef __mc68000__
+ printf("DeviceType=0x%x, DeviceId=0x%x\n",
+ p->sbDevType, p->sbDevId);
+ if (p->sbDrvrCount > 0) {
+@@ -130,6 +136,7 @@
+ }
+ }
+ printf("\n");
++#endif
+ }
+
+
+@@ -138,31 +145,50 @@
+ {
+ partition_map * entry;
+ int j;
++ size_t len;
++ char *buf;
+
+ if (map == NULL) {
+ bad_input("No partition map exists");
+ return;
+ }
++#ifdef __mc68000__
++ printf("Disk %s\n", map->name);
++#else
+ printf("%s\n", map->name);
++#endif
+
+ j = number_of_digits(map->media_size);
+ if (j < 7) {
+ j = 7;
+ }
+- printf(" #: type name "
+- "%*s %-*s ( size )\n", j, "length", j, "base");
++#ifdef __mc68000__
++ printf("%*s type name "
++ "%*s %-*s ( size ) system\n", strlen(map->name)+1, "#", j,
"length", j, "base");
++#else
++ printf("%*s type name "
++ "%*s %-*s ( size ) system\n", strlen(map->name)+1, "#", j,
"length", j, "base");
++#endif
++
++ /* Grok devfs names. (courtesy Colin Walters)*/
++
++ len = strlen(map->name);
++ buf = strdup(map->name);
++ if (len >= 4 && !strcmp(buf+len-4, "disc")) {
++ strcpy(buf+len-4, "part");
++ }
+
+ if (disk_order) {
+ for (entry = map->disk_order; entry != NULL;
+ entry = entry->next_on_disk) {
+
+- dump_partition_entry(entry, j);
++ dump_partition_entry(entry, j, buf);
+ }
+ } else {
+ for (entry = map->base_order; entry != NULL;
+ entry = entry->next_by_base) {
+
+- dump_partition_entry(entry, j);
++ dump_partition_entry(entry, j, buf);
+ }
+ }
+ dump_block_zero(map);
+@@ -170,18 +196,23 @@
+
+
+ void
+-dump_partition_entry(partition_map *entry, int digits)
++dump_partition_entry(partition_map *entry, int digits, char *dev)
+ {
+ partition_map_header *map;
+ int j;
+ DPME *p;
+ BZB *bp;
+ char *s;
++#ifdef __mc68000__
++ int aflag = 1;
++#else
+ int aflag = 0;
++#endif
+ int pflag = 1;
+ u32 size;
+ double bytes;
+
++
+ map = entry->the_map;
+ p = entry->data;
+ if (aflag) {
+@@ -192,9 +223,13 @@
+ break;
+ }
+ }
+- printf("%4d: %.4s %-18.32s ", entry->disk_address, s, p->dpme_name);
++#ifdef __mc68000__
++ printf("%s%-2d %.4s %-12.12s ", dev, entry->disk_address, s,
p->dpme_name);
++#else
++ printf("%s%-4d %.4s %-18.32s ", dev, entry->disk_address, s,
p->dpme_name);
++#endif
+ } else {
+- printf("%4d: %20.32s %-18.32s ",
++ printf("%s%-4d %20.32s %-18.32s ", dev,
+ entry->disk_address, p->dpme_type, p->dpme_name);
+ }
+
+@@ -217,7 +252,10 @@
+ printf("@~%-*u", digits, p->dpme_pblock_start + p->dpme_lblock_start);
+ }
+
++ j = 's';
++
+ bytes = size / ONE_KILOBYTE_IN_BLOCKS;
++ j = 'k';
+ if (bytes >= 1024.0) {
+ bytes = bytes / 1024.0;
+ if (bytes < 1024.0) {
+@@ -226,58 +264,45 @@
+ bytes = bytes / 1024.0;
+ j = 'G';
+ }
+- printf(" (%#5.1f%c)", bytes, j);
+ }
++ printf(" (%#5.1f%c) ", bytes, j);
+
+-#if 0
+- // Old A/UX fields that no one pays attention to anymore.
+- bp = (BZB *) (p->dpme_bzb);
+- j = -1;
+- if (bp->bzb_magic == BZBMAGIC) {
+- switch (bp->bzb_type) {
+- case FSTEFS:
+- s = "EFS";
+- break;
+- case FSTSFS:
+- s = "SFS";
+- j = 1;
+- break;
+- case FST:
+- default:
+- if (bzb_root_get(bp) != 0) {
+- if (bzb_usr_get(bp) != 0) {
+- s = "RUFS";
+- } else {
+- s = "RFS";
+- }
+- j = 0;
+- } else if (bzb_usr_get(bp) != 0) {
+- s = "UFS";
+- j = 2;
+- } else {
+- s = "FS";
+- }
+- break;
+- }
+- if (bzb_slice_get(bp) != 0) {
+- printf(" s%1d %4s", bzb_slice_get(bp)-1, s);
+- } else if (j >= 0) {
+- printf(" S%1d %4s", j, s);
+- } else {
+- printf(" %4s", s);
+- }
+- if (bzb_crit_get(bp) != 0) {
+- printf(" K%1d", bp->bzb_cluster);
+- } else if (j < 0) {
+- printf(" ");
+- } else {
+- printf(" k%1d", bp->bzb_cluster);
+- }
+- if (bp->bzb_mount_point[0] != 0) {
+- printf(" %.64s", bp->bzb_mount_point);
+- }
+- }
+-#endif
++ if (!strcmp(p->dpme_type, "Apple_UNIX_SVR2"))
++ {
++ if (!strcmp(p->dpme_name, "Swap") || !strcmp(p->dpme_name, "swap"))
++ printf("Linux swap");
++ else
++ printf("Linux native");
++ }
++ else
++ if (!strcmp(p->dpme_type, "Apple_Bootstrap"))
++ printf("NewWorld bootblock");
++ else
++ if (!strcmp(p->dpme_type, "Apple_Scratch"))
++ printf("Linux swap"); //not just linux, but who cares
++ else
++ if (!strcmp(p->dpme_type, "Apple_HFS"))
++ printf("HFS");
++ else
++ if (!strcmp(p->dpme_type, "Apple_MFS"))
++ printf("MFS");
++ else
++ if (!strcmp(p->dpme_type, "Apple_Driver"))
++ printf("Driver");
++ else
++ if (!strcmp(p->dpme_type, "Apple_Driver43"))
++ printf("Driver 4.3");
++ else
++ if (!strcmp(p->dpme_type, "Apple_partition_map"))
++ printf("Partition map");
++ else
++ if (!strcmp(p->dpme_type, "Apple_PRODOS"))
++ printf("ProDOS");
++ else
++ if (!strcmp(p->dpme_type, "Apple_Free"))
++ printf("Free space");
++ else
++ printf("Unknown");
+ printf("\n");
+ }
+
+@@ -316,6 +341,24 @@
+
+ dump(name);
+ }
++#ifdef __linux__
++ for (i = 0; i < 4; i++) {
++ sprintf(name, "/dev/hd%c", 'a'+i);
++ if ((fd = open_device(name, O_RDONLY)) < 0) {
++ if (errno == EACCES) {
++ error(errno, "can't open file '%s'", name);
++ }
++ continue;
++ }
++ if (read_block(fd, 1, (char *)data, 1) == 0) {
++ close_device(fd);
++ continue;
++ }
++ close_device(fd);
++
++ dump(name);
++ }
++#endif
+ free(data);
+ }
+
+@@ -385,7 +428,7 @@
+ printf("%2d: %20.32s ",
+ entry->disk_address, p->dpme_type);
+ printf("%7u @ %-7u ", p->dpme_pblocks, p->dpme_pblock_start);
+- printf("%c%c%c%c%c%c%c%c%c ",
++ printf("%c%c%c%c%c%c%c%c%c%c ",
+ (dpme_valid_get(p))?'V':'v',
+ (dpme_allocated_get(p))?'A':'a',
+ (dpme_in_use_get(p))?'I':'i',
+@@ -394,7 +437,8 @@
+ (dpme_writable_get(p))?'W':'w',
+ (dpme_os_pic_code_get(p))?'P':'p',
+ (dpme_os_specific_1_get(p))?'1':'.',
+- (dpme_os_specific_2_get(p))?'2':'.');
++ (dpme_os_specific_2_get(p))?'2':'.',
++ (dpme_automount_get(p))?'M':'m');
+ if (p->dpme_lblock_start != 0 || p->dpme_pblocks != p->dpme_lblocks) {
+ printf("(%u @ %u)", p->dpme_lblocks, p->dpme_lblock_start);
+ }
+--- mac-fdisk-0.1.orig/io.c
++++ mac-fdisk-0.1/io.c
+@@ -30,6 +30,10 @@
+ #include <stdlib.h>
+ #include <fcntl.h>
+ #include <SCSI.h>
++#else
++#ifdef __GLIBC__
++#include <sys/types.h>
++#endif
+ #endif
+ #include <unistd.h>
+ #include <string.h>
+@@ -51,6 +55,8 @@
+ #define SCSI_FD 8
+ #define loff_t long
+ #define llseek lseek
++#else
++#define llseek lseek64
+ #endif
+
+
+@@ -435,8 +441,8 @@
+ #else
+ {
+ #endif
+- x = num * PBLOCK_SIZE;
+- if ((x = llseek(fd, x, 0)) < 0) {
++ x = ((long long) num * PBLOCK_SIZE); /* cast to ll to work around
compiler bug */
++ if ((x = lseek64(fd, x, 0)) < 0) {
+ if (quiet == 0) {
+ error(errno, "Can't seek on file");
+ }
+--- mac-fdisk-0.1.orig/partition_map.c
++++ mac-fdisk-0.1/partition_map.c
+@@ -30,14 +30,12 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #endif
+-#include <string.h>
+ #include <errno.h>
+
+ #include <fcntl.h>
+ #ifdef __linux__
+ #include <sys/ioctl.h>
+-#include <linux/fs.h>
+-#include <linux/hdreg.h>
++#include "kernel-defs.h"
+ #include <sys/stat.h>
+ #endif
+
+@@ -65,6 +63,8 @@
+ const char * kFreeType = "Apple_Free";
+ const char * kMapType = "Apple_partition_map";
+ const char * kUnixType = "Apple_UNIX_SVR2";
++const char * kBootstrapType = "Apple_Bootstrap";
++const char * kBootstrapName = "bootstrap";
+
+ const char * kFreeName = "Extra";
+
+@@ -288,15 +288,17 @@
+ free(block);
+ }
+ }
+- printf("The partition table has been altered!\n\n");
++ printf("The partition map has been saved successfully!\n\n");
+
+ #ifdef __linux__
+ if (map->regular_file) {
+ close_device(map->fd);
+ } else {
+- // printf("Calling ioctl() to re-read partition table.\n"
+- // "(Reboot to ensure the partition table has been
updated.)\n");
+- sync();
++ // printf("Calling ioctl() to re-read partition table.\n");
++ if ((i = ioctl(fd, BLKFLSBUF)) != 0) {
++ perror("ioctl(BLKFLSBUF)");
++ sync();
++ }
+ sleep(2);
+ if ((i = ioctl(fd, BLKRRPART)) != 0) {
+ saved_errno = errno;
+@@ -304,20 +306,26 @@
+ // some kernel versions (1.2.x) seem to have trouble
+ // rereading the partition table, but if asked to do it
+ // twice, the second time works. - biro AT yggdrasil.com */
+- sync();
++ // printf("Again calling ioctl() to re-read partition table.\n");
++ if ((i = ioctl(fd, BLKFLSBUF)) != 0) {
++ perror("ioctl(BLKFLSBUF)");
++ sync();
++ }
+ sleep(2);
+ if ((i = ioctl(fd, BLKRRPART)) != 0) {
+ saved_errno = errno;
+ }
+ }
++ printf("Syncing disks.\n");
++ if ((i = ioctl(fd, BLKFLSBUF)) != 0) {
++ perror("ioctl(BLKFLSBUF)");
++ sync();
++ }
+ close_device(map->fd);
+-
+- // printf("Syncing disks.\n");
+- sync();
+ sleep(4); /* for sync() */
+
+ if (i < 0) {
+- error(saved_errno, "Re-read of partition table failed");
++ error(saved_errno, "Re-read of partition map failed");
+ printf("Reboot your system to ensure the "
+ "partition table is updated.\n");
+ }
+@@ -692,9 +700,9 @@
+ geometry.heads*geometry.sectors*geometry.cylinders);
+ }
+
+- if ((pos = llseek(fd, 0, SEEK_END)) < 0) {
++ if ((pos = lseek64(fd, 0, SEEK_END)) < 0) {
+ printf("llseek to end of device failed\n");
+- } else if ((pos = llseek(fd, 0, SEEK_CUR)) < 0) {
++ } else if ((pos = lseek64(fd, 0, SEEK_CUR)) < 0) {
+ printf("llseek to end of device failed on second try\n");
+ } else {
+ printf("llseek: pos = %d, blocks=%d\n", pos, pos/PBLOCK_SIZE);
+@@ -895,6 +903,7 @@
+ printf("No such partition\n");
+ } else {
+ remove_from_disk_order(cur);
++ if (old_index < index) index++; /* renumber_disk_addresses(map); */
+ cur->disk_address = index;
+ insert_in_disk_order(cur);
+ renumber_disk_addresses(map);
+--- mac-fdisk-0.1.orig/partition_map.h
++++ mac-fdisk-0.1/partition_map.h
+@@ -69,6 +69,8 @@
+ extern const char * kFreeType;
+ extern const char * kMapType;
+ extern const char * kUnixType;
++extern const char * kBootstrapType;
++extern const char * kBootstrapName;
+
+ extern const char * kFreeName;
+
+--- mac-fdisk-0.1.orig/pdisk.c
++++ mac-fdisk-0.1/pdisk.c
+@@ -30,18 +30,17 @@
+ #include <stdio.h>
+ #ifdef __linux__
+ #include <getopt.h>
++#include <stddef.h>
+ #else
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <SIOUX.h>
+ #endif
+-#include <string.h>
+ #include <errno.h>
+
+ #ifdef __linux__
+ #include <sys/ioctl.h>
+-#include <linux/fs.h>
+-#include <linux/hdreg.h>
++#include "kernel-defs.h"
+ #endif
+
+ #include "pdisk.h"
+@@ -94,6 +93,7 @@
+ void do_add_intel_partition(partition_map_header *map);
+ void do_change_map_size(partition_map_header *map);
+ void do_create_partition(partition_map_header *map, int get_type);
++void do_create_bootstrap_partition(partition_map_header *map);
+ void do_delete_partition(partition_map_header *map);
+ int do_expert(partition_map_header *map);
+ void do_reorder(partition_map_header *map);
+@@ -114,6 +114,7 @@
+ main(int argc, char **argv)
+ {
+ int name_index;
++ int err=0;
+
+ if (sizeof(DPME) != PBLOCK_SIZE) {
+ fatal(-1, "Size of partion map entry (%d) "
+@@ -150,7 +151,9 @@
+ } else if (!vflag) {
+ usage("no device argument");
+ do_help();
++ err=-EINVAL; // debatable
+ }
++ exit(err);
+ }
+ #else
+ main()
+@@ -351,7 +354,8 @@
+ printf(" P (print ordered by base address)\n");
+ printf(" i initialize partition map\n");
+ printf(" s change size of partition map\n");
+- printf(" c create new partition\n");
++ printf(" b create new 800K bootstrap partition\n");
++ printf(" c create new Linux partition\n");
+ printf(" C (create with type also specified)\n");
+ printf(" d delete a partition\n");
+ printf(" r reorder partition entry in map\n");
+@@ -378,6 +382,10 @@
+ case 'i':
+ map = init_partition_map(name, map);
+ break;
++ case 'B':
++ case 'b':
++ do_create_bootstrap_partition(map);
++ break;
+ case 'C':
+ get_type = 1;
+ // fall through
+@@ -471,6 +479,30 @@
+ }
+
+
++void
++do_create_bootstrap_partition(partition_map_header *map)
++{
++ long base;
++
++ if (map == NULL) {
++ bad_input("No partition map exists");
++ return;
++ }
++
++ if (!rflag && map->writeable == 0) {
++ printf("The map is not writeable.\n");
++ }
++
++ // XXX add help feature (i.e. '?' in any argument routine prints help
string)
++ if (get_base_argument(&base, map) == 0) {
++ return;
++ }
++
++ // create 800K type Apple_Bootstrap partition named `bootstrap'
++ add_partition_to_map(kBootstrapName, kBootstrapType, base, 1600, map);
++}
++
++
+ int
+ get_base_argument(long *number, partition_map_header *map)
+ {
+@@ -508,7 +540,7 @@
+ int result = 0;
+ long multiple;
+
+- if (get_number_argument("Length in blocks: ", number, kDefault) == 0) {
++ if (get_number_argument("Length (in blocks, kB (k), MB (M) or GB (G)):
", number, kDefault) == 0) {
+ bad_input("Bad length");
+ } else {
+ result = 1;
+@@ -605,13 +637,22 @@
+ bad_input("The map is not writeable.");
+ return;
+ }
+- printf("Writing the map destroys what was there before. ");
+- if (get_okay("Is that okay? [n/y]: ", 0) != 1) {
++// printf("Writing the map destroys what was there before. ");
++ printf("IMPORTANT: You are about to write a changed partition map to
disk. \n");
++ printf("For any partition you changed the start or size of, writing out
\n");
++ printf("the map causes all data on that partition to be LOST FOREVER.
\n");
++ printf("Make sure you have a backup of any data on such partitions you
\n");
++ printf("want to keep before answering 'yes' to the question below!
\n\n");
++ if (get_okay("Write partition map? [n/y]: ", 0) != 1) {
+ return;
+ }
+
+ write_partition_map(map);
+
++ printf("\nPartition map written to disk. If any partitions on this disk
\n");
++ printf("were still in use by the system (see messages above), you will
need \n");
++ printf("to reboot in order to utilize the new partition map.\n\n");
++
+ // exit(0);
+ }
+
+--- mac-fdisk-0.1.orig/fdisk.c
++++ mac-fdisk-0.1/fdisk.c
+@@ -62,7 +62,6 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <string.h>
+ #include <fcntl.h>
+ #include <ctype.h>
+ #include <setjmp.h>
+@@ -71,9 +70,9 @@
+
+ #include <sys/ioctl.h>
+
+-#include <linux/genhd.h>
+-#include <linux/hdreg.h>
+-#include <linux/fs.h>
++typedef unsigned short kdev_t; /* BAD hack; kdev_t is not exported */
++
++#include "kernel-defs.h"
+
+ #include "fdisk.h"
+
+@@ -428,7 +427,7 @@
+ offsets[partitions] = extended_offset + SWAP32(p->start_sect);
+ if (!extended_offset)
+ extended_offset = SWAP32(p->start_sect);
+- if (llseek(fd, (loff_t)offsets[partitions]
++ if (lseek64(fd, (loff_t)offsets[partitions]
+ * SECTOR_SIZE, SEEK_SET) < 0)
+ fatal(unable_to_seek);
+ if (!(buffers[partitions] = (char *) malloc(SECTOR_SIZE)))
+@@ -438,14 +437,14 @@
+ part_table[partitions] = ext_pointers[partitions] = NULL;
+ q = p = offset(buffers[partitions], 0);
+ for (i = 0; i < 4; i++, p++) {
+- if (p->sys_ind == EXTENDED)
++ if (p->sys_ind == EXTENDED) {
+ if (ext_pointers[partitions])
+ fprintf(stderr, "Warning: extra link "
+ "pointer in partition table "
+ "%d\n", partitions + 1);
+ else
+ ext_pointers[partitions] = p;
+- else if (p->sys_ind)
++ } else if (p->sys_ind) {
+ if (part_table[partitions])
+ fprintf(stderr,
+ "Warning: ignoring extra data
"
+@@ -453,15 +452,18 @@
+ partitions + 1);
+ else
+ part_table[partitions] = p;
++ }
+ }
+- if (!part_table[partitions])
++ if (!part_table[partitions]) {
+ if (q != ext_pointers[partitions])
+ part_table[partitions] = q;
+ else part_table[partitions] = q + 1;
+- if (!ext_pointers[partitions])
++ }
++ if (!ext_pointers[partitions]) {
+ if (q != part_table[partitions])
+ ext_pointers[partitions] = q;
+ else ext_pointers[partitions] = q + 1;
++ }
+ p = ext_pointers[partitions++];
+ }
+ }
+@@ -497,11 +499,12 @@
+ warn_geometry();
+
+ for (i = 0; i < 4; i++)
+- if(part_table[i]->sys_ind == EXTENDED)
++ if(part_table[i]->sys_ind == EXTENDED) {
+ if (partitions != 4)
+ fprintf(stderr, "Ignoring extra extended "
+ "partition %d\n", i + 1);
+ else read_extended(part_table[ext_index = i]);
++ }
+
+ for (i = 3; i < partitions; i++)
+ if (SWAP16(*table_check(buffers[i])) != PART_TABLE_FLAG) {
+@@ -621,6 +624,7 @@
+ case lower: i += low; break;
+ case upper: i += high; break;
+ case deflt: i += dflt; break;
++ default: break;
+ }
+ }
+ else
+@@ -844,12 +848,12 @@
+ return; /* do not check extended partitions */
+
+ /* physical beginning c, h, s */
+- pbc = p->cyl & 0xff | (p->sector << 2) & 0x300;
++ pbc = (p->cyl & 0xff) | ((p->sector << 2) & 0x300);
+ pbh = p->head;
+ pbs = p->sector & 0x3f;
+
+ /* physical ending c, h, s */
+- pec = p->end_cyl & 0xff | (p->end_sector << 2) & 0x300;
++ pec = (p->end_cyl & 0xff) | ((p->end_sector << 2) & 0x300);
+ peh = p->end_head;
+ pes = p->end_sector & 0x3f;
+
+@@ -941,7 +945,7 @@
+ disk_device, heads, sectors, cylinders);
+ printf("Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n");
+ for (i = 0 ; i < partitions; i++)
+- if (p = q[i]) {
++ if ((p = q[i])) {
+ printf("%2d %02x%4d%4d%5d%4d%4d%5d%8d%8d %02x\n",
+ i + 1, p->boot_ind, p->head,
+ sector(p->sector),
+@@ -1026,7 +1030,7 @@
+ last[i]);
+ total += last[i] + 1 - first[i];
+ for (j = 0; j < i; j++)
+- if (first[i] >= first[j] && first[i] <= last[j]
++ if ((first[i] >= first[j] && first[i] <= last[j])
+ || (last[i] <= last[j] &&
+ last[i] >= first[j])) {
+ printf("Warning: partition %d overlaps "
+@@ -1060,11 +1064,11 @@
+ if (total > heads * sectors * cylinders)
+ printf("Total allocated sectors %d greater than the maximum "
+ "%d\n", total, heads * sectors * cylinders);
+- else if (total = heads * sectors * cylinders - total)
++ else if ((total = heads * sectors * cylinders - total))
+ printf("%d unallocated sectors\n", total);
+ }
+
+-void add_partition(int n, int sys)
++static void add_partition(int n, int sys)
+ {
+ char mesg[48];
+ int i, read = 0;
+@@ -1100,11 +1104,12 @@
+ for (i = 0; i < partitions; i++) {
+ if (start == offsets[i])
+ start += sector_offset;
+- if (start >= first[i] && start <= last[i])
++ if (start >= first[i] && start <= last[i]) {
+ if (n < 4)
+ start = last[i] + 1;
+ else
+ start = last[i] + sector_offset;
++ }
+ }
+ if (start > limit)
+ break;
+@@ -1249,7 +1254,7 @@
+ for (i = 3; i < partitions; i++)
+ if (changed[i]) {
+ *table_check(buffers[i]) = SWAP16(PART_TABLE_FLAG);
+- if (llseek(fd, (loff_t)offsets[i]
++ if (lseek64(fd, (loff_t)offsets[i]
+ * SECTOR_SIZE, SEEK_SET) < 0)
+ fatal(unable_to_seek);
+ if (write(fd, buffers[i], SECTOR_SIZE) != SECTOR_SIZE)
+@@ -1262,7 +1267,7 @@
+ "(Reboot to ensure the partition table has been updated.)\n");
+ sync();
+ sleep(2);
+- if (i = ioctl(fd, BLKRRPART)) {
++ if ((i = ioctl(fd, BLKRRPART))) {
+ error = errno;
+ } else {
+ /* some kernel versions (1.2.x) seem to have trouble
+@@ -1270,7 +1275,7 @@
+ twice, the second time works. - biro AT yggdrasil.com */
+ sync();
+ sleep(2);
+- if(i = ioctl(fd, BLKRRPART))
++ if((i = ioctl(fd, BLKRRPART)))
+ error = errno;
+ }
+
+@@ -1391,7 +1396,7 @@
+ void try(char *device)
+ {
+ disk_device = device;
+- if (!setjmp(listingbuf))
++ if (!setjmp(listingbuf)) {
+ if ((fd = open(disk_device, type_open)) >= 0) {
+ close(fd);
+ get_boot();
+@@ -1407,6 +1412,7 @@
+ exit(1);
+ }
+ }
++ }
+ }
+
+ void main(int argc, char **argv)
+--- mac-fdisk-0.1.orig/fdisklabel.c
++++ mac-fdisk-0.1/fdisklabel.c
+@@ -38,7 +38,6 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <string.h>
+ #include <fcntl.h>
+ #include <ctype.h>
+ #include <setjmp.h>
+@@ -47,9 +46,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/param.h>
+
+-#include <linux/genhd.h>
+-#include <linux/hdreg.h>
+-#include <linux/fs.h>
++#include "kernel-defs.h"
+
+ #include "fdisk.h"
+ #define DKTYPENAMES
+@@ -377,7 +374,7 @@
+ {
+ #if defined (i386)
+ if (bsd_initlabel (bsd_part, &bsd_dlabel, bsd_part_index) == 1)
+-#elif defined (__alpha__) || defined (__powerpc__)
++#elif defined (__alpha__) || defined (__powerpc__) || defined (__mc68000__)
+ if (bsd_initlabel (NULL, &bsd_dlabel, 0) == 1)
+ #endif
+ {
+@@ -515,7 +512,7 @@
+ alpha_bootblock_checksum (buffer);
+ #endif
+
+- if (llseek (fd, sector * SECTOR_SIZE, SEEK_SET) == -1)
++ if (lseek64 (fd, sector * SECTOR_SIZE, SEEK_SET) == -1)
+ fatal (unable_to_seek);
+ if (BSD_BBSIZE != write (fd, buffer, BSD_BBSIZE))
+ fatal (unable_to_write);
+@@ -679,7 +676,7 @@
+ sector = 0;
+ #endif
+
+- if (llseek (fd, sector * SECTOR_SIZE, SEEK_SET) == -1)
++ if (lseek64 (fd, sector * SECTOR_SIZE, SEEK_SET) == -1)
+ fatal (unable_to_seek);
+ if (BSD_BBSIZE != read (fd, buffer, BSD_BBSIZE))
+ fatal (unable_to_read);
+@@ -724,12 +721,12 @@
+
+ #if defined (__alpha__) && BSD_LABELSECTOR == 0
+ alpha_bootblock_checksum (buffer);
+- if (llseek (fd, 0, SEEK_SET) == -1)
++ if (lseek64 (fd, 0, SEEK_SET) == -1)
+ fatal (unable_to_seek);
+ if (BSD_BBSIZE != write (fd, buffer, BSD_BBSIZE))
+ fatal (unable_to_write);
+ #else
+- if (llseek (fd, sector * SECTOR_SIZE + BSD_LABELOFFSET, SEEK_SET) == -1)
++ if (lseek64 (fd, sector * SECTOR_SIZE + BSD_LABELOFFSET, SEEK_SET) == -1)
+ fatal (unable_to_seek);
+ if (sizeof (struct disklabel) != write (fd, d, sizeof (struct disklabel)))
+ fatal (unable_to_write);
+--- mac-fdisk-0.1.orig/fdisklabel.h
++++ mac-fdisk-0.1/fdisklabel.h
+@@ -52,6 +52,12 @@
+ #define BSD_LABELOFFSET 0
+ #define BSD_BBSIZE 0
+ #define BSD_SBSIZE 0
++#elif defined (__mc68000__)
++/* LABELSECTOR, LABELOFFSET, BBSIZE & SBSIZE are undefined for __powerpc__
*/
++#define BSD_LABELSECTOR 0
++#define BSD_LABELOFFSET 0
++#define BSD_BBSIZE 0
++#define BSD_SBSIZE 0
+ #else
+ #error unknown architecture
+ #endif
+--- mac-fdisk-0.1.orig/Makefile
++++ mac-fdisk-0.1/Makefile
+@@ -5,7 +5,14 @@
+ fdisk: fdisk.o fdisklabel.o
+
+ clean:
+- rm -f *.o pdisk fdisk
++ rm -f *.o pdisk fdisk mac-fdisk pmac-fdisk
++
++install: pdisk fdisk
++ -rm -f pmac-fdisk mac-fdisk
++ ln pdisk mac-fdisk
++ ln fdisk pmac-fdisk
++ install -o root -g root -m 0755 mac-fdisk ${DESTDIR}/sbin
++ install -o root -g root -m 0755 pmac-fdisk ${DESTDIR}/sbin
+
+ distribution:
+ cd ..; tar cvf pdisk.src.tar.`date +%y%m%d` --files-from
pdisk/list.src
+--- mac-fdisk-0.1.orig/kernel-defs.h
++++ mac-fdisk-0.1/kernel-defs.h
+@@ -0,0 +1,64 @@
++/* from asm/types.h */
++typedef unsigned short __u16;
++typedef unsigned int __u32;
++
++/* from linux/hdreg.h */
++#define HDIO_GETGEO 0x0301 /* get device geometry */
++
++struct hd_geometry {
++ unsigned char heads;
++ unsigned char sectors;
++ unsigned short cylinders;
++ unsigned long start;
++};
++
++/* from asm/ioctl.h */
++#define _IOC_NRBITS 8
++#define _IOC_TYPEBITS 8
++#define _IOC_SIZEBITS 13
++#define _IOC_DIRBITS 3
++
++#define _IOC_NRMASK ((1 << _IOC_NRBITS)-1)
++#define _IOC_TYPEMASK ((1 << _IOC_TYPEBITS)-1)
++#define _IOC_SIZEMASK ((1 << _IOC_SIZEBITS)-1)
++#define _IOC_DIRMASK ((1 << _IOC_DIRBITS)-1)
++
++#define _IOC_NRSHIFT 0
++#define _IOC_TYPESHIFT (_IOC_NRSHIFT+_IOC_NRBITS)
++#define _IOC_SIZESHIFT (_IOC_TYPESHIFT+_IOC_TYPEBITS)
++#define _IOC_DIRSHIFT (_IOC_SIZESHIFT+_IOC_SIZEBITS)
++
++#ifdef __powerpc__
++#define _IOC_NONE 1U
++#define _IOC_READ 2U
++#define _IOC_WRITE 4U
++#else
++#define _IOC_NONE 0U
++#define _IOC_READ 2U
++#define _IOC_WRITE 1U
++#endif
++
++#define _IOC(dir,type,nr,size) \
++ (((dir) << _IOC_DIRSHIFT) | \
++ ((type) << _IOC_TYPESHIFT) | \
++ ((nr) << _IOC_NRSHIFT) | \
++ ((size) << _IOC_SIZESHIFT))
++#define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0)
++
++/* from linux/fs.h */
++#define BLKRRPART _IO(0x12,95) /* re-read partition table */
++#define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */
++
++/* from linux/genhd.h */
++struct partition {
++ unsigned char boot_ind; /* 0x80 - active */
++ unsigned char head; /* starting head */
++ unsigned char sector; /* starting sector */
++ unsigned char cyl; /* starting cylinder */
++ unsigned char sys_ind; /* What partition type */
++ unsigned char end_head; /* end head */
++ unsigned char end_sector; /* end sector */
++ unsigned char end_cyl; /* end cylinder */
++ unsigned int start_sect; /* starting sector counting from 0 */
++ unsigned int nr_sects; /* nr of sectors in partition */
++} __attribute__((packed));
+--- mac-fdisk-0.1.orig/debian/changelog
++++ mac-fdisk-0.1/debian/changelog
+@@ -0,0 +1,137 @@
++mac-fdisk (0.1-13) unstable; urgency=low
++
++ * Add patch for broken dpkg --print-gnu-build-architecture (patch by
++ Andreas Jochens <aj AT andaco.de>).
++ Closes: #328102.
++
++ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Wed, 14 Sep 2005
17:25:23 +0100
++
++mac-fdisk (0.1-12) unstable; urgency=low
++
++ * Add makefile support for ppc64 arch (patch by Andreas Jochens
++ <aj AT andaco.de>).
++ Closes: #307897.
++
++ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Mon, 09 May 2005
12:58:47 +0100
++
++mac-fdisk (0.1-11) unstable; urgency=low
++
++ * Big fat overdue cleanup - back in business after replacing my stolen
++ Powerbook.
++ * fixes as suggested in proposed NMU: changes mostly by Frank Lichtenheld
++ <djpig AT debian.org>, with subarchitecture modifications by Colin Watson
++ <cjwatson AT debian.org>.
++ * Copy needed kernel definitions from kernel-headers 2.4.25 (powerpc) and
++ 2.4.26-m68k (cjwatson; Closes: #262457).
++ * Add Subarchitecture: fields in DEBIAN/control of the udebs. "mac" for
++ mac-fdisk-udeb on m68k, "powermac_oldworld powermac_newworld" for
++ mac-fdisk-udeb on powerpc, and "chrp chrp_pegasos prep iseries" for
++ pmac-fdisk-udeb on powerpc (djpig; Closes: #250581).
++ * Remove XSI:sms in debian/rules and debian/postinst, patch by David
++ Weinehall (djpig; Closes: #254918).
++
++ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Thu, 26 Aug 2004
14:23:13 +0200
++
++mac-fdisk (0.1-10) unstable; urgency=high
++
++ * Added .udeb magic to rules (kudos to Gaudenz Steinlin
++ <gaudenz AT soziologie.ch>); kept mac-fdisk in /sbin though).
++ Closes: #188420.
++
++ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Wed, 04 Jun 2003
17:06:02 +0200
++
++mac-fdisk (0.1-9) unstable; urgency=high
++
++ * Rebuilt with woody binutils to allow for prelinking. Closes: #176353.
++
++ * Set 'automagically mount on boot' flag when creating HFS partitions
++ (thanks to Derrick Pates <dpates AT dsdk12.net> for finding the
++ undocumented bit!). Experimental, but this is unstable, right?
++
++ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Fri, 24 Jan 2003
16:20:20 +0200
++
++mac-fdisk (0.1-8) unstable; urgency=high
++
++ * Update mac-fdisk man page (kudos to Chris Tillman). Closes: #121928.
++
++ * Remove mac-fdisk-cross from control file; remove Sparc from Arch:
entries
++ (to get rid of outdated mac-fdisk-cross 0.1-1 in the archive). Change
++ package descrption line for pmac-fdisk to emphasize it's a fdisk clone.
++
++ * Change sync() to ioctl(fd, BLKFLSBUF) to flush partition table to disk
++ on write - hopefully work around a kernel bug on new machines.
++
++ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Fri, 07 Dec 2001
13:38:10 +0200
++
++mac-fdisk (0.1-7) unstable; urgency=high
++
++ * Bugfix: mac-fdisk didn't properly handle devfs device names. Mangle disk
++ name (.../disc) in dump routine to end in .../part%d (patch by Colin
++ Walters <walters AT verbum.org>). Closes: #110056.
++
++ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Mon, 04 Sep 2001
16:02:45 +0200
++
++mac-fdisk (0.1-6.0potato1) stable; urgency=high
++
++ * Feature added: menu option to create bootstrap partition needed for
++ powerpc NewWorld machines with the proper type and size (patch supplied
++ by Ethan Benson). This should help newbies that won't read the docs
++ anyway. Closes: #99660.
++
++ * Bugfix: mac-fdisk used to get the disk size wrong when brute force
++ probing for end-of-disk by seek&read. Turns out gcc did not cope with
++ arithmetics on long long types without explicit cast. Closes: #99700.
++
++ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Fri, 15 Jun 2001
12:16:35 +0200
++
++mac-fdisk (0.1-6) unstable; urgency=high
++
++ * Feature added: menu option to create bootstrap partition needed for
++ powerpc NewWorld machines with the proper type and size (patch supplied
++ by Ethan Benson). This should help newbies that won't read the docs
++ anyway. Closes: #99660.
++
++ * Bugfix: mac-fdisk used to get the disk size wrong when brute force
++ probing for end-of-disk by seek&read. Turns out gcc did not cope with
++ arithmetics on long long types without explicit cast. Closes: #99700.
++
++ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Mon, 04 Jun 2001
13:54:21 +0200
++
++mac-fdisk (0.1-5) unstable; urgency=low
++
++ * Bugfix: fix build problems for glibc 2.2 (remove string.h includes,
++ use lseek64 for llseek, fix some petty gcc warnings)
++
++ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Wed, 02 Mar 2001
19:42:01 +0200
++
++mac-fdisk (0.1-4) unstable; urgency=low
++
++ * Bugfix: correct off-by-one error on moving a partition downwards in the
++ partition map. Clarification of various program messages and prompts
++ (closes #69148, #69149 and #69152). Update of mac-fdisk man page.
++
++ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Wed, 08 Oct 2000
17:49:07 +0200
++
++mac-fdisk (0.1-3) unstable; urgency=low
++
++ * PowerPC install fixes (work around lack of /proc/hardware), rename
pmac-fdisk
++ package (previously pmac-fdisk-cross). Add pmac-fdisk man page.
++
++ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Wed, 08 Mar 2000
18:29:07 +0200
++
++mac-fdisk (0.1-2) unstable; urgency=low
++
++ * Change man page name and install location, changed man page, rebuild
for 2.2.
++
++ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Fri, 22 Oct 1999
20:29:07 +0200
++
++mac-fdisk (0.1-1) unstable; urgency=low
++
++ * Initial Release. (built from previous pdisk-0.4a2 with fixes by Roman
Hodek)
++
++ -- Michael Schmitz <schmitz AT lcbvax.cchem.berkeley.edu> Sat, 28 Feb 1998
21:58:07 -0800
++
++Local variables:
++mode: debian-changelog
++add-log-mailing-address: "schmitz AT biophys.uni-duesseldorf.de"
++End:
+--- mac-fdisk-0.1.orig/debian/README.debian
++++ mac-fdisk-0.1/debian/README.debian
+@@ -0,0 +1,18 @@
++mac-fdisk for DEBIAN
++----------------------
++
++Comments regarding mac-fdisk
++
++mac-fdisk provides Apple partition format utilities required for
++installation of Debian/68k on Apple Macintosh computers. The Debian version
++of mac-fdisk is derived from pdisk 0.4a2 (pdisk.970115.tar) by Eryk Vershen
++(eryk AT apple.com).
++pmac-fdisk is a version of the PC partition format utilities for PowerPC
++computers, taken from the same pdisk source version and can be used for
++installation of Debian/68k on PC partition format disks on Macintosh.
++
++Modifications have been made to the pdisk partition table output code to
permit
++parsing the output of 'mac-fdisk -l' in a manner consistent with other Linux
++fdisk utilities. (Christiaan Welvaart, <>)
++
++Michael Schmitz <schmitz AT lcbvax.cchem.berkeley.edu>, Sat, 28 Feb 1998
12:58:07 -0800
+--- mac-fdisk-0.1.orig/debian/rules
++++ mac-fdisk-0.1/debian/rules
+@@ -0,0 +1,192 @@
++#!/usr/bin/make -f
++# Made with the aid of debmake, by Christoph Lameter,
++# based on the sample debian/rules file for GNU hello by Ian Jackson.
++
++export DH_VERBOSE=1
++
++#BUILDARCH = $(shell dpkg --print-gnu-build-architecture)
++BUILDARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
++POWERPC = $(findstring $(BUILDARCH),powerpc ppc64)
++
++packmn = mac-fdisk
++packmc = mac-fdisk-cross
++packpmn = pmac-fdisk
++packpmc = pmac-fdisk-cross
++packudeb = mac-fdisk-udeb
++packpudeb = pmac-fdisk-udeb
++tmpmn = debian/tmp
++tmpmc = debian/$(packmc)
++tmppmn = debian/$(packpmn)
++tmppmc = debian/$(packpmc)
++tmpudeb = debian/$(packudeb)
++tmppudeb = debian/$(packpudeb)
++docmn = $(tmpmn)/usr/share/doc/$(packmn)
++docmc = $(tmpmc)/usr/share/doc/$(packmc)
++docpmn = $(tmppmn)/usr/share/doc/$(packpmn)
++docpmc = $(tmppmc)/usr/share/doc/$(packpmc)
++
++ifeq "$(BUILDARCH)" "powerpc"
++mac_subarches=powermac_oldworld powermac_newworld
++pmac_subarches=chrp chrp_pegasos prep iseries
++else
++mac_subarches=mac
++endif
++
++build:
++ $(checkdir)
++ make CFLAGS="-O2 -g -Wall"
++ touch build
++
++clean:
++ $(checkdir)
++ -rm -f build
++ -make clean
++ -rm -f `find . -name "*~"`
++ -rm -rf $(tmpmn) $(tmpmc) $(tmppmn) $(tmppmc) $(tmpudeb) $(tmppudeb)
debian/files* core debian/*substvars
++
++binary-indep: build
++ $(checkdir)
++# There are no architecture-independent files to be uploaded
++# generated by this package. If there were any they would be
++# made here.
++
++binary-arch: build
++ dh_testdir pdisk.h
++ dh_testroot
++ dh_clean -k
++ #dh_installdirs
++ # we don't want to package the pdisk man page
++ mv pdisk.8 pdisk.8.in
++ set -e; if [ "$(BUILDARCH)" = "m68k" ] || [ -n "$(POWERPC)" ]; then \
++ install -d $(tmpmn)/sbin; \
++ install -m 755 pdisk $(tmpmn)/sbin/mac-fdisk; \
++ install -d $(tmpmn)/usr/share/man/man8; \
++ install -m 644 mac-fdisk.8.in
$(tmpmn)/usr/share/man/man8/mac-fdisk.8; \
++ dh_installdocs README -p$(packmn); \
++ dh_installmanpages -p$(packmn); \
++ dh_installchangelogs HISTORY -p$(packmn); \
++ else \
++ install -d $(tmpmc)/usr/sbin; \
++ install -m 755 pdisk $(tmpmc)/usr/sbin/mac-fdisk; \
++ install -d $(tmpmn)/usr/share/man/man8; \
++ install -m 644 mac-fdisk.8.in
$(tmpmn)/usr/share/man/man8/mac-fdisk.8; \
++ dh_installdocs README -p$(packmc); \
++ dh_installmanpages -p$(packmc); \
++ dh_installchangelogs HISTORY -p$(packmc); \
++ fi
++ set -e; if [ -n "$(POWERPC)" ]; then \
++ install -d $(tmppmn)/sbin; \
++ install -m 755 fdisk $(tmppmn)/sbin/pmac-fdisk; \
++ install -d $(tmppmn)/usr/share/man/man8; \
++ install -m 644 pmac-fdisk.8.in
$(tmppmn)/usr/share/man/man8/pmac-fdisk.8; \
++ dh_installdocs README -p$(packpmn); \
++ dh_installmanpages -p$(packpmn); \
++ dh_installchangelogs HISTORY -p$(packpmn); \
++ else \
++ install -d $(tmppmc)/usr/sbin; \
++ install -m 755 fdisk $(tmppmc)/usr/sbin/pmac-fdisk; \
++ install -d $(tmppmc)/usr/share/man/man8; \
++ install -m 644 pmac-fdisk.8.in
$(tmppmc)/usr/share/man/man8/pmac-fdisk.8; \
++ dh_installdocs README -p$(packpmc); \
++ dh_installmanpages -p$(packpmc); \
++ dh_installchangelogs HISTORY -p$(packpmc); \
++ fi
++ # install README.Debian also in cross package (not done by
dh_installdocs)
++ set -e; if [ "$(BUILDARCH)" != "m68k" ] && ! [ -n "$(POWERPC)" ];
then \
++ install -m 644 debian/README.debian $(docmc)/README.Debian; \
++ fi
++ # and move the pdisk man page back again ...
++ mv pdisk.8.in pdisk.8
++
++ # install mac-fdisk-udeb files
++ set -e; if [ "$(BUILDARCH)" = "m68k" ] || [ -n "$(POWERPC)" ]; then \
++ install -d $(tmpudeb)/sbin; \
++ install -d $(tmpudeb)/DEBIAN; \
++ install -m 755 pdisk $(tmpudeb)/sbin/mac-fdisk; \
++ fi
++
++ # install pmac-fdisk-udeb files
++ set -e; if [ -n "$(POWERPC)" ]; then \
++ install -d $(tmppudeb)/usr/sbin; \
++ install -d $(tmppudeb)/DEBIAN; \
++ install -m 755 fdisk $(tmppudeb)/usr/sbin/pmac-fdisk; \
++ fi
++
++ # build native pdisk only for m68k, cross package only for others
++ set -e; if [ "$(BUILDARCH)" = "m68k" ] || [ -n "$(POWERPC)" ]; then \
++ dh_strip -p$(packmn) -P$(tmpmn); \
++ dh_compress -p$(packmn) -P$(tmpmn); \
++ dh_fixperms -p$(packmn) -P$(tmpmn); \
++ dh_installdeb -p$(packmn) -P$(tmpmn); \
++ dh_shlibdeps -p$(packmn) -P$(tmpmn); \
++ dh_gencontrol -p$(packmn) -P$(tmpmn); \
++ dh_md5sums -p$(packmn) -P$(tmpmn); \
++ else \
++ dh_strip -p$(packmc); \
++ dh_compress -p$(packmc); \
++ dh_fixperms -p$(packmc); \
++ dh_installdeb -p$(packmc); \
++ dh_shlibdeps -p$(packmc); \
++ dh_gencontrol -p$(packmc); \
++ dh_md5sums -p$(packmc); \
++ fi
++ # build native fdisk only for powerpc, cross package only for others
++ set -e; if [ -n "$(POWERPC)" ]; then \
++ dh_strip -p$(packpmn); \
++ dh_compress -p$(packpmn); \
++ dh_fixperms -p$(packpmn); \
++ dh_installdeb -p$(packpmn); \
++ dh_shlibdeps -p$(packpmn); \
++ dh_gencontrol -p$(packpmn); \
++ dh_md5sums -p$(packpmn); \
++ else \
++ dh_strip -p$(packpmc); \
++ dh_compress -p$(packpmc); \
++ dh_fixperms -p$(packpmc); \
++ dh_installdeb -p$(packpmc); \
++ dh_shlibdeps -p$(packpmc); \
++ dh_gencontrol -p$(packpmc); \
++ dh_md5sums -p$(packpmc); \
++ fi
++ set -e; if [ "$(BUILDARCH)" = "m68k" ] || [ -n "$(POWERPC)" ]; then \
++ dh_builddeb -p$(packmn) -P$(tmpmn); \
++ else \
++ dh_builddeb -p$(packmc); \
++ fi
++ set -e; if [ -n "$(POWERPC)" ]; then \
++ dh_builddeb -p$(packpmn); \
++ else \
++ dh_builddeb -p$(packpmc); \
++ fi
++
++ # build mac-fdisk-udeb on powerpc and m68k
++ set -e; if [ "$(BUILDARCH)" = "m68k" ] || [ -n "$(POWERPC)" ]; then \
++ dh_strip -p$(packudeb); \
++ dh_installdeb -p$(packudeb); \
++ dh_shlibdeps -p$(packudeb); \
++ dh_gencontrol -p$(packudeb) -- -isp
"-DSubarchitecture=$(mac_subarches)" -fdebian/files~; \
++ dpkg-distaddfile $(packudeb)_$(shell dpkg-parsechangelog |
grep ^Version: | cut -d ' ' -f 2)_$(BUILDARCH).udeb debian-installer
standard; \
++ dh_builddeb -p$(packudeb) --filename=$(packudeb)_$(shell
dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(BUILDARCH).udeb; \
++ fi
++
++ # build pmac-fdisk-udeb on powerpc
++ set -e; if [ -n "$(POWERPC)" ]; then \
++ dh_strip -p$(packpudeb); \
++ dh_installdeb -p$(packpudeb); \
++ dh_shlibdeps -p$(packpudeb); \
++ dh_gencontrol -p$(packpudeb) -- -isp
"-DSubarchitecture=$(pmac_subarches)" -fdebian/files~; \
++ dpkg-distaddfile $(packpudeb)_$(shell dpkg-parsechangelog |
grep ^Version: | cut -d ' ' -f 2)_$(BUILDARCH).udeb debian-installer
standard; \
++ dh_builddeb -p$(packpudeb) --filename=$(packpudeb)_$(shell
dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(BUILDARCH).udeb; \
++ fi
++
++define checkdir
++ test -f debian/rules
++endef
++
++binary: binary-indep binary-arch
++
++checkroot:
++ $(checkdir)
++ test root = "`whoami`"
++
++.PHONY: binary binary-arch binary-indep clean checkroot
+--- mac-fdisk-0.1.orig/debian/postinst
++++ mac-fdisk-0.1/debian/postinst
+@@ -0,0 +1,50 @@
++#! /bin/sh
++set -e
++
++Arch=`dpkg --print-installation-architecture`
++
++#
++# make symlink /sbin/fdisk point to the native fdisk
++#
++
++# This is also true if /sbin/fdisk is a dangling symlink; in that case we
++# want to update the link, too.
++if [ ! -e /sbin/fdisk ]; then
++ machine=""
++ if [ "$Arch" = "m68k" ]; then
++ case `awk '$1 == "Model:" { print $2 }' /proc/hardware` in
++ Atari)
++ machine=atari
++ ;;
++ Amiga)
++ machine=amiga
++ ;;
++ Macintosh)
++ machine=mac
++ ;;
++ Motorola) # MVME
++ ;;
++ esac
++ elif [ "$Arch" = "powerpc" ]; then
++ # case `awk '$1 == "motherboard" { print $6 }' /proc/cpuinfo`
in
++ # case `cat /proc/cpuinfo | grep -E "^motherboard" | sed -e
's/.* \([a-zA-Z]*\)$/\1/'` in
++ case `awk '$1 == "motherboard" { print $NF }' /proc/cpuinfo`
in
++ Macintosh)
++ machine=mac
++ ;;
++ *)
++ machine=pmac
++ ;;
++ esac
++
++ fi
++ if [ -n "$machine" ] && [ -f /sbin/$machine-fdisk ]; then
++ ln -sf $machine-fdisk /sbin/fdisk
++ else
++ echo "No native fdisk for this machine type!"
++ fi
++fi
++
++#DEBHELPER#
++
++exit 0
+--- mac-fdisk-0.1.orig/debian/control
++++ mac-fdisk-0.1/debian/control
+@@ -0,0 +1,68 @@
++Source: mac-fdisk
++Section: base
++Priority: required
++Build-Depends: debhelper, coreutils, grep
++Maintainer: Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de>
++Standards-Version: 3.5.8.0
++
++Package: mac-fdisk
++Architecture: m68k powerpc ppc64
++Depends: ${shlibs:Depends}
++Description: Apple disk partition manipulation tool
++ The fdisk utilities from the MkLinux project, adopted for Linux/m68k.
++ Mac-fdisk allows you to create and edit the partition table of a disk.
++ It supports only the Apple partition format used on Macintosh and
PowerMac,
++ use pmac-fdisk for PC partition format disks as used on PowerPC machines.
++ Mac-fdisk is an interactive tool with a menu similar to PC fdisk,
supported
++ options are somewhat different from PC fdisk due to the differences in
++ partition format.
++
++Package: pmac-fdisk
++Architecture: powerpc ppc64
++Depends: ${shlibs:Depends}
++Description: fdisk partition manipulation tool for PowerPC
++ The fdisk utilities from the MkLinux project, adopted for Linux/ppc.
++ Pmac-fdisk allows you to create and edit the partition table of a disk.
++ It supports the PC partition format as used on PowerPC. It is an
++ interactive tool similar to PC fdisk.
++
++Package: pmac-fdisk-cross
++Architecture: m68k
++Section: otherosfs
++Priority: extra
++Depends: ${shlibs:Depends}
++Description: fdisk partition manipulation tool for PowerPC
++ The fdisk utilities from the MkLinux project, adopted for Linux/ppc.
++ Pmac-fdisk allows you to create and edit the partition table of a disk.
++ It supports the PC partition format as used on PowerPC. It is an
++ interactive tool similar to PC fdisk.
++
++Package: mac-fdisk-udeb
++Architecture: powerpc ppc64 m68k
++Priority: standard
++Section: debian-installer
++Depends: ${shlibs:Depends}
++Description: Apple disk partition manipulation tool
++ The fdisk utilities from the MkLinux project, adopted for Linux/m68k.
++ Mac-fdisk allows you to create and edit the partition table of a disk.
++ It supports only the Apple partition format used on Macintosh and
PowerMac,
++ use pmac-fdisk for PC partition format disks as used on PowerPC machines.
++ Mac-fdisk is an interactive tool with a menu similar to PC fdisk,
supported
++ options are somewhat different from PC fdisk due to the differences in
++ partition format.
++ .
++ This is a minimal mac-fdisk package used by the debian-installer.
++
++Package: pmac-fdisk-udeb
++Architecture: powerpc ppc64
++Priority: standard
++Section: debian-installer
++Depends: ${shlibs:Depends}
++Description: fdisk partition manipulation tool for PowerPC
++ The fdisk utilities from the MkLinux project, adopted for Linux/ppc.
++ Pmac-fdisk allows you to create and edit the partition table of a disk.
++ It supports the PC partition format as used on PowerPC. It is an
++ interactive tool similar to PC fdisk.
++ .
++ This is a minimal pmac-fdisk package used by the debian-installer.
++
+--- mac-fdisk-0.1.orig/debian/copyright
++++ mac-fdisk-0.1/debian/copyright
+@@ -0,0 +1,25 @@
++This package was debianized by Michael Schmitz
schmitz AT lcbvax.cchem.berkeley.edu on
++Sun, 11 Jan 1998 22:58:07 -0800.
++
++It was downloaded from ftp.mklinux.apple.com:/pub/Other_Tools/
++
++Copyright:
++
++ * Copyright 1996,1997 by Apple Computer, Inc.
++ * All Rights Reserved
++ *
++ * Permission to use, copy, modify, and distribute this software and
++ * its documentation for any purpose and without fee is hereby granted,
++ * provided that the above copyright notice appears in all copies and
++ * that both the copyright notice and this permission notice appear in
++ * supporting documentation.
++ *
++ * APPLE COMPUTER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
++ * FOR A PARTICULAR PURPOSE.
++ *
++ * IN NO EVENT SHALL APPLE COMPUTER BE LIABLE FOR ANY SPECIAL, INDIRECT, OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
++ * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT,
++ * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
++ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+--- mac-fdisk-0.1.orig/mac-fdisk.8.in
++++ mac-fdisk-0.1/mac-fdisk.8.in
+@@ -0,0 +1,262 @@
++.TH MAC-FDISK 8 "1 December 2001" "Debian" "Apple Disk Partitioning Manual"
++.SH NAME
++mac-fdisk \- Apple partition table editor for Linux
++.SH SYNOPSIS
++.B mac-fdisk
++.B "[ \-h | \--help ] [ \-v | \--version ] [ \-l | \--list device ... ]"
++.br
++.B mac-fdisk
++.B "[ \-r | \--readonly ] device ... "
++.SH DESCRIPTION
++.B mac-fdisk
++is a command line type program which partitions disks using the standard
Apple
++disk partitioning scheme described in "Inside Macintosh: Devices".
++The
++.I device
++is usually one of the following:
++
++.nf
++.RS
++/dev/sda
++/dev/sdb
++/dev/sdc
++/dev/sdd
++/dev/sde
++/dev/sdf
++/dev/sdg
++/dev/hda
++/dev/hdb
++
++.RE
++.fi
++/dev/sda is the first hard disk on the SCSI bus (i.e. the
++one with the lowest id), /dev/sdb is the second hard disk, and so on.
++The
++.I partition
++is a
++.I device
++name followed by a partition number.
++The partition number is the index (starting from one) of the partition
++map entry in the partition map (and the partition map itself occupies the
++first entry).
++For example,
++.B /dev/sda2
++is the partition described by the second entry in the partiton map on
/dev/sda.
++
++.SH OPTIONS
++.TP
++.B \-v | \--version
++Prints version number of the
++.B mac-fdisk
++program.
++.TP
++.B \-h | \--help
++Prints a list of available commands for the
++.B mac-fdisk
++program.
++.TP
++.B \-l | \--list
++Lists the partition tables for the specified
++.IR device(s).
++With no
++.IR device(s)
++given, lists all SCSI and IDE devices found in the system.
++.TP
++.B \-r | \--readonly
++Prevents
++.B mac-fdisk
++from writing to the device.
++.SH "Editing Partition Tables"
++An argument which is simply the name of a
++.I device
++indicates that
++.B mac-fdisk
++should edit the partition table of that device. Once started,
++.B mac-fdisk
++presents an interactive command prompt to edit the partition table.
++The partition editing commands are:
++
++.nf
++.RS
++h list available commands
++p print (list) the current edited partition table status
++P print ordered by base address
++i initialize the partition map
++s change size of partition map
++b create new 800K Apple_Bootstrap partition (used by yaboot)
++c create new standard Linux type partition
++C create new partition, specifying the partition type
++d delete a partition
++r reorder partition entry
++w write the partition table to disk
++q quit
++
++.RE
++.fi
++Commands which take arguments prompt for each argument in turn.
++You can also type the arguments separated by spaces
++and those prompts will be skipped. The
++.B i
++and
++.B w
++commands will prompt for confirmation. None of the editing you do will
++actually affect the state of the disk you are partitioning until the
++.B w
++command is issued. Then the map in its edited state will be
++permanently written to the disk.
++
++Partitions are always specified by their number, the index of the
++partition entry in the partition map. Many commands will change the
++index numbers of partitions which follow the affected partition; you are
++encouraged to use the
++.B p
++command to print the partition table as frequently as necessary. For SCSI
++disks, the partition table should not contain more than fifteen partitions
++(partition map excluded). IDE disks have a limit of 31 partitions.
++
++Here is a more-or-less typical output for the print command:
++
++.nf
++.RS
++Command (? for help): p
++/dev/sdb
++ # type name length base ( size )
system
++/dev/sdb1 Apple_partition_map Apple 63 @ 1 ( 31.5k)
Partition map
++/dev/sdb2 Apple_Driver43 Macintosh 54 @ 64 ( 27.0k)
Driver 4.3
++/dev/sdb3 Apple_Driver43 Macintosh 74 @ 118 ( 37.0k)
Driver 4.3
++/dev/sdb4 Apple_Driver_IOKit Macintosh 512 @ 192 (256.0k)
Unknown
++/dev/sdb5 Apple_Patches Patch Partition 512 @ 704 (256.0k)
Unknown
++/dev/sdb6 Apple_HFS untitled 3072000 @ 1216 ( 1.5G)
HFS
++/dev/sdb7 Apple_HFS untitled 2 333026 @ 3073216 (162.6M)
HFS
++/dev/sdb8 Apple_Free Extra 10 @ 3406242 ( 5.0k)
Free space
++
++Block size=512, Number of Blocks=3406252
++DeviceType=0x0, DeviceId=0x0
++Drivers-
++1: @ 64 for 22, type=0x1
++2: @ 118 for 36, type=0xffff
++
++.RE
++.fi
++
++The
++.B i
++(initialize) command prompts for the size of the device. You can just
++type Return to accept the offered size, which should be correct.
++
++The
++.B b
++command is a shortcut to create the bootstrap partition used on PowerPC
++NewWorld machines. It is equivalent to creating an 800k
++.B Apple_Bootstrap
++type partition using the
++.B C
++command described below. The sole purpose of this partition is to
++store the boot loader. In multiboot environments, the first bootable
++partition found on the disk takes precedence unless a specific boot
++partition is set in OpenFirmware, so it's best to create the bootstrap
++partition first, or move it to a position before any
++.B Apple_HFS
++or
++.B Apple_Boot
++partitions using the
++.B r
++command described below. Then you will still able to boot Linux after
++the occasional OpenFirmware reset.
++
++The
++.B c
++(create new partition) command has three arguments. As mentioned
++above you can type the arguments following the command, separated by
++spaces, or respond to prompts for each argument:
++
++ 1) The base address of the start of the partition.
++
++ You can specify a number in blocks (most likely reading from the
++ existing partition map) or you can also type a partition number
++ followed by the letter 'p' to indicate that the new partition
++ should take the place of that existing free space partition.
++
++ 2) The length of the partition.
++
++ Again, you can specify a number in blocks or type a partition
++ number followed by the letter 'p' to indicate use of the entire
++ partition. You can also type a number followed by 'k', 'm', or
++ 'g' to indicate the size in kilobytes, megabytes, or gigabytes
++ respectively. (These are powers of 1024, of course, not powers
++ of 1000.)
++
++ 3) The name of the partition.
++
++ This can be a single word without quotes, or a string surrounded
++ by single or double quotes. It is best to name any swap partition
++ you create `swap'; other partition names are up to you. The names
++ are not visible to Linux.
++
++The
++.B C
++command is identical to the
++.B c
++command, with the addition of a partition type argument after the
++other arguments. The partition type used for Linux swap and data partitons
++is
++.B APPLE_UNIX_SVR2
++(this is the partition type created by the
++.B c
++command). Under normal circumstances, you should not need to use this
++command.
++
++The
++.B d
++command deletes the partition number specified, replacing that partition
++with partitionable free space.
++
++The
++.B r
++(reorder) command allows the index number of partitions to be changed.
++The index numbers are constrained to be a contiguous sequence.
++.B mac-fdisk
++will enforce this constraint by recalculating the partition numbers
++after each insert, delete or reorder operation. OpenFirmware looks for
++bootable partitions in the order specified by the index. The
++partitions are not moved on the disk. This command takes two
++arguments, the number of the partition to be moved and the partition
++number it should become.
++
++The
++.B w
++command writes the partition map out to disk. Note that partition
++maps for disks with mounted partitions cannot immediately be
++reinterpreted by the kernel. In order to use the new partition map you
++must reboot. Within the Debian installer system,
++.B mac-fdisk
++is normally invoked before any partitions are mounted, thus a reboot is not
++necessary before continuing the installation.
++
++The
++.B q
++command terminates the program. If there was no
++.B w
++command issued during the program run, then there will be no effect on the
disk.
++
++.SH BUGS
++Some people believe there should really be just one disk partitioning
utility.
++
++.B mac-fdisk
++should be able to create HFS partitions that work. Currently, if a
++pre-existing HFS partition is resized, MacOS will continue to use the
++partition size stored in the HFS 'superblock' instead of using the size from
++the partition table (the MacOS volume on the partition remains valid even
++though the sizes don't match anymore). This can have undesired side effects
++especially when creating a smaller HFS partition followed by a few Linux
++partitions in place of the previous HFS partition space. To avoid this
++issue, create MacOS partitions within MacOS and then don't resize them
++in
++.B mac-fdisk.
++
++.SH "SEE ALSO"
++.BR fdisk (8),
++.BR mkswap (8),
++.BR mkfs (8)
++.SH AUTHOR
++Eryk Vershen (eryk AT apple.com), man page revised by Chris Tillman
(tillman AT azstarnet.com)
+--- mac-fdisk-0.1.orig/pmac-fdisk.8.in
++++ mac-fdisk-0.1/pmac-fdisk.8.in
+@@ -0,0 +1,222 @@
++.\" Copyright 1992, 1993 Rickard E. Faith (faith AT cs.unc.edu)
++.\" Copyright 1998 Andries E. Brouwer (aeb AT cwi.nl)
++.\" Copyright 2000 Michael Schmitz (schmitz AT biophys.uni-duesseldorf.de)
++.\" May be distributed under the GNU General Public License
++.TH PMAC-FDISK 8 "11 June 1998" "Linux 2.0" "Linux Programmer's Manual"
++.SH NAME
++pmac-fdisk \- Partition table manipulator for Linux
++.SH SYNOPSIS
++.BI "pmac-fdisk [\-u] " device
++.sp
++.BI "pmac-fdisk \-l [\-u] " "device ..."
++.sp
++.BI "pmac-fdisk \-s " "partition ..."
++.sp
++.BI "pmac-fdisk \-v
++.SH DESCRIPTION
++Hard disks can be divided into one or more logical disks called
++.IR partitions .
++This division is described in the
++.I "partition table"
++found in sector 0 of the disk.
++
++In the BSD world one talks about `disk slices' and a `disklabel'.
++
++Linux needs at least one partition, namely for its root file system.
++It can use swap files and/or swap partitions, but the latter are more
++efficient. So, usually one will want a second Linux partition
++dedicated as swap partition.
++On Intel compatible hardware, the BIOS that boots the system
++can often only access the first 1024 cylinders of the disk.
++For this reason people with large disks often create a third partition,
++just a few MB large, typically mounted on
++.IR /boot ,
++to store the kernel image and a few auxiliary files needed at boot time,
++so as to make sure that this stuff is accessible to the BIOS.
++There may be reasons of security, ease of administration and backup,
++or testing, to use more than the minimum number of partitions.
++
++.B pmac-fdisk
++(in the first form of invocation)
++is a menu driven program for creation and manipulation of
++partition tables.
++It understands DOS type partition tables and BSD or SUN type disklabels.
++
++The
++.I device
++is usually one of the following:
++.br
++.nf
++.RS
++/dev/hda
++/dev/hdb
++/dev/sda
++/dev/sdb
++.RE
++.fi
++(/dev/hd[a-h] for IDE disks, /dev/sd[a-p] for SCSI disks).
++A device name refers to the entire disk.
++
++The
++.I partition
++is a
++.I device
++name followed by a partition number. For example,
++.B /dev/hda1
++is the first partition on the first IDE hard disk in the system.
++IDE disks can have up to 63 partitions, SCSI disks up to 15.
++See also
++.IR /usr/src/linux/Documentation/devices.txt .
++
++A BSD/SUN type disklabel can describe 8 partitions,
++the third of which should be a `whole disk' partition.
++Do not start a partition that actually uses its first sector
++(like a swap partition) at cylinder 0, since that will
++destroy the disklabel.
++
++An IRIX/SGI type disklabel can describe 16 partitions,
++the eleventh of which should be an entire `volume' partition,
++while the ninth should be labeled `volume header'.
++The volume header will also cover the partition table, i.e.,
++it starts at block zero and extends by default over five cylinders.
++The remaining space in the volume header may be used by header
++directory entries. No partitions may overlap with the volume header.
++Also do not change its type and make some file system on it, since
++you will lose the partition table. Use this type of label only when
++working with Linux on IRIX/SGI machines or IRIX/SGI disks under Linux.
++
++A DOS type partition table can describe an unlimited number
++of partitions. In sector 0 there is room for the description
++of 4 partitions (called `primary'). One of these may be an
++extended partition; this is a box holding logical partitions,
++with descriptors found in a linked list of sectors, each
++preceding the corresponding logical partitions.
++The four primary partitions, present or not, get numbers 1-4.
++Logical partitions start numbering from 5.
++
++In a DOS type partition table the starting offset and the size
++of each partition is stored in two ways: as an absolute number
++of sectors (given in 32 bits) and as a Cylinders/Heads/Sectors
++triple (given in 10+8+6 bits). The former is OK - with 512-byte
++sectors this will work up to 2 TB. The latter has two different
++problems. First of all, these C/H/S fields can be filled only
++when the number of heads and the number of sectors per track
++are known. Secondly, even if we know what these numbers should be,
++the 24 bits that are available do not suffice.
++DOS uses C/H/S only, Windows uses both, Linux never uses C/H/S.
++
++If possible,
++.B pmac-fdisk
++will obtain the disk geometry automatically. This is not
++necessarily the physical disk geometry (indeed, modern disks do not
++really have anything like a physical geometry, certainly not something
++that can be described in simplistic Cylinders/Heads/Sectors form),
++but is the disk geometry that MS-DOS uses for the partition table.
++
++Usually all goes well by default, and there are no problems if
++Linux is the only system on the disk. However, if the disk has
++to be shared with other operating systems, it is often a good idea
++to let an fdisk from another operating system make at least one
++partition. When Linux boots it looks at the partition table, and
++tries to deduce what (fake) geometry is required for good
++cooperation with other systems.
++
++Whenever a partition table is printed out, a consistency check is performed
++on the partition table entries. This check verifies that the physical and
++logical start and end points are identical, and that the partition starts
++and ends on a cylinder boundary (except for the first partition).
++
++Some versions of MS-DOS create a first partition which does not begin
++on a cylinder boundary, but on sector 2 of the first cylinder.
++Partitions beginning in cylinder 1 cannot begin on a cylinder boundary, but
++this is unlikely to cause difficulty unless you have OS/2 on your machine.
++
++A sync() and a BLKRRPART ioctl() (reread partition table from disk)
++are performed before exiting when the partition table has been updated.
++Long ago it used to be necessary to reboot after the use of pmac-fdisk.
++I do not think this is the case anymore - indeed, rebooting too quickly
++might cause loss of not-yet-written data. Note that both the kernel
++and the disk hardware may buffer data.
++
++.SH "DOS 6.x WARNING"
++
++The DOS 6.x FORMAT command looks for some information in the first
++sector of the data area of the partition, and treats this information
++as more reliable than the information in the partition table. DOS
++FORMAT expects DOS FDISK to clear the first 512 bytes of the data area
++of a partition whenever a size change occurs. DOS FORMAT will look at
++this extra information even if the /U flag is given -- we consider
++this a bug in DOS FORMAT and DOS FDISK.
++
++The bottom line is that if you use pmac-fdisk to change the size of a
++DOS partition table entry, then you must also use
++.B dd
++to zero the first 512 bytes of that partition before using DOS FORMAT to
++format the partition. For example, if you were using pmac-fdisk to make a
++DOS partition table entry for /dev/hda1, then (after exiting pmac-fdisk
++and rebooting Linux so that the partition table information is valid) you
++would use the command "dd if=/dev/zero of=/dev/hda1 bs=512 count=1" to zero
++the first 512 bytes of the partition.
++
++.B BE EXTREMELY CAREFUL
++if you use the
++.B dd
++command, since a small typo can make all of the data on your disk useless.
++
++For best results, you should always use an OS-specific partition table
++program. For example, you should make DOS partitions with the DOS FDISK
++program and Linux partitions with the Linux pmac-fdisk program.
++
++.SH OPTIONS
++.TP
++.B \-v
++Print version number of
++.B pmac-fdisk
++program and exit.
++.TP
++.B \-l
++List the partition tables for
++.BR /dev/hd[a-d] ,
++.BR /dev/sd[a-h] ,
++and then exit.
++.TP
++.B \-u
++When listing partition tables, give sizes in sectors instead
++of cylinders.
++.TP
++.BI "\-s " partition
++The
++.I size
++of the partition (in blocks) is printed on the standard output.
++.SH BUGS
++There are several *fdisk programs around.
++Each has its problems and strengths.
++Try them in the order
++.BR cfdisk ,
++.BR pmac-fdisk ,
++.BR sfdisk .
++(Indeed,
++.B cfdisk
++is a beautiful program that has strict requirements on
++the partition tables it accepts, and produces high quality partition
++tables. Use it if you can.
++.B pmac-fdisk
++is a buggy program that does fuzzy things - usually it happens to
++produce reasonable results. Its single advantage is that it has
++some support for BSD disk labels and other non-DOS partition tables.
++Avoid it if you can.
++.B sfdisk
++is for hackers only - the user interface is terrible, but it is
++more correct than pmac-fdisk and more powerful than both pmac-fdisk and
cfdisk.
++Moreover, it can be used noninteractively.)
++.PP
++The IRIX/SGI type disklabel is currently not supported by the kernel.
++Moreover, IRIX/SGI header directories are not fully supported yet.
++.PP
++The option `dump partition table to file' is missing.
++.\" .SH AUTHORS
++.\" A. V. Le Blanc (LeBlanc AT mcc.ac.uk)
++.\" Bernhard Fastenrath (fasten AT informatik.uni-bonn.de)
++.\" Jakub Jelinek (jj AT sunsite.mff.cuni.cz)
++.\" Andreas Neuper (ANeuper AT GUUG.de)
++.\" and many others.
diff --git a/disk/mac-fdisk/mac-fdisk_0.1.orig.tar.gz.sig
b/disk/mac-fdisk/mac-fdisk_0.1.orig.tar.gz.sig
new file mode 100644
index 0000000..5be9ce9
Binary files /dev/null and b/disk/mac-fdisk/mac-fdisk_0.1.orig.tar.gz.sig
differ
diff --git a/disk/mac-fdisk/patch.diff b/disk/mac-fdisk/patch.diff
deleted file mode 100644
index 0574b67..0000000
--- a/disk/mac-fdisk/patch.diff
+++ /dev/null
@@ -1,1869 +0,0 @@
---- mac-fdisk-0.1.orig/dpme.h
-+++ mac-fdisk-0.1/dpme.h
-@@ -124,6 +124,7 @@
- };
- typedef struct dpme DPME;
-
-+#define dpme_automount_set(p, v) bitfield_set(&p->dpme_flags,
30, 1, v) /* MSch */
- #define dpme_os_specific_1_set(p, v) bitfield_set(&p->dpme_flags,
8, 1, v)
- #define dpme_os_specific_2_set(p, v) bitfield_set(&p->dpme_flags,
7, 1, v)
- #define dpme_os_pic_code_set(p, v) bitfield_set(&p->dpme_flags,
6, 1, v)
-@@ -134,6 +135,7 @@
- #define dpme_allocated_set(p, v) bitfield_set(&p->dpme_flags,
1, 1, v)
- #define dpme_valid_set(p, v) bitfield_set(&p->dpme_flags,
0, 1, v)
-
-+#define dpme_automount_get(p) bitfield_get(p->dpme_flags,
30, 1) /* MSch */
- #define dpme_os_specific_1_get(p) bitfield_get(p->dpme_flags,
8, 1)
- #define dpme_os_specific_2_get(p) bitfield_get(p->dpme_flags,
7, 1)
- #define dpme_os_pic_code_get(p) bitfield_get(p->dpme_flags,
6, 1)
---- mac-fdisk-0.1.orig/dump.c
-+++ mac-fdisk-0.1/dump.c
-@@ -3,7 +3,11 @@
- //
- // Written by Eryk Vershen (eryk AT apple.com)
- //
--
-+/*
-+ * Linux/m68k version by Christiaan Welvaart
-+ * minor fixes and glibc change by Michael Schmitz
-+ */
-+
- /*
- * Copyright 1996,1997 by Apple Computer, Inc.
- * All Rights Reserved
-@@ -60,6 +64,7 @@
- //
- NAMES plist[] = {
- "Drvr", "Apple_Driver",
-+ "Dr43", "Apple_Driver43",
- "Free", "Apple_Free",
- " HFS", "Apple_HFS",
- " MFS", "Apple_MFS",
-@@ -83,7 +88,7 @@
- // Forward declarations
- //
- void dump_block_zero(partition_map_header *map);
--void dump_partition_entry(partition_map *entry, int digits);
-+void dump_partition_entry(partition_map *entry, int digits, char *dev);
-
-
- //
-@@ -119,6 +124,7 @@
- }
- printf("\nBlock size=%u, Number of Blocks=%u\n",
- p->sbBlkSize, p->sbBlkCount);
-+#ifndef __mc68000__
- printf("DeviceType=0x%x, DeviceId=0x%x\n",
- p->sbDevType, p->sbDevId);
- if (p->sbDrvrCount > 0) {
-@@ -130,6 +136,7 @@
- }
- }
- printf("\n");
-+#endif
- }
-
-
-@@ -138,31 +145,50 @@
- {
- partition_map * entry;
- int j;
-+ size_t len;
-+ char *buf;
-
- if (map == NULL) {
- bad_input("No partition map exists");
- return;
- }
-+#ifdef __mc68000__
-+ printf("Disk %s\n", map->name);
-+#else
- printf("%s\n", map->name);
-+#endif
-
- j = number_of_digits(map->media_size);
- if (j < 7) {
- j = 7;
- }
-- printf(" #: type name "
-- "%*s %-*s ( size )\n", j, "length", j, "base");
-+#ifdef __mc68000__
-+ printf("%*s type name "
-+ "%*s %-*s ( size ) system\n", strlen(map->name)+1, "#", j,
"length", j, "base");
-+#else
-+ printf("%*s type name "
-+ "%*s %-*s ( size ) system\n", strlen(map->name)+1, "#", j,
"length", j, "base");
-+#endif
-+
-+ /* Grok devfs names. (courtesy Colin Walters)*/
-+
-+ len = strlen(map->name);
-+ buf = strdup(map->name);
-+ if (len >= 4 && !strcmp(buf+len-4, "disc")) {
-+ strcpy(buf+len-4, "part");
-+ }
-
- if (disk_order) {
- for (entry = map->disk_order; entry != NULL;
- entry = entry->next_on_disk) {
-
-- dump_partition_entry(entry, j);
-+ dump_partition_entry(entry, j, buf);
- }
- } else {
- for (entry = map->base_order; entry != NULL;
- entry = entry->next_by_base) {
-
-- dump_partition_entry(entry, j);
-+ dump_partition_entry(entry, j, buf);
- }
- }
- dump_block_zero(map);
-@@ -170,18 +196,23 @@
-
-
- void
--dump_partition_entry(partition_map *entry, int digits)
-+dump_partition_entry(partition_map *entry, int digits, char *dev)
- {
- partition_map_header *map;
- int j;
- DPME *p;
- BZB *bp;
- char *s;
-+#ifdef __mc68000__
-+ int aflag = 1;
-+#else
- int aflag = 0;
-+#endif
- int pflag = 1;
- u32 size;
- double bytes;
-
-+
- map = entry->the_map;
- p = entry->data;
- if (aflag) {
-@@ -192,9 +223,13 @@
- break;
- }
- }
-- printf("%4d: %.4s %-18.32s ", entry->disk_address, s, p->dpme_name);
-+#ifdef __mc68000__
-+ printf("%s%-2d %.4s %-12.12s ", dev, entry->disk_address, s,
p->dpme_name);
-+#else
-+ printf("%s%-4d %.4s %-18.32s ", dev, entry->disk_address, s,
p->dpme_name);
-+#endif
- } else {
-- printf("%4d: %20.32s %-18.32s ",
-+ printf("%s%-4d %20.32s %-18.32s ", dev,
- entry->disk_address, p->dpme_type, p->dpme_name);
- }
-
-@@ -217,7 +252,10 @@
- printf("@~%-*u", digits, p->dpme_pblock_start + p->dpme_lblock_start);
- }
-
-+ j = 's';
-+
- bytes = size / ONE_KILOBYTE_IN_BLOCKS;
-+ j = 'k';
- if (bytes >= 1024.0) {
- bytes = bytes / 1024.0;
- if (bytes < 1024.0) {
-@@ -226,58 +264,45 @@
- bytes = bytes / 1024.0;
- j = 'G';
- }
-- printf(" (%#5.1f%c)", bytes, j);
- }
-+ printf(" (%#5.1f%c) ", bytes, j);
-
--#if 0
-- // Old A/UX fields that no one pays attention to anymore.
-- bp = (BZB *) (p->dpme_bzb);
-- j = -1;
-- if (bp->bzb_magic == BZBMAGIC) {
-- switch (bp->bzb_type) {
-- case FSTEFS:
-- s = "EFS";
-- break;
-- case FSTSFS:
-- s = "SFS";
-- j = 1;
-- break;
-- case FST:
-- default:
-- if (bzb_root_get(bp) != 0) {
-- if (bzb_usr_get(bp) != 0) {
-- s = "RUFS";
-- } else {
-- s = "RFS";
-- }
-- j = 0;
-- } else if (bzb_usr_get(bp) != 0) {
-- s = "UFS";
-- j = 2;
-- } else {
-- s = "FS";
-- }
-- break;
-- }
-- if (bzb_slice_get(bp) != 0) {
-- printf(" s%1d %4s", bzb_slice_get(bp)-1, s);
-- } else if (j >= 0) {
-- printf(" S%1d %4s", j, s);
-- } else {
-- printf(" %4s", s);
-- }
-- if (bzb_crit_get(bp) != 0) {
-- printf(" K%1d", bp->bzb_cluster);
-- } else if (j < 0) {
-- printf(" ");
-- } else {
-- printf(" k%1d", bp->bzb_cluster);
-- }
-- if (bp->bzb_mount_point[0] != 0) {
-- printf(" %.64s", bp->bzb_mount_point);
-- }
-- }
--#endif
-+ if (!strcmp(p->dpme_type, "Apple_UNIX_SVR2"))
-+ {
-+ if (!strcmp(p->dpme_name, "Swap") || !strcmp(p->dpme_name, "swap"))
-+ printf("Linux swap");
-+ else
-+ printf("Linux native");
-+ }
-+ else
-+ if (!strcmp(p->dpme_type, "Apple_Bootstrap"))
-+ printf("NewWorld bootblock");
-+ else
-+ if (!strcmp(p->dpme_type, "Apple_Scratch"))
-+ printf("Linux swap"); //not just linux, but who cares
-+ else
-+ if (!strcmp(p->dpme_type, "Apple_HFS"))
-+ printf("HFS");
-+ else
-+ if (!strcmp(p->dpme_type, "Apple_MFS"))
-+ printf("MFS");
-+ else
-+ if (!strcmp(p->dpme_type, "Apple_Driver"))
-+ printf("Driver");
-+ else
-+ if (!strcmp(p->dpme_type, "Apple_Driver43"))
-+ printf("Driver 4.3");
-+ else
-+ if (!strcmp(p->dpme_type, "Apple_partition_map"))
-+ printf("Partition map");
-+ else
-+ if (!strcmp(p->dpme_type, "Apple_PRODOS"))
-+ printf("ProDOS");
-+ else
-+ if (!strcmp(p->dpme_type, "Apple_Free"))
-+ printf("Free space");
-+ else
-+ printf("Unknown");
- printf("\n");
- }
-
-@@ -316,6 +341,24 @@
-
- dump(name);
- }
-+#ifdef __linux__
-+ for (i = 0; i < 4; i++) {
-+ sprintf(name, "/dev/hd%c", 'a'+i);
-+ if ((fd = open_device(name, O_RDONLY)) < 0) {
-+ if (errno == EACCES) {
-+ error(errno, "can't open file '%s'", name);
-+ }
-+ continue;
-+ }
-+ if (read_block(fd, 1, (char *)data, 1) == 0) {
-+ close_device(fd);
-+ continue;
-+ }
-+ close_device(fd);
-+
-+ dump(name);
-+ }
-+#endif
- free(data);
- }
-
-@@ -385,7 +428,7 @@
- printf("%2d: %20.32s ",
- entry->disk_address, p->dpme_type);
- printf("%7u @ %-7u ", p->dpme_pblocks, p->dpme_pblock_start);
-- printf("%c%c%c%c%c%c%c%c%c ",
-+ printf("%c%c%c%c%c%c%c%c%c%c ",
- (dpme_valid_get(p))?'V':'v',
- (dpme_allocated_get(p))?'A':'a',
- (dpme_in_use_get(p))?'I':'i',
-@@ -394,7 +437,8 @@
- (dpme_writable_get(p))?'W':'w',
- (dpme_os_pic_code_get(p))?'P':'p',
- (dpme_os_specific_1_get(p))?'1':'.',
-- (dpme_os_specific_2_get(p))?'2':'.');
-+ (dpme_os_specific_2_get(p))?'2':'.',
-+ (dpme_automount_get(p))?'M':'m');
- if (p->dpme_lblock_start != 0 || p->dpme_pblocks != p->dpme_lblocks) {
- printf("(%u @ %u)", p->dpme_lblocks, p->dpme_lblock_start);
- }
---- mac-fdisk-0.1.orig/io.c
-+++ mac-fdisk-0.1/io.c
-@@ -30,6 +30,10 @@
- #include <stdlib.h>
- #include <fcntl.h>
- #include <SCSI.h>
-+#else
-+#ifdef __GLIBC__
-+#include <sys/types.h>
-+#endif
- #endif
- #include <unistd.h>
- #include <string.h>
-@@ -51,6 +55,8 @@
- #define SCSI_FD 8
- #define loff_t long
- #define llseek lseek
-+#else
-+#define llseek lseek64
- #endif
-
-
-@@ -435,8 +441,8 @@
- #else
- {
- #endif
-- x = num * PBLOCK_SIZE;
-- if ((x = llseek(fd, x, 0)) < 0) {
-+ x = ((long long) num * PBLOCK_SIZE); /* cast to ll to work around
compiler bug */
-+ if ((x = lseek64(fd, x, 0)) < 0) {
- if (quiet == 0) {
- error(errno, "Can't seek on file");
- }
---- mac-fdisk-0.1.orig/partition_map.c
-+++ mac-fdisk-0.1/partition_map.c
-@@ -30,7 +30,6 @@
- #include <stdlib.h>
- #include <unistd.h>
- #endif
--#include <string.h>
- #include <errno.h>
-
- #include <fcntl.h>
-@@ -65,6 +64,8 @@
- const char * kFreeType = "Apple_Free";
- const char * kMapType = "Apple_partition_map";
- const char * kUnixType = "Apple_UNIX_SVR2";
-+const char * kBootstrapType = "Apple_Bootstrap";
-+const char * kBootstrapName = "bootstrap";
-
- const char * kFreeName = "Extra";
-
-@@ -288,15 +289,17 @@
- free(block);
- }
- }
-- printf("The partition table has been altered!\n\n");
-+ printf("The partition map has been saved successfully!\n\n");
-
- #ifdef __linux__
- if (map->regular_file) {
- close_device(map->fd);
- } else {
-- // printf("Calling ioctl() to re-read partition table.\n"
-- // "(Reboot to ensure the partition table has been
updated.)\n");
-- sync();
-+ // printf("Calling ioctl() to re-read partition table.\n");
-+ if ((i = ioctl(fd, BLKFLSBUF)) != 0) {
-+ perror("ioctl(BLKFLSBUF)");
-+ sync();
-+ }
- sleep(2);
- if ((i = ioctl(fd, BLKRRPART)) != 0) {
- saved_errno = errno;
-@@ -304,20 +307,26 @@
- // some kernel versions (1.2.x) seem to have trouble
- // rereading the partition table, but if asked to do it
- // twice, the second time works. - biro AT yggdrasil.com */
-- sync();
-+ // printf("Again calling ioctl() to re-read partition table.\n");
-+ if ((i = ioctl(fd, BLKFLSBUF)) != 0) {
-+ perror("ioctl(BLKFLSBUF)");
-+ sync();
-+ }
- sleep(2);
- if ((i = ioctl(fd, BLKRRPART)) != 0) {
- saved_errno = errno;
- }
- }
-+ printf("Syncing disks.\n");
-+ if ((i = ioctl(fd, BLKFLSBUF)) != 0) {
-+ perror("ioctl(BLKFLSBUF)");
-+ sync();
-+ }
- close_device(map->fd);
--
-- // printf("Syncing disks.\n");
-- sync();
- sleep(4); /* for sync() */
-
- if (i < 0) {
-- error(saved_errno, "Re-read of partition table failed");
-+ error(saved_errno, "Re-read of partition map failed");
- printf("Reboot your system to ensure the "
- "partition table is updated.\n");
- }
-@@ -692,9 +701,9 @@
- geometry.heads*geometry.sectors*geometry.cylinders);
- }
-
-- if ((pos = llseek(fd, 0, SEEK_END)) < 0) {
-+ if ((pos = lseek64(fd, 0, SEEK_END)) < 0) {
- printf("llseek to end of device failed\n");
-- } else if ((pos = llseek(fd, 0, SEEK_CUR)) < 0) {
-+ } else if ((pos = lseek64(fd, 0, SEEK_CUR)) < 0) {
- printf("llseek to end of device failed on second try\n");
- } else {
- printf("llseek: pos = %d, blocks=%d\n", pos, pos/PBLOCK_SIZE);
-@@ -895,6 +904,7 @@
- printf("No such partition\n");
- } else {
- remove_from_disk_order(cur);
-+ if (old_index < index) index++; /* renumber_disk_addresses(map); */
- cur->disk_address = index;
- insert_in_disk_order(cur);
- renumber_disk_addresses(map);
---- mac-fdisk-0.1.orig/partition_map.h
-+++ mac-fdisk-0.1/partition_map.h
-@@ -69,6 +69,8 @@
- extern const char * kFreeType;
- extern const char * kMapType;
- extern const char * kUnixType;
-+extern const char * kBootstrapType;
-+extern const char * kBootstrapName;
-
- extern const char * kFreeName;
-
---- mac-fdisk-0.1.orig/pdisk.c
-+++ mac-fdisk-0.1/pdisk.c
-@@ -30,12 +30,12 @@
- #include <stdio.h>
- #ifdef __linux__
- #include <getopt.h>
-+#include <stddef.h>
- #else
- #include <stdlib.h>
- #include <unistd.h>
- #include <SIOUX.h>
- #endif
--#include <string.h>
- #include <errno.h>
-
- #ifdef __linux__
-@@ -94,6 +94,7 @@
- void do_add_intel_partition(partition_map_header *map);
- void do_change_map_size(partition_map_header *map);
- void do_create_partition(partition_map_header *map, int get_type);
-+void do_create_bootstrap_partition(partition_map_header *map);
- void do_delete_partition(partition_map_header *map);
- int do_expert(partition_map_header *map);
- void do_reorder(partition_map_header *map);
-@@ -114,6 +115,7 @@
- main(int argc, char **argv)
- {
- int name_index;
-+ int err=0;
-
- if (sizeof(DPME) != PBLOCK_SIZE) {
- fatal(-1, "Size of partion map entry (%d) "
-@@ -150,7 +152,9 @@
- } else if (!vflag) {
- usage("no device argument");
- do_help();
-+ err=-EINVAL; // debatable
- }
-+ exit(err);
- }
- #else
- main()
-@@ -351,7 +355,8 @@
- printf(" P (print ordered by base address)\n");
- printf(" i initialize partition map\n");
- printf(" s change size of partition map\n");
-- printf(" c create new partition\n");
-+ printf(" b create new 800K bootstrap partition\n");
-+ printf(" c create new Linux partition\n");
- printf(" C (create with type also specified)\n");
- printf(" d delete a partition\n");
- printf(" r reorder partition entry in map\n");
-@@ -378,6 +383,10 @@
- case 'i':
- map = init_partition_map(name, map);
- break;
-+ case 'B':
-+ case 'b':
-+ do_create_bootstrap_partition(map);
-+ break;
- case 'C':
- get_type = 1;
- // fall through
-@@ -471,6 +480,30 @@
- }
-
-
-+void
-+do_create_bootstrap_partition(partition_map_header *map)
-+{
-+ long base;
-+
-+ if (map == NULL) {
-+ bad_input("No partition map exists");
-+ return;
-+ }
-+
-+ if (!rflag && map->writeable == 0) {
-+ printf("The map is not writeable.\n");
-+ }
-+
-+ // XXX add help feature (i.e. '?' in any argument routine prints help
string)
-+ if (get_base_argument(&base, map) == 0) {
-+ return;
-+ }
-+
-+ // create 800K type Apple_Bootstrap partition named `bootstrap'
-+ add_partition_to_map(kBootstrapName, kBootstrapType, base, 1600, map);
-+}
-+
-+
- int
- get_base_argument(long *number, partition_map_header *map)
- {
-@@ -508,7 +541,7 @@
- int result = 0;
- long multiple;
-
-- if (get_number_argument("Length in blocks: ", number, kDefault) == 0) {
-+ if (get_number_argument("Length (in blocks, kB (k), MB (M) or GB (G)):
", number, kDefault) == 0) {
- bad_input("Bad length");
- } else {
- result = 1;
-@@ -605,13 +638,22 @@
- bad_input("The map is not writeable.");
- return;
- }
-- printf("Writing the map destroys what was there before. ");
-- if (get_okay("Is that okay? [n/y]: ", 0) != 1) {
-+// printf("Writing the map destroys what was there before. ");
-+ printf("IMPORTANT: You are about to write a changed partition map to
disk. \n");
-+ printf("For any partition you changed the start or size of, writing out
\n");
-+ printf("the map causes all data on that partition to be LOST FOREVER.
\n");
-+ printf("Make sure you have a backup of any data on such partitions you
\n");
-+ printf("want to keep before answering 'yes' to the question below!
\n\n");
-+ if (get_okay("Write partition map? [n/y]: ", 0) != 1) {
- return;
- }
-
- write_partition_map(map);
-
-+ printf("\nPartition map written to disk. If any partitions on this disk
\n");
-+ printf("were still in use by the system (see messages above), you will
need \n");
-+ printf("to reboot in order to utilize the new partition map.\n\n");
-+
- // exit(0);
- }
-
---- mac-fdisk-0.1.orig/fdisk.c
-+++ mac-fdisk-0.1/fdisk.c
-@@ -62,7 +62,6 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <string.h>
- #include <fcntl.h>
- #include <ctype.h>
- #include <setjmp.h>
-@@ -71,6 +70,10 @@
-
- #include <sys/ioctl.h>
-
-+#include <linux/types.h>
-+
-+typedef unsigned short kdev_t; /* BAD hack; kdev_t is not exported */
-+
- #include <linux/genhd.h>
- #include <linux/hdreg.h>
- #include <linux/fs.h>
-@@ -428,7 +431,7 @@
- offsets[partitions] = extended_offset + SWAP32(p->start_sect);
- if (!extended_offset)
- extended_offset = SWAP32(p->start_sect);
-- if (llseek(fd, (loff_t)offsets[partitions]
-+ if (lseek64(fd, (loff_t)offsets[partitions]
- * SECTOR_SIZE, SEEK_SET) < 0)
- fatal(unable_to_seek);
- if (!(buffers[partitions] = (char *) malloc(SECTOR_SIZE)))
-@@ -438,14 +441,14 @@
- part_table[partitions] = ext_pointers[partitions] = NULL;
- q = p = offset(buffers[partitions], 0);
- for (i = 0; i < 4; i++, p++) {
-- if (p->sys_ind == EXTENDED)
-+ if (p->sys_ind == EXTENDED) {
- if (ext_pointers[partitions])
- fprintf(stderr, "Warning: extra link "
- "pointer in partition table "
- "%d\n", partitions + 1);
- else
- ext_pointers[partitions] = p;
-- else if (p->sys_ind)
-+ } else if (p->sys_ind) {
- if (part_table[partitions])
- fprintf(stderr,
- "Warning: ignoring extra data
"
-@@ -453,15 +456,18 @@
- partitions + 1);
- else
- part_table[partitions] = p;
-+ }
- }
-- if (!part_table[partitions])
-+ if (!part_table[partitions]) {
- if (q != ext_pointers[partitions])
- part_table[partitions] = q;
- else part_table[partitions] = q + 1;
-- if (!ext_pointers[partitions])
-+ }
-+ if (!ext_pointers[partitions]) {
- if (q != part_table[partitions])
- ext_pointers[partitions] = q;
- else ext_pointers[partitions] = q + 1;
-+ }
- p = ext_pointers[partitions++];
- }
- }
-@@ -497,11 +503,12 @@
- warn_geometry();
-
- for (i = 0; i < 4; i++)
-- if(part_table[i]->sys_ind == EXTENDED)
-+ if(part_table[i]->sys_ind == EXTENDED) {
- if (partitions != 4)
- fprintf(stderr, "Ignoring extra extended "
- "partition %d\n", i + 1);
- else read_extended(part_table[ext_index = i]);
-+ }
-
- for (i = 3; i < partitions; i++)
- if (SWAP16(*table_check(buffers[i])) != PART_TABLE_FLAG) {
-@@ -621,6 +628,7 @@
- case lower: i += low; break;
- case upper: i += high; break;
- case deflt: i += dflt; break;
-+ default: break;
- }
- }
- else
-@@ -844,12 +852,12 @@
- return; /* do not check extended partitions */
-
- /* physical beginning c, h, s */
-- pbc = p->cyl & 0xff | (p->sector << 2) & 0x300;
-+ pbc = (p->cyl & 0xff) | ((p->sector << 2) & 0x300);
- pbh = p->head;
- pbs = p->sector & 0x3f;
-
- /* physical ending c, h, s */
-- pec = p->end_cyl & 0xff | (p->end_sector << 2) & 0x300;
-+ pec = (p->end_cyl & 0xff) | ((p->end_sector << 2) & 0x300);
- peh = p->end_head;
- pes = p->end_sector & 0x3f;
-
-@@ -941,7 +949,7 @@
- disk_device, heads, sectors, cylinders);
- printf("Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n");
- for (i = 0 ; i < partitions; i++)
-- if (p = q[i]) {
-+ if ((p = q[i])) {
- printf("%2d %02x%4d%4d%5d%4d%4d%5d%8d%8d %02x\n",
- i + 1, p->boot_ind, p->head,
- sector(p->sector),
-@@ -1026,7 +1034,7 @@
- last[i]);
- total += last[i] + 1 - first[i];
- for (j = 0; j < i; j++)
-- if (first[i] >= first[j] && first[i] <= last[j]
-+ if ((first[i] >= first[j] && first[i] <= last[j])
- || (last[i] <= last[j] &&
- last[i] >= first[j])) {
- printf("Warning: partition %d overlaps "
-@@ -1060,11 +1068,11 @@
- if (total > heads * sectors * cylinders)
- printf("Total allocated sectors %d greater than the maximum "
- "%d\n", total, heads * sectors * cylinders);
-- else if (total = heads * sectors * cylinders - total)
-+ else if ((total = heads * sectors * cylinders - total))
- printf("%d unallocated sectors\n", total);
- }
-
--void add_partition(int n, int sys)
-+static void add_partition(int n, int sys)
- {
- char mesg[48];
- int i, read = 0;
-@@ -1100,11 +1108,12 @@
- for (i = 0; i < partitions; i++) {
- if (start == offsets[i])
- start += sector_offset;
-- if (start >= first[i] && start <= last[i])
-+ if (start >= first[i] && start <= last[i]) {
- if (n < 4)
- start = last[i] + 1;
- else
- start = last[i] + sector_offset;
-+ }
- }
- if (start > limit)
- break;
-@@ -1249,7 +1258,7 @@
- for (i = 3; i < partitions; i++)
- if (changed[i]) {
- *table_check(buffers[i]) = SWAP16(PART_TABLE_FLAG);
-- if (llseek(fd, (loff_t)offsets[i]
-+ if (lseek64(fd, (loff_t)offsets[i]
- * SECTOR_SIZE, SEEK_SET) < 0)
- fatal(unable_to_seek);
- if (write(fd, buffers[i], SECTOR_SIZE) != SECTOR_SIZE)
-@@ -1262,7 +1271,7 @@
- "(Reboot to ensure the partition table has been updated.)\n");
- sync();
- sleep(2);
-- if (i = ioctl(fd, BLKRRPART)) {
-+ if ((i = ioctl(fd, BLKRRPART))) {
- error = errno;
- } else {
- /* some kernel versions (1.2.x) seem to have trouble
-@@ -1270,7 +1279,7 @@
- twice, the second time works. - biro AT yggdrasil.com */
- sync();
- sleep(2);
-- if(i = ioctl(fd, BLKRRPART))
-+ if((i = ioctl(fd, BLKRRPART)))
- error = errno;
- }
-
-@@ -1391,7 +1400,7 @@
- void try(char *device)
- {
- disk_device = device;
-- if (!setjmp(listingbuf))
-+ if (!setjmp(listingbuf)) {
- if ((fd = open(disk_device, type_open)) >= 0) {
- close(fd);
- get_boot();
-@@ -1407,6 +1416,7 @@
- exit(1);
- }
- }
-+ }
- }
-
- void main(int argc, char **argv)
---- mac-fdisk-0.1.orig/fdisklabel.c
-+++ mac-fdisk-0.1/fdisklabel.c
-@@ -38,7 +38,6 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <string.h>
- #include <fcntl.h>
- #include <ctype.h>
- #include <setjmp.h>
-@@ -47,7 +46,6 @@
- #include <sys/ioctl.h>
- #include <sys/param.h>
-
--#include <linux/genhd.h>
- #include <linux/hdreg.h>
- #include <linux/fs.h>
-
-@@ -377,7 +375,7 @@
- {
- #if defined (i386)
- if (bsd_initlabel (bsd_part, &bsd_dlabel, bsd_part_index) == 1)
--#elif defined (__alpha__) || defined (__powerpc__)
-+#elif defined (__alpha__) || defined (__powerpc__) || defined (__mc68000__)
- if (bsd_initlabel (NULL, &bsd_dlabel, 0) == 1)
- #endif
- {
-@@ -515,7 +513,7 @@
- alpha_bootblock_checksum (buffer);
- #endif
-
-- if (llseek (fd, sector * SECTOR_SIZE, SEEK_SET) == -1)
-+ if (lseek64 (fd, sector * SECTOR_SIZE, SEEK_SET) == -1)
- fatal (unable_to_seek);
- if (BSD_BBSIZE != write (fd, buffer, BSD_BBSIZE))
- fatal (unable_to_write);
-@@ -679,7 +677,7 @@
- sector = 0;
- #endif
-
-- if (llseek (fd, sector * SECTOR_SIZE, SEEK_SET) == -1)
-+ if (lseek64 (fd, sector * SECTOR_SIZE, SEEK_SET) == -1)
- fatal (unable_to_seek);
- if (BSD_BBSIZE != read (fd, buffer, BSD_BBSIZE))
- fatal (unable_to_read);
-@@ -724,12 +722,12 @@
-
- #if defined (__alpha__) && BSD_LABELSECTOR == 0
- alpha_bootblock_checksum (buffer);
-- if (llseek (fd, 0, SEEK_SET) == -1)
-+ if (lseek64 (fd, 0, SEEK_SET) == -1)
- fatal (unable_to_seek);
- if (BSD_BBSIZE != write (fd, buffer, BSD_BBSIZE))
- fatal (unable_to_write);
- #else
-- if (llseek (fd, sector * SECTOR_SIZE + BSD_LABELOFFSET, SEEK_SET) == -1)
-+ if (lseek64 (fd, sector * SECTOR_SIZE + BSD_LABELOFFSET, SEEK_SET) == -1)
- fatal (unable_to_seek);
- if (sizeof (struct disklabel) != write (fd, d, sizeof (struct disklabel)))
- fatal (unable_to_write);
---- mac-fdisk-0.1.orig/fdisklabel.h
-+++ mac-fdisk-0.1/fdisklabel.h
-@@ -52,6 +52,12 @@
- #define BSD_LABELOFFSET 0
- #define BSD_BBSIZE 0
- #define BSD_SBSIZE 0
-+#elif defined (__mc68000__)
-+/* LABELSECTOR, LABELOFFSET, BBSIZE & SBSIZE are undefined for __powerpc__
*/
-+#define BSD_LABELSECTOR 0
-+#define BSD_LABELOFFSET 0
-+#define BSD_BBSIZE 0
-+#define BSD_SBSIZE 0
- #else
- #error unknown architecture
- #endif
---- mac-fdisk-0.1.orig/Makefile
-+++ mac-fdisk-0.1/Makefile
-@@ -5,7 +5,14 @@
- fdisk: fdisk.o fdisklabel.o
-
- clean:
-- rm -f *.o pdisk fdisk
-+ rm -f *.o pdisk fdisk mac-fdisk pmac-fdisk
-+
-+install: pdisk fdisk
-+ -rm -f pmac-fdisk mac-fdisk
-+ ln pdisk mac-fdisk
-+ ln fdisk pmac-fdisk
-+ install -o root -g root -m 0755 mac-fdisk ${DESTDIR}/sbin
-+ install -o root -g root -m 0755 pmac-fdisk ${DESTDIR}/sbin
-
- distribution:
- cd ..; tar cvf pdisk.src.tar.`date +%y%m%d` --files-from
pdisk/list.src
---- mac-fdisk-0.1.orig/debian/README.debian
-+++ mac-fdisk-0.1/debian/README.debian
-@@ -0,0 +1,18 @@
-+mac-fdisk for DEBIAN
-+----------------------
-+
-+Comments regarding mac-fdisk
-+
-+mac-fdisk provides Apple partition format utilities required for
-+installation of Debian/68k on Apple Macintosh computers. The Debian version
-+of mac-fdisk is derived from pdisk 0.4a2 (pdisk.970115.tar) by Eryk Vershen
-+(eryk AT apple.com).
-+pmac-fdisk is a version of the PC partition format utilities for PowerPC
-+computers, taken from the same pdisk source version and can be used for
-+installation of Debian/68k on PC partition format disks on Macintosh.
-+
-+Modifications have been made to the pdisk partition table output code to
permit
-+parsing the output of 'mac-fdisk -l' in a manner consistent with other Linux
-+fdisk utilities. (Christiaan Welvaart, <>)
-+
-+Michael Schmitz <schmitz AT lcbvax.cchem.berkeley.edu>, Sat, 28 Feb 1998
12:58:07 -0800
---- mac-fdisk-0.1.orig/debian/postinst.debhelper
-+++ mac-fdisk-0.1/debian/postinst.debhelper
-@@ -0,0 +1,7 @@
-+# Automatically added by dh_installdocs
-+if [ "$1" = "configure" ]; then
-+ if [ -d /usr/doc -a ! -e /usr/doc/mac-fdisk -a -d
/usr/share/doc/mac-fdisk ]; then
-+ ln -sf ../share/doc/mac-fdisk /usr/doc/mac-fdisk
-+ fi
-+fi
-+# End automatically added section
---- mac-fdisk-0.1.orig/debian/changelog
-+++ mac-fdisk-0.1/debian/changelog
-@@ -0,0 +1,103 @@
-+mac-fdisk (0.1-10) unstable; urgency=high
-+
-+ * Added .udeb magic to rules (kudos to Gaudenz Steinlin
-+ <gaudenz AT soziologie.ch>); kept mac-fdisk in /sbin though).
-+ Closes: #188420.
-+
-+ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Wed, 04 Jun 2003
17:06:02 +0200
-+
-+mac-fdisk (0.1-9) unstable; urgency=high
-+
-+ * Rebuilt with woody binutils to allow for prelinking. Closes: #176353.
-+
-+ * Set 'automagically mount on boot' flag when creating HFS partitions
-+ (thanks to Derrick Pates <dpates AT dsdk12.net> for finding the
-+ undocumented bit!). Experimental, but this is unstable, right?
-+
-+ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Fri, 24 Jan 2003
16:20:20 +0200
-+
-+mac-fdisk (0.1-8) unstable; urgency=high
-+
-+ * Update mac-fdisk man page (kudos to Chris Tillman). Closes: #121928.
-+
-+ * Remove mac-fdisk-cross from control file; remove Sparc from Arch:
entries
-+ (to get rid of outdated mac-fdisk-cross 0.1-1 in the archive). Change
-+ package descrption line for pmac-fdisk to emphasize it's a fdisk clone.
-+
-+ * Change sync() to ioctl(fd, BLKFLSBUF) to flush partition table to disk
-+ on write - hopefully work around a kernel bug on new machines.
-+
-+ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Fri, 07 Dec 2001
13:38:10 +0200
-+
-+mac-fdisk (0.1-7) unstable; urgency=high
-+
-+ * Bugfix: mac-fdisk didn't properly handle devfs device names. Mangle disk
-+ name (.../disc) in dump routine to end in .../part%d (patch by Colin
-+ Walters <walters AT verbum.org>). Closes: #110056.
-+
-+ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Mon, 04 Sep 2001
16:02:45 +0200
-+
-+mac-fdisk (0.1-6.0potato1) stable; urgency=high
-+
-+ * Feature added: menu option to create bootstrap partition needed for
-+ powerpc NewWorld machines with the proper type and size (patch supplied
-+ by Ethan Benson). This should help newbies that won't read the docs
-+ anyway. Closes: #99660.
-+
-+ * Bugfix: mac-fdisk used to get the disk size wrong when brute force
-+ probing for end-of-disk by seek&read. Turns out gcc did not cope with
-+ arithmetics on long long types without explicit cast. Closes: #99700.
-+
-+ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Fri, 15 Jun 2001
12:16:35 +0200
-+
-+mac-fdisk (0.1-6) unstable; urgency=high
-+
-+ * Feature added: menu option to create bootstrap partition needed for
-+ powerpc NewWorld machines with the proper type and size (patch supplied
-+ by Ethan Benson). This should help newbies that won't read the docs
-+ anyway. Closes: #99660.
-+
-+ * Bugfix: mac-fdisk used to get the disk size wrong when brute force
-+ probing for end-of-disk by seek&read. Turns out gcc did not cope with
-+ arithmetics on long long types without explicit cast. Closes: #99700.
-+
-+ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Mon, 04 Jun 2001
13:54:21 +0200
-+
-+mac-fdisk (0.1-5) unstable; urgency=low
-+
-+ * Bugfix: fix build problems for glibc 2.2 (remove string.h includes,
-+ use lseek64 for llseek, fix some petty gcc warnings)
-+
-+ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Wed, 02 Mar 2001
19:42:01 +0200
-+
-+mac-fdisk (0.1-4) unstable; urgency=low
-+
-+ * Bugfix: correct off-by-one error on moving a partition downwards in the
-+ partition map. Clarification of various program messages and prompts
-+ (closes #69148, #69149 and #69152). Update of mac-fdisk man page.
-+
-+ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Wed, 08 Oct 2000
17:49:07 +0200
-+
-+mac-fdisk (0.1-3) unstable; urgency=low
-+
-+ * PowerPC install fixes (work around lack of /proc/hardware), rename
pmac-fdisk
-+ package (previously pmac-fdisk-cross). Add pmac-fdisk man page.
-+
-+ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Wed, 08 Mar 2000
18:29:07 +0200
-+
-+mac-fdisk (0.1-2) unstable; urgency=low
-+
-+ * Change man page name and install location, changed man page, rebuild
for 2.2.
-+
-+ -- Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de> Fri, 22 Oct 1999
20:29:07 +0200
-+
-+mac-fdisk (0.1-1) unstable; urgency=low
-+
-+ * Initial Release. (built from previous pdisk-0.4a2 with fixes by Roman
Hodek)
-+
-+ -- Michael Schmitz <schmitz AT lcbvax.cchem.berkeley.edu> Sat, 28 Feb 1998
21:58:07 -0800
-+
-+Local variables:
-+mode: debian-changelog
-+add-log-mailing-address: "schmitz AT biophys.uni-duesseldorf.de"
-+End:
---- mac-fdisk-0.1.orig/debian/prerm.debhelper
-+++ mac-fdisk-0.1/debian/prerm.debhelper
-@@ -0,0 +1,5 @@
-+# Automatically added by dh_installdocs
-+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/mac-fdisk ];
then
-+ rm -f /usr/doc/mac-fdisk
-+fi
-+# End automatically added section
---- mac-fdisk-0.1.orig/debian/copyright
-+++ mac-fdisk-0.1/debian/copyright
-@@ -0,0 +1,25 @@
-+This package was debianized by Michael Schmitz
schmitz AT lcbvax.cchem.berkeley.edu on
-+Sun, 11 Jan 1998 22:58:07 -0800.
-+
-+It was downloaded from ftp.mklinux.apple.com:/pub/Other_Tools/
-+
-+Copyright:
-+
-+ * Copyright 1996,1997 by Apple Computer, Inc.
-+ * All Rights Reserved
-+ *
-+ * Permission to use, copy, modify, and distribute this software and
-+ * its documentation for any purpose and without fee is hereby granted,
-+ * provided that the above copyright notice appears in all copies and
-+ * that both the copyright notice and this permission notice appear in
-+ * supporting documentation.
-+ *
-+ * APPLE COMPUTER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE.
-+ *
-+ * IN NO EVENT SHALL APPLE COMPUTER BE LIABLE FOR ANY SPECIAL, INDIRECT, OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT,
-+ * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
---- mac-fdisk-0.1.orig/debian/control
-+++ mac-fdisk-0.1/debian/control
-@@ -0,0 +1,68 @@
-+Source: mac-fdisk
-+Section: base
-+Priority: required
-+Build-Depends: debhelper, coreutils, grep
-+Maintainer: Michael Schmitz <schmitz AT biophys.uni-duesseldorf.de>
-+Standards-Version: 3.5.8.0
-+
-+Package: mac-fdisk
-+Architecture: m68k powerpc
-+Depends: ${shlibs:Depends}
-+Description: Apple disk partition manipulation tool
-+ The fdisk utilities from the MkLinux project, adopted for Linux/m68k.
-+ Mac-fdisk allows you to create and edit the partition table of a disk.
-+ It supports only the Apple partition format used on Macintosh and
PowerMac,
-+ use pmac-fdisk for PC partition format disks as used on PowerPC machines.
-+ Mac-fdisk is an interactive tool with a menu similar to PC fdisk,
supported
-+ options are somewhat different from PC fdisk due to the differences in
-+ partition format.
-+
-+Package: pmac-fdisk
-+Architecture: powerpc
-+Depends: ${shlibs:Depends}
-+Description: fdisk partition manipulation tool for PowerPC
-+ The fdisk utilities from the MkLinux project, adopted for Linux/ppc.
-+ Pmac-fdisk allows you to create and edit the partition table of a disk.
-+ It supports the PC partition format as used on PowerPC. It is an
-+ interactive tool similar to PC fdisk.
-+
-+Package: pmac-fdisk-cross
-+Architecture: m68k
-+Section: otherosfs
-+Priority: extra
-+Depends: ${shlibs:Depends}
-+Description: fdisk partition manipulation tool for PowerPC
-+ The fdisk utilities from the MkLinux project, adopted for Linux/ppc.
-+ Pmac-fdisk allows you to create and edit the partition table of a disk.
-+ It supports the PC partition format as used on PowerPC. It is an
-+ interactive tool similar to PC fdisk.
-+
-+Package: mac-fdisk-udeb
-+Architecture: powerpc m68k
-+Priority: standard
-+Section: debian-installer
-+Depends: ${shlibs:Depends}
-+Description: Apple disk partition manipulation tool
-+ The fdisk utilities from the MkLinux project, adopted for Linux/m68k.
-+ Mac-fdisk allows you to create and edit the partition table of a disk.
-+ It supports only the Apple partition format used on Macintosh and
PowerMac,
-+ use pmac-fdisk for PC partition format disks as used on PowerPC machines.
-+ Mac-fdisk is an interactive tool with a menu similar to PC fdisk,
supported
-+ options are somewhat different from PC fdisk due to the differences in
-+ partition format.
-+ .
-+ This is a minimal mac-fdisk package used by the debian-installer.
-+
-+Package: pmac-fdisk-udeb
-+Architecture: powerpc
-+Priority: standard
-+Section: debian-installer
-+Depends: ${shlibs:Depends}
-+Description: fdisk partition manipulation tool for PowerPC
-+ The fdisk utilities from the MkLinux project, adopted for Linux/ppc.
-+ Pmac-fdisk allows you to create and edit the partition table of a disk.
-+ It supports the PC partition format as used on PowerPC. It is an
-+ interactive tool similar to PC fdisk.
-+ .
-+ This is a minimal pmac-fdisk package used by the debian-installer.
-+
---- mac-fdisk-0.1.orig/debian/rules
-+++ mac-fdisk-0.1/debian/rules
-@@ -0,0 +1,183 @@
-+#!/usr/bin/make -f
-+# Made with the aid of debmake, by Christoph Lameter,
-+# based on the sample debian/rules file for GNU hello by Ian Jackson.
-+
-+export DH_VERBOSE=1
-+
-+BUILDARCH = $(shell dpkg --print-gnu-build-architecture)
-+
-+packmn = mac-fdisk
-+packmc = mac-fdisk-cross
-+packpmn = pmac-fdisk
-+packpmc = pmac-fdisk-cross
-+packudeb = mac-fdisk-udeb
-+packpudeb = pmac-fdisk-udeb
-+tmpmn = debian/tmp
-+tmpmc = debian/$(packmc)
-+tmppmn = debian/$(packpmn)
-+tmppmc = debian/$(packpmc)
-+tmpudeb = debian/$(packudeb)
-+tmppudeb = debian/$(packpudeb)
-+docmn = $(tmpmn)/usr/share/doc/$(packmn)
-+docmc = $(tmpmc)/usr/share/doc/$(packmc)
-+docpmn = $(tmppmn)/usr/share/doc/$(packpmn)
-+docpmc = $(tmppmc)/usr/share/doc/$(packpmc)
-+
-+build:
-+ $(checkdir)
-+ make CFLAGS="-O2 -g -Wall"
-+ touch build
-+
-+clean:
-+ $(checkdir)
-+ -rm -f build
-+ -make clean
-+ -rm -f `find . -name "*~"`
-+ -rm -rf $(tmpmn) $(tmpmc) $(tmppmn) $(tmppmc) $(tmpudeb) $(tmppudeb)
debian/files* core debian/substvars
-+
-+binary-indep: build
-+ $(checkdir)
-+# There are no architecture-independent files to be uploaded
-+# generated by this package. If there were any they would be
-+# made here.
-+
-+binary-arch: build
-+ dh_testdir pdisk.h
-+ dh_testroot
-+ dh_clean -k
-+ #dh_installdirs
-+ # we don't want to package the pdisk man page
-+ mv pdisk.8 pdisk.8.in
-+ set -e; if [ "$(BUILDARCH)" = "m68k" -o "$(BUILDARCH)" = "powerpc" ];
then \
-+ install -d $(tmpmn)/sbin; \
-+ install -m 755 pdisk $(tmpmn)/sbin/mac-fdisk; \
-+ install -d $(tmpmn)/usr/share/man/man8; \
-+ install -m 644 mac-fdisk.8.in
$(tmpmn)/usr/share/man/man8/mac-fdisk.8; \
-+ dh_installdocs README -p$(packmn); \
-+ dh_installmanpages -p$(packmn); \
-+ dh_installchangelogs HISTORY -p$(packmn); \
-+ else \
-+ install -d $(tmpmc)/usr/sbin; \
-+ install -m 755 pdisk $(tmpmc)/usr/sbin/mac-fdisk; \
-+ install -d $(tmpmn)/usr/share/man/man8; \
-+ install -m 644 mac-fdisk.8.in
$(tmpmn)/usr/share/man/man8/mac-fdisk.8; \
-+ dh_installdocs README -p$(packmc); \
-+ dh_installmanpages -p$(packmc); \
-+ dh_installchangelogs HISTORY -p$(packmc); \
-+ fi
-+ set -e; if [ "$(BUILDARCH)" = "powerpc" ]; then \
-+ install -d $(tmppmn)/sbin; \
-+ install -m 755 fdisk $(tmppmn)/sbin/pmac-fdisk; \
-+ install -d $(tmppmn)/usr/share/man/man8; \
-+ install -m 644 pmac-fdisk.8.in
$(tmppmn)/usr/share/man/man8/pmac-fdisk.8; \
-+ dh_installdocs README -p$(packpmn); \
-+ dh_installmanpages -p$(packpmn); \
-+ dh_installchangelogs HISTORY -p$(packpmn); \
-+ else \
-+ install -d $(tmppmc)/usr/sbin; \
-+ install -m 755 fdisk $(tmppmc)/usr/sbin/pmac-fdisk; \
-+ install -d $(tmppmc)/usr/share/man/man8; \
-+ install -m 644 pmac-fdisk.8.in
$(tmppmc)/usr/share/man/man8/pmac-fdisk.8; \
-+ dh_installdocs README -p$(packpmc); \
-+ dh_installmanpages -p$(packpmc); \
-+ dh_installchangelogs HISTORY -p$(packpmc); \
-+ fi
-+ # install README.Debian also in cross package (not done by
dh_installdocs)
-+ set -e; if [ "$(BUILDARCH)" != "m68k" -a "$(BUILDARCH)" != "powerpc"
]; then \
-+ install -m 644 debian/README.debian $(docmc)/README.Debian; \
-+ fi
-+ # and move the pdisk man page back again ...
-+ mv pdisk.8.in pdisk.8
-+
-+ # install mac-fdisk-udeb files
-+ set -e; if [ "$(BUILDARCH)" = "m68k" -o "$(BUILDARCH)" = "powerpc" ];
then \
-+ install -d $(tmpudeb)/sbin; \
-+ install -d $(tmpudeb)/DEBIAN; \
-+ install -m 755 pdisk $(tmpudeb)/sbin/mac-fdisk; \
-+ fi
-+
-+ # install pmac-fdisk-udeb files
-+ set -e; if [ "$(BUILDARCH)" = "powerpc" ]; then \
-+ install -d $(tmppudeb)/usr/sbin; \
-+ install -d $(tmppudeb)/DEBIAN; \
-+ install -m 755 fdisk $(tmppudeb)/usr/sbin/pmac-fdisk; \
-+ fi
-+
-+ # build native pdisk only for m68k, cross package only for others
-+ set -e; if [ "$(BUILDARCH)" = "m68k" -o "$(BUILDARCH)" = "powerpc" ];
then \
-+ dh_strip -p$(packmn) -P$(tmpmn); \
-+ dh_compress -p$(packmn) -P$(tmpmn); \
-+ dh_fixperms -p$(packmn) -P$(tmpmn); \
-+ dh_installdeb -p$(packmn) -P$(tmpmn); \
-+ dh_shlibdeps -p$(packmn) -P$(tmpmn); \
-+ dh_gencontrol -p$(packmn) -P$(tmpmn); \
-+ dh_md5sums -p$(packmn) -P$(tmpmn); \
-+ else \
-+ dh_strip -p$(packmc); \
-+ dh_compress -p$(packmc); \
-+ dh_fixperms -p$(packmc); \
-+ dh_installdeb -p$(packmc); \
-+ dh_shlibdeps -p$(packmc); \
-+ dh_gencontrol -p$(packmc); \
-+ dh_md5sums -p$(packmc); \
-+ fi
-+ # build native fdisk only for powerpc, cross package only for others
-+ set -e; if [ "$(BUILDARCH)" = "powerpc" ]; then \
-+ dh_strip -p$(packpmn); \
-+ dh_compress -p$(packpmn); \
-+ dh_fixperms -p$(packpmn); \
-+ dh_installdeb -p$(packpmn); \
-+ dh_shlibdeps -p$(packpmn); \
-+ dh_gencontrol -p$(packpmn); \
-+ dh_md5sums -p$(packpmn); \
-+ else \
-+ dh_strip -p$(packpmc); \
-+ dh_compress -p$(packpmc); \
-+ dh_fixperms -p$(packpmc); \
-+ dh_installdeb -p$(packpmc); \
-+ dh_shlibdeps -p$(packpmc); \
-+ dh_gencontrol -p$(packpmc); \
-+ dh_md5sums -p$(packpmc); \
-+ fi
-+ set -e; if [ "$(BUILDARCH)" = "m68k" -o "$(BUILDARCH)" = "powerpc" ];
then \
-+ dh_builddeb -p$(packmn) -P$(tmpmn); \
-+ else \
-+ dh_builddeb -p$(packmc); \
-+ fi
-+ set -e; if [ "$(BUILDARCH)" = "powerpc" ]; then \
-+ dh_builddeb -p$(packpmn); \
-+ else \
-+ dh_builddeb -p$(packpmc); \
-+ fi
-+
-+ # build mac-fdisk-udeb on powerpc and m68k
-+ set -e; if [ "$(BUILDARCH)" = "m68k" -o "$(BUILDARCH)" = "powerpc" ];
then \
-+ dh_strip -p$(packudeb); \
-+ dh_installdeb -p$(packudeb); \
-+ dh_shlibdeps -p$(packudeb); \
-+ dh_gencontrol -p$(packudeb) -- -isp -fdebian/files~; \
-+ dpkg-distaddfile $(packudeb)_$(shell dpkg-parsechangelog |
grep ^Version: | cut -d ' ' -f 2)_$(BUILDARCH).udeb debian-installer
standard; \
-+ dh_builddeb -p$(packudeb) --filename=$(packudeb)_$(shell
dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(BUILDARCH).udeb; \
-+ fi
-+
-+ # build pmac-fdisk-udeb on powerpc
-+ set -e; if [ "$(BUILDARCH)" = "powerpc" ]; then \
-+ dh_strip -p$(packpudeb); \
-+ dh_installdeb -p$(packpudeb); \
-+ dh_shlibdeps -p$(packpudeb); \
-+ dh_gencontrol -p$(packpudeb) -- -isp -fdebian/files~; \
-+ dpkg-distaddfile $(packpudeb)_$(shell dpkg-parsechangelog |
grep ^Version: | cut -d ' ' -f 2)_$(BUILDARCH).udeb debian-installer
standard; \
-+ dh_builddeb -p$(packpudeb) --filename=$(packpudeb)_$(shell
dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(BUILDARCH).udeb; \
-+ fi
-+
-+define checkdir
-+ test -f debian/rules
-+endef
-+
-+binary: binary-indep binary-arch
-+
-+checkroot:
-+ $(checkdir)
-+ test root = "`whoami`"
-+
-+.PHONY: binary binary-arch binary-indep clean checkroot
---- mac-fdisk-0.1.orig/debian/pmac-fdisk.postinst.debhelper
-+++ mac-fdisk-0.1/debian/pmac-fdisk.postinst.debhelper
-@@ -0,0 +1,7 @@
-+# Automatically added by dh_installdocs
-+if [ "$1" = "configure" ]; then
-+ if [ -d /usr/doc -a ! -e /usr/doc/pmac-fdisk -a -d
/usr/share/doc/pmac-fdisk ]; then
-+ ln -sf ../share/doc/pmac-fdisk /usr/doc/pmac-fdisk
-+ fi
-+fi
-+# End automatically added section
---- mac-fdisk-0.1.orig/debian/postinst
-+++ mac-fdisk-0.1/debian/postinst
-@@ -0,0 +1,50 @@
-+#! /bin/sh
-+set -e
-+
-+Arch=`dpkg --print-installation-architecture`
-+
-+#
-+# make symlink /sbin/fdisk point to the native fdisk
-+#
-+
-+# This is also true if /sbin/fdisk is a dangling symlink; in that case we
-+# want to update the link, too.
-+if [ ! -e /sbin/fdisk ]; then
-+ machine=""
-+ if [ "$Arch" == "m68k" ]; then
-+ case `awk '$1 == "Model:" { print $2 }' /proc/hardware` in
-+ Atari)
-+ machine=atari
-+ ;;
-+ Amiga)
-+ machine=amiga
-+ ;;
-+ Macintosh)
-+ machine=mac
-+ ;;
-+ Motorola) # MVME
-+ ;;
-+ esac
-+ elif [ "$Arch" == "powerpc" ]; then
-+ # case `awk '$1 == "motherboard" { print $6 }' /proc/cpuinfo`
in
-+ # case `cat /proc/cpuinfo | egrep "^motherboard" | sed -e
's/.* \([a-zA-Z]*\)$/\1/'` in
-+ case `awk '$1 == "motherboard" { print $NF }' /proc/cpuinfo`
in
-+ Macintosh)
-+ machine=mac
-+ ;;
-+ *)
-+ machine=pmac
-+ ;;
-+ esac
-+
-+ fi
-+ if [ -n "$machine" -a -f /sbin/$machine-fdisk ]; then
-+ ln -sf $machine-fdisk /sbin/fdisk
-+ else
-+ echo "No native fdisk for this machine type!"
-+ fi
-+fi
-+
-+#DEBHELPER#
-+
-+exit 0
---- mac-fdisk-0.1.orig/debian/pmac-fdisk.prerm.debhelper
-+++ mac-fdisk-0.1/debian/pmac-fdisk.prerm.debhelper
-@@ -0,0 +1,5 @@
-+# Automatically added by dh_installdocs
-+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/pmac-fdisk ];
then
-+ rm -f /usr/doc/pmac-fdisk
-+fi
-+# End automatically added section
---- mac-fdisk-0.1.orig/debian/mac-fdisk-udeb.substvars
-+++ mac-fdisk-0.1/debian/mac-fdisk-udeb.substvars
-@@ -0,0 +1 @@
-+shlibs:Depends=libc6 (>= 2.2.5-13)
---- mac-fdisk-0.1.orig/debian/pmac-fdisk.substvars
-+++ mac-fdisk-0.1/debian/pmac-fdisk.substvars
-@@ -0,0 +1 @@
-+shlibs:Depends=libc6 (>= 2.2.5-13)
---- mac-fdisk-0.1.orig/debian/pmac-fdisk-udeb.substvars
-+++ mac-fdisk-0.1/debian/pmac-fdisk-udeb.substvars
-@@ -0,0 +1 @@
-+shlibs:Depends=libc6 (>= 2.2.5-13)
---- mac-fdisk-0.1.orig/mac-fdisk.8.in
-+++ mac-fdisk-0.1/mac-fdisk.8.in
-@@ -0,0 +1,262 @@
-+.TH MAC-FDISK 8 "1 December 2001" "Debian" "Apple Disk Partitioning Manual"
-+.SH NAME
-+mac-fdisk \- Apple partition table editor for Linux
-+.SH SYNOPSIS
-+.B mac-fdisk
-+.B "[ \-h | \--help ] [ \-v | \--version ] [ \-l | \--list device ... ]"
-+.br
-+.B mac-fdisk
-+.B "[ \-r | \--readonly ] device ... "
-+.SH DESCRIPTION
-+.B mac-fdisk
-+is a command line type program which partitions disks using the standard
Apple
-+disk partitioning scheme described in "Inside Macintosh: Devices".
-+The
-+.I device
-+is usually one of the following:
-+
-+.nf
-+.RS
-+/dev/sda
-+/dev/sdb
-+/dev/sdc
-+/dev/sdd
-+/dev/sde
-+/dev/sdf
-+/dev/sdg
-+/dev/hda
-+/dev/hdb
-+
-+.RE
-+.fi
-+/dev/sda is the first hard disk on the SCSI bus (i.e. the
-+one with the lowest id), /dev/sdb is the second hard disk, and so on.
-+The
-+.I partition
-+is a
-+.I device
-+name followed by a partition number.
-+The partition number is the index (starting from one) of the partition
-+map entry in the partition map (and the partition map itself occupies the
-+first entry).
-+For example,
-+.B /dev/sda2
-+is the partition described by the second entry in the partiton map on
/dev/sda.
-+
-+.SH OPTIONS
-+.TP
-+.B \-v | \--version
-+Prints version number of the
-+.B mac-fdisk
-+program.
-+.TP
-+.B \-h | \--help
-+Prints a list of available commands for the
-+.B mac-fdisk
-+program.
-+.TP
-+.B \-l | \--list
-+Lists the partition tables for the specified
-+.IR device(s).
-+With no
-+.IR device(s)
-+given, lists all SCSI and IDE devices found in the system.
-+.TP
-+.B \-r | \--readonly
-+Prevents
-+.B mac-fdisk
-+from writing to the device.
-+.SH "Editing Partition Tables"
-+An argument which is simply the name of a
-+.I device
-+indicates that
-+.B mac-fdisk
-+should edit the partition table of that device. Once started,
-+.B mac-fdisk
-+presents an interactive command prompt to edit the partition table.
-+The partition editing commands are:
-+
-+.nf
-+.RS
-+h list available commands
-+p print (list) the current edited partition table status
-+P print ordered by base address
-+i initialize the partition map
-+s change size of partition map
-+b create new 800K Apple_Bootstrap partition (used by yaboot)
-+c create new standard Linux type partition
-+C create new partition, specifying the partition type
-+d delete a partition
-+r reorder partition entry
-+w write the partition table to disk
-+q quit
-+
-+.RE
-+.fi
-+Commands which take arguments prompt for each argument in turn.
-+You can also type the arguments separated by spaces
-+and those prompts will be skipped. The
-+.B i
-+and
-+.B w
-+commands will prompt for confirmation. None of the editing you do will
-+actually affect the state of the disk you are partitioning until the
-+.B w
-+command is issued. Then the map in its edited state will be
-+permanently written to the disk.
-+
-+Partitions are always specified by their number, the index of the
-+partition entry in the partition map. Many commands will change the
-+index numbers of partitions which follow the affected partition; you are
-+encouraged to use the
-+.B p
-+command to print the partition table as frequently as necessary. For SCSI
-+disks, the partition table should not contain more than fifteen partitions
-+(partition map excluded). IDE disks have a limit of 31 partitions.
-+
-+Here is a more-or-less typical output for the print command:
-+
-+.nf
-+.RS
-+Command (? for help): p
-+/dev/sdb
-+ # type name length base ( size )
system
-+/dev/sdb1 Apple_partition_map Apple 63 @ 1 ( 31.5k)
Partition map
-+/dev/sdb2 Apple_Driver43 Macintosh 54 @ 64 ( 27.0k)
Driver 4.3
-+/dev/sdb3 Apple_Driver43 Macintosh 74 @ 118 ( 37.0k)
Driver 4.3
-+/dev/sdb4 Apple_Driver_IOKit Macintosh 512 @ 192 (256.0k)
Unknown
-+/dev/sdb5 Apple_Patches Patch Partition 512 @ 704 (256.0k)
Unknown
-+/dev/sdb6 Apple_HFS untitled 3072000 @ 1216 ( 1.5G)
HFS
-+/dev/sdb7 Apple_HFS untitled 2 333026 @ 3073216 (162.6M)
HFS
-+/dev/sdb8 Apple_Free Extra 10 @ 3406242 ( 5.0k)
Free space
-+
-+Block size=512, Number of Blocks=3406252
-+DeviceType=0x0, DeviceId=0x0
-+Drivers-
-+1: @ 64 for 22, type=0x1
-+2: @ 118 for 36, type=0xffff
-+
-+.RE
-+.fi
-+
-+The
-+.B i
-+(initialize) command prompts for the size of the device. You can just
-+type Return to accept the offered size, which should be correct.
-+
-+The
-+.B b
-+command is a shortcut to create the bootstrap partition used on PowerPC
-+NewWorld machines. It is equivalent to creating an 800k
-+.B Apple_Bootstrap
-+type partition using the
-+.B C
-+command described below. The sole purpose of this partition is to
-+store the boot loader. In multiboot environments, the first bootable
-+partition found on the disk takes precedence unless a specific boot
-+partition is set in OpenFirmware, so it's best to create the bootstrap
-+partition first, or move it to a position before any
-+.B Apple_HFS
-+or
-+.B Apple_Boot
-+partitions using the
-+.B r
-+command described below. Then you will still able to boot Linux after
-+the occasional OpenFirmware reset.
-+
-+The
-+.B c
-+(create new partition) command has three arguments. As mentioned
-+above you can type the arguments following the command, separated by
-+spaces, or respond to prompts for each argument:
-+
-+ 1) The base address of the start of the partition.
-+
-+ You can specify a number in blocks (most likely reading from the
-+ existing partition map) or you can also type a partition number
-+ followed by the letter 'p' to indicate that the new partition
-+ should take the place of that existing free space partition.
-+
-+ 2) The length of the partition.
-+
-+ Again, you can specify a number in blocks or type a partition
-+ number followed by the letter 'p' to indicate use of the entire
-+ partition. You can also type a number followed by 'k', 'm', or
-+ 'g' to indicate the size in kilobytes, megabytes, or gigabytes
-+ respectively. (These are powers of 1024, of course, not powers
-+ of 1000.)
-+
-+ 3) The name of the partition.
-+
-+ This can be a single word without quotes, or a string surrounded
-+ by single or double quotes. It is best to name any swap partition
-+ you create `swap'; other partition names are up to you. The names
-+ are not visible to Linux.
-+
-+The
-+.B C
-+command is identical to the
-+.B c
-+command, with the addition of a partition type argument after the
-+other arguments. The partition type used for Linux swap and data partitons
-+is
-+.B APPLE_UNIX_SVR2
-+(this is the partition type created by the
-+.B c
-+command). Under normal circumstances, you should not need to use this
-+command.
-+
-+The
-+.B d
-+command deletes the partition number specified, replacing that partition
-+with partitionable free space.
-+
-+The
-+.B r
-+(reorder) command allows the index number of partitions to be changed.
-+The index numbers are constrained to be a contiguous sequence.
-+.B mac-fdisk
-+will enforce this constraint by recalculating the partition numbers
-+after each insert, delete or reorder operation. OpenFirmware looks for
-+bootable partitions in the order specified by the index. The
-+partitions are not moved on the disk. This command takes two
-+arguments, the number of the partition to be moved and the partition
-+number it should become.
-+
-+The
-+.B w
-+command writes the partition map out to disk. Note that partition
-+maps for disks with mounted partitions cannot immediately be
-+reinterpreted by the kernel. In order to use the new partition map you
-+must reboot. Within the Debian installer system,
-+.B mac-fdisk
-+is normally invoked before any partitions are mounted, thus a reboot is not
-+necessary before continuing the installation.
-+
-+The
-+.B q
-+command terminates the program. If there was no
-+.B w
-+command issued during the program run, then there will be no effect on the
disk.
-+
-+.SH BUGS
-+Some people believe there should really be just one disk partitioning
utility.
-+
-+.B mac-fdisk
-+should be able to create HFS partitions that work. Currently, if a
-+pre-existing HFS partition is resized, MacOS will continue to use the
-+partition size stored in the HFS 'superblock' instead of using the size from
-+the partition table (the MacOS volume on the partition remains valid even
-+though the sizes don't match anymore). This can have undesired side effects
-+especially when creating a smaller HFS partition followed by a few Linux
-+partitions in place of the previous HFS partition space. To avoid this
-+issue, create MacOS partitions within MacOS and then don't resize them
-+in
-+.B mac-fdisk.
-+
-+.SH "SEE ALSO"
-+.BR fdisk (8),
-+.BR mkswap (8),
-+.BR mkfs (8)
-+.SH AUTHOR
-+Eryk Vershen (eryk AT apple.com), man page revised by Chris Tillman
(tillman AT azstarnet.com)
---- mac-fdisk-0.1.orig/pmac-fdisk.8.in
-+++ mac-fdisk-0.1/pmac-fdisk.8.in
-@@ -0,0 +1,222 @@
-+.\" Copyright 1992, 1993 Rickard E. Faith (faith AT cs.unc.edu)
-+.\" Copyright 1998 Andries E. Brouwer (aeb AT cwi.nl)
-+.\" Copyright 2000 Michael Schmitz (schmitz AT biophys.uni-duesseldorf.de)
-+.\" May be distributed under the GNU General Public License
-+.TH PMAC-FDISK 8 "11 June 1998" "Linux 2.0" "Linux Programmer's Manual"
-+.SH NAME
-+pmac-fdisk \- Partition table manipulator for Linux
-+.SH SYNOPSIS
-+.BI "pmac-fdisk [\-u] " device
-+.sp
-+.BI "pmac-fdisk \-l [\-u] " "device ..."
-+.sp
-+.BI "pmac-fdisk \-s " "partition ..."
-+.sp
-+.BI "pmac-fdisk \-v
-+.SH DESCRIPTION
-+Hard disks can be divided into one or more logical disks called
-+.IR partitions .
-+This division is described in the
-+.I "partition table"
-+found in sector 0 of the disk.
-+
-+In the BSD world one talks about `disk slices' and a `disklabel'.
-+
-+Linux needs at least one partition, namely for its root file system.
-+It can use swap files and/or swap partitions, but the latter are more
-+efficient. So, usually one will want a second Linux partition
-+dedicated as swap partition.
-+On Intel compatible hardware, the BIOS that boots the system
-+can often only access the first 1024 cylinders of the disk.
-+For this reason people with large disks often create a third partition,
-+just a few MB large, typically mounted on
-+.IR /boot ,
-+to store the kernel image and a few auxiliary files needed at boot time,
-+so as to make sure that this stuff is accessible to the BIOS.
-+There may be reasons of security, ease of administration and backup,
-+or testing, to use more than the minimum number of partitions.
-+
-+.B pmac-fdisk
-+(in the first form of invocation)
-+is a menu driven program for creation and manipulation of
-+partition tables.
-+It understands DOS type partition tables and BSD or SUN type disklabels.
-+
-+The
-+.I device
-+is usually one of the following:
-+.br
-+.nf
-+.RS
-+/dev/hda
-+/dev/hdb
-+/dev/sda
-+/dev/sdb
-+.RE
-+.fi
-+(/dev/hd[a-h] for IDE disks, /dev/sd[a-p] for SCSI disks).
-+A device name refers to the entire disk.
-+
-+The
-+.I partition
-+is a
-+.I device
-+name followed by a partition number. For example,
-+.B /dev/hda1
-+is the first partition on the first IDE hard disk in the system.
-+IDE disks can have up to 63 partitions, SCSI disks up to 15.
-+See also
-+.IR /usr/src/linux/Documentation/devices.txt .
-+
-+A BSD/SUN type disklabel can describe 8 partitions,
-+the third of which should be a `whole disk' partition.
-+Do not start a partition that actually uses its first sector
-+(like a swap partition) at cylinder 0, since that will
-+destroy the disklabel.
-+
-+An IRIX/SGI type disklabel can describe 16 partitions,
-+the eleventh of which should be an entire `volume' partition,
-+while the ninth should be labeled `volume header'.
-+The volume header will also cover the partition table, i.e.,
-+it starts at block zero and extends by default over five cylinders.
-+The remaining space in the volume header may be used by header
-+directory entries. No partitions may overlap with the volume header.
-+Also do not change its type and make some file system on it, since
-+you will lose the partition table. Use this type of label only when
-+working with Linux on IRIX/SGI machines or IRIX/SGI disks under Linux.
-+
-+A DOS type partition table can describe an unlimited number
-+of partitions. In sector 0 there is room for the description
-+of 4 partitions (called `primary'). One of these may be an
-+extended partition; this is a box holding logical partitions,
-+with descriptors found in a linked list of sectors, each
-+preceding the corresponding logical partitions.
-+The four primary partitions, present or not, get numbers 1-4.
-+Logical partitions start numbering from 5.
-+
-+In a DOS type partition table the starting offset and the size
-+of each partition is stored in two ways: as an absolute number
-+of sectors (given in 32 bits) and as a Cylinders/Heads/Sectors
-+triple (given in 10+8+6 bits). The former is OK - with 512-byte
-+sectors this will work up to 2 TB. The latter has two different
-+problems. First of all, these C/H/S fields can be filled only
-+when the number of heads and the number of sectors per track
-+are known. Secondly, even if we know what these numbers should be,
-+the 24 bits that are available do not suffice.
-+DOS uses C/H/S only, Windows uses both, Linux never uses C/H/S.
-+
-+If possible,
-+.B pmac-fdisk
-+will obtain the disk geometry automatically. This is not
-+necessarily the physical disk geometry (indeed, modern disks do not
-+really have anything like a physical geometry, certainly not something
-+that can be described in simplistic Cylinders/Heads/Sectors form),
-+but is the disk geometry that MS-DOS uses for the partition table.
-+
-+Usually all goes well by default, and there are no problems if
-+Linux is the only system on the disk. However, if the disk has
-+to be shared with other operating systems, it is often a good idea
-+to let an fdisk from another operating system make at least one
-+partition. When Linux boots it looks at the partition table, and
-+tries to deduce what (fake) geometry is required for good
-+cooperation with other systems.
-+
-+Whenever a partition table is printed out, a consistency check is performed
-+on the partition table entries. This check verifies that the physical and
-+logical start and end points are identical, and that the partition starts
-+and ends on a cylinder boundary (except for the first partition).
-+
-+Some versions of MS-DOS create a first partition which does not begin
-+on a cylinder boundary, but on sector 2 of the first cylinder.
-+Partitions beginning in cylinder 1 cannot begin on a cylinder boundary, but
-+this is unlikely to cause difficulty unless you have OS/2 on your machine.
-+
-+A sync() and a BLKRRPART ioctl() (reread partition table from disk)
-+are performed before exiting when the partition table has been updated.
-+Long ago it used to be necessary to reboot after the use of pmac-fdisk.
-+I do not think this is the case anymore - indeed, rebooting too quickly
-+might cause loss of not-yet-written data. Note that both the kernel
-+and the disk hardware may buffer data.
-+
-+.SH "DOS 6.x WARNING"
-+
-+The DOS 6.x FORMAT command looks for some information in the first
-+sector of the data area of the partition, and treats this information
-+as more reliable than the information in the partition table. DOS
-+FORMAT expects DOS FDISK to clear the first 512 bytes of the data area
-+of a partition whenever a size change occurs. DOS FORMAT will look at
-+this extra information even if the /U flag is given -- we consider
-+this a bug in DOS FORMAT and DOS FDISK.
-+
-+The bottom line is that if you use pmac-fdisk to change the size of a
-+DOS partition table entry, then you must also use
-+.B dd
-+to zero the first 512 bytes of that partition before using DOS FORMAT to
-+format the partition. For example, if you were using pmac-fdisk to make a
-+DOS partition table entry for /dev/hda1, then (after exiting pmac-fdisk
-+and rebooting Linux so that the partition table information is valid) you
-+would use the command "dd if=/dev/zero of=/dev/hda1 bs=512 count=1" to zero
-+the first 512 bytes of the partition.
-+
-+.B BE EXTREMELY CAREFUL
-+if you use the
-+.B dd
-+command, since a small typo can make all of the data on your disk useless.
-+
-+For best results, you should always use an OS-specific partition table
-+program. For example, you should make DOS partitions with the DOS FDISK
-+program and Linux partitions with the Linux pmac-fdisk program.
-+
-+.SH OPTIONS
-+.TP
-+.B \-v
-+Print version number of
-+.B pmac-fdisk
-+program and exit.
-+.TP
-+.B \-l
-+List the partition tables for
-+.BR /dev/hd[a-d] ,
-+.BR /dev/sd[a-h] ,
-+and then exit.
-+.TP
-+.B \-u
-+When listing partition tables, give sizes in sectors instead
-+of cylinders.
-+.TP
-+.BI "\-s " partition
-+The
-+.I size
-+of the partition (in blocks) is printed on the standard output.
-+.SH BUGS
-+There are several *fdisk programs around.
-+Each has its problems and strengths.
-+Try them in the order
-+.BR cfdisk ,
-+.BR pmac-fdisk ,
-+.BR sfdisk .
-+(Indeed,
-+.B cfdisk
-+is a beautiful program that has strict requirements on
-+the partition tables it accepts, and produces high quality partition
-+tables. Use it if you can.
-+.B pmac-fdisk
-+is a buggy program that does fuzzy things - usually it happens to
-+produce reasonable results. Its single advantage is that it has
-+some support for BSD disk labels and other non-DOS partition tables.
-+Avoid it if you can.
-+.B sfdisk
-+is for hackers only - the user interface is terrible, but it is
-+more correct than pmac-fdisk and more powerful than both pmac-fdisk and
cfdisk.
-+Moreover, it can be used noninteractively.)
-+.PP
-+The IRIX/SGI type disklabel is currently not supported by the kernel.
-+Moreover, IRIX/SGI header directories are not fully supported yet.
-+.PP
-+The option `dump partition table to file' is missing.
-+.\" .SH AUTHORS
-+.\" A. V. Le Blanc (LeBlanc AT mcc.ac.uk)
-+.\" Bernhard Fastenrath (fasten AT informatik.uni-bonn.de)
-+.\" Jakub Jelinek (jj AT sunsite.mff.cuni.cz)
-+.\" Andreas Neuper (ANeuper AT GUUG.de)
-+.\" and many others.
diff --git a/disk/mdadm/DETAILS b/disk/mdadm/DETAILS
index 1d2b13c..506578a 100755
--- a/disk/mdadm/DETAILS
+++ b/disk/mdadm/DETAILS
@@ -1,9 +1,9 @@
SPELL=mdadm
- VERSION=2.4
+ VERSION=2.5
SOURCE=${SPELL}-${VERSION}.tgz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://neilb.web.cse.unsw.edu.au/source/mdadm/${SOURCE}
-
SOURCE_HASH[0]=sha512:7bc622f89fa371a6dae24f5dc7b6bdc0967b515eed2ff463e482447a7f04072ddeeea37a4ee98b2e6debd458ac3b37378ff46e85a86a7b84cca7c8b9fdbbaee8
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://cgi.cse.unsw.edu.au/~neilb/mdadm
LICENSE[0]=GPL
ENTERED=20040805
diff --git a/disk/mdadm/HISTORY b/disk/mdadm/HISTORY
index 404bef4..a589d89 100644
--- a/disk/mdadm/HISTORY
+++ b/disk/mdadm/HISTORY
@@ -1,3 +1,6 @@
+2006-05-26 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 2.5
+
2006-03-30 Flavien Bridault <disk AT sourcemage.org>
* DETAILS: Updated to 2.4

diff --git a/disk/mdadm/mdadm-2.5.tgz.sig b/disk/mdadm/mdadm-2.5.tgz.sig
new file mode 100644
index 0000000..525cd4d
Binary files /dev/null and b/disk/mdadm/mdadm-2.5.tgz.sig differ
diff --git a/disk/mount-iso/DEPENDS b/disk/mount-iso/DEPENDS
index 3a7895d..b3f70a2 100755
--- a/disk/mount-iso/DEPENDS
+++ b/disk/mount-iso/DEPENDS
@@ -1,6 +1,5 @@
-if [ "$MOUNT_SUDO" == "kdesu" ]; then
- depends kdebase
-else
+depends kdebase &&
+if [ "$MOUNT_SUDO" == "sudo" ]; then
depends sudo
fi &&

diff --git a/disk/mount-iso/DETAILS b/disk/mount-iso/DETAILS
index bd511ad..dddbd33 100755
--- a/disk/mount-iso/DETAILS
+++ b/disk/mount-iso/DETAILS
@@ -9,11 +9,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

WEB_SITE=http://linux.softpedia.com/get/Desktop-Environment/Tools/Mount-ISO-image-2216.shtml
ENTERED=20051231
KEYWORDS="iso disk"
- SHORT='Mount various ISO image formats'
+ SHORT='Mount various ISO image formats in KDE'
cat << EOF
Mount ISO Image is an advanced script which allows to perform multiple
operations with ISO, NRG (Nero Burning ROM), UDF (DVD), CUE/BIN, CCD/IMG/SUB
-(CloneCD), XDVDFS (XBOX) images.
+(CloneCD), XDVDFS (XBOX) images. These are accessible with the right-click
+menu of KDE.

Mount/unmount operations can be performed in two different ways: using kdesu
or
sudo. During the installation you'll be offered to choose a variant to use.
diff --git a/disk/mount-iso/HISTORY b/disk/mount-iso/HISTORY
index c770ef6..1d22900 100644
--- a/disk/mount-iso/HISTORY
+++ b/disk/mount-iso/HISTORY
@@ -1,3 +1,8 @@
+2006-05-29 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: kdebase is not optional, the spell is useless and
+ doesn't build without it (bug #11793)
+ * DETAILS: updated SHORT and DESCRIPTION to highlight that
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/parted/BUILD b/disk/parted/BUILD
deleted file mode 100755
index 84bca1d..0000000
--- a/disk/parted/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-./configure --prefix=${INSTALL_ROOT}/usr $OPTS &&
-sedit "s/-Werror//" libparted/fs_ext2/Makefile &&
-sedit "s/-Werror//" libparted/Makefile &&
-make
diff --git a/disk/parted/DETAILS b/disk/parted/DETAILS
index 289782d..95a37b2 100755
--- a/disk/parted/DETAILS
+++ b/disk/parted/DETAILS
@@ -1,5 +1,5 @@
SPELL=parted
- VERSION=1.6.25.1
+ VERSION=1.7.1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/disk/parted/HISTORY b/disk/parted/HISTORY
index 6669ea8..31e0f45 100644
--- a/disk/parted/HISTORY
+++ b/disk/parted/HISTORY
@@ -1,17 +1,33 @@
+2006-05-27 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 1.7.1
+
+2006-05-17 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 1.7.0
+
+2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * UP_TRIGGERS: replaced 'gaze depends' call with
+ fast_up_depends, bug #10661
+
+2006-04-25 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: Updated to 1.7.0rc5
+ * UP_TRIGGERS: added
+ * PRE_BUILD BUILD: deleted
+ default actions are ok. builds with gcc-4.1.0
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

2005-11-13 Flavien Bridault <disk AT sourcemage.org>
- * DETAILS: Updated to 1.6.25.1, sha512->GPG
+ * DETAILS: Updated to 1.6.25.1, sha512->GPG

2005-11-03 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: Updated to 1.6.25

2005-10-16 Flavien Bridault <disk AT sourcemage.org>
- * DETAILS: md5->sha512
+ * DETAILS: md5->sha512

2005-09-07 Flavien Bridault <disk AT sourcemage.org>
- * DETAILS: Updated to 1.6.24
+ * DETAILS: Updated to 1.6.24

2005-08-22 Flavien Bridault <disk AT sourcemage.org>
* PRE_BUILD: Added aclocal, autoconf, automake and libtoolize
diff --git a/disk/parted/PRE_BUILD b/disk/parted/PRE_BUILD
deleted file mode 100755
index 71204d2..0000000
--- a/disk/parted/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-aclocal &&
-autoconf &&
-automake &&
-libtoolize -f -c
diff --git a/disk/parted/UP_TRIGGERS b/disk/parted/UP_TRIGGERS
new file mode 100755
index 0000000..c2e44e6
--- /dev/null
+++ b/disk/parted/UP_TRIGGERS
@@ -0,0 +1,16 @@
+# up_trigger everything on minor version updates
+#libparted-1.6.so.13
+local OLD_SPELL_VERSION=""
+if spell_ok $SPELL; then
+ OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
+ message "This is a possibly incompatible update of parted..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(fast_up_depends $SPELL 1); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libparted-${OLD_SPELL_VERSION:0:3}.so*"; then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi
diff --git a/disk/pmount/BUILD b/disk/pmount/BUILD
index e009166..67e3453 100755
--- a/disk/pmount/BUILD
+++ b/disk/pmount/BUILD
@@ -1,5 +1,5 @@
if [[ $CRYPT == "y" ]]; then
CRYPTSETUP=`which cryptsetup` &&
- sed -i -e "s|/sbin/cryptsetup|$CRYPTSETUP|" policy.h
-fi
-make
+ sed -i -e "s|/sbin/cryptsetup|$CRYPTSETUP|" src/policy.h
+fi &&
+default_build
diff --git a/disk/pmount/DETAILS b/disk/pmount/DETAILS
index 5f704ec..d1541dd 100755
--- a/disk/pmount/DETAILS
+++ b/disk/pmount/DETAILS
@@ -1,5 +1,5 @@
SPELL=pmount
- VERSION=0.9.3
+ VERSION=0.9.11
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.piware.de/projects/$SOURCE
@@ -7,7 +7,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://ivman.sourceforge.net/
ENTERED=20050512
UPDATED=20051202
- PATCHLEVEL=1
LICENSE[0]=GPL
KEYWORDS="disk"
SHORT="Wrapper around the standard mount program"
diff --git a/disk/pmount/HISTORY b/disk/pmount/HISTORY
index 9b6e464..efb8373 100644
--- a/disk/pmount/HISTORY
+++ b/disk/pmount/HISTORY
@@ -1,3 +1,7 @@
+2006-05-17 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 0.9.11 (bug #11866)
+ * BUILD; Updated to work with new version
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/pmount/pmount-0.9.11.tar.gz.sig
b/disk/pmount/pmount-0.9.11.tar.gz.sig
new file mode 100644
index 0000000..4b68312
Binary files /dev/null and b/disk/pmount/pmount-0.9.11.tar.gz.sig differ
diff --git a/disk/pmount/pmount-0.9.3.tar.gz.sig
b/disk/pmount/pmount-0.9.3.tar.gz.sig
deleted file mode 100644
index fbd3c40..0000000
Binary files a/disk/pmount/pmount-0.9.3.tar.gz.sig and /dev/null differ
diff --git a/disk/sfs/BUILD b/disk/sfs/BUILD
index b508712..42ab776 100755
--- a/disk/sfs/BUILD
+++ b/disk/sfs/BUILD
@@ -1,5 +1,9 @@
-create_account sfs
+create_account sfs &&

+OPTS="$OPTS --with-gmp=/usr" &&
+#if [ "$SFS_CVS" == "y" ]; then
+ ./setup
+#fi &&
# needed for gcc 3.3
-sedit "s:-Werror::" configure &&
+sed -i "s:-Werror::" configure &&
default_build
diff --git a/disk/sfs/DEPENDS b/disk/sfs/DEPENDS
index 758d59a..e2b10a2 100755
--- a/disk/sfs/DEPENDS
+++ b/disk/sfs/DEPENDS
@@ -1 +1 @@
-depends gmp '--with-gmp=/usr'
+depends gmp
diff --git a/disk/sfs/DETAILS b/disk/sfs/DETAILS
index eade61f..aea4e06 100755
--- a/disk/sfs/DETAILS
+++ b/disk/sfs/DETAILS
@@ -1,13 +1,28 @@
SPELL=sfs
- VERSION=0.7.2
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.fs.net/sfswww/dist/$SOURCE
-
SOURCE_HASH=sha512:5b46d67053bd6a5d7bd4ed00cd61c0f20bdeb0f50050035952c446bd6f7f8a87b56f32aeb886f1b1e3f4fc7047905681199b6f3032b5b6da18bd6c7e2a41c9a5
+#if [ "$SFS_CVS" == "y" ]; then
+ if [ "$SFS_CVS_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
+ SOURCE_URL[0]="cvs://:pserver:sfscvs AT cvs.fs.net:/cvs:sfs1"
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+#else
+# VERSION=0.7.2
+# SOURCE=$SPELL-$VERSION.tar.gz
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+# SOURCE_URL[0]=http://www.fs.net/sfswww/dist/$SOURCE
+#
SOURCE_HASH=sha512:5b46d67053bd6a5d7bd4ed00cd61c0f20bdeb0f50050035952c446bd6f7f8a87b56f32aeb886f1b1e3f4fc7047905681199b6f3032b5b6da18bd6c7e2a41c9a5
+#10c15
+# GCC_VERSION=33
+#fi
WEB_SITE=http://www.fs.net/
LICENSE[0]=GPL
ENTERED=20030705
- UPDATED=20030822
+ UPDATED=20030822
KEYWORDS="disk"
SHORT='Self-certifying File System (SFS)'
cat << EOF
diff --git a/disk/sfs/FINAL b/disk/sfs/FINAL
new file mode 100755
index 0000000..1ad03ab
--- /dev/null
+++ b/disk/sfs/FINAL
@@ -0,0 +1,14 @@
+[ -d /etc/sfs ] || mkdir -p /etc/sfs
+[ -d /var/sfs ] || mkdir -p /var/sfs/root
+[ -d /var/sfs/authdb ] || mkdir -p /var/sfs/authdb
+chown -R sfs.sfs /var/sfs
+cat <<EOF >/etc/sfs/sfsrwsd_config.default
+Export /var/sfs/root /
+EOF
+[ -f /etc/sfs/sfsrwsd_config ] || cp /etc/sfs/sfsrwsd_config.default
/etc/sfs/sfsrwsd_config
+[ -f /etc/sfs/sfs_host_key ] || (
+# sfskey gen -P /etc/sfs/sfs_host_key
+ chown root /var/sfs/authdb
+ message "It seems you don't have yet a host key"
+ message "Please generate it using 'sfskey gen -P /etc/sfs/sfs_host_key'"
+)
diff --git a/disk/sfs/HISTORY b/disk/sfs/HISTORY
index 71b29cf..644f0a2 100644
--- a/disk/sfs/HISTORY
+++ b/disk/sfs/HISTORY
@@ -1,3 +1,19 @@
+2006-05-29 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS, BUILD, DEPENDS: only compiles CVS version, "stable"
+ version is desperatly broken (bug #5824)
+ * FINAL: removed sfs host key generation, ask the user to do it
+ if it is not present (bug #5824)
+ * PREPARE: prompt for cvs autoupdate
+ * PRE_BUILD: added to apply patch below
+ * sfs-gcc41.patch: correct compiling with gcc4.1
+
+2006-04-06 Flavien Bridault <vlaaad AT sourcemage.org>
+ * BUILD: added commands to compile CVS version
+ * POST_INSTALL: removed
+ * FINAL: added, taking code from POST_INSTALL
+ * DETAILS: allow to compile CVS version
+ * DEPENDS: depends either on gcc33 or gcc34
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/sfs/POST_INSTALL b/disk/sfs/POST_INSTALL
deleted file mode 100755
index b5a3a36..0000000
--- a/disk/sfs/POST_INSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-[ -d /etc/sfs ] || mkdir -p /etc/sfs
-[ -d /var/sfs ] || mkdir -p /var/sfs/root
-chown -R sfs.sfs /var/sfs
-cat <<EOF >/etc/sfs/sfsrwsd_config.default
-Export /var/sfs/root /
-EOF
-[ -f /etc/sfs/sfsrwsd_config ] || cp /etc/sfs/sfsrwsd_config.default
/etc/sfs/sfsrwsd_config
-[ -f /etc/sfs/sfs_host_key ] || (
- sfskey gen -P /etc/sfs/sfs_host_key
- chown root /var/sfs/authdb
-)
diff --git a/disk/sfs/PREPARE b/disk/sfs/PREPARE
new file mode 100755
index 0000000..b1a8815
--- /dev/null
+++ b/disk/sfs/PREPARE
@@ -0,0 +1,2 @@
+config_query SFS_CVS_AUTOUPDATE \
+ "Update to the latest CVS automatically on every cast?" n
diff --git a/disk/sfs/PRE_BUILD b/disk/sfs/PRE_BUILD
new file mode 100755
index 0000000..d24df76
--- /dev/null
+++ b/disk/sfs/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/sfs-gcc41.patch
diff --git a/disk/sfs/sfs-gcc41.patch b/disk/sfs/sfs-gcc41.patch
new file mode 100644
index 0000000..a5bc87f
--- /dev/null
+++ b/disk/sfs/sfs-gcc41.patch
@@ -0,0 +1,36 @@
+diff -uNr sfs-cvs.old/adb/indexNode.h sfs-cvs/adb/indexNode.h
+--- sfs-cvs.old/adb/indexNode.h 2006-05-29 12:40:31.000000000 +0200
++++ sfs-cvs/adb/indexNode.h 2006-05-29 12:52:41.000000000 +0200
+@@ -71,7 +71,7 @@
+
+ public:
+ indexNode(nodeStorage *buf, btree* tree, int size);
+- indexNode::~indexNode();
++ ~indexNode();
+
+ void insert(record *item, int policy, callback<void, int>::ref cb);
+ void remove(void *key, bSize_t len);
+diff -uNr sfs-cvs.old/adb/nodeBuf.h sfs-cvs/adb/nodeBuf.h
+--- sfs-cvs.old/adb/nodeBuf.h 2006-05-29 12:40:31.000000000 +0200
++++ sfs-cvs/adb/nodeBuf.h 2006-05-29 12:42:10.000000000 +0200
+@@ -87,7 +87,7 @@
+
+ int idToOffset(nodeID_t id);
+ nodeID_t blockToID(blockID_t b);
+- blockID_t nodeBuf::IDToBlock(nodeID_t n);
++ blockID_t IDToBlock(nodeID_t n);
+
+ void verifySpace(bSize_t nsize);
+ void initNode(void* buf, char, blockID_t, nodeID_t, bSize_t);
+diff -uNr sfs-cvs.old/adb/record.h sfs-cvs/adb/record.h
+--- sfs-cvs.old/adb/record.h 2006-05-29 12:40:31.000000000 +0200
++++ sfs-cvs/adb/record.h 2006-05-29 12:41:47.000000000 +0200
+@@ -35,7 +35,7 @@
+
+ public:
+ record(void *key, int keyLen, void *value, int valueLen);
+- record::record(record *rec);
++ record(record *rec);
+ ~record();
+ void dealloc();
+ void *getKey(bSize_t *len);
diff --git a/disk/simplecdrx/DEPENDS b/disk/simplecdrx/DEPENDS
index eabe506..85c56ce 100755
--- a/disk/simplecdrx/DEPENDS
+++ b/disk/simplecdrx/DEPENDS
@@ -1,2 +1,2 @@
depends gtk+ '--disable-gtktest' &&
-optional_depends "libvorbis" "" "" "for ogg/vorbis support"
+depends libvorbis
diff --git a/disk/simplecdrx/DETAILS b/disk/simplecdrx/DETAILS
index f35e449..3942d38 100755
--- a/disk/simplecdrx/DETAILS
+++ b/disk/simplecdrx/DETAILS
@@ -3,7 +3,7 @@
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://ogre.rocky-road.net/files/${SOURCE}
-
SOURCE_HASH=sha512:51d55ea962ffd7ab4665d7b203334ef5f7141840bd16bf454b1e5556774952731295376300f2b2f0efe2c4b74b323c457f1625ff39a6b0b28d751e94c258afbf
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://ogre.rocky-road.net/cdr.shtml
LICENSE[0]=GPL
ENTERED=20020116
diff --git a/disk/simplecdrx/HISTORY b/disk/simplecdrx/HISTORY
index 65bfae0..69bf9a6 100644
--- a/disk/simplecdrx/HISTORY
+++ b/disk/simplecdrx/HISTORY
@@ -1,3 +1,6 @@
+2006-05-10 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: made libvorbis non optional (bug #11780)
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/simplecdrx/simplecdrx-1.3.3.tar.bz2.sig
b/disk/simplecdrx/simplecdrx-1.3.3.tar.bz2.sig
new file mode 100644
index 0000000..a134867
Binary files /dev/null and b/disk/simplecdrx/simplecdrx-1.3.3.tar.bz2.sig
differ
diff --git a/disk/udev/50-default.rules b/disk/udev/50-default.rules
deleted file mode 100644
index 8ab74a8..0000000
--- a/disk/udev/50-default.rules
+++ /dev/null
@@ -1,111 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some of the
-# fields. See the udev man page for a full description of them.
-
-# All block devices
-SUBSYSTEM=="block", GROUP="disk", MODE="0640"
-SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy"
-
-# device mapper creates its own device nodes so ignore these
-#KERNEL=="dm-[0-9]*", NAME=""
-KERNEL=="device-mapper", NAME="mapper/control"
-
-# Disk devices
-KERNEL=="sd*", NAME="%k", GROUP="disk"
-KERNEL=="dasd*", NAME="%k", GROUP="disk"
-KERNEL=="ataraid*", NAME="%k", GROUP="disk"
-BUS=="scsi", KERNEL=="sr[0-9]*", GROUP="scsi"
-BUS=="scsi", KERNEL=="sg[0-9]*", GROUP="burning"
-
-# CDrom devices
-BUS=="ide", KERNEL=="hd[a-z]", ACTION=="add", IMPORT="cdrom_id --export
$tempnode"
-BUS=="scsi", KERNEL=="sr[0-9]*", ACTION=="add", IMPORT="cdrom_id --export
$tempnode"
-BUS=="scsi", KERNEL=="scd[a-z]", ACTION=="add", IMPORT="cdrom_id --export
$tempnode"
-
-ENV{ID_CDROM}=="?*", SYMLINK+="cdrom%e", GROUP="cdrom"
-ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cdrw%e", MODE="0660",
GROUP="burning"
-ENV{ID_CDROM_DVD}=="?*", SYMLINK+="dvd%e"
-ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="dvdrw%e"
-
-# permissions for SCSI CD devices
-BUS=="scsi", KERNEL=="s[grt][0-9]*", SYSFS{type}=="5", MODE="0660",
GROUP="cdrom"
-
-# alsa devices
-SUBSYSTEM=="sound", GROUP="audio", MODE="0660"
-KERNEL=="controlC[0-9]*", NAME="snd/%k", RUN="/usr/sbin/alsactl restore"
-KERNEL=="hw[CD0-9]*", NAME="snd/%k"
-KERNEL=="pcm[CD0-9cp]*", NAME="snd/%k"
-KERNEL=="midi[CD0-9]*", NAME="snd/%k"
-KERNEL=="timer", NAME="snd/%k"
-KERNEL=="seq", NAME="snd/%k"
-
-# sound devices
-KERNEL=="admmidi" NAME="sound/%k", SYMLINK="%k"
-KERNEL=="adsp", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="amidi" NAME="sound/%k", SYMLINK="%k"
-KERNEL=="adsp[0-9]*", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="audio", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="dmmidi" NAME="sound/%k", SYMLINK="%k"
-KERNEL=="audio[0-9]*", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="dsp", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="dsp[0-9]*", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="mixer", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="mixer[0-9]*", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="sequencer", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="sequencer[0-9]*", NAME="sound/%k", SYMLINK="%k"
-
-# input devices
-KERNEL=="mice", NAME="input/%k", MODE="0644"
-KERNEL=="mouse*", NAME="input/%k", MODE="0644"
-KERNEL=="event*", NAME="input/%k", MODE="0644"
-KERNEL=="js*", NAME="input/%k", MODE="0644"
-KERNEL=="ts*", NAME="input/%k", MODE="0644"
-KERNEL=="psaux" NAME="input/%k", SYMLINK="%k", MODE="0644"
-
-# misc devices
-KERNEL=="console" NAME="%k", MODE="0600"
-KERNEL=="full", NAME="%k", MODE="0666"
-KERNEL=="kmem", NAME="%k", MODE="0640"
-KERNEL=="mem", NAME="%k", MODE="0640"
-KERNEL=="null", NAME="%k", MODE="0666"
-KERNEL=="port", NAME="%k", MODE="0640"
-KERNEL=="random", NAME="%k", MODE="0644"
-KERNEL=="rtc", NAME="%k", MODE="0644"
-KERNEL=="tty", NAME="%k", MODE="0666"
-KERNEL=="urandom", NAME="%k", MODE="0644"
-KERNEL=="zero", NAME="%k", MODE="0666"
-
-# needed to create ptys
-KERNEL=="ptmx", NAME="%k", MODE="0666"
-
-# printer
-KERNEL=="lp*", NAME="%k", MODE="0660"
-# HP printers
-BUS=="usb", KERNEL=="lp[0-9]*", SYMLINK="usb%k"
-
-# v4l devices
-KERNEL=="video[0-9]*", NAME="v4l/video%n", SYMLINK="video%n",
GROUP="video", MODE="0660"
-KERNEL=="radio[0-9]*", NAME="v4l/radio%n", GROUP="video", MODE="0660"
-KERNEL=="vbi[0-9]*", NAME="v4l/vbi%n", SYMLINK="vbi%n", GROUP="video",
MODE="0660"
-KERNEL=="vtx[0-9]*", NAME="v4l/vtx%n", GROUP="video", MODE="0660"
-
-#nvidia devices
-KERNEL=="nvidia*" NAME="%k", MODE="0660", GROUP="video"
-
-#framebuffer devices
-KERNEL=="fb[0-9]", NAME="%k", MODE="0660", GROUP="video"
-
-#svgalib devices
-KERNEL=="svga[0-9]", NAME="%k", MODE="0660", GROUP="video"
-
-# Network devices
-KERNEL=="tun", NAME="net/%k"
-
-# Load firmware
-SUBSYSTEM=="firmware", ACTION=="add", RUN+="/lib/udev/firmware_helper"
-
-# Autoload modules
-SYSFS{modalias}=="?*", ACTION=="add", RUN+="/sbin/modprobe $env{MODALIAS}"
-
-# Autoload modules that lack aliases but have them defined in
-# /etc/modprobe.conf
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do
/sbin/modprobe pnp:d$$id; done < /sys$devpath/id'"
diff --git a/disk/udev/50-default.rules-hotplug
b/disk/udev/50-default.rules-hotplug
deleted file mode 100644
index d30584f..0000000
--- a/disk/udev/50-default.rules-hotplug
+++ /dev/null
@@ -1,110 +0,0 @@
-# allow automatic module loading in kernels >= 2.6.15
-ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
-
-# There are a number of modifiers that are allowed to be used in some of the
-# fields. See the udev man page for a full description of them.
-
-# All block devices
-SUBSYSTEM=="block", GROUP="disk", MODE="0640"
-SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy"
-
-# device mapper creates its own device nodes so ignore these
-#KERNEL=="dm-[0-9]*", NAME=""
-KERNEL=="device-mapper", NAME="mapper/control"
-
-# Disk devices
-KERNEL=="sd*", NAME="%k", GROUP="disk"
-KERNEL=="dasd*", NAME="%k", GROUP="disk"
-KERNEL=="ataraid*", NAME="%k", GROUP="disk"
-BUS=="scsi", KERNEL=="sr[0-9]*", GROUP="scsi"
-BUS=="scsi", KERNEL=="sg[0-9]*", GROUP="burning"
-
-# CDrom devices
-BUS=="ide", KERNEL=="hd[a-z]", ACTION=="add", IMPORT="cdrom_id --export
$tempnode"
-BUS=="scsi", KERNEL=="sr[0-9]*", ACTION=="add", IMPORT="cdrom_id --export
$tempnode"
-BUS=="scsi", KERNEL=="scd[a-z]", ACTION=="add", IMPORT="cdrom_id --export
$tempnode"
-
-ENV{ID_CDROM}=="?*", SYMLINK+="cdrom%e", GROUP="cdrom"
-ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cdrw%e", MODE="0660",
GROUP="burning"
-ENV{ID_CDROM_DVD}=="?*", SYMLINK+="dvd%e"
-ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="dvdrw%e"
-
-# permissions for SCSI CD devices
-BUS=="scsi", KERNEL=="s[grt][0-9]*", SYSFS{type}=="5", MODE="0660",
GROUP="cdrom"
-
-# alsa devices
-SUBSYSTEM=="sound", GROUP="audio", MODE="0660"
-KERNEL=="controlC[0-9]*", NAME="snd/%k", RUN="/usr/sbin/alsactl restore"
-KERNEL=="hw[CD0-9]*", NAME="snd/%k"
-KERNEL=="pcm[CD0-9cp]*", NAME="snd/%k"
-KERNEL=="midi[CD0-9]*", NAME="snd/%k"
-KERNEL=="timer", NAME="snd/%k"
-KERNEL=="seq", NAME="snd/%k"
-
-# sound devices
-KERNEL=="admmidi" NAME="sound/%k", SYMLINK="%k"
-KERNEL=="adsp", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="amidi" NAME="sound/%k", SYMLINK="%k"
-KERNEL=="adsp[0-9]*", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="audio", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="dmmidi" NAME="sound/%k", SYMLINK="%k"
-KERNEL=="audio[0-9]*", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="dsp", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="dsp[0-9]*", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="mixer", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="mixer[0-9]*", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="sequencer", NAME="sound/%k", SYMLINK="%k"
-KERNEL=="sequencer[0-9]*", NAME="sound/%k", SYMLINK="%k"
-
-# input devices
-KERNEL=="mice", NAME="input/%k", MODE="0644"
-KERNEL=="mouse*", NAME="input/%k", MODE="0644"
-KERNEL=="event*", NAME="input/%k", MODE="0644"
-KERNEL=="js*", NAME="input/%k", MODE="0644"
-KERNEL=="ts*", NAME="input/%k", MODE="0644"
-KERNEL=="psaux" NAME="input/%k", SYMLINK="%k", MODE="0644"
-
-# misc devices
-KERNEL=="console" NAME="%k", MODE="0600"
-KERNEL=="full", NAME="%k", MODE="0666"
-KERNEL=="kmem", NAME="%k", MODE="0640"
-KERNEL=="mem", NAME="%k", MODE="0640"
-KERNEL=="null", NAME="%k", MODE="0666"
-KERNEL=="port", NAME="%k", MODE="0640"
-KERNEL=="random", NAME="%k", MODE="0644"
-KERNEL=="rtc", NAME="%k", MODE="0644"
-KERNEL=="tty", NAME="%k", MODE="0666"
-KERNEL=="urandom", NAME="%k", MODE="0644"
-KERNEL=="zero", NAME="%k", MODE="0666"
-
-# needed to create ptys
-KERNEL=="ptmx", NAME="%k", MODE="0666"
-
-# printer
-KERNEL=="lp*", NAME="%k", MODE="0660"
-# HP printers
-BUS=="usb", KERNEL=="lp[0-9]*", SYMLINK="usb%k"
-
-# v4l devices
-KERNEL=="video[0-9]*", NAME="v4l/video%n", SYMLINK="video%n",
GROUP="video", MODE="0660"
-KERNEL=="radio[0-9]*", NAME="v4l/radio%n", GROUP="video", MODE="0660"
-KERNEL=="vbi[0-9]*", NAME="v4l/vbi%n", SYMLINK="vbi%n", GROUP="video",
MODE="0660"
-KERNEL=="vtx[0-9]*", NAME="v4l/vtx%n", GROUP="video", MODE="0660"
-
-#nvidia devices
-KERNEL=="nvidia*" NAME="%k", MODE="0660", GROUP="video"
-
-#framebuffer devices
-KERNEL=="fb[0-9]", NAME="%k", MODE="0660", GROUP="video"
-
-#svgalib devices
-KERNEL=="svga[0-9]", NAME="%k", MODE="0660", GROUP="video"
-
-# Network devices
-KERNEL=="tun", NAME="net/%k"
-
-SUBSYSTEM=="firmware", ACTION="add", RUN+="/lib/udev/firmware_helper"
-
-# be backward compatible for a while with the /etc/hotplug.d/ system
-# run /etc/hotplug.d/ stuff only if we came from a hotplug event, not for
udevstart
-ENV{UDEVD_EVENT}=="1", RUN="udev_run_hotplugd $env{SUBSYSTEM}"
diff --git a/disk/udev/52-modules.rules b/disk/udev/52-modules.rules
new file mode 100644
index 0000000..eb7e18c
--- /dev/null
+++ b/disk/udev/52-modules.rules
@@ -0,0 +1,35 @@
+# Module loading rules for systems without hotplug
+
+# Autoload modules that lack aliases but have them defined in
+# /etc/modprobe.conf
+ENV{MODALIAS}!="?*", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do
/sbin/modprobe pnp:d$$id; done < /sys$devpath/id'"
+
+# Check whether we need these rules for this event
+ACTION!="add", GOTO="modprobe_end"
+
+# Autoload modules with aliases
+SYSFS{modalias}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# PCMCIA
+SUBSYSTEM=="pcmcia_socket", RUN+="/sbin/modprobe pcmcia"
+
+# I2O
+SUBSYSTEM!="i2o", GOTO="i2o_end"
+RUN+="/sbin/modprobe i2o-block"
+LABEL="i2o_end"
+
+# MMC
+SUBSYSTEM!="mmc", GOTO="mmc_end"
+RUN+="/sbin/modprobe mmc-block"
+LABEL="mmc_end"
+
+# SCSI
+SUBSYSTEM!="scsi_device", GOTO="scsi_device_end"
+SYSFS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod"
+SYSFS{type}=="1", SYSFS{vendor}=="Onstream", SYSFS{model}!="ADR*"
RUN+="/sbin/modprobe osst"
+SYSFS{type}=="1", RUN+="/sbin/modprobe st"
+SYSFS{type}=="[345]", RUN+="/sbin/modprobe sr_mod"
+RUN+="/sbin/modprobe sg"
+LABEL="scsi_device_end"
+
+LABEL="modprobe_end"
diff --git a/disk/udev/52-modules.rules-hotplug
b/disk/udev/52-modules.rules-hotplug
new file mode 100644
index 0000000..4512d32
--- /dev/null
+++ b/disk/udev/52-modules.rules-hotplug
@@ -0,0 +1,5 @@
+# Module loading rules for systems with hotplug
+
+# be backward compatible for a while with the /etc/hotplug.d/ system
+# run /etc/hotplug.d/ stuff only if we came from a hotplug event, not for
udevstart
+ENV{UDEVD_EVENT}=="1", RUN="udev_run_hotplugd $env{SUBSYSTEM}"
diff --git a/disk/udev/DEPENDS b/disk/udev/DEPENDS
index 096db19..f17ed61 100755
--- a/disk/udev/DEPENDS
+++ b/disk/udev/DEPENDS
@@ -1,7 +1,8 @@
depends gnupg &&
depends smgl-fhs &&

-local KVER=`installed_version linux |cut -c-6` &&
+. $GRIMOIRE/FUNCTIONS
+local KVER=$(get_kernel_version |cut -c-6) &&

if [[ "$KVER" < "2.6.13" ]]; then
depends hotplug
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index de8dc1a..dfe1bcd 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,5 +1,5 @@
SPELL=udev
- VERSION=090
+ VERSION=092
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -10,10 +10,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

WEB_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
ENTERED=20030725
UPDATED=20060107
- PATCHLEVEL=8
+ PATCHLEVEL=11
DOCS="ChangeLog COPYING FAQ README docs/* RELEASE-NOTES"
LICENSE[0]=GPL
- KEYWORDS="disk"
+ KEYWORDS="disk devices nodes modules"
SHORT="Udev creates and removes device nodes"
cat << EOF
Udev creates and removes device nodes in /dev, based on events the kernel
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 5f93d98..cc22e57 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,59 @@
+2006-05-15 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Removed fix for typo in alsa rules file, was fixed
+ upstream
+ * DEPENDS: Replaced "installed_version linux" with
+ "get_kernel_version", fixes conditional for custom kernels
+
+2006-05-15 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 092
+
+2006-05-12 Juuso Alasuutari <iuso AT sourcemage.org>
+ * rules/50-default.rules: Fixed invalid KERNEL fields
+
+2006-05-12 Juuso Alasuutari <iuso AT sourcemage.org>
+ * rules/50-default.rules: Fixed ptmx device permission error
+ * DETAILS: PATCHLEVEL
+
+2006-05-11 Flavien Bridault <vlaaad AT sourcemage.org>
+ * INSTALL: install path_id in /lib/udev since this is a helper,
+ otherwise udev persistent disk rules don't find it
+
+2006-05-10 Juuso Alasuutari <iuso AT sourcemage.org>
+ * rules/50-default.rules: Fixed incorrect node naming for usb
+ printers, added new rules for various devices
+ * DETAILS: Updated PATCHLEVEL, added some new keywords
+
+2006-05-02 Juuso Alasuutari <iuso AT sourcemage.org>
+ * INSTALL: Install early rules straight from source dir
+ * rules/05-udev-early.rules: Deleted
+ * rules/50-default.rules: Thiefed a ton of rules from gentoo
+ rules file, fixed some typos
+ * 52-modules.rules: Some edits
+
+2006-04-30 Juuso Alasuutari <iuso AT sourcemage.org>
+ * INSTALL: Install modprobe aliases for non-hotplug systems
+
+2006-04-29 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Add fix for upstream typo in alsa rules file
+
+2006-04-28 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated PATCHLEVEL
+
+2006-04-28 Juuso Alasuutari <iuso AT sourcemage.org>
+ * 50-default.rules, 50-default.rules-hotplug: Deleted, see below
+ * rules/50-default.rules: Added, now the differences between
+ non-hotplug and hotplug systems are taken care of in
+ 52-modules.rules*
+ * 52-modules.rules, 52-modules.rules-hotplug: Added, different
+ module loading rules for non-hotplug and hotplug systems. Also
+ some new rules for non-hotplug, fixes e.g. SCSI driver
+ loading.
+ * INSTALL: Edited to install correct 52-modules.rules* file
+ * rules/README: Updated the text a bit
+
+2006-04-27 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Version 091
+
2006-04-18 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Version 090
* rules/05-udev-early.rules: Added
diff --git a/disk/udev/INSTALL b/disk/udev/INSTALL
index c795fe2..351fc59 100755
--- a/disk/udev/INSTALL
+++ b/disk/udev/INSTALL
@@ -9,15 +9,23 @@ for file in $SCRIPT_DIRECTORY/rules/* ;
install_config_file $file ${UDEV_CFG}/rules.d/$(basename $file)
done &&

-# install diff default rules on hotplug and non-hotplug systems
+# install diff default rules on hotplug and non-hotplug systems, install
+# required modprobe aliases for non-hotplug rules
if spell_ok hotplug; then
- install_config_file $SCRIPT_DIRECTORY/50-default.rules-hotplug
${UDEV_CFG}/rules.d/50-default.rules
+ install_config_file $SCRIPT_DIRECTORY/52-modules.rules-hotplug
${UDEV_CFG}/rules.d/52-modules.rules
else
- install_config_file $SCRIPT_DIRECTORY/50-default.rules
${UDEV_CFG}/rules.d/50-default.rules
+ install_config_file $SCRIPT_DIRECTORY/52-modules.rules
${UDEV_CFG}/rules.d/52-modules.rules &&
+ mkdir -p $INSTALL_ROOT/etc/modprobe.d &&
+ install_config_file $SCRIPT_DIRECTORY/modprobe.aliases
$INSTALL_ROOT/etc/modprobe.d/udev
fi

+# install early rules
+install_config_file $SOURCE_DIRECTORY/etc/udev/05-udev-early.rules \
+ ${UDEV_CFG}/rules.d/05-udev-early.rules
+
# install alsa rules
-install_config_file etc/udev/suse/40-alsa.rules
${UDEV_CFG}/rules.d/40-alsa.rules
+install_config_file etc/udev/suse/40-alsa.rules \
+ ${UDEV_CFG}/rules.d/40-alsa.rules

# udevstart and udevsend are nolonger installed by default. we still need
them
install udevsend udevstart ${INSTALL_ROOT}/sbin &&
@@ -34,7 +42,7 @@ install -m 755 $SCRIPT_DIRECTORY/helpers

if [[ "$UDEV_EXTRAS" == 'y' ]]; then
make EXTRAS="extras/ata_id extras/dasd_id extras/edd_id extras/floppy
extras/scsi_id extras/usb_id extras/volume_id" prefix=${INSTALL_ROOT}/
exec_prefix=${INSTALL_ROOT}/ ${OPTS} V=true install &&
- install extras/path_id/path_id ${INSTALL_ROOT}/sbin &&
+ install extras/path_id/path_id ${INSTALL_ROOT}/lib/udev &&

if [[ "$UDEV_PERSIST" == 'y' ]];then
install_config_file etc/udev/60-persistent-storage.rules
${UDEV_CFG}/rules.d/60-persistent-storage.rules
diff --git a/disk/udev/modprobe.aliases b/disk/udev/modprobe.aliases
new file mode 100644
index 0000000..d8c455f
--- /dev/null
+++ b/disk/udev/modprobe.aliases
@@ -0,0 +1,9 @@
+# These are needed by udev to autoload some modules
+alias pnp:dPNP0510 irtty-sir
+alias pnp:dPNP0511 irtty-sir
+alias pnp:dPNP0700 floppy
+alias pnp:dPNP0800 pcspkr
+alias pnp:dPNP0b00 rtc
+alias pnp:dPNP0303 atkbd
+alias pnp:dPNP0f13 psmouse
+alias pnp:dPNPb02f analog
diff --git a/disk/udev/rules/05-udev-early.rules
b/disk/udev/rules/05-udev-early.rules
deleted file mode 100644
index 417ee67..0000000
--- a/disk/udev/rules/05-udev-early.rules
+++ /dev/null
@@ -1,4 +0,0 @@
-# sysfs is populated after the event is sent
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*",
WAIT_FOR_SYSFS="bus"
-ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
-
diff --git a/disk/udev/rules/50-default.rules
b/disk/udev/rules/50-default.rules
new file mode 100644
index 0000000..7bbed58
--- /dev/null
+++ b/disk/udev/rules/50-default.rules
@@ -0,0 +1,224 @@
+# There are a number of modifiers that are allowed to be used in some of the
+# fields. See the udev man page for a full description of them.
+
+# tty devices
+KERNEL=="console", NAME="%k", MODE="0600"
+KERNEL=="tty", NAME="%k", MODE="0666"
+KERNEL=="tty[0-9]*", NAME="vc/%n", SYMLINK="%k"
+KERNEL=="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k"
+KERNEL=="ttyUSB[0-9]*", NAME="tts/USB%n", SYMLINK="%k", MODE="0660"
+KERNEL=="ippp0", NAME="%k"
+KERNEL=="isdn*", NAME="%k"
+KERNEL=="dcbri*", NAME="%k"
+KERNEL=="ircomm*", NAME="%k"
+
+# pty devices
+KERNEL=="ptmx", NAME="%k", MODE="0666"
+KERNEL=="pty[p-za-e][0-9a-f]*", NAME="pty/m%n", SYMLINK="%k"
+KERNEL=="tty[p-za-e][0-9a-f]*", NAME="pty/s%n", SYMLINK="%k"
+
+# vc devices
+KERNEL=="vcs", NAME="vcc/0", SYMLINK="%k"
+KERNEL=="vcs[0-9]*", NAME="vcc/%n", SYMLINK="%k"
+KERNEL=="vcsa", NAME="vcc/a0", SYMLINK="%k"
+KERNEL=="vcsa[0-9]*", NAME="vcc/a%n", SYMLINK="%k"
+
+# all block devices
+SUBSYSTEM=="block", GROUP="disk", MODE="0640"
+SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy"
+
+# device mapper creates its own device nodes so ignore these
+KERNEL=="dm-[0-9]*", OPTIONS="ignore_device"
+KERNEL=="device-mapper", NAME="mapper/control"
+
+# disk devices
+KERNEL=="sd*", NAME="%k", GROUP="disk"
+KERNEL=="dasd*", NAME="%k", GROUP="disk"
+KERNEL=="ataraid*", NAME="%k", GROUP="disk"
+BUS=="scsi", KERNEL=="sr[0-9]*", GROUP="scsi"
+BUS=="scsi", KERNEL=="sg[0-9]*", GROUP="burning"
+
+# cdrom devices
+BUS=="ide", KERNEL=="hd[a-z]", ACTION=="add", IMPORT="cdrom_id --export
$tempnode"
+BUS=="scsi", KERNEL=="sr[0-9]*", ACTION=="add", IMPORT="cdrom_id --export
$tempnode"
+BUS=="scsi", KERNEL=="scd[a-z]", ACTION=="add", IMPORT="cdrom_id --export
$tempnode"
+ENV{ID_CDROM}=="?*", SYMLINK+="cdrom%e", GROUP="cdrom"
+ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cdrw%e", MODE="0660",
GROUP="burning"
+ENV{ID_CDROM_DVD}=="?*", SYMLINK+="dvd%e"
+ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="dvdrw%e"
+
+# permissions for SCSI CD devices
+BUS=="scsi", KERNEL=="s[grt][0-9]*", SYSFS{type}=="5", MODE="0660",
GROUP="cdrom"
+
+# tape devices
+KERNEL=="ht*", NAME="%k"
+KERNEL=="nht*", NAME="%k"
+KERNEL=="pt*", NAME="%k"
+KERNEL=="npt*", NAME="%k"
+KERNEL=="st*", NAME="%k"
+KERNEL=="nst*", NAME="%k"
+KERNEL=="osst*", NAME="%k"
+KERNEL=="nosst*", NAME="%k"
+
+# sound devices
+KERNEL=="admmidi", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="adsp", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="amidi", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="adsp[0-9]*", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="audio", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="dmmidi", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="audio[0-9]*", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="dsp", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="dsp[0-9]*", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="mixer", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="mixer[0-9]*", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="sequencer", NAME="sound/%k", SYMLINK="%k"
+KERNEL=="sequencer[0-9]*", NAME="sound/%k", SYMLINK="%k"
+
+# input devices
+KERNEL=="mice", NAME="input/%k", MODE="0644"
+KERNEL=="mouse*", NAME="input/%k", MODE="0644"
+KERNEL=="event*", NAME="input/%k", MODE="0644"
+KERNEL=="js*", NAME="input/%k", MODE="0644"
+KERNEL=="ts*", NAME="input/%k", MODE="0644"
+KERNEL=="psaux", NAME="input/%k", SYMLINK="%k", MODE="0644"
+
+# misc devices
+KERNEL=="agpgart", NAME="misc/%k", SYMLINK="%k"
+KERNEL=="rtc", NAME="misc/%k", SYMLINK+="%k", MODE="0644"
+KERNEL=="uinput", NAME="misc/%k", SYMLINK+="%k"
+KERNEL=="inotify", NAME="misc/%k", SYMLINK+="%k", MODE="0666"
+
+# capi devices
+KERNEL=="capi", NAME="capi20", SYMLINK="isdn/capi20"
+KERNEL=="capi*", NAME="capi/%n"
+
+# cpu devices
+KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid"
+KERNEL=="msr[0-9]*", NAME="cpu/%n/msr"
+KERNEL=="microcode", NAME="cpu/microcode"
+
+# i2c devices
+KERNEL=="i2c-[0-9]*", NAME="i2c/%n", SYMLINK+="%k"
+
+# loop devices
+KERNEL=="loop[0-9]*", NAME="loop/%n", SYMLINK+="%k", GROUP="disk"
+
+# md block devices
+KERNEL=="md[0-9]*", NAME="md/%n", SYMLINK+="%k", GROUP="disk"
+
+# aoe char devices,
+SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k", GROUP="disk",
MODE="0220"
+SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k", GROUP="disk",
MODE="0440"
+SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k", GROUP="disk",
MODE="0220"
+
+# netlink devices
+KERNEL=="route", NAME="netlink/%k"
+KERNEL=="skip", NAME="netlink/%k"
+KERNEL=="usersock", NAME="netlink/%k"
+KERNEL=="fwmonitor", NAME="netlink/%k"
+KERNEL=="tcpdiag", NAME="netlink/%k"
+KERNEL=="nflog", NAME="netlink/%k"
+KERNEL=="xfrm", NAME="netlink/%k"
+KERNEL=="arpd", NAME="netlink/%k"
+KERNEL=="route6", NAME="netlink/%k"
+KERNEL=="ip6_fw", NAME="netlink/%k"
+KERNEL=="dnrtmsg", NAME="netlink/%k"
+KERNEL=="tap*", NAME="netlink/%k"
+
+# ramdisk devices
+KERNEL=="ram[0-9]*", NAME="rd/%n", SYMLINK+="%k"
+
+# IEEE1394 (firewire) devices (must be before raw devices below)
+KERNEL=="raw1394", NAME="%k", GROUP="video"
+KERNEL=="dv1394*", NAME="dv1394/%n", GROUP="video"
+KERNEL=="video1394*", NAME="video1394/%n", GROUP="video"
+
+# raw devices
+KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk"
+KERNEL=="ram*", NAME="%k", GROUP="disk"
+
+# memory devices
+KERNEL=="random", NAME="%k", MODE="0666"
+KERNEL=="urandom", NAME="%k", MODE="0444"
+KERNEL=="mem", NAME="%k", MODE="0640"
+KERNEL=="kmem", NAME="%k", MODE="0640"
+KERNEL=="port", NAME="%k", MODE="0640"
+KERNEL=="full", NAME="%k", MODE="0666"
+KERNEL=="null", NAME="%k", MODE="0666"
+KERNEL=="zero", NAME="%k", MODE="0666"
+
+# usb devices
+KERNEL=="hiddev*", NAME="usb/%k"
+KERNEL=="auer*", NAME="usb/%k"
+KERNEL=="legousbtower*", NAME="usb/%k", GROUP="usb"
+KERNEL=="dabusb*", NAME="usb/%k"
+
+# dvb devices
+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf
dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
+
+# Asterisk Zaptel devices
+KERNEL=="zapctl", NAME="zap/ctl"
+KERNEL=="zaptimer", NAME="zap/timer"
+KERNEL=="zapchannel", NAME="zap/channel"
+KERNEL=="zappseudo", NAME="zap/pseudo"
+KERNEL=="zap[0-9]*", NAME="zap/%n"
+
+# jaz devices
+KERNEL=="jaz*", NAME="%k", GROUP="disk"
+
+# zip devices
+KERNEL=="pocketzip*", NAME="%k", GROUP="disk"
+KERNEL=="zip*", NAME="%k", GROUP="disk"
+
+# ls120 devices
+KERNEL=="ls120", NAME="%k", GROUP="disk"
+
+# printer (usb printer rule must be before the rest)
+BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k", GROUP="lp", MODE="0660"
+KERNEL=="lp*", NAME="%k", GROUP="lp", MODE="0660"
+KERNEL=="irlpt", NAME="%k", GROUP="lp", MODE="0660"
+KERNEL=="usblp", NAME="%k", GROUP="lp", MODE="0660"
+KERNEL=="parport*", NAME="%k", GROUP="lp", MODE="0660"
+
+# v4l devices
+KERNEL=="video[0-9]*", NAME="v4l/video%n", SYMLINK="video%n",
GROUP="video", MODE="0660"
+KERNEL=="radio[0-9]*", NAME="v4l/radio%n", GROUP="video", MODE="0660"
+KERNEL=="vbi[0-9]*", NAME="v4l/vbi%n", SYMLINK="vbi%n", GROUP="video",
MODE="0660"
+KERNEL=="vtx[0-9]*", NAME="v4l/vtx%n", GROUP="video", MODE="0660"
+
+# video devices
+KERNEL=="card*", NAME="dri/card%n", MODE="0660", GROUP="video"
+KERNEL=="3dfx*", NAME="%k", MODE="0660", GROUP="video"
+KERNEL=="nvidia*", NAME="%k", MODE="0660", GROUP="video"
+KERNEL=="fb[0-9]", NAME="%k", MODE="0660", GROUP="video"
+KERNEL=="svga[0-9]", NAME="%k", MODE="0660", GROUP="video"
+
+# network devices
+KERNEL=="tun", NAME="net/%k"
+KERNEL=="ippp*", NAME="net/%k", SYMLINK="%k", MODE="0644"
+KERNEL=="ipstate*", NAME="net/%k", SYMLINK="%k", MODE="0660"
+KERNEL=="spx", NAME="net/%k", SYMLINK="%k", MODE="0644"
+
+# diskonkey devices
+KERNEL=="diskonkey*", NAME="%k", GROUP="disk"
+
+# rem_ide devices
+KERNEL=="microdrive*", NAME="%k", GROUP="disk"
+
+# kbd devices
+KERNEL=="kbd", NAME="%k", MODE="0664"
+
+# Sony Vaio Jogdial sonypi device
+KERNEL=="sonypi", NAME="%k", MODE="0666"
+
+# packet devices
+KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrw", MODE="0660"
+KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/pktcdvd%n", GROUP="cdrw", MODE="0660"
+
+# infiniband devices
+KERNEL=="umad*", NAME="infiniband/%k"
+KERNEL=="issm*", NAME="infiniband/%k"
+
+# load firmware
+SUBSYSTEM=="firmware", ACTION=="add", RUN+="/lib/udev/firmware_helper"
diff --git a/disk/udev/rules/README b/disk/udev/rules/README
index 3e5c56c..00a082a 100644
--- a/disk/udev/rules/README
+++ b/disk/udev/rules/README
@@ -6,4 +6,6 @@ an idea of what's possible with udev.
When a rule matches in one file, a different rule in another file will be
ignored, so be sure to name your own files properly.

-Be sure to leave 50-default.rules as it is, so the spell can update it when
needed.
+Be sure to leave rules files installed by the spell as they are, so the
+spell can update them when needed. If you need to make changes, always
+add your own rules files when possible.
diff --git a/disk/udftools/DEPENDS b/disk/udftools/DEPENDS
index a69731c..1dab21d 100755
--- a/disk/udftools/DEPENDS
+++ b/disk/udftools/DEPENDS
@@ -1 +1,2 @@
-depends gcc34
+depends ncurses &&
+depends readline
diff --git a/disk/udftools/DETAILS b/disk/udftools/DETAILS
index 9a153b8..69115e2 100755
--- a/disk/udftools/DETAILS
+++ b/disk/udftools/DETAILS
@@ -1,13 +1,12 @@
SPELL=udftools
VERSION=1.0.0b3
- GCC_VERSION=3.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/linux-udf/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://sourceforge.net/projects/linux-udf/
ENTERED=20040308
UPDATED=20040308
-
SOURCE_HASH=sha512:4b45ff2e389ce93c3ac372f74daa3e2a43e02434c1e3d9df8cf050e137799491ac88d7aedd2b61c6d79a7ab8878042689c948c0b2aeb4be0a172c64844f07068
LICENSE[0]=GPL
KEYWORDS="filesystem disk"
SHORT="Linux UDF Filesystem userspace utilities"
diff --git a/disk/udftools/HISTORY b/disk/udftools/HISTORY
index 7f0283b..1315d62 100644
--- a/disk/udftools/HISTORY
+++ b/disk/udftools/HISTORY
@@ -1,3 +1,9 @@
+2006-05-06 Flavien Bridault <vlaaad AT sourcemage.org>
+ * udftools-1.0.0b3-gcc4.diff: added, fix gcc4 compiling
+ * PRE_BUILD: added to apply patch
+ * DETAILS: Removed GCC_VERSION
+ * DEPENDS: Removed gcc34, added ncurses and readline
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/udftools/PRE_BUILD b/disk/udftools/PRE_BUILD
new file mode 100755
index 0000000..2fb304f
--- /dev/null
+++ b/disk/udftools/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/udftools-1.0.0b3-gcc4.diff
diff --git a/disk/udftools/udftools-1.0.0b3-gcc4.diff
b/disk/udftools/udftools-1.0.0b3-gcc4.diff
new file mode 100644
index 0000000..1b03dc0
--- /dev/null
+++ b/disk/udftools/udftools-1.0.0b3-gcc4.diff
@@ -0,0 +1,11 @@
+--- udftools-1.0.0b3.orig/wrudf/wrudf.c 2002-11-25 23:18:51.000000000
-0800
++++ udftools-1.0.0b3/wrudf/wrudf.c 2006-04-18 10:34:59.177536143 -0700
+@@ -245,7 +245,7 @@ initialise(char *devicename)
+ } else if( strncmp( spm->partIdent.ident, UDF_ID_VIRTUAL,
strlen(UDF_ID_VIRTUAL)) == 0 )
+ virtualPartitionNum = i;
+ }
+- (char*)spm += spm->partitionMapLength;
++ spm = (char*)spm + spm->partitionMapLength;
+ }
+
+ if( medium == CDR ) {
diff --git a/disk/udftools/udftools-1.0.0b3.tar.gz.sig
b/disk/udftools/udftools-1.0.0b3.tar.gz.sig
new file mode 100644
index 0000000..3d1a72a
Binary files /dev/null and b/disk/udftools/udftools-1.0.0b3.tar.gz.sig differ
diff --git a/disk/vamps/DETAILS b/disk/vamps/DETAILS
index 3f81f6a..3328dd0 100755
--- a/disk/vamps/DETAILS
+++ b/disk/vamps/DETAILS
@@ -6,7 +6,6 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SP
WEB_SITE=http://vamps.sourceforge.net/
LICENSE[0]=GPL
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
- BUILD_API=2
ENTERED=20060102
UPDATED=20060102
KEYWORDS="dvd disk"
diff --git a/disk/vamps/HISTORY b/disk/vamps/HISTORY
index fba97a7..fdfd6c1 100644
--- a/disk/vamps/HISTORY
+++ b/disk/vamps/HISTORY
@@ -1,3 +1,6 @@
+2006-05-26 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Removed useless BUILD_API
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/xcdroast/DEPENDS b/disk/xcdroast/DEPENDS
index 7d44e72..122bbb3 100755
--- a/disk/xcdroast/DEPENDS
+++ b/disk/xcdroast/DEPENDS
@@ -1,4 +1,4 @@
-depends CD-BURN-UTILITY &&
+depends cdrtools &&
if [ $XCDROAST_GTK2 == "y" ]; then
depends gtk+2
else
diff --git a/disk/xcdroast/HISTORY b/disk/xcdroast/HISTORY
index bdaa7ec..68b8fad 100644
--- a/disk/xcdroast/HISTORY
+++ b/disk/xcdroast/HISTORY
@@ -1,3 +1,7 @@
+2006-06-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: doesn't work with dvdrtools, only depends on
+ cdrtools (bug #10535)
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/video/API_VERSION b/video/API_VERSION
deleted file mode 100755
index 844885a..0000000
--- a/video/API_VERSION
+++ /dev/null
@@ -1 +0,0 @@
-BUILD_API=2
diff --git a/video/camstream/DEPENDS b/video/camstream/DEPENDS
index 15e65dc..764926f 100755
--- a/video/camstream/DEPENDS
+++ b/video/camstream/DEPENDS
@@ -1,4 +1,4 @@
depends autoconf &&
depends automake &&
depends qt-x11 &&
-optional_depends alsa-lib "" "" "for alsa support"
+depends alsa-lib
diff --git a/video/camstream/HISTORY b/video/camstream/HISTORY
index 7e6ff38..247d685 100644
--- a/video/camstream/HISTORY
+++ b/video/camstream/HISTORY
@@ -1,3 +1,6 @@
+2006-05-31 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: alsa-lib isn't optional right now, bug #12487
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/video/cinelerra/HISTORY b/video/cinelerra/HISTORY
index 7a99891..f636347 100644
--- a/video/cinelerra/HISTORY
+++ b/video/cinelerra/HISTORY
@@ -1,3 +1,9 @@
+2006-06-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, make-compat.patch: fix build system to work with
+ make 3.81, bug #12607
+ * PRE_BUILD: undef some stuff in ffplay.c so it builds with current
+ sdl 1.2.10
+
2006-03-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: removed dependency on quicktime4linux as the spell uses
the included one currently
diff --git a/video/cinelerra/PRE_BUILD b/video/cinelerra/PRE_BUILD
index ed78404..9380593 100755
--- a/video/cinelerra/PRE_BUILD
+++ b/video/cinelerra/PRE_BUILD
@@ -6,5 +6,11 @@ patch -p0 < $SCRIPT_DIRECTORY/gcc41.p
patch -d quicktime/jpeg-mmx.0.1.6 -p1 < \
$SCRIPT_DIRECTORY/jpeg-mmx-0.1.6-gcc41.patch &&
patch -d quicktime/libdv-0.104 -p1 < \
- $SCRIPT_DIRECTORY/libdv-0.103-mmx.patch
+ $SCRIPT_DIRECTORY/libdv-0.103-mmx.patch &&
#patch -p1 < $SCRIPT_DIRECTORY/cinelerra-2.0-shared.patch
+# remove unnecessary stuff from ffplay so it works with sdl 1.2.10
+sedit 's/#define HAVE_X11/#undef HAVE_X11/'
quicktime/ffmpeg.071405/ffplay.c &&
+if make -v | grep -q 3.81; then
+ # fix build system to work with make 3.81
+ patch -p0 < $SCRIPT_DIRECTORY/make-compat.patch
+fi
diff --git a/video/cinelerra/make-compat.patch
b/video/cinelerra/make-compat.patch
new file mode 100644
index 0000000..4b788cc
--- /dev/null
+++ b/video/cinelerra/make-compat.patch
@@ -0,0 +1,126 @@
+--- build/Makefile.asound~ 2005-06-16 23:07:20.000000000 +0200
++++ build/Makefile.asound 2006-06-04 15:18:50.000000000 +0200
+@@ -116,7 +116,7 @@
+ $(shell mkdir -p $(DIRS) )
+ $(shell echo $(CFLAGS) > $(ALSA_DIR)/$(OBJDIR)/c_flags)
+ $(shell echo $(OBJS) > $(ALSA_DIR)/$(OBJDIR)/objs)
+-$(shell if ! test -L $(ALSA_DIR)/include/alsa \; then cd
$(ALSA_DIR)/include \; ln -sf . alsa \; fi )
++$(shell if ! test -L $(ALSA_DIR)/include/alsa ; then cd $(ALSA_DIR)/include
; ln -sf . alsa ; fi )
+
+
+
+--- build/Makefile.libavc~ 2005-04-21 08:57:00.000000000 +0200
++++ build/Makefile.libavc 2006-06-04 15:21:21.000000000 +0200
+@@ -15,9 +15,9 @@
+
+ CFLAGS += -DHAVE_CONFIG_H -I$(AVCDIR) -I$(RAWDIR)
+
+-$(shell sh -c 'if ! test -d $(AVCDIR)/$(OBJDIR)/common\; then mkdir -p
$(AVCDIR)/$(OBJDIR)/common\; fi' )
+-$(shell sh -c 'if ! test -d $(AVCDIR)/$(OBJDIR)/libavc1394\; then mkdir -p
$(AVCDIR)/$(OBJDIR)/libavc1394\; fi' )
+-$(shell sh -c 'if ! test -d $(AVCDIR)/$(OBJDIR)/librom1394\; then mkdir -p
$(AVCDIR)/$(OBJDIR)/librom1394\; fi' )
++$(shell sh -c 'if ! test -d $(AVCDIR)/$(OBJDIR)/common; then mkdir -p
$(AVCDIR)/$(OBJDIR)/common; fi' )
++$(shell sh -c 'if ! test -d $(AVCDIR)/$(OBJDIR)/libavc1394; then mkdir -p
$(AVCDIR)/$(OBJDIR)/libavc1394; fi' )
++$(shell sh -c 'if ! test -d $(AVCDIR)/$(OBJDIR)/librom1394; then mkdir -p
$(AVCDIR)/$(OBJDIR)/librom1394; fi' )
+ $(shell echo $(CFLAGS) > $(AVCDIR)/$(OBJDIR)/c_flags)
+
+ $(OUTPUT): $(OBJS)
+--- build/Makefile.sndfile~ 2005-04-20 22:15:32.000000000 +0200
++++ build/Makefile.sndfile 2006-06-04 15:21:49.000000000 +0200
+@@ -5,7 +5,7 @@
+ DIRS := $(SNDFILE_DIR)/$(OBJDIR)/src/G72x\
+ $(SNDFILE_DIR)/$(OBJDIR)/src/GSM610
+
+-$(shell if ! test -d $(SNDFILE_DIR)/$(OBJDIR) \; then mkdir -p $(DIRS) \;
fi )
++$(shell if ! test -d $(SNDFILE_DIR)/$(OBJDIR) ; then mkdir -p $(DIRS) ; fi )
+
+
+ OBJS := \
+--- build/Makefile.libraw~ 2005-04-20 22:15:32.000000000 +0200
++++ build/Makefile.libraw 2006-06-04 15:22:13.000000000 +0200
+@@ -24,8 +24,8 @@
+ DIRS += $(OBJDIR)/libraw1394/src
+
+
+-$(shell sh -c 'if ! test -d $(DIR)/$(OBJDIR)/src/\; then mkdir -p
$(DIR)/$(OBJDIR)/src/\; fi' )
+-$(shell sh -c 'if ! test -d $(DIR)/libraw1394\; then mkdir -p
$(DIR)/libraw1394\; fi' )
++$(shell sh -c 'if ! test -d $(DIR)/$(OBJDIR)/src/; then mkdir -p
$(DIR)/$(OBJDIR)/src/; fi' )
++$(shell sh -c 'if ! test -d $(DIR)/libraw1394; then mkdir -p
$(DIR)/libraw1394; fi' )
+ $(shell echo $(CFLAGS) > $(DIR)/$(OBJDIR)/c_flags)
+
+ $(OUTPUT): $(OBJS) $(HEADERS)
+--- esound/Makefile~ 2005-04-20 22:15:12.000000000 +0200
++++ esound/Makefile 2006-06-04 15:28:01.000000000 +0200
+@@ -1,6 +1,6 @@
+ include ../global_config
+
+-$(shell sh -c 'if ! test -d $(OBJDIR)\; then mkdir $(OBJDIR)\; fi' )
++$(shell sh -c 'if ! test -d $(OBJDIR); then mkdir $(OBJDIR); fi' )
+
+ OBJS = \
+ $(OBJDIR)/audio.o \
+--- guicast/Makefile~ 2005-07-08 10:29:23.000000000 +0200
++++ guicast/Makefile 2006-06-04 15:28:19.000000000 +0200
+@@ -26,7 +26,7 @@
+ endif
+
+
+-$(shell sh -c 'if ! test -d $(OBJDIR)\; then mkdir $(OBJDIR)\; fi' )
++$(shell sh -c 'if ! test -d $(OBJDIR); then mkdir $(OBJDIR); fi' )
+
+ OBJS = \
+ $(OBJDIR)/bcbar.o \
+--- cinelerra/Makefile~ 2005-09-07 23:25:21.000000000 +0200
++++ cinelerra/Makefile 2006-06-04 15:32:04.000000000 +0200
+@@ -436,7 +436,7 @@
+
+
+
+-$(shell echo "\#define BUILDDATE \"`date`\"" > builddate.h )
++$(shell echo "#define BUILDDATE \"`date`\"" > builddate.h )
+ $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
+ $(shell echo $(LDFLAGS1) $(OBJS) $(DCRAW) $(FILEEXR) $(AVIOBJS)
$(CXXREPOSITORY) $(STATICLIBS) $(LIBS) $(LDFLAGS2) > $(OBJDIR)/objs)
+
+--- global_config~ 2005-08-04 09:27:47.000000000 +0200
++++ global_config 2006-06-04 15:55:48.000000000 +0200
+@@ -83,7 +83,7 @@
+ CXXREPOSITORY = cxx_repository/*.o
+ endif
+
+-$(shell sh -c 'if ! test -d $(OBJDIR)\; then mkdir $(OBJDIR)\; fi' )
++$(shell sh -c 'if ! test -d $(OBJDIR); then mkdir $(OBJDIR); fi' )
+
+ ########################## LINKER
+
+--- build/Makefile.exr~ 2005-04-20 22:15:32.000000000 +0200
++++ build/Makefile.exr 2006-06-04 15:56:04.000000000 +0200
+@@ -99,7 +99,7 @@
+ -DHAVE_IOS_BASE=1 \
+ -DHAVE_STL_LIMITS=1
+
+-$(shell sh -c 'if ! test -d $(EXRDIR)/$(OBJDIR)\; then mkdir -p $(DIRS)\;
fi' )
++$(shell sh -c 'if ! test -d $(EXRDIR)/$(OBJDIR); then mkdir -p $(DIRS); fi'
)
+ $(shell echo $(CFLAGS) > $(EXRDIR)/$(OBJDIR)/c_flags)
+ $(shell echo $(OBJS) > $(EXRDIR)/$(OBJDIR)/objs)
+
+--- quicktime/Makefile~ 2005-10-02 00:13:17.000000000 +0200
++++ quicktime/Makefile 2006-06-04 15:56:14.000000000 +0200
+@@ -240,7 +240,7 @@
+ LIBS := $(OUTPUT) $(MPEG3_DIR)/$(OBJDIR)/libmpeg3.a -lpng -lz -lpthread
-ldl -lm
+
+
+-$(shell if ! test -d $(OBJDIR) \; then mkdir -p $(DIRS) \; fi )
++$(shell if ! test -d $(OBJDIR) ; then mkdir -p $(DIRS) ; fi )
+ $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
+ $(shell echo $(LAME_CFLAGS) > $(OBJDIR)/lame_flags)
+ $(shell echo $(OBJS) $(JPEG_LIB)/*.o $(DV_LIB)/*.o $(FAAD_LIB)/*.o
$(FAAC_LIB)/*.o $(FFMPEG_LIB)/*.o $(X264_LIB)/*.o $(OGG_LIB)/*.o
$(VORBIS_LIB)/*.o $(LAME_OBJS) > $(OBJDIR)/objs)
+--- libmpeg3/Makefile~ 2005-08-23 20:11:16.000000000 +0200
++++ libmpeg3/Makefile 2006-06-04 17:45:39.000000000 +0200
+@@ -146,7 +146,7 @@
+
+ LIBS = -lm -lpthread
+
+-$(shell if ! test -d $(OBJDIR) \; then mkdir -p $(OBJDIR) \; fi )
++$(shell if ! test -d $(OBJDIR) ; then mkdir -p $(OBJDIR) ; fi )
+
+ $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
+ $(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags)
diff --git a/video/drip/DEPENDS b/video/drip/DEPENDS
index 53e5838..51bea84 100755
--- a/video/drip/DEPENDS
+++ b/video/drip/DEPENDS
@@ -8,4 +8,6 @@ depends gnome-libs &&
depends gdk-pixbuf &&
depends avifile &&
depends mpeg2dec &&
+depends libxml2 &&
+depends libmad &&
depends imagemagick
diff --git a/video/drip/HISTORY b/video/drip/HISTORY
index 556bb11..648d7ec 100644
--- a/video/drip/HISTORY
+++ b/video/drip/HISTORY
@@ -1,3 +1,6 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added dependencies on libxml2 and libmad, bug #11569
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/video/ffmpeg-cvs/BUILD b/video/ffmpeg-cvs/BUILD
index 3ae90ab..27ba77d 100755
--- a/video/ffmpeg-cvs/BUILD
+++ b/video/ffmpeg-cvs/BUILD
@@ -1,12 +1 @@
-CFLAGS="${CFLAGS/-funroll-loops/} -O3"
-disable_pic &&
-
-sedit 's:-lpostproc:-Llibpostproc -lpostproc:' libavcodec/Makefile &&
-sedit 's:-Werror::' libavformat/Makefile &&
-./configure --prefix=${INSTALL_ROOT}/usr \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --enable-shared \
- --enable-pp \
- --enable-gpl \
- $OPTS &&
-make
+true
diff --git a/video/ffmpeg-cvs/DEPENDS b/video/ffmpeg-cvs/DEPENDS
index 99c7d4c..c0d8d7b 100755
--- a/video/ffmpeg-cvs/DEPENDS
+++ b/video/ffmpeg-cvs/DEPENDS
@@ -1,33 +1 @@
-depends CVS &&
-optional_depends "nasm" \
- "" \
- "--disable-mmx" \
- "for MMX support" &&
-optional_depends "lame" \
- "--enable-mp3lame" \
- "" \
- "for mp3 encoding via libmp3lame" &&
-optional_depends "libvorbis" \
- "--enable-libogg --enable-vorbis" \
- "" \
- "for ogg/vorbis support" &&
-optional_depends "faad2" \
- "--enable-faad" \
- "" \
- "for AAC audio support" &&
-optional_depends "imlib2" \
- "" \
- "" \
- "for imlib2 support" &&
-optional_depends "freetype2" \
- "" \
- "" \
- "for a text render plugin" &&
-optional_depends "libdts" \
- "--enable-dts" \
- "" \
- "for DTS audio decoding" &&
-optional_depends "xvid" \
- "--enable-xvid" \
- "" \
- "for xvid support"
+depends ffmpeg-svn
diff --git a/video/ffmpeg-cvs/DETAILS b/video/ffmpeg-cvs/DETAILS
index 51a2e76..5795f8c 100755
--- a/video/ffmpeg-cvs/DETAILS
+++ b/video/ffmpeg-cvs/DETAILS
@@ -1,19 +1,26 @@
SPELL=ffmpeg-cvs
if test "$FFMPEG_CVS_AUTOUPDATE" = "y"; then
- VERSION=$(date +%Y%m%d)
+# VERSION=$(date +%Y%m%d)
+ VERSION=snapshot
else
- VERSION=cvs
+# VERSION=cvs
+ VERSION=snapshot
fi
- SOURCE=$SPELL.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
- SOURCE_URL[0]=cvs://:pserver:anonymous AT mplayerhq.hu:/cvsroot/ffmpeg:ffmpeg
+# SOURCE=$SPELL.tar.bz2
+# SOURCE=ffmpeg_20060519.tar.bz2
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/ffmpeg_20060519
+#
SOURCE_URL[0]=cvs://:pserver:anonymous AT mplayerhq.hu:/cvsroot/ffmpeg:ffmpeg
+# SOURCE_URL[0]=http://www.mplayerhq.hu/~rtogni/snapshots/$SOURCE
WEB_SITE=http://ffmpeg.sourceforge.net
ENTERED=20030514
UPDATED=20041205
- SOURCE_IGNORE=volatile
+# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+# SOURCE_IGNORE=volatile
LICENSE[0]=GPL
- FORCE_DOWNLOAD=on
+# FORCE_DOWNLOAD=on
KEYWORDS="video"
+ PATCHLEVEL=1
SHORT="ffmpeg is complete video and audio broadcasting solution"
cat << EOF
FFMpeg is a complete and free Internet live audio and video
diff --git a/video/ffmpeg-cvs/EXPORTS b/video/ffmpeg-cvs/EXPORTS
new file mode 100644
index 0000000..331ea6d
--- /dev/null
+++ b/video/ffmpeg-cvs/EXPORTS
@@ -0,0 +1 @@
+FFMPEG_CVS_AUTOUPDATE
diff --git a/video/ffmpeg-cvs/HISTORY b/video/ffmpeg-cvs/HISTORY
index e0b32f6..1cc6f11 100644
--- a/video/ffmpeg-cvs/HISTORY
+++ b/video/ffmpeg-cvs/HISTORY
@@ -1,3 +1,19 @@
+2006-05-26 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * deprecated for ffmpeg-svn
+ * EXPORTS, REPAIR^none^EXPORTS: added so ffmpeg-svn can read our
+ AUTOUPDATE variable and use that as its own default
+
+2006-05-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: commented all cvs stuff, switch to a snapshot from
+ http://www.mplayerhq.hu/~rtogni/snapshots/ as the cvs server is
+ dead
+ * DEPENDS: commented dependency on CVS
+
+2006-05-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on sdl
+ * BUILD: fix SDL_LIBS after running configure so it works with
+ SDL 1.2.10
+
2006-04-11 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx:
* BUILD: replaced fPIC and DPIC removal code with disable_pic

diff --git a/video/ffmpeg-cvs/INSTALL b/video/ffmpeg-cvs/INSTALL
index 1e537a5..27ba77d 100755
--- a/video/ffmpeg-cvs/INSTALL
+++ b/video/ffmpeg-cvs/INSTALL
@@ -1,5 +1 @@
-make install &&
-
-if [ ! -f ${INSTALL_ROOT}/etc/ffserver.conf ]
-then cp doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf
-fi
+true
diff --git a/video/ffmpeg-cvs/PREPARE b/video/ffmpeg-cvs/PREPARE
deleted file mode 100755
index 11200ef..0000000
--- a/video/ffmpeg-cvs/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query FFMPEG_CVS_AUTOUPDATE "Update to the latest CVS on every cast?"
n
diff --git a/video/ffmpeg-cvs/PRE_BUILD b/video/ffmpeg-cvs/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/video/ffmpeg-cvs/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/video/ffmpeg-cvs/PROVIDES b/video/ffmpeg-cvs/PROVIDES
deleted file mode 100755
index d50bfee..0000000
--- a/video/ffmpeg-cvs/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-provides LIBAVCODEC
diff --git a/video/ffmpeg-cvs/REPAIR^none^EXPORTS
b/video/ffmpeg-cvs/REPAIR^none^EXPORTS
new file mode 100644
index 0000000..331ea6d
--- /dev/null
+++ b/video/ffmpeg-cvs/REPAIR^none^EXPORTS
@@ -0,0 +1 @@
+FFMPEG_CVS_AUTOUPDATE
diff --git a/video/ffmpeg-cvs/TRIGGERS b/video/ffmpeg-cvs/TRIGGERS
new file mode 100755
index 0000000..d53b9bb
--- /dev/null
+++ b/video/ffmpeg-cvs/TRIGGERS
@@ -0,0 +1 @@
+on_cast ffmpeg-cvs dispel_self
diff --git a/video/ffmpeg-svn/BUILD b/video/ffmpeg-svn/BUILD
new file mode 100755
index 0000000..abeb30b
--- /dev/null
+++ b/video/ffmpeg-svn/BUILD
@@ -0,0 +1,13 @@
+CFLAGS="${CFLAGS/-funroll-loops/} -O3"
+disable_pic &&
+
+sedit 's:-lpostproc:-Llibpostproc -lpostproc:' libavcodec/Makefile &&
+sedit 's:-Werror::' libavformat/Makefile &&
+./configure --prefix=${INSTALL_ROOT}/usr \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --enable-shared \
+ --enable-pp \
+ --enable-gpl \
+ $OPTS &&
+sedit 's:SDL_LIBS=.*:\0 -L/usr/X11R6/lib -lX11:' config.mak &&
+make
diff --git a/video/ffmpeg-svn/CONFLICTS b/video/ffmpeg-svn/CONFLICTS
new file mode 100755
index 0000000..767f932
--- /dev/null
+++ b/video/ffmpeg-svn/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts ffmpeg
+conflicts ffmpeg-cvs y
diff --git a/video/ffmpeg-svn/DEPENDS b/video/ffmpeg-svn/DEPENDS
new file mode 100755
index 0000000..a54f50c
--- /dev/null
+++ b/video/ffmpeg-svn/DEPENDS
@@ -0,0 +1,37 @@
+depends subversion &&
+optional_depends "nasm" \
+ "" \
+ "--disable-mmx" \
+ "for MMX support" &&
+optional_depends "lame" \
+ "--enable-mp3lame" \
+ "" \
+ "for mp3 encoding via libmp3lame" &&
+optional_depends "libvorbis" \
+ "--enable-libogg --enable-vorbis" \
+ "" \
+ "for ogg/vorbis support" &&
+optional_depends "faad2" \
+ "--enable-faad" \
+ "" \
+ "for AAC audio support" &&
+optional_depends "imlib2" \
+ "" \
+ "" \
+ "for imlib2 support" &&
+optional_depends "freetype2" \
+ "" \
+ "" \
+ "for a text render plugin" &&
+optional_depends "libdts" \
+ "--enable-dts" \
+ "" \
+ "for DTS audio decoding" &&
+optional_depends "xvid" \
+ "--enable-xvid" \
+ "" \
+ "for xvid support" &&
+optional_depends sdl \
+ "" \
+ "--disable-ffplay" \
+ "for ffplay video player"
diff --git a/video/ffmpeg-svn/DETAILS b/video/ffmpeg-svn/DETAILS
new file mode 100755
index 0000000..e7c3a24
--- /dev/null
+++ b/video/ffmpeg-svn/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=ffmpeg-svn
+if test "$FFMPEG_SVN_AUTOUPDATE" = "y"; then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=svn
+fi
+ SOURCE=$SPELL.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+ SOURCE_URL[0]=svn://svn.mplayerhq.hu/ffmpeg/trunk:$SPELL
+ WEB_SITE=http://ffmpeg.sourceforge.net
+ ENTERED=20030514
+ UPDATED=20041205
+ SOURCE_IGNORE=volatile
+ LICENSE[0]=GPL
+ FORCE_DOWNLOAD=on
+ KEYWORDS="video"
+ SHORT="ffmpeg is complete video and audio broadcasting solution"
+cat << EOF
+FFMpeg is a complete and free Internet live audio and video
+broadcasting solution for Linux/Unix. It also includes a digital VCR.
+It can encode in real time in many formats including MPEG1 audio and
+video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
+EOF
diff --git a/video/ffmpeg-svn/DOWNLOAD b/video/ffmpeg-svn/DOWNLOAD
new file mode 100755
index 0000000..b21c982
--- /dev/null
+++ b/video/ffmpeg-svn/DOWNLOAD
@@ -0,0 +1,43 @@
+function url_r_svn_crack() {
+
+ URL=`url_strip_prefix "$1" svn`
+ R_SVN_ROOT=`echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#"`
+ local R_SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#"`
+ R_SVN_MODULE=`echo $R_SVN_MODULE_TAG | cut -d : -f2`
+ local R_SVN_TAGNAME=`echo $R_SVN_MODULE_TAG | cut -d : -f3`
+ R_SVN_TAG=${R_SVN_TAGNAME:-HEAD}
+
+}
+
+url_r_svn_crack ${SOURCE_URL}
&&
+message "${MESSAGE_COLOR}Starting SVN checkout of"
\
+ "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"
&&
+if [[ -f $SOURCE_CACHE/${SOURCE} ]]
+then
+ message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
+ tar -jxf $SOURCE_CACHE/${SOURCE}
&&
+ cd $R_SVN_MODULE
&&
+ message "${MESSAGE_COLOR}Running SVN update...${DEFAULT_COLOR}"
&&
+ svn
\
+ --non-interactive
\
+ update
\
+ -r${R_SVN_TAG}
&&
+ cd ..
&&
+ message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+else
+ message "${MESSAGE_COLOR}Running initial SVN checkout...${DEFAULT_COLOR}"
&&
+ svn
\
+ --non-interactive
\
+ checkout
\
+ -r${R_SVN_TAG}
\
+ svn://${R_SVN_ROOT}
\
+ ${R_SVN_MODULE}
&&
+ message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+fi
&&
+message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}"
&&
+tar -jcf
\
+ ${SOURCE}
\
+ ${R_SVN_MODULE}
&&
+cp ${SOURCE} ${SOURCE_CACHE}/${SOURCE}
&&
+rm ${SOURCE}
&&
+message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
new file mode 100644
index 0000000..4ebffc8
--- /dev/null
+++ b/video/ffmpeg-svn/HISTORY
@@ -0,0 +1,182 @@
+2006-05-26 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * renamed from ffmpeg-cvs
+ * DETAILS: renamed to ffmpeg-svn, changed SOURCE_URL to use new
+ svn server, removed the whole snapshot stuff again
+ * DEPENDS: depends on subversion instead of CVS now
+ * CONFLICTS: added conflicts ffmpeg-cvs y
+ * DOWNLOAD: added to handle svn:// url for stable sorcery
+ * PREPARE: persistent_read the old value of AUTOUPDATE from ffmpeg-cvs
+ and use that as default for our own
+
+2006-05-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: commented all cvs stuff, switch to a snapshot from
+ http://www.mplayerhq.hu/~rtogni/snapshots/ as the cvs server is
+ dead
+ * DEPENDS: commented dependency on CVS
+
+2006-05-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on sdl
+ * BUILD: fix SDL_LIBS after running configure so it works with
+ SDL 1.2.10
+
+2006-04-11 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx:
+ * BUILD: replaced fPIC and DPIC removal code with disable_pic
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-02-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * INSTALL: removed creation of /usr/include/postproc and copying
+ of dsputil.h, both handled by the Makefiles now,
+ removed installation of several headers that aren't necessary
anymore
+ * bswap-fix.patch, PRE_BUILD: removed, bswap header isn't installed
+
+2006-02-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, INSTALL: removed old hacks for libpostproc build/install,
+ create /usr/include/postproc before installing
+
+2006-02-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PREPARE, DETAILS: added autoupdate query
+
+2006-01-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: removed --enable-shared-pp, not used anymore and breaks the
+ compile
+
+2005-12-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, bswap-fix.patch: fix the bswap.h header
+
+2005-09-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: add --mandir switch to configure so man pages go to
+ /usr/share/man instead of /usr/man
+
+2005-08-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * INSTALL: copy bswap.h from libavutil instead of libavcodec
+
+2005-05-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: don't fiddle with CXXFLAGS, they're unused anyway,
+ don't remove -DPIC -fPIC on x86_64, fixes bug #8851
+
+2005-05-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, DEPENDS, DETAILS: remove the gcc 3.4 stuff, compiles with 4.0
+ now
+
+2005-04-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: call invoke_gcc at the beginning
+ * DETAILS: add GCC_VERSION=3.4
+ * DEPENDS: added dependency on gcc34, changed configure switch for
+ vorbis to '--enable-libogg --enable-vorbis'
+
+2005-04-07 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: don't replace pentium4 with pentium3, that's only needed for
+ the ffmpeg release, ffmpeg-cvs actually breaks due to it
+
+2005-03-15 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: add --enable-ogg to vorbis OPTS flags
+
+2005-03-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: replace pentium4 with pentium3 in CFLAGS, fixes bug #8362
+
+2004-12-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: removed the --enable-liba52, breaks dvd playback in mplayer
+
+2004-11-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, gcc-3.4.patch, ffmpeg.patch: removed patches
+
+2004-07-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on xvid
+
+2004-07-14 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on libdts
+
+2004-07-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, INSTALL: converted to build_api 2
+ * DETAILS: use $(date +%Y%m%d) as VERSION
+
+2004-07-07 Eric Sandall <eric AT sandall.us>
+ * BUILD: Remove "-DPIC -fPIC" from C{XX}FLAGS as ffmpeg fails
+ to compile with PIC
+
+2004-05-14 Eric Sandall <eric AT sandall.us>
+ * DEPENDS: Depends on any provider of CVS (Bug #6396)
+
+2004-05-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, gcc-3.4.patch: patch to compile with gcc 3.4
+
+2004-04-15 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: add --enable-gpl
+ * BUILD, faad2.patch: removed patch
+
+2004-02-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, linux-2.6.patch: removed patch
+
+2003-12-15 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, linux-2.6.patch: support building with 2.6 kernel headers
+
+2003-12-07 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, faad2.patch: support faad2 2.0
+
+2003-12-05 hgg <hgreig AT bigpond.net.au>
+ * DETAILS: add cvs
+
+2003-12-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: use FORCE_DOWNLOAD=on
+
+2003-10-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: rational.h is now installed automatically, but MPlayer-cvs
also
+ needs dsputil.h, installing that
+
+2003-10-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: install libavcodec/rational.h, used by avcodec.h
+
+2003-10-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, ffmpeg.patch: patch avcodec.h, otherwise MPlayer(-cvs) can
not
+ use it
+
+2003-10-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: changed SOURCE_URL to
+ cvs://:pserver:anonymous AT mplayerhq.hu:/cvsroot/ffmpeg:ffmpeg
+ changed VERSION from 'head' to 'current' to force redownload
+
+2003-10-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: BUILD: install libavcodec/bswap.h and
libavformat/os_support.h
+
+2003-08-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on freetype2
+
+2003-08-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on imlib2
+
+2003-07-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: added sedit to BUILD to remove the crappy -Werror flag
+ * DEPENDS: added faad2 as optional_depends
+
+2003-06-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: make the shared libpostproc work
+
+2003-05-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: use $INSTALL_ROOT in BUILD
+
+2003-05-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: first cvs version of the spell
+ * BUILD: added the libpostproc header installation to BUILD,
+ so mplayer-cvs compiles
+ * PROVIDES: added PROVIDES libavcodec
+
+2003-02-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: enabled building of shared libavcodec
+ * DEPENDS: added lame and libvorbis as optional_depends
+
+2003-02-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.4.6
+
+2002-10-30 Seth Woolley <seth AT tautology.org>
+ * BUILD: fixed BUILD/CONFIGURE issue with MMX
+ deleted CONFIGURE bug 1525
+
+2002-10-23 Seth Woolley <seth AT tautology.org>
+ * BUILD: added -O3 hack
+ * HISTORY: cleaned history
+
+2002-06-12 Unet <unet AT sourcemage.org>
+ * Created this.
+
diff --git a/video/ffmpeg-svn/INSTALL b/video/ffmpeg-svn/INSTALL
new file mode 100755
index 0000000..1e537a5
--- /dev/null
+++ b/video/ffmpeg-svn/INSTALL
@@ -0,0 +1,5 @@
+make install &&
+
+if [ ! -f ${INSTALL_ROOT}/etc/ffserver.conf ]
+then cp doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf
+fi
diff --git a/video/ffmpeg-svn/PREPARE b/video/ffmpeg-svn/PREPARE
new file mode 100755
index 0000000..6ae3af0
--- /dev/null
+++ b/video/ffmpeg-svn/PREPARE
@@ -0,0 +1,2 @@
+persistent_read ffmpeg-cvs FFMPEG_CVS_AUTOUPDATE DEFAULT
+config_query FFMPEG_SVN_AUTOUPDATE "Update to the latest SVN on every cast?"
${DEFAULT:-n}
diff --git a/video/ffmpeg-svn/PROVIDES b/video/ffmpeg-svn/PROVIDES
new file mode 100755
index 0000000..d50bfee
--- /dev/null
+++ b/video/ffmpeg-svn/PROVIDES
@@ -0,0 +1 @@
+provides LIBAVCODEC
diff --git a/video/ffmpeg/BUILD b/video/ffmpeg/BUILD
index 9ef24c4..55c83a4 100755
--- a/video/ffmpeg/BUILD
+++ b/video/ffmpeg/BUILD
@@ -16,6 +16,7 @@ sedit 's:-lpostproc:-Llibpostproc -lpos
--enable-gpl \
--enable-a52 \
$OPTS &&
+sedit 's:SDL_LIBS=.*:\0 -L/usr/X11R6/lib -lX11:' config.mak &&
cd libavcodec/libpostproc &&
make &&
cd $SOURCE_DIRECTORY &&
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index 30823cd..001bb1b 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -22,4 +22,8 @@ optional_depends "imlib2" \
optional_depends "freetype2" \
"" \
"" \
- "for a text render plugin"
+ "for a text render plugin" &&
+optional_depends sdl \
+ "" \
+ "--disable-ffplay" \
+ "for ffplay video player"
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 26403bf..18e063c 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,8 @@
+2006-05-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on sdl
+ * BUILD: fix SDL_LIBS after running configure so it works with
+ SDL 1.2.10
+
2006-04-11 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx:
* BUILD: replaced fPIC and DPIC removal code with disable_pic

diff --git a/video/gxine/DETAILS b/video/gxine/DETAILS
index 4118ec2..24d67a5 100755
--- a/video/gxine/DETAILS
+++ b/video/gxine/DETAILS
@@ -1,5 +1,5 @@
SPELL=gxine
- VERSION=0.5.3
+ VERSION=0.5.6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/xine/$SOURCE
diff --git a/video/gxine/HISTORY b/video/gxine/HISTORY
index df313b9..850cbcb 100644
--- a/video/gxine/HISTORY
+++ b/video/gxine/HISTORY
@@ -1,6 +1,12 @@
+2006-05-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.5.6
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

+2006-03-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.5.5
+
2005-12-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: depends on GECKO and autoconf
* BUILD, PRE_BUILD, 053-ffjs-fix.patch, spidermonkey-hack.patch:
diff --git a/video/gxine/gxine-0.5.3.tar.bz2.sig
b/video/gxine/gxine-0.5.3.tar.bz2.sig
deleted file mode 100644
index fd05ea1..0000000
Binary files a/video/gxine/gxine-0.5.3.tar.bz2.sig and /dev/null differ
diff --git a/video/gxine/gxine-0.5.6.tar.bz2.sig
b/video/gxine/gxine-0.5.6.tar.bz2.sig
new file mode 100644
index 0000000..7b741ae
Binary files /dev/null and b/video/gxine/gxine-0.5.6.tar.bz2.sig differ
diff --git a/video/kaffeine/DETAILS b/video/kaffeine/DETAILS
index ed05df9..53fc73d 100755
--- a/video/kaffeine/DETAILS
+++ b/video/kaffeine/DETAILS
@@ -1,9 +1,9 @@
SPELL=kaffeine
VERSION=0.8.1
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:99aefc97eb6149f063cc3cd56bf2b8fd41cba1b90d359abf88ce7b3b52d42c2ab5948aa49238f63c6354ef139107ffd7c2818a77c5d75f9ae0f7b3b928d9986d
WEB_SITE=http://kaffeine.sourceforge.net
ENTERED=20040117
UPDATED=20040117
diff --git a/video/kaffeine/HISTORY b/video/kaffeine/HISTORY
index 7a0e2a4..f5ea00c 100644
--- a/video/kaffeine/HISTORY
+++ b/video/kaffeine/HISTORY
@@ -1,3 +1,7 @@
+2006-04-26 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: changed SOURCE_HASH to SOURCE_GPG, sign the source as the
+ checksum wasn't updated when the version was
+
2006-04-12 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 0.8.1. Thanks to lynxlynxlynx!

diff --git a/video/kaffeine/kaffeine-0.8.1.tar.bz2.sig
b/video/kaffeine/kaffeine-0.8.1.tar.bz2.sig
new file mode 100644
index 0000000..03b38db
Binary files /dev/null and b/video/kaffeine/kaffeine-0.8.1.tar.bz2.sig differ
diff --git a/video/kino/BUILD b/video/kino/BUILD
index 279cbb2..d282ed3 100755
--- a/video/kino/BUILD
+++ b/video/kino/BUILD
@@ -1,7 +1,2 @@
-if [ "$KINO_FFMPEG" == "y" ]; then
- OPTS="$OPTS --with-avcodec"
-fi &&
-
-OPTS="$OPTS --with-hotplug-script-dir=/etc/hotplug/usb" &&
-
+OPTS="--enable-hotplug-script-dir=/etc/hotplug/usb $OPTS" &&
default_build
diff --git a/video/kino/DEPENDS b/video/kino/DEPENDS
index 3313ef7..3256d4e 100755
--- a/video/kino/DEPENDS
+++ b/video/kino/DEPENDS
@@ -1,10 +1,12 @@
depends g++ &&
depends gtk+2 &&
depends libavc1394 &&
-depends libsamplerate &&
+depends libiec61883 &&
+depends libsamplerate &&
+depends xml-parser-expat &&

if [ "$KINO_FFMPEG" == "y" ]; then
- depends LIBAVCODEC
+ depends ffmpeg-svn '--with-avcodec'
else
depends libdv
fi
diff --git a/video/kino/DETAILS b/video/kino/DETAILS
index 815f1bb..9961ca4 100755
--- a/video/kino/DETAILS
+++ b/video/kino/DETAILS
@@ -1,9 +1,9 @@
SPELL=kino
- VERSION=0.8.1
+ VERSION=0.9.0
SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:93aa4d1f0eb3d9fa9ef4df80ee318d52270037ad62674086c87ca6c5a58d70e32b664911c407647a4df9bd11d7a71e8da464e66af9f07929b84ff6982d578eb2
LICENSE[0]=GPL
WEB_SITE=http://kino.schirmacher.de
ENTERED=20020812
diff --git a/video/kino/HISTORY b/video/kino/HISTORY
index 355af7c..aad9894 100644
--- a/video/kino/HISTORY
+++ b/video/kino/HISTORY
@@ -1,3 +1,18 @@
+2006-06-09 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: changed LIBAVCODEC to ffmpeg-svn, as it doesn't work with
+ ffmpeg release, bug #12640
+
+2006-06-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.9.0
+ * BUILD: changed --with-hotplug-script-dir to
+ --enable-hotplug-script-dir
+ * DEPENDS: depends on libiec61883
+ * PREPARE: reworded ffmpeg query to be more clear
+ * BUILD, DEPENDS: moved --with-avcodec switch to DEPENDS
+
+2006-05-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: depends on xml-parser-expat, bug #12176
+
2006-04-16 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 0.8.1

diff --git a/video/kino/PREPARE b/video/kino/PREPARE
index 6abb666..ada50f2 100755
--- a/video/kino/PREPARE
+++ b/video/kino/PREPARE
@@ -1 +1 @@
-config_query KINO_FFMPEG "Use ffmpeg instead of libdv?" n
+config_query KINO_FFMPEG "Use ffmpeg instead of libdv for video coding?" n
diff --git a/video/kino/kino-0.9.0.tar.gz.sig
b/video/kino/kino-0.9.0.tar.gz.sig
new file mode 100644
index 0000000..40c9556
Binary files /dev/null and b/video/kino/kino-0.9.0.tar.gz.sig differ
diff --git a/video/kmplayer/BUILD b/video/kmplayer/BUILD
new file mode 100755
index 0000000..24b3465
--- /dev/null
+++ b/video/kmplayer/BUILD
@@ -0,0 +1,8 @@
+if ! list_find "$BACKENDS" "xine"; then
+ OPTS="$OPTS --without-xine"
+fi &&
+if ! list_find "$BACKENDS" "gstreamer"; then
+ OPTS="$OPTS --without-gstreamer"
+fi &&
+
+default_build
diff --git a/video/kmplayer/CONFIGURE b/video/kmplayer/CONFIGURE
new file mode 100755
index 0000000..418a3e2
--- /dev/null
+++ b/video/kmplayer/CONFIGURE
@@ -0,0 +1,7 @@
+. $GRIMOIRE/config_query_multi.function &&
+
+config_query_multi BACKENDS \
+ "Which backends do you want?" \
+ mplayer \
+ xine \
+ gstreamer
diff --git a/video/kmplayer/DEPENDS b/video/kmplayer/DEPENDS
index 2a7ad67..fc8b708 100755
--- a/video/kmplayer/DEPENDS
+++ b/video/kmplayer/DEPENDS
@@ -1,20 +1,23 @@
-depends mplayer &&
depends kdelibs &&

-optional_depends arts "" "--without-arts" "for arts support" &&
-optional_depends gst-plugins "" "--without-gstreamer" "for gstreamer
backend" &&
+if list_find "$BACKENDS" "mplayer"; then
+ depends mplayer
+fi &&
+if list_find "$BACKENDS" "xine"; then
+ depends xine-lib
+fi &&
+if list_find "$BACKENDS" "gstreamer"; then
+ depends gst-plugins
+fi &&

-optional_depends koffice \
- "" \
- "--disable-koffice-plugin" \
- "for koffice integration" &&
+optional_depends arts "" "--without-arts" "for arts support" &&

optional_depends LIBAVCODEC \
"" \
"" \
"for recording using ffmpeg" &&

-optional_depends xine-lib \
- "" \
- "--without-xine" \
- "for xine backend"
+optional_depends koffice \
+ "" \
+ "--disable-koffice-plugin" \
+ "for koffice integration"
diff --git a/video/kmplayer/HISTORY b/video/kmplayer/HISTORY
index f6dbc76..ad52dd1 100644
--- a/video/kmplayer/HISTORY
+++ b/video/kmplayer/HISTORY
@@ -1,4 +1,11 @@
-2006-04-22Treeve Jelbert <treeve01 AT pi.be>
+2006-04-24 Juuso Alasuutari <iuso AT sourcemage.org>
+ * CONFIGURE: Added, uses config_query_multi to select mplayer /
+ xine / gstreamer backends.
+ * DEPENDS: Removed depends mplayer, added conditionals for
+ depends mplayer / xine-lib / gst-plugins
+ * BUILD: Added, adds stuff in $OPTS for mentioned choices
+
+2006-04-22 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 0.9.2

2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
diff --git a/video/mlt/DEPENDS b/video/mlt/DEPENDS
index c8af977..a847dbe 100755
--- a/video/mlt/DEPENDS
+++ b/video/mlt/DEPENDS
@@ -1,6 +1,6 @@
depends CVS &&

-optional_depends ffmpeg-cvs \
+optional_depends ffmpeg-svn \
"--avformat-shared --avformat-ldextra" \
"--disable-avformat" \
"Enable avformat module" &&
@@ -48,4 +48,9 @@ optional_depends libxml2
optional_depends xine-lib \
"--enable-xine" \
"--disable-xine" \
- "Enable Xine Module"
+ "Enable Xine Module" &&
+
+optional_depends qt-x11 \
+ "--enable-qimage --qimage-includedir=/usr/include/qt" \
+ "--disable-qimage" \
+ "Enable qimage module"
diff --git a/video/mlt/DETAILS b/video/mlt/DETAILS
index d53a0f4..ce8de42 100755
--- a/video/mlt/DETAILS
+++ b/video/mlt/DETAILS
@@ -1,8 +1,12 @@
SPELL=mlt
+if [[ $MLT_AUTOUPDATE = y ]]; then
VERSION=$(date +%Y%m%d)
- SOURCE=$SPELL.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/mlt:mlt
+else
+ VERSION=cvs
+fi
+ SOURCE=$SPELL-cvs.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+
SOURCE_URL[0]=cvs://:pserver:anonymous AT mlt.cvs.sourceforge.net:/cvsroot/mlt:mlt
SOURCE_IGNORE=volatile
LICENSE[0]=GPL
FORCE_DOWNLOAD=on
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index 1e906f1..9e62d72 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,14 @@
+2006-05-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: changed ffmpeg-cvs to ffmpeg-svn
+
+2006-05-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: fixed SOURCE_URL, bug #12075, changes SOURCE and
+ SOURCE_DIRECTORY to force a new checkout
+ * DEPENDS: added optional_depends on qt-x11
+ * PRE_BUILD, buildsystem.patch: removed
+ * PREPARE, DETAILS: ask if spell should auto-update and set
+ VERSION accordingly
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/video/mlt/PREPARE b/video/mlt/PREPARE
new file mode 100755
index 0000000..679d0bb
--- /dev/null
+++ b/video/mlt/PREPARE
@@ -0,0 +1 @@
+config_query MLT_AUTOUPDATE "Update to latest CVS on every system-update?"
n
diff --git a/video/mlt/PRE_BUILD b/video/mlt/PRE_BUILD
deleted file mode 100755
index 981ab2b..0000000
--- a/video/mlt/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/buildsystem.patch
diff --git a/video/mlt/buildsystem.patch b/video/mlt/buildsystem.patch
deleted file mode 100644
index f0798a8..0000000
--- a/video/mlt/buildsystem.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- configure.orig 2004-08-01 01:43:57.889284992 -0500
-+++ configure 2004-08-01 01:45:17.876125144 -0500
-@@ -48,8 +48,7 @@
- echo "LARGE_FILE=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
-
- [ "$cpu" != "" ] &&
-- echo "TARGETARCH=-march=$cpu" &&
-- echo "TARGETCPU=-mcpu=$cpu"
-+ echo "TARGETARCH=-march=$cpu"
-
- [ "`uname`" = "Linux" ] &&
- echo "LIBDL=-ldl"
-@@ -72,7 +71,7 @@
-
- function build_pkgconfig
- {
-- for i in framework valerie miracle
-+ for i in framework valerie
- do
- echo "prefix=$prefix" >mlt-$i.pc
- echo "exec_prefix=$prefix" >>mlt-$i.pc
-@@ -90,7 +89,7 @@
-
- # Define build directory for scripts called
- export build_dir=`dirname $0`
--export prefix=/usr/local
-+export prefix=/usr
- export help=0
- export version=0.1.1
- export debug=true
-@@ -115,7 +114,7 @@
- [ $help = 1 ] && show_help || build_config
-
- # Iterate through each of the components
--for i in framework modules inigo valerie miracle humperdink
-+for i in framework modules inigo valerie
- do
- if [ -x src/$i/configure ]
- then
---- src/modules/kino/Makefile~ 2005-04-15 16:28:26.000000000 +0200
-+++ src/modules/kino/Makefile 2005-04-27 18:11:27.000000000 +0200
-@@ -6,7 +6,7 @@
- OBJS=factory.o producer_kino.o
- CPPOBJS=kino_wrapper.o avi.o error.o filehandler.o riff.o
- CFLAGS+=-I../../
--LDFLAGS+=-lmlt -lstdc++
-+LDFLAGS+=-L../../framework -lmlt -lstdc++
- CXXFLAGS+=$(CFLAGS) -Wno-deprecated
-
- ifdef HAVE_LIBQUICKTIME
diff --git a/video/mplayer/BUILD b/video/mplayer/BUILD
index 2f03aab..69dbfb2 100755
--- a/video/mplayer/BUILD
+++ b/video/mplayer/BUILD
@@ -1,18 +1,7 @@
-invoke_gcc
-# needed so it actually uses gcc 3.4
-OPTS="$OPTS --cc=gcc" &&
-
-if [ "$MPLAYER_CVS" != "y" ]; then
- OPTS="$OPTS --enable-libavcodec"
-else
+if [[ $MPLAYER_SVN = y ]]; then
OPTS="$OPTS --with-extraincdir=/usr/include/ffmpeg"
fi &&

-# remove --enable-old-gtk for 1.0pre7try2 as it doesn't know that option
-if [ "$MPLAYER_GUI" = "gtk+" -a "$MPLAYER_CVS" = "n" ]; then
- OPTS="${OPTS/--enable-old-gtk/}"
-fi &&
-
OPTS="$MPLAYER_OPTS $OPTS" &&

CFLAGS= ./configure --prefix=${INSTALL_ROOT}/usr \
diff --git a/video/mplayer/CONFIGURE b/video/mplayer/CONFIGURE
index ef1c265..92a18d5 100755
--- a/video/mplayer/CONFIGURE
+++ b/video/mplayer/CONFIGURE
@@ -1,8 +1,4 @@
-if [ "$MPLAYER_CVS" == "y" ]; then
- config_query_list MPLAYER_GUI "What GUI do you want?" none gtk+ gtk+2
-else
- config_query_list MPLAYER_GUI "What GUI do you want?" none gtk+
-fi &&
+config_query_list MPLAYER_GUI "What GUI do you want?" none gtk+ gtk+2 &&
config_query_option MPLAYER_OPTS \
"Enable Joystick support?" ${MPLAYER_JOYSTICK:-y} \
"--enable-joystick" "--disable-joystick" &&
diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index eb911a1..8b0356d 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -1,6 +1,3 @@
-if [ "$MPLAYER_CVS" == "n" ]; then
- depends gcc34
-fi &&
if [ "$MPLAYER_GUI" == "gtk+" ]
then depends gtk+ '--enable-gui --enable-old-gtk' &&
depends mplayer-gui
@@ -9,16 +6,14 @@ then depends gtk+2 '--enable-gui' &&
depends mplayer-gui
fi &&

-if [ "$MPLAYER_CVS" == "y" ]; then
- depends CVS &&
- optional_depends ffmpeg-cvs \
- "--enable-libavcodec_so --enable-libavformat_so --enable-libpostproc_so"
\
- "--disable-libavcodec_so --disable-libavformat_so
--disable-libpostproc_so" \
- "for libavcodec audio/video decoders (you really want this)" &&
- optional_depends libmpcdec "" "--disable-musepack" "for musepack (mpc)
support"
+if [[ $MPLAYER_SVN = y ]]; then
+ depends subversion &&
+ optional_depends ffmpeg-svn \
+ "--disable-libavcodec --enable-libavcodec_so --disable-libavformat
--enable-libavformat_so --disable-libpostproc --enable-libpostproc_so
--disable-libavutil --enable-libavutil_so" "" "to use system ffmpeg instead
of internal one"
fi &&

# audio codecs
+optional_depends libmpcdec "" "--disable-musepack" "for musepack (mpc)
support" &&
optional_depends libvorbis "--disable-internal-tremor" "" "to use external
libvorbis to play ogg/vorbis audio" &&
optional_depends libmad "" "--disable-mad" "to play mp3 audio using libmad"
&&
optional_depends xmms "--enable-xmms" "" "for xmms input plugin support" &&
@@ -36,9 +31,7 @@ optional_depends quicktime-codecs "" "-
optional_depends real-codecs "" "--disable-real" "to decode RealMedia
files" "z-rejected" &&
optional_depends xanim-codecs "" "--disable-xanim" "for additional codecs
(intel indeo, ...)" "z-rejected" &&
optional_depends xvid "" "--disable-xvid" "for encoding with the xvid codec
(distribution in USA and Japan is forbidden)" &&
-if [ "$MPLAYER_CVS" == "y" ]; then
- optional_depends twolame "" "--disable-twolame" "Twolame (MPEG layer 2
audio) support in mencoder"
-fi &&
+optional_depends twolame "" "--disable-twolame" "Twolame (MPEG layer 2
audio) support in mencoder" &&

# audio devices
optional_depends svgalib "" "--disable-svga" "for svgalib video output" &&
diff --git a/video/mplayer/DETAILS b/video/mplayer/DETAILS
index f547650..6e6e3a7 100755
--- a/video/mplayer/DETAILS
+++ b/video/mplayer/DETAILS
@@ -1,24 +1,24 @@
SPELL=mplayer
-if [ "$MPLAYER_CVS" == "y" ]; then
- if [ "$MPLAYER_CVS_AUTOUPDATE" == "y" ]; then
+if [[ $MPLAYER_SVN = y ]]; then
+ if [[ $MPLAYER_SVN_AUTOUPDATE = y ]]; then
VERSION=$(date +%Y%m%d)
else
- VERSION=cvs
+ VERSION=svn
fi
- SOURCE=$SPELL-cvs.tar.bz2
- SOURCE_URL[0]=cvs://:pserver:anonymous AT mplayerhq.hu:/cvsroot/mplayer:main
+ SOURCE=$SPELL-svn.tar.bz2
+ SOURCE_URL[0]=svn://svn.mplayerhq.hu/mplayer/trunk/:$SPELL-svn
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
- VERSION=1.0pre7try2
+ VERSION=1.0pre8
SOURCE=MPlayer-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp1.mplayerhq.hu/MPlayer/releases/$SOURCE
SOURCE_URL[1]=ftp://ftp2.mplayerhq.hu/MPlayer/releases/$SOURCE
SOURCE_URL[2]=ftp://ftp5.mplayerhq.hu/MPlayer/releases/$SOURCE
- SOURCE_HASH=sha1:dcaced128167f15d094c9b63ca8b3dfd8f583e32
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=$BUILD_DIRECTORY/MPlayer-$VERSION
- GCC_VERSION=3.4
+ SECURITY_PATCH=1
fi
WEB_SITE=http://www.mplayerhq.hu
LICENSE[0]=GPL
diff --git a/video/mplayer/DOWNLOAD b/video/mplayer/DOWNLOAD
new file mode 100755
index 0000000..1a5913d
--- /dev/null
+++ b/video/mplayer/DOWNLOAD
@@ -0,0 +1,47 @@
+function url_r_svn_crack() {
+
+ URL=`url_strip_prefix "$1" svn`
+ R_SVN_ROOT=`echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#"`
+ local R_SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#"`
+ R_SVN_MODULE=`echo $R_SVN_MODULE_TAG | cut -d : -f2`
+ local R_SVN_TAGNAME=`echo $R_SVN_MODULE_TAG | cut -d : -f3`
+ R_SVN_TAG=${R_SVN_TAGNAME:-HEAD}
+
+}
+
+if [[ $(url_get_prefix) != svn ]]; then
+ default_download
+ return $?
+fi &&
+url_r_svn_crack ${SOURCE_URL}
&&
+message "${MESSAGE_COLOR}Starting SVN checkout of"
\
+ "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"
&&
+if [[ -f $SOURCE_CACHE/${SOURCE} ]]
+then
+ message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
+ tar -jxf $SOURCE_CACHE/${SOURCE}
&&
+ cd $R_SVN_MODULE
&&
+ message "${MESSAGE_COLOR}Running SVN update...${DEFAULT_COLOR}"
&&
+ svn
\
+ --non-interactive
\
+ update
\
+ -r${R_SVN_TAG}
&&
+ cd ..
&&
+ message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+else
+ message "${MESSAGE_COLOR}Running initial SVN checkout...${DEFAULT_COLOR}"
&&
+ svn
\
+ --non-interactive
\
+ checkout
\
+ -r${R_SVN_TAG}
\
+ svn://${R_SVN_ROOT}
\
+ ${R_SVN_MODULE}
&&
+ message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+fi
&&
+message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}"
&&
+tar -jcf
\
+ ${SOURCE}
\
+ ${R_SVN_MODULE}
&&
+cp ${SOURCE} ${SOURCE_CACHE}/${SOURCE}
&&
+rm ${SOURCE}
&&
+message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 4a6e4ff..bf35881 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,43 @@
+2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 1.0pre8, don't use gcc 3.4 for that anymore
+ * DEPENDS: removed gcc34, moved libmpcdec and twolame optional_depends
+ from svn version only to normal
+ * BUILD: removed gcc34 and mplayer 1.0pre7 workarounds
+ * CONFIGURE: gui choice for 1.0pre8 includes gtk+2
+ * DOWNLOAD: fixed so it actually works with non-svn version
+ * PRE_BUILD: removed all patching and sediting except the
+ cvs.Makefile.patch, renamed that to Makefile.patch
+ * cvs.Makefile.patch, mplayer-headers.patch, patch-CVS-2006-1502:
+ removed
+
+2006-06-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, patch-CVS-2006-1502: security patch for bug #10883
+ * DETAILS: SECURITY_PATCH=1 for the release version
+
+2006-06-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: switched from snapshot to new svn checkout for the scm
+ version
+ * DOWNLOAD: added for svn download
+ * BUILD, CONFIGURE, DEPENDS, PREPARE, PRE_BUILD: changed variables
+ from MPLAYER_CVS* to MPLAYER_SVN*
+ * BUILD, PRE_BUILD: moved invoke_gcc call to PRE_BUILD
+ * DEPENDS: changed switches for ffmpeg-svn optional_depends, this is
+ required because the svn checkout includes a full copy of ffmpeg
+ svn
+
+2006-06-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD: sedit getline to vs_getline in vobsub.c for stable
+ release, seems to be incompatible with current glibc otherwise
+
+2006-05-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: changed ffmpeg-cvs to ffmpeg-svn
+
+2006-05-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: commented all cvs stuff, switch to a snapshot from
+ http://www.mplayerhq.hu/~rtogni/snapshots/ as the cvs server is
+ dead
+ * DEPENDS: commented dependency on CVS
+
2006-03-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
* cvs.Makefile.patch: updated

diff --git a/video/mplayer/MPlayer-1.0pre8.tar.bz2.sig
b/video/mplayer/MPlayer-1.0pre8.tar.bz2.sig
new file mode 100644
index 0000000..7ca900c
Binary files /dev/null and b/video/mplayer/MPlayer-1.0pre8.tar.bz2.sig differ
diff --git a/video/mplayer/Makefile.patch b/video/mplayer/Makefile.patch
index 392c454..197a820 100644
--- a/video/mplayer/Makefile.patch
+++ b/video/mplayer/Makefile.patch
@@ -1,14 +1,14 @@
---- Makefile~ 2003-10-05 00:00:01.000000000 +0200
-+++ Makefile 2003-11-30 18:03:02.000000000 +0100
-@@ -284,11 +284,6 @@
+--- Makefile~ 2006-06-11 20:35:47.000000000 +0200
++++ Makefile 2006-06-12 09:31:16.000000000 +0200
+@@ -471,11 +471,6 @@
done
endif
- @if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi
-- @if test ! -d $(DATADIR)/font ; then mkdir -p $(DATADIR)/font ; fi
+ @$(INSTALL) -d $(DATADIR)
+- @$(INSTALL) -d $(DATADIR)/font
- @if test ! -f $(DATADIR)/font/font.desc ; then \
-- echo "*** Download font at
http://www.mplayerhq.hu/homepage/dload.html"; ; \
+- echo "*** Download font at http://www.mplayerhq.hu/dload.html"; ; \
- echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/"
; \
- fi
ifeq ($(GUI),yes)
- @if test ! -d $(DATADIR)/Skin ; then mkdir -p $(DATADIR)/Skin ; fi
- @echo "*** Download skin(s) at
http://www.mplayerhq.hu/homepage/dload.html";
+ @$(INSTALL) -d $(DATADIR)/skins
+ @echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html";
diff --git a/video/mplayer/PREPARE b/video/mplayer/PREPARE
index a6de452..08386a5 100755
--- a/video/mplayer/PREPARE
+++ b/video/mplayer/PREPARE
@@ -1,6 +1,9 @@
-config_query MPLAYER_CVS "Build CVS version?" n
-if [ "$MPLAYER_CVS" == "y" ]; then
- config_query MPLAYER_CVS_AUTOUPDATE \
- "Update to the latest CVS on every cast?" \
- n
+# changed CVS -> SVN, remove from test when it's in stable
+# 2006-06-05 Arwed v. Merkatz
+config_query MPLAYER_SVN "Build SVN version?" ${MPLAYER_CVS:-n}
+if [[ $MPLAYER_SVN = y ]]; then
+ config_query MPLAYER_SVN_AUTOUPDATE \
+ "Update to the latest SVN on every system-update?" \
+ ${MPLAYER_CVS_AUTOUPDATE:-n}
fi
+persistent_remove MPLAYER_CVS MPLAYER_CVS_AUTOUPDATE
diff --git a/video/mplayer/PRE_BUILD b/video/mplayer/PRE_BUILD
index 5bf17c7..f095b45 100755
--- a/video/mplayer/PRE_BUILD
+++ b/video/mplayer/PRE_BUILD
@@ -1,16 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-if [ "$MPLAYER_CVS" = "y" ]; then
- patch Makefile $SCRIPT_DIRECTORY/cvs.Makefile.patch &&
- if [ "$MPLAYER_GUI" == "gtk+" ]; then
- sedit "s|_gui=no|_gui=yes|" configure &&
- sedit "s|_gtk1=no|_gtk1=yes|" configure
- elif [ "$MPLAYER_GUI" == "gtk+2" ]; then
- sedit "s|_gui=no|_gui=yes|" configure
- fi
-
-else
- # fixes bug #6833
- patch Makefile $SCRIPT_DIRECTORY/Makefile.patch &&
- patch -p1 < $SCRIPT_DIRECTORY/mplayer-headers.patch
-fi
+patch Makefile $SCRIPT_DIRECTORY/Makefile.patch
diff --git a/video/mplayer/cvs.Makefile.patch
b/video/mplayer/cvs.Makefile.patch
deleted file mode 100644
index 05b9c89..0000000
--- a/video/mplayer/cvs.Makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile~ 2006-03-30 18:56:17.000000000 +0200
-+++ Makefile 2006-03-30 20:53:15.000000000 +0200
-@@ -492,11 +492,6 @@
- done
- endif
- @$(INSTALL) -d $(DATADIR)
-- @$(INSTALL) -d $(DATADIR)/font
-- @if test ! -f $(DATADIR)/font/font.desc ; then \
-- echo "*** Download font at http://www.mplayerhq.hu/dload.html"; ; \
-- echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/"
; \
-- fi
- ifeq ($(GUI),yes)
- @$(INSTALL) -d $(DATADIR)/skins
- @echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html";
diff --git a/video/mplayer/mplayer-headers.patch
b/video/mplayer/mplayer-headers.patch
deleted file mode 100644
index 47950b4..0000000
--- a/video/mplayer/mplayer-headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- main/osdep/kerneltwosix.h.orig 2004-04-16 13:10:24.000000000 +0000
-+++ main/osdep/kerneltwosix.h 2004-04-16 13:10:36.000000000 +0000
-@@ -1,9 +1,3 @@
- #include <linux/version.h>
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70)
--#define __KERNEL__
--#include <linux/thread_info.h>
--#include <linux/list.h>
--#undef __KERNEL__
--#endif
-
-
diff --git a/video/mythtv/BUILD b/video/mythtv/BUILD
index 454bcfd..0122390 100755
--- a/video/mythtv/BUILD
+++ b/video/mythtv/BUILD
@@ -1,6 +1,4 @@
-#sedit "s:/usr/local:$INSTALL_ROOT/usr:" configure &&
-#sedit "s:/usr/local:$INSTALL_ROOT/usr:" settings.pro &&
-invoke_gcc
-./configure --prefix=/usr $OPTS &&
+QTDIR=${QTDIR:-$INSTALL_ROOT/usr} &&
+./configure --prefix=/usr --disable-distcc $OPTS &&
qmake mythtv.pro &&
make
diff --git a/video/mythtv/DEPENDS b/video/mythtv/DEPENDS
index b4d10bb..508c446 100755
--- a/video/mythtv/DEPENDS
+++ b/video/mythtv/DEPENDS
@@ -1,4 +1,3 @@
-depends gcc34 &&
depends mysql &&
depends qt-x11 &&
depends freetype2 &&
@@ -6,7 +5,5 @@ depends lame &&
depends libmad &&
depends libvorbis &&
depends flac &&
-depends libcdaudio &&
depends cdparanoia &&
-depends imlib2 &&
depends xmltv
diff --git a/video/mythtv/DETAILS b/video/mythtv/DETAILS
index c4a9af7..9639200 100755
--- a/video/mythtv/DETAILS
+++ b/video/mythtv/DETAILS
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
ENTERED=20040727
UPDATED=20050430
LICENSE[0]=GPL
- GCC_VERSION=3.4
DOCS="$DOCS keys.txt"
KEYWORDS="video"
SHORT="A PVR for Linux"
diff --git a/video/mythtv/HISTORY b/video/mythtv/HISTORY
index 871bd48..031b023 100644
--- a/video/mythtv/HISTORY
+++ b/video/mythtv/HISTORY
@@ -1,3 +1,11 @@
+2006-05-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: disable distcc as it breaks, bug #10422
+
+2006-05-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: set QTDIR if unset, fixes bug #11763, removed invoke_gcc call
+ * DEPENDS: removed gcc34, libcdaudio and imlib2
+ * DETAILS: removed GCC_VERSION, builds fine with gcc 4.x
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/video/subrip/DETAILS b/video/subrip/DETAILS
index bf9bbaf..ef3e2ed 100755
--- a/video/subrip/DETAILS
+++ b/video/subrip/DETAILS
@@ -1,9 +1,9 @@
SPELL=subrip
- VERSION=0.3-1
+ VERSION=0.3-4
SOURCE=subtitleripper-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/subtitleripper
SOURCE_URL[0]=$SOURCEFORGE_URL/subtitleripper/$SOURCE
-
SOURCE_HASH=sha512:c0a923ed6c31e9aad23af803da24b69741aa8e495a904a31c3facf75bda004ee6b9eb4bfa6bc289d54e7bbd85787e921bbf06183b7abafdb3a558cd832a7d1e6
+
SOURCE_HASH=sha512:6d25a43b5b1bf8a6c69200c8bab995265356d1235a872bb641d30dbf27b765be9280325b4dd8aa625c25a865563bd7525dd277682d5baeff3c54951da7b9a86a
WEB_SITE=http://sourceforge.net/projects/subtitleripper
LICENSE[0]=GPL
ENTERED=20030113
diff --git a/video/subrip/HISTORY b/video/subrip/HISTORY
index 88054a6..4c62396 100644
--- a/video/subrip/HISTORY
+++ b/video/subrip/HISTORY
@@ -1,3 +1,6 @@
+2006-06-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: Updated to 0.3-4
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/video/tcvp/DEPENDS b/video/tcvp/DEPENDS
index 5ea72c1..6ca552e 100755
--- a/video/tcvp/DEPENDS
+++ b/video/tcvp/DEPENDS
@@ -1,5 +1,5 @@
depends tc2-modules &&
-optional_depends "ffmpeg-cvs" \
+optional_depends "ffmpeg-svn" \
"--enable-avformat --enable-avcodec" \
"--disable-avformat --disable-avcodec" \
"for lots of video formats/codecs" &&
diff --git a/video/tcvp/HISTORY b/video/tcvp/HISTORY
index 406cae1..5155a62 100644
--- a/video/tcvp/HISTORY
+++ b/video/tcvp/HISTORY
@@ -1,3 +1,6 @@
+2006-05-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: changed ffmpeg-cvs to ffmpeg-svn
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/video/totem/DEPENDS b/video/totem/DEPENDS
index 540aa50..5d0ff62 100755
--- a/video/totem/DEPENDS
+++ b/video/totem/DEPENDS
@@ -1,5 +1,11 @@
-depends libgnomeui &&
-depends iso-codes &&
+depends glib2 &&
+depends gtk+2 &&
+depends libgnomeui &&
+depends libglade2 &&
+depends gnome-vfs2 &&
+depends gnome-desktop &&
+depends gnome-icon-theme &&
+depends iso-codes &&
optional_depends libmusicbrainz \
"--enable-musicbrainz" \
"--disable-musicbrainz" \
@@ -20,6 +26,10 @@ optional_depends nvtv \
"--enable-nvtv" \
"--disable-nvtv" \
"Enable support for TV-output with nvtv?" &&
+optional_depends dbus \
+ "--with-dbus" \
+ "--without-dbus" \
+ "for dbus remote control" &&
if [ "$TOTEM_BACKEND" = "xine" ]; then
depends xine-lib
elif [ "$TOTEM_BACKEND" = "gstreamer-0.8" ]; then
diff --git a/video/totem/DETAILS b/video/totem/DETAILS
index 2b92154..ac80734 100755
--- a/video/totem/DETAILS
+++ b/video/totem/DETAILS
@@ -1,5 +1,5 @@
SPELL=totem
- VERSION=1.4.0
+ VERSION=1.4.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/video/totem/HISTORY b/video/totem/HISTORY
index 5943927..019d818 100644
--- a/video/totem/HISTORY
+++ b/video/totem/HISTORY
@@ -1,3 +1,15 @@
+2006-06-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added dependencies on glib2, gtk+2, libglade2, gnome-vfs2,
+ gnome-desktop, gnome-icon-theme and optional_depends on dbus,
+ fixes bug #12633
+
+2006-05-14 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 1.4.1
+
+2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * UP_TRIGGERS: replaced 'gaze depends' call with
+ fast_up_depends, bug #10661
+
2006-03-13 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.4.0

diff --git a/video/totem/UP_TRIGGERS b/video/totem/UP_TRIGGERS
index cbb3467..af40235 100755
--- a/video/totem/UP_TRIGGERS
+++ b/video/totem/UP_TRIGGERS
@@ -4,7 +4,7 @@ if spell_ok $SPELL; then
if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
message "This is a possibly incompatible update of libtotem-plparser..."
message "Figuring out what spells need to be recast."
- for each in $(gaze depends $SPELL 1| cut -f1 -d: | sort | uniq); do
+ for each in $(fast_up_depends $SPELL 1); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libtotem-plparser.so.0"; then
up_trigger $each cast_self
diff --git a/video/totem/totem-1.4.0.tar.bz2.sig
b/video/totem/totem-1.4.0.tar.bz2.sig
deleted file mode 100644
index c2afccb..0000000
Binary files a/video/totem/totem-1.4.0.tar.bz2.sig and /dev/null differ
diff --git a/video/totem/totem-1.4.1.tar.bz2.sig
b/video/totem/totem-1.4.1.tar.bz2.sig
new file mode 100644
index 0000000..1b7e904
Binary files /dev/null and b/video/totem/totem-1.4.1.tar.bz2.sig differ
diff --git a/video/transcode/03_imagemagick.dpatch
b/video/transcode/03_imagemagick.dpatch
new file mode 100644
index 0000000..a650e80
--- /dev/null
+++ b/video/transcode/03_imagemagick.dpatch
@@ -0,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_configure.dpatch by Christian Marillat <marillat AT debian.org>
+##
+## All lines beginning with ## DP:' are a description of the patch.
+## DP: Fix configure.
+
+@DPATCH@
+
+--- transcode-1.0.1.orig/filter/filter_compare.c
++++ transcode-1.0.1/filter/filter_compare.c
+@@ -180,6 +180,7 @@
+ if (!(compare[instance]->results =
fopen(results_name, "w")))
+ {
+ perror("could not open file for writing");
++ return (-1);
+ }
+
+ InitializeMagick("");
+--- transcode-1.0.1.orig/filter/filter_logo.c 2005-10-21 22:18:49.000000000
+0200
++++ transcode-1.0.1/filter/filter_logo.c 2005-10-21 22:19:52.000000000
+0200
+@@ -183,17 +183,18 @@
+
+ if (optstr_get (options, "help", "") >= 0)
+ help_optstr();
+- }
+
+- if (verbose > 1) {
+- printf (" Logo renderer Settings:\n");
+- printf (" file = %s\n", mfd->file);
+- printf (" posdef = %d\n", mfd->pos);
+- printf (" pos = %dx%d\n", mfd->posx, mfd->posy);
+- printf (" range = %u-%u\n", mfd->start, mfd->end);
+- printf (" flip = %d\n", mfd->flip);
+- printf (" ignoredelay = %d\n", mfd->ignoredelay);
+- printf (" rgbswap = %d\n", mfd->rgbswap);
++ if (verbose > 1) {
++ printf (" Logo renderer Settings:\n");
++ printf (" file = %s\n", mfd->file);
++ printf (" posdef = %d\n", mfd->pos);
++ printf (" pos = %dx%d\n", mfd->posx, mfd->posy);
++ printf (" range = %u-%u\n", mfd->start, mfd->end);
++ printf (" flip = %d\n", mfd->flip);
++ printf (" ignoredelay = %d\n", mfd->ignoredelay);
++ printf (" rgbswap = %d\n", mfd->rgbswap);
++ }
++ return (-1);
+ }
+
+ InitializeMagick("");
diff --git a/video/transcode/DETAILS b/video/transcode/DETAILS
index 29c7adf..23c5e45 100755
--- a/video/transcode/DETAILS
+++ b/video/transcode/DETAILS
@@ -1,5 +1,6 @@
SPELL=transcode
VERSION=1.0.2
+ PATCHLEVEL=1

SOURCE_HASH=sha512:79424ae83ad244553c9d283bd9d8f57535e3bf2b36919f861a2cea9c00d31d8d46e6a00cab5fdc24ecaf2001af5338babd51fac30f18dbdc13dfb44c6ff45834
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -11,5 +12,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
KEYWORDS="video"
SHORT="Console video-stream processing tool"
cat << EOF
-Transcode is a text console video-stream processing tool. It supports
elementary video and audio frame transformations. Some example modules are
included to enable import of MPEG-1/2, Digital Video, and other formats. It
also includes export modules for writing to AVI files with DivX, OpenDivX,
XviD, Digital Video or other codecs. Direct DVD transcoding is also
supported. A set of tools is available to extract and decode the sources into
raw video/audio streams for import and to enable post-processing of AVI files.
+Transcode is a text console video-stream processing tool. It supports
+elementary video and audio frame transformations. Some example modules are
+included to enable import of MPEG-1/2, Digital Video, and other formats. It
+also includes export modules for writing to AVI files with DivX, OpenDivX,
+XviD, Digital Video or other codecs. Direct DVD transcoding is also
supported.
+A set of tools is available to extract and decode the sources into raw
+video/audio streams for import and to enable post-processing of AVI files.
EOF
diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index bd20d9e..ee02f44 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,3 +1,8 @@
+2006-06-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, 03_imagemagick.dpatch:
+ apply patch from bug #12625 to make the imagemagick filters not hang
+ * DETAILS: set PATCHLEVEL=1
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/video/transcode/PRE_BUILD b/video/transcode/PRE_BUILD
index b2742fa..17b6302 100755
--- a/video/transcode/PRE_BUILD
+++ b/video/transcode/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/ffmpeg-api.patch
+patch -p0 < $SCRIPT_DIRECTORY/ffmpeg-api.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/03_imagemagick.dpatch
diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index 9161dbc..44c1bd6 100755
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -67,6 +67,11 @@ optional_depends "alsa-lib"
"--disable-alsa" \
"for alsa audio output" &&

+optional_depends "jack" \
+ "--enable-jack" \
+ "--disable-jack" \
+ "for jack audio output" &&
+
# audio codec options
optional_depends "a52dec" \
"--enable-a52" \
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index 50e9e0a..57d2b55 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,5 +1,5 @@
SPELL=vlc
- VERSION=0.8.4a
+ VERSION=0.8.5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.videolan.org/pub/vlc/$VERSION/$SOURCE
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index dfea9f1..ec541c2 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,11 @@
+2006-05-07 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.8.5
+ * PRE_BUILD, gcc41.patch: removed patch
+ * DEPENDS: added optional_depends on jack
+
+2006-05-06 Flavien Bridault <vlaaad AT sourcemage.org>
+ * desktop/vlc: added mimetypes, comments and icon
+
2006-03-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, gcc41.patch: fixed compile with gcc 4.1.x

diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index 4886019..6080bd4 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -6,7 +6,5 @@ elif test "$(get_spell_provider $SPELL G
sedit 's:$(libdir)/mozilla:$(libdir)/seamonkey:' mozilla/Makefile.in
fi &&

-patch -p0 < $SCRIPT_DIRECTORY/gcc41.patch &&
-
# fix png linking
sedit 's/-lpng -lz/-lpng -lm -lz/' configure
diff --git a/video/vlc/desktop/vlc.desktop b/video/vlc/desktop/vlc.desktop
index e772c8b..fb9857c 100644
--- a/video/vlc/desktop/vlc.desktop
+++ b/video/vlc/desktop/vlc.desktop
@@ -1,8 +1,15 @@
[Desktop Entry]
Encoding=UTF-8
Name=VLC
+Name[en_CA]=VLC
+Name[fr]=VLC
+Comment=Video and music player which can act as a stream server
+Comment[en_CA]=Video and music player which can act as a stream server
+Comment[fr]=Lecteur de vid??os et de musique pouvant faire office de serveur
de flux multim??dia
Exec=vlc
-Icon=
+Icon=/usr/share/vlc/vlc48x48.png
Terminal=false
Type=Application
-Categories=Application;Multimedia;Video;
+StartupNotify=true
+Categories=Application;AudioVideo;Player;
+MimeType=application/x-extension-mp4;application/x-extension-m4a;application/x-shorten;application/x-smil;application/smil;video/mp4;video/x-m4v;video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;video/vnd.divx;video/3gpp;audio/3gpp;application/ogg;application/x-ogg;application/x-matroska;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/mpegurl;audio/x-scpls;audio/x-m4a;audio/mp4;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/x-flac;audio/x-flac;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;application/x-flash-video;video/x-ogm+ogg;
diff --git a/video/vlc/gcc41.patch b/video/vlc/gcc41.patch
deleted file mode 100644
index a3ced4c..0000000
--- a/video/vlc/gcc41.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- modules/gui/skins2/utils/var_tree.hpp~ 2005-12-11 22:36:20.000000000
+0100
-+++ modules/gui/skins2/utils/var_tree.hpp 2006-03-21 10:57:04.000000000
+0100
-@@ -88,7 +88,7 @@
-
- /// Parent node
- VarTree *parent() { return m_pParent; }
-- void VarTree::checkParents( VarTree *pParent );
-+ void checkParents( VarTree *pParent );
-
- Iterator uncle();
-
---- modules/gui/skins2/x11/x11_graphics.hpp~ 2005-12-11 22:36:20.000000000
+0100
-+++ modules/gui/skins2/x11/x11_graphics.hpp 2006-03-21 11:06:48.000000000
+0100
-@@ -98,10 +98,10 @@
- GC m_gc;
-
- /// Add an horizontal segment in a region
-- void X11Graphics::addHSegmentInRegion( Region &rMask, int xStart,
-+ void addHSegmentInRegion( Region &rMask, int xStart,
- int xEnd, int y );
- /// Add a vertical segment in a region
-- void X11Graphics::addVSegmentInRegion( Region &rMask, int yStart,
-+ void addVSegmentInRegion( Region &rMask, int yStart,
- int yEnd, int x );
- };
-
diff --git a/video/vlc/vlc-0.8.4a.tar.bz2.sig
b/video/vlc/vlc-0.8.4a.tar.bz2.sig
deleted file mode 100644
index b1132dd..0000000
Binary files a/video/vlc/vlc-0.8.4a.tar.bz2.sig and /dev/null differ
diff --git a/video/vlc/vlc-0.8.5.tar.bz2.sig b/video/vlc/vlc-0.8.5.tar.bz2.sig
new file mode 100644
index 0000000..420b68f
Binary files /dev/null and b/video/vlc/vlc-0.8.5.tar.bz2.sig differ
diff --git a/video/xvattr/BUILD b/video/xvattr/BUILD
index 64cdaa2..c6cfacc 100755
--- a/video/xvattr/BUILD
+++ b/video/xvattr/BUILD
@@ -1,5 +1,6 @@
./configure $OPTS &&
make xvattr &&
-if spell_ok gtk+ || spell_held gtk+; then
+# change this to is_depends_enabled once that makes it to stable sorcery
+if spell_ok gtk+; then
make gxvattr
fi
diff --git a/video/xvattr/HISTORY b/video/xvattr/HISTORY
index d8cbad8..369f366 100644
--- a/video/xvattr/HISTORY
+++ b/video/xvattr/HISTORY
@@ -1,3 +1,7 @@
+2006-05-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * INSTALL: really added the file, bug #12051
+ * BUILD: removed unnecessary spell_held check
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/video/xvattr/INSTALL b/video/xvattr/INSTALL
new file mode 100755
index 0000000..246ef77
--- /dev/null
+++ b/video/xvattr/INSTALL
@@ -0,0 +1,5 @@
+install -m 755 xvattr ${INSTALL_ROOT}/usr/bin &&
+install -m 644 xvattr.1 ${INSTALL_ROOT}/usr/share/man/man1 &&
+if [ -x gxvattr ]; then
+ install -m 755 gxvattr ${INSTALL_ROOT}/usr/bin
+fi



  • [SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz (0cb68d53f55139076c7af362c8a66af8e70ef21a), Arwed v. Merkatz, 06/17/2006

Archive powered by MHonArc 2.6.24.

Top of Page