diff --git a/disk/genisoimage/BUILD b/disk/genisoimage/BUILD
new file mode 100755
index 0000000..99c9a34
--- /dev/null
+++ b/disk/genisoimage/BUILD
@@ -0,0 +1,3 @@
+cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr &&
+cd genisoimage &&
+make
diff --git a/disk/genisoimage/CONFLICTS b/disk/genisoimage/CONFLICTS
new file mode 100755
index 0000000..8a6b5c0
--- /dev/null
+++ b/disk/genisoimage/CONFLICTS
@@ -0,0 +1,4 @@
+conflicts cdrkit &&
+conflicts dvdrtools &&
+conflicts cdrtools &&
+conflicts mkisofs y
diff --git a/disk/genisoimage/DEPENDS b/disk/genisoimage/DEPENDS
new file mode 100755
index 0000000..1f2604a
--- /dev/null
+++ b/disk/genisoimage/DEPENDS
@@ -0,0 +1,2 @@
+depends cmake &&
+depends libcap
diff --git a/disk/genisoimage/DETAILS b/disk/genisoimage/DETAILS
new file mode 100755
index 0000000..3151718
--- /dev/null
+++ b/disk/genisoimage/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=genisoimage
+ PKG=cdrkit
+ VERSION=1.1.0
+ SOURCE=${PKG}-${VERSION}.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
+ SOURCE_URL[0]=http://debburn.alioth.debian.org/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+ WEB_SITE=http://debburn.alioth.debian.org/
+ ENTERED=20060913
+ LICENSE[0]=GPL
+ KEYWORDS="disk"
+ SHORT="Only install genisoimage from cdrkit."
+cat << EOF
+Only install genisoimage from cdrkit. This is a replacement for mkisofs from
+cdrtools. cdrkit is CD Recording Kit, a collection of applications related to
+creation of optical disk media on Unix platforms. It is heavily based on the
+cdrtools package (partially developed and maintained by Joerg Schilling
before),
+but is maintained independently.
+This spell is mainly intended to provide a iso generation tool until the
+libburnia project release its own tool named genisofs. During this time, this
+spell can be used in conjunction with cdrkskin from the libburn-pykix spell.
+EOF
diff --git a/disk/genisoimage/HISTORY b/disk/genisoimage/HISTORY
new file mode 100644
index 0000000..6530d21
--- /dev/null
+++ b/disk/genisoimage/HISTORY
@@ -0,0 +1,4 @@
+2006-12-06 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS, DEPENDS, BUILD, CONFLICTS, HISTORY: forked from mkisofs
+ spell and updated to 1.1.0
+
diff --git a/disk/genisoimage/cdrkit-1.1.0.tar.gz.sig
b/disk/genisoimage/cdrkit-1.1.0.tar.gz.sig
new file mode 100644
index 0000000..3d47530
Binary files /dev/null and b/disk/genisoimage/cdrkit-1.1.0.tar.gz.sig differ
diff --git a/disk/libburn-pykix/DEPENDS b/disk/libburn-pykix/DEPENDS
index 7048532..f8234f2 100755
--- a/disk/libburn-pykix/DEPENDS
+++ b/disk/libburn-pykix/DEPENDS
@@ -4,4 +4,4 @@ if [ "$LIBBURN_SVN" == "y" ]; then
depends autoconf &&
depends subversion
fi &&
-optional_depends mkisofs "" "" "For an ISO generation tool"
+optional_depends genisoimage "" "" "For an ISO generation tool"
diff --git a/disk/libburn-pykix/HISTORY b/disk/libburn-pykix/HISTORY
index 62c7994..fd82879 100644
--- a/disk/libburn-pykix/HISTORY
+++ b/disk/libburn-pykix/HISTORY
@@ -1,6 +1,7 @@
2006-12-06 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: updated tarball to 0.2.6.1, updated SOURCE_URL for svn,
- updated WEB_SITE, updated SOURCE_DIRECTORY
+ updated WEB_SITE, updated SOURCE_DIRECTORY
+ * DEPENDS: replaced mkisofs by genisoimage
2006-10-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: use TRACK_ROOT not INSTALL_ROOT when linking #9163
diff --git a/disk/libisofs/DEPENDS b/disk/libisofs/DEPENDS
new file mode 100755
index 0000000..c8c0e67
--- /dev/null
+++ b/disk/libisofs/DEPENDS
@@ -0,0 +1,7 @@
+if [ "$LIBISOFS_SVN" == "y" ]; then
+ depends libtool &&
+ depends automake &&
+ depends autoconf &&
+ depends subversion
+fi &&
+depends libburn-pykix
diff --git a/disk/libisofs/DETAILS b/disk/libisofs/DETAILS
new file mode 100755
index 0000000..301ccb6
--- /dev/null
+++ b/disk/libisofs/DETAILS
@@ -0,0 +1,31 @@
+ SPELL=libisofs
+if [ "$LIBISOFS_SVN" == "y" ]; then
+ if [ "${LIBISOFS_AUTOUPDATE}" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=svn
+ fi
+ SOURCE=$SPELL-svn.tar.bz2
+ FORCE_DOWNLOAD=ON
+ SOURCE_HINTS=old_svn_compat
+ SOURCE_URL[0]=svn://libburnia-svn.pykix.org/libisofs/trunk:libisofs_pykix
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-svn
+ SOURCE_IGNORE=volatile
+else
+ VERSION=0.2.3
+ SOURCE=${SPELL/-*}-${VERSION}.tar.gz
+ SOURCE_URL[0]=http://libburn-download.pykix.org/releases/$SOURCE
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL/-*}-${VERSION}
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+fi
+ WEB_SITE=http://libburnia.pykix.org/
+ ENTERED=20060908
+ LICENSE[0]=GPL
+ SHORT="ISO making library from libburnia project"
+cat << EOF
+This is a fork of the freedesktops libburn library.
+Libburn is an open-source library for reading, mastering and writing optical
discs.
+Libisofs is the library to pack up hard disk files and directories into a
ISO 9660
+disk image. This may then be brought to CD via libburn. libisofs is to be
the
+foundation of the upcoming mkisofs emulation.
+EOF
diff --git a/disk/libisofs/HISTORY b/disk/libisofs/HISTORY
new file mode 100644
index 0000000..cff7fb8
--- /dev/null
+++ b/disk/libisofs/HISTORY
@@ -0,0 +1,3 @@
+2006-12-06 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS, HISTORY, PREPARE, DEPENDS, PRE_BUILD: created spell
+
diff --git a/disk/libisofs/PREPARE b/disk/libisofs/PREPARE
new file mode 100755
index 0000000..2925c13
--- /dev/null
+++ b/disk/libisofs/PREPARE
@@ -0,0 +1,5 @@
+config_query LIBISOFS_SVN "Download latest code?" n &&
+if [ "$LIBISOFS_SVN" = "y" ]; then
+ config_query LIBISOFS_AUTOUPDATE \
+ "Automaticaly update the spell on sorcery queue/system-update?" n
+fi
diff --git a/disk/libisofs/PRE_BUILD b/disk/libisofs/PRE_BUILD
new file mode 100755
index 0000000..b2bf6fa
--- /dev/null
+++ b/disk/libisofs/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if [ "$LIBISOFS_SVN" = "y" ]; then
+ ./bootstrap
+fi
diff --git a/disk/libisofs/libisofs-0.2.3.tar.gz.sig
b/disk/libisofs/libisofs-0.2.3.tar.gz.sig
new file mode 100644
index 0000000..cf48a52
Binary files /dev/null and b/disk/libisofs/libisofs-0.2.3.tar.gz.sig differ
diff --git a/disk/mkisofs/BUILD b/disk/mkisofs/BUILD
index c9a2ab6..27ba77d 100755
--- a/disk/mkisofs/BUILD
+++ b/disk/mkisofs/BUILD
@@ -1,3 +1 @@
-cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr &&
-cd mkisofs &&
-make
+true
diff --git a/disk/mkisofs/DEPENDS b/disk/mkisofs/DEPENDS
index 1f2604a..156300a 100755
--- a/disk/mkisofs/DEPENDS
+++ b/disk/mkisofs/DEPENDS
@@ -1,2 +1 @@
-depends cmake &&
-depends libcap
+depends genisoimage
diff --git a/disk/mkisofs/DETAILS b/disk/mkisofs/DETAILS
index 007e3a7..a7085a5 100755
--- a/disk/mkisofs/DETAILS
+++ b/disk/mkisofs/DETAILS
@@ -1,12 +1,13 @@
SPELL=mkisofs
PKG=cdrkit
VERSION=1.0pre4
- SOURCE=${PKG}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
+# SOURCE=${PKG}-${VERSION}.tar.gz
+#SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
SOURCE_URL[0]=http://debburn.alioth.debian.org/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://debburn.alioth.debian.org/
ENTERED=20060913
+ PATCHLEVEL=1
LICENSE[0]=GPL
KEYWORDS="disk"
SHORT="Only install mkisofs"
diff --git a/disk/mkisofs/HISTORY b/disk/mkisofs/HISTORY
index ccbcee4..b8deff4 100644
--- a/disk/mkisofs/HISTORY
+++ b/disk/mkisofs/HISTORY
@@ -1,3 +1,6 @@
+2006-12-06 Flavien Bridault <vlaaad AT sourcemage.org>
+ * Deprecated in favour of genisoimage, binary name has changed
+
2006-09-19 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, DEPENDS: forked from cdrkit
* BUILD, CONFLICTS, HISTORY: forked from cdrkit
diff --git a/disk/mkisofs/INSTALL b/disk/mkisofs/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/disk/mkisofs/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/disk/mkisofs/PRE_BUILD b/disk/mkisofs/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/disk/mkisofs/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/disk/mkisofs/TRIGGERS b/disk/mkisofs/TRIGGERS
new file mode 100755
index 0000000..f1811c6
--- /dev/null
+++ b/disk/mkisofs/TRIGGERS
@@ -0,0 +1 @@
+on_cast mkisofs dispel_self
diff --git a/disk/mkisofs/cdrkit-1.0pre4.tar.gz.sig
b/disk/mkisofs/cdrkit-1.0pre4.tar.gz.sig
deleted file mode 100644
index cbdbe40..0000000
Binary files a/disk/mkisofs/cdrkit-1.0pre4.tar.gz.sig and /dev/null differ
diff --git a/net/net-tools/DETAILS b/net/net-tools/DETAILS
index 92f1195..f81de8a 100755
--- a/net/net-tools/DETAILS
+++ b/net/net-tools/DETAILS
@@ -4,7 +4,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.tazenda.demon.co.uk/phil/net-tools/$SOURCE
SOURCE_HASH=sha512:8e1ae9bca726ad7d795a06c58388f9e11c1d617d94eebb9ed18bd11e5f34c6541e1ffe631706c407996db86e78df6e5cf1968a2d90b242b473596fda3b6d1eae
- PATCHLEVEL=3
+ PATCHLEVEL=4
LICENSE[0]=GPL
WEB_SITE=http://www.tazenda.demon.co.uk/phil/net-tools
ENTERED=20010922
diff --git a/net/net-tools/HISTORY b/net/net-tools/HISTORY
index 74d420a..4c2b01b 100644
--- a/net/net-tools/HISTORY
+++ b/net/net-tools/HISTORY
@@ -1,3 +1,7 @@
+2006-12-06 Flavien Bridault <vlaaad AT sourcemage.org>
+ * ifup, ifdown: Fixed wrong path for dhcpcd pid files, temp files
+ should anyway go in /var not in /etc
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.