Merge branch 'master' of ssh://treeve@scm.sourcemage.org/smgl/grimoire

17 files changed, 65 insertions, 57 deletions

diff --git a/ChangeLog b/ChangeLog
index dca90e7bf3..0e7b951d99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-05 Vlad Glagolev <codex@sourcemage.org>
+	* ftp/transmission: new spell, gtk+2 BitTorrent client
+	* audio-soft/asunder: new spell, gtk+2 ripper
+	* disk/tkdvd: new spell, Tk frontend for dvd+rw-tools
+
 2007-11-05 Treeve Jelbert <treeve@sourcemage.org>
 	* devel/openfst: new spell, pattern recognition
 
diff --git a/utils/vlock/BUILD b/utils/vlock/BUILD
index 8f58e6df93..29ea58eb29 100755
--- a/utils/vlock/BUILD
+++ b/utils/vlock/BUILD
@@ -1 +1,5 @@
-make
+if is_depends_enabled $SPELL linux-pam; then
+  make PREFIX="$INSTALL_ROOT/usr" AUTH_METHOD=pam USE_PAM=y
+else
+  make PREFIX="$INSTALL_ROOT/usr" AUTH_METHOD=shadow USE_PAM=n
+fi
diff --git a/utils/vlock/DEPENDS b/utils/vlock/DEPENDS
index 59c8634b1d..5c38206b9f 100755
--- a/utils/vlock/DEPENDS
+++ b/utils/vlock/DEPENDS
@@ -1,16 +1,9 @@
 optional_depends linux-pam "YES_PAM" "NO_PAM" \
 "use pam for authentication and disable native shadow support"  &&
-# only in devel sorcery (?)
-if declare -f is_depends_enabled &> /dev/null
+
+# only ask if no pam selected
+if ! is_depends_enabled $SPELL linux-pam
 then
-  # only ask if no pam selected
-  if ! is_depends_enabled $SPELL linux-pam
-  then
-    config_query VLOCK_SUID \
-    "Set vlock binary suid root for non-root users and shadow passwords?" n
-  fi
-else
-  # always ask, even if meaningless
   config_query VLOCK_SUID \
-  "Set vlock binary suid root for non-root users and shadow passwords (not with pam)?" n
+    "Set vlock binary suid root for non-root users and shadow passwords?" n
 fi
diff --git a/utils/vlock/DETAILS b/utils/vlock/DETAILS
index 35d027173e..87b41407db 100755
--- a/utils/vlock/DETAILS
+++ b/utils/vlock/DETAILS
@@ -1,21 +1,16 @@
            SPELL=vlock
-         VERSION=1.3
+         VERSION=2.1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/$SOURCE
-        WEB_SITE=http://freshmeat.net/projects/vlock/
+   SOURCE_URL[0]=http://cthulhu.c3d2.de/~toidinamai/vlock/archive/$SOURCE
+        WEB_SITE=http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
          ENTERED=20020815
-         UPDATED=20030810
-      PATCHLEVEL=1
         KEYWORDS="utils"
            SHORT="vlock locks virtual consoles, as well as normal TTYs."
-
 cat << EOF
-
 vlock locks virtual consoles, as well as normal TTYs. It can prevent console
 switching, and it supports PAM authentication by default. Ideal for work 
 environments, lan parties, or anywhere you'll want to be able to walk away from
 your computer while leaving things running.
-
 EOF
diff --git a/utils/vlock/HISTORY b/utils/vlock/HISTORY
index a6254b9610..5ae1df3841 100644
--- a/utils/vlock/HISTORY
+++ b/utils/vlock/HISTORY
@@ -1,3 +1,11 @@
+2007-11-05 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+	* PRE_BUILD: removed
+	* BUILD: pass some flags to make it build
+	* INSTALL: use make install, it works now
+	* DETAILS: Fixed SOURCE_URL[0]
+	  fixed WEB_SITE
+	  updated spell to 2.1
+
 2006-10-19 Thomas Orgis <sobukus@sourcemage.org>
 	* DEPENDS, PRE_BUILD, INSTALL: added optional suid install and
 	  added $INSTALL_ROOT in INSTALL, removed some question marks
diff --git a/utils/vlock/INSTALL b/utils/vlock/INSTALL
index 5a0f2f856a..3bb728799b 100755
--- a/utils/vlock/INSTALL
+++ b/utils/vlock/INSTALL
@@ -1,7 +1,5 @@
-install  vlock       "$INSTALL_ROOT/usr/bin" &&
+make install PREFIX="$INSTALL_ROOT/usr" &&
 if [[ "$VLOCK_SUID" == "y" ]]
 then
   chmod u+s "$INSTALL_ROOT/usr/bin/vlock"
-fi &&
-gzip -9  vlock.1  &&
-install  vlock.1.gz  "$INSTALL_ROOT/usr/share/man/man1"
+fi
diff --git a/utils/vlock/PRE_BUILD b/utils/vlock/PRE_BUILD
deleted file mode 100755
index e81e5bb35a..0000000000
--- a/utils/vlock/PRE_BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-default_pre_build                 &&
-cd $SOURCE_DIRECTORY              &&
-sedit  "s/-O2/$CFLAGS/"  Makefile &&
-if list_find "$OPTS" "NO_PAM"
-then
-  message "seding Makefile to disable PAM and enable shadow" &&
-  # shadow code in vlock conflicts with pam code
-  # but it's fine with or without shadow passwords and current glibc
-  sedit 's/^\(CFLAGS =.*\)-DUSE_PAM/\1 -DSHADOW_PWD/' Makefile &&
-  sedit 's/^\(LDFLAGS =.*\)-ldl -lpam -lpam_misc/\1-lcrypt/' Makefile
-fi
diff --git a/utils/vlock/vlock-1.3.tar.gz.sig b/utils/vlock/vlock-1.3.tar.gz.sig
deleted file mode 100644
index c9688baa29..0000000000
--- a/utils/vlock/vlock-1.3.tar.gz.sig
+++ /dev/null
diff --git a/utils/vlock/vlock-2.1.tar.gz.sig b/utils/vlock/vlock-2.1.tar.gz.sig
new file mode 100644
index 0000000000..91216f10ab
--- /dev/null
+++ b/utils/vlock/vlock-2.1.tar.gz.sig
diff --git a/xfce/libxfcegui4/DEPENDS b/xfce/libxfcegui4/DEPENDS
index 632c090364..5756228a99 100755
--- a/xfce/libxfcegui4/DEPENDS
+++ b/xfce/libxfcegui4/DEPENDS
@@ -1,4 +1,3 @@
-depends  gtk+2         &&
-depends  libxml2       &&
-depends  libxfce4util  &&
-depends  dbh
+depends gtk+2 &&
+depends libxml2 &&
+depends libxfce4util
diff --git a/xfce/libxfcegui4/DETAILS b/xfce/libxfcegui4/DETAILS
index 1a13fd65c0..d624e935cf 100755
--- a/xfce/libxfcegui4/DETAILS
+++ b/xfce/libxfcegui4/DETAILS
@@ -7,6 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       SOURCE_GPG="gurus.gpg:$SOURCE.sig"
       LICENSE[0]=LGPL
          ENTERED=20030608
+      PATCHLEVEL=1
         KEYWORDS="xfce"
            SHORT="various gtk widgets for xfce"
 cat << EOF
diff --git a/xfce/libxfcegui4/HISTORY b/xfce/libxfcegui4/HISTORY
index 38bda36e76..490f624333 100644
--- a/xfce/libxfcegui4/HISTORY
+++ b/xfce/libxfcegui4/HISTORY
@@ -1,3 +1,6 @@
+2007-11-05 Vlad Glagolev <codex@sourcemage.org>
+	* DEPENDS: fixed dbh dep, cleaned up
+
 2007-04-10 George Sherwood <george@beernabeer.com>
 	* DETAILS: updated spell to 4.4.1
 
diff --git a/xfce/thunar/DEPENDS b/xfce/thunar/DEPENDS
index f9fb36360e..4767752ccf 100755
--- a/xfce/thunar/DEPENDS
+++ b/xfce/thunar/DEPENDS
@@ -1,5 +1,4 @@
-depends  xfce4-panel  &&
-depends  exo          &&
+depends exo &&
 
 optional_depends  dbus                 \
                   "--enable-dbus"      \
@@ -26,7 +25,12 @@ optional_depends  pcre                               \
                   "--disable-pcre"                   \
                   "for regular expressions support"  &&
 
-optional_depends  startup-notification                        \
-                  "--enable-startup-notification"             \
-                  "--disable-startup-notification"            \
-                  "for startup notification library support"
+optional_depends  startup-notification                       \
+                  "--enable-startup-notification"            \
+                  "--disable-startup-notification"           \
+                  "for startup notification library support" &&
+
+optional_depends  gamin                           \
+                  ""                              \
+		  ""                              \
+		  "for filesystem change updates"
diff --git a/xfce/thunar/DETAILS b/xfce/thunar/DETAILS
index a8040520a8..240532e8a0 100755
--- a/xfce/thunar/DETAILS
+++ b/xfce/thunar/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Thunar-$VERSION
       SOURCE_GPG="gurus.gpg:$SOURCE.sig"
       LICENSE[0]=GPL
          ENTERED=20030608
-      PATCHLEVEL=1
+      PATCHLEVEL=2
         KEYWORDS="xfce"
            SHORT="File manager for the XFce Desktop Environment"
 cat << EOF
diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index df0823f809..c28b7bc88f 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,3 +1,7 @@
+2007-11-05 Vlad Glagolev <codex@sourcemage.org>
+	* DEPENDS: fixed xfce-panel dep, added gamin as optional
+	* PRE_BUILD: cleaned up
+
 2007-08-20 Pol Vinogradov <vin.public@gmail.com>
 	* DEPENDS: added dbus, gtk-doc, hal, libexif, pcre and
 	  startup-notification as optional
diff --git a/xfce/thunar/PRE_BUILD b/xfce/thunar/PRE_BUILD
index 6956dfc37a..e49f76794d 100755
--- a/xfce/thunar/PRE_BUILD
+++ b/xfce/thunar/PRE_BUILD
@@ -1,14 +1,19 @@
-default_pre_build                                                              &&
-cd ${SOURCE_DIRECTORY}                                                         &&
-sedit "s:doc/Thunar:doc/${SPELL}:g" docs/Makefile.am                           &&
-sedit "s:doc/Thunar:doc/${SPELL}:g" docs/Makefile.in                           &&
-sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/Makefile.am                    &&
-sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/Makefile.in                    &&
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+sedit "s:doc/Thunar:doc/${SPELL}:g" \
+  docs/Makefile.am \
+  docs/Makefile.in \
+  docs/manual/Makefile.am \
+  docs/manual/Makefile.in &&
+
 for lang in C es eu fr ja pl ru zh_TW
 do
-  sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/${lang}/Makefile.am          &&
-  sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/${lang}/Makefile.in          &&
-  sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/${lang}/images/Makefile.am   &&
-  sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/${lang}/images/Makefile.in
-done                                                                           &&
+  sedit "s:doc/Thunar:doc/${SPELL}:g" \
+   docs/manual/${lang}/Makefile.am \
+   docs/manual/${lang}/Makefile.in \
+   docs/manual/${lang}/images/Makefile.am \
+   docs/manual/${lang}/images/Makefile.in
+done &&
+
 sedit "s:doc/Thunar:doc/${SPELL}:g" ThunarHelp.in
diff --git a/xfce/thunar/Thunar-0.8.0.tar.bz2.sig b/xfce/thunar/Thunar-0.8.0.tar.bz2.sig
index bade4d4d33..b000e55f1f 100644
--- a/xfce/thunar/Thunar-0.8.0.tar.bz2.sig
+++ b/xfce/thunar/Thunar-0.8.0.tar.bz2.sig