From 8c5a43b73e1d2cff0454c537810d69adb965a2c4 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@crux.nu>
Date: Sat, 16 May 2009 10:34:05 +0200
Subject: [PATCH] Updated setup-helper for new 2.6 ports.

---
 iso/bin/setup-helper | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/iso/bin/setup-helper b/iso/bin/setup-helper
index 82bd980..7bdab8f 100755
--- a/iso/bin/setup-helper
+++ b/iso/bin/setup-helper
@@ -90,29 +90,11 @@ if [ -z "$1" ]; then
     exit -1
 fi
 
-# 2.4 -> 2.5
-echo "* CRUX 2.4 -> 2.5 setup-helper"
-remove_packages mktemp hotplug inetd netkit-ftp netkit-telnet xorg-xf86-video-via slocate
-inject_packages inetutils libpcre libgmp libmpfr mlocate
-rename_packages xorg-xf86-video-amd:xorg-xf86-video-geode
-
-if [ `is_installed cdrtools` ]; then
-    remove_packages cdrtools
-    inject_packages cdrkit cmake libcap libattr
-fi
+# 2.5 -> 2.6
+echo "* CRUX 2.5 -> 2.6 setup-helper"
+remove_packages rdate xorg-evieext xorg-libxevie xorg-fontcacheproto xorg-libxfontcache   xorg-xproxymanagementprotocol xorg-xf86-video-xgi xorg-xf86-video-nsc
+inject_packages openrdate libusb-compat
 
 if [ `is_installed xorg` ]; then
-    inject_packages xorg-libpciaccess
+    inject_packages xorg-dri2proto
 fi
-
-if [ `is_installed firefox` ]; then
-    inject_packages dbus dbus-glib sqlite3 nspr nss xulrunner python
-fi
-
-if [ `is_installed python` ]; then
-    inject_packages sqlite3
-fi
-
-# Replace slocate with mlocate in /etc/group
-sed -i 's/slocate/mlocate/' $ROOT/etc/group
-