[Lunar-commits] <crater> update it from moonbase repo.

Florin Braescu florin at lunar-linux.org
Tue Jan 5 18:04:00 CET 2010


commit 0ad919be84ea062f28cff6d119c27a4ca75cfa68
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Tue Jan 5 19:04:00 2010 +0200

    update it from moonbase repo.
---
 app-themes/polyester/DETAILS     |    2 +-
 chat/licq/DEPENDS                |    5 ----
 devel/dbus-qt3/DEPENDS           |    4 +-
 devel/dbus-qt3/DETAILS           |   13 +++++----
 devel/dbus/BUILD                 |   26 +++++++-------------
 devel/dbus/DEPENDS               |    4 +-
 devel/dbus/DETAILS               |   14 +++++-----
 doc-tools/doxygen/BUILD          |   12 +++++----
 doc-tools/doxygen/DEPENDS        |    8 ++++--
 doc-tools/doxygen/DETAILS        |   11 ++++----
 editors/eric/DEPENDS             |    2 +-
 games/ggz-client-libs/DETAILS    |   10 ++++----
 games/ggz-gnome-client/DEPENDS   |    4 +-
 games/ggz-gnome-client/DETAILS   |   10 ++++----
 games/ggz-grubby/DETAILS         |   12 ++++----
 games/ggz-gtk-client/DEPENDS     |    3 +-
 games/ggz-gtk-client/DETAILS     |   10 ++++----
 games/ggz-gtk-games/DEPENDS      |    5 +--
 games/ggz-gtk-games/DETAILS      |   10 ++++----
 games/ggz-kde-client/DEPENDS     |    3 +-
 games/ggz-kde-client/DETAILS     |   12 ++++----
 games/ggz-kde-games/BUILD        |    2 +
 games/ggz-kde-games/DEPENDS      |    5 +--
 games/ggz-kde-games/DETAILS      |   12 ++++----
 games/ggz-python/BUILD           |   15 +++++++++++
 games/ggz-python/DEPENDS         |    2 +
 games/ggz-python/DETAILS         |   19 ++++++++++++++
 games/ggz-sdl-games/DEPENDS      |    7 ++---
 games/ggz-sdl-games/DETAILS      |   10 ++++----
 games/ggz-server/DEPENDS         |    3 +-
 games/ggz-server/DETAILS         |   10 ++++----
 games/ggz-txt-client/DEPENDS     |    2 +-
 games/ggz-txt-client/DETAILS     |   10 ++++----
 games/ggz-utils/DETAILS          |   10 ++++----
 graphics/GraphicsMagick/BUILD    |   15 +++++++----
 graphics/GraphicsMagick/DEPENDS  |   20 +++++++-------
 graphics/GraphicsMagick/DETAILS  |   10 ++++----
 graphics/djvulibre/BUILD         |    6 ++++
 graphics/djvulibre/DEPENDS       |    1 +
 graphics/djvulibre/DETAILS       |   15 ++++++-----
 graphics/libkexiv2/DETAILS       |    6 ++--
 graphics/pfstools/BUILD          |   14 ++++++++++
 graphics/pfstools/DETAILS        |    6 ++--
 libs/aqbanking/DEPENDS           |    3 --
 libs/libmcs/DEPENDS              |   11 ++------
 libs/libmcs/DETAILS              |    2 +-
 net/avahi/BUILD                  |   28 +++++++++++++--------
 net/avahi/CONFLICTS              |    3 +-
 net/avahi/DEPENDS                |   10 ++++---
 net/avahi/DETAILS                |   10 ++++----
 net/wvstreams/BUILD              |    4 ++-
 net/wvstreams/DEPENDS            |   50 ++++++++++---------------------------
 net/wvstreams/DETAILS            |   11 ++++----
 printer/hplip/BUILD              |   14 +++++++---
 printer/hplip/CONFIGURE          |    1 +
 printer/hplip/DEPENDS            |   30 +++++++++++++++-------
 printer/hplip/DETAILS            |    6 ++--
 printer/pdfedit/DETAILS          |    9 ++++---
 python/PyQt/DETAILS              |    8 +++---
 python/PyQt/PRE_BUILD            |    1 +
 qt4-apps/qscintilla2/BUILD       |   24 ++++++++++++++++++
 qt4-apps/qscintilla2/DEPENDS     |    2 +
 qt4-apps/qscintilla2/DETAILS     |   17 +++++++++++++
 qt4-apps/qwt/BUILD               |   18 +++++++++++++
 qt4-apps/qwt/DEPENDS             |    2 +
 qt4-apps/qwt/DETAILS             |   17 +++++++++++++
 security/fwbuilder/BUILD         |    4 +-
 security/fwbuilder/DETAILS       |    6 ++--
 security/qca-sasl/BUILD          |    8 ++++++
 security/qca-sasl/DEPENDS        |    2 +
 security/qca-sasl/DETAILS        |   13 ++++++++++
 security/qca-tls/BUILD           |    2 +
 security/qca-tls/DEPENDS         |    4 +-
 sql/unixODBC/BUILD               |   13 +++++++--
 sql/unixODBC/DEPENDS             |    3 ++
 sql/unixODBC/DETAILS             |    6 ++--
 video/avifile/BUILD              |    2 +-
 video/avifile/DEPENDS            |    7 +++--
 video/avifile/DETAILS            |    6 +++-
 video/transcode/BUILD            |    6 +----
 video/transcode/DEPENDS          |   39 +++++++++++++++++------------
 video/transcode/DETAILS          |   12 ++++-----
 wifi/wpa_supplicant/BUILD        |   22 +++++++++-------
 wifi/wpa_supplicant/DEPENDS      |    1 +
 wifi/wpa_supplicant/DETAILS      |    7 ++---
 x11-apps/openoffice-src/DEPENDS  |   11 ++------
 x11-utils/pinentry/BUILD         |    9 +++++++
 x11-utils/pinentry/DETAILS       |    5 ++-
 xorg7/x11-profiles/XOrg7/DEPENDS |   12 ++++++---
 89 files changed, 520 insertions(+), 341 deletions(-)

diff --git a/app-themes/polyester/DETAILS b/app-themes/polyester/DETAILS
index 3863623..5aba721 100644
--- a/app-themes/polyester/DETAILS
+++ b/app-themes/polyester/DETAILS
@@ -1,7 +1,7 @@
           MODULE=polyester
          VERSION=1.0.2
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=http://www.notmart.org/files/
+      SOURCE_URL=ftp://ftp.eenet.ee/pub/FreeBSD/distfiles/
    MODULE_PREFIX=${KDE_PREFIX:-/opt/lunar/kde/3}
       SOURCE_VFY=dcc767f787e17fd6e6fb8281b17968974ea1a4bc
         WEB_SITE="http://www.kde-look.org/content/show.php?content=27968"
diff --git a/chat/licq/DEPENDS b/chat/licq/DEPENDS
index 1497fd8..3d2f65b 100644
--- a/chat/licq/DEPENDS
+++ b/chat/licq/DEPENDS
@@ -3,11 +3,6 @@ optional_depends  "openssl"                                   \
                   ""                                          \
                   "for secure communication and MSN support"
 
-optional_depends  "kdelibs3"                                  \
-                  "--with-kde"                                \
-                  ""                                          \
-                  "for KDE integration"                      
-
 optional_depends "gpgme"                                      \
                  ""                                           \
                  ""                                           \
diff --git a/devel/dbus-qt3/DEPENDS b/devel/dbus-qt3/DEPENDS
index 85b11c6..68f3087 100644
--- a/devel/dbus-qt3/DEPENDS
+++ b/devel/dbus-qt3/DEPENDS
@@ -1,2 +1,2 @@
-depends  dbus  &&
-depends  qt3
+depends dbus
+depends qt3
diff --git a/devel/dbus-qt3/DETAILS b/devel/dbus-qt3/DETAILS
index 40deabc..676a80b 100644
--- a/devel/dbus-qt3/DETAILS
+++ b/devel/dbus-qt3/DETAILS
@@ -1,12 +1,13 @@
           MODULE=dbus-qt3
-         VERSION=0.70
-          SOURCE=dbus-qt3-$VERSION.tar.bz2
-      SOURCE_URL=http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/dbus-qt3-$VERSION
-      SOURCE_VFY=sha1:d87cfd7af62d36cc98f0a01f3d7e66eb677b081a
+         VERSION=0.8.1
+          SOURCE=libdbus-1-qt3-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://people.freedesktop.org/~krake/dbus-1-qt3
+   SOURCE_URL[1]=$PATCH_URL
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/libdbus-1-qt3-$VERSION
+      SOURCE_VFY=sha1:1b7a9b15f6c0119be110633094a15ee8897da43b
         WEB_SITE=http://www.freedesktop.org/wiki/Software/DBusBindings
          ENTERED=20070326
-         UPDATED=20070802
+         UPDATED=20090926
            SHORT="qt3 bindings to DBUS"
 
 cat << EOF
diff --git a/devel/dbus/BUILD b/devel/dbus/BUILD
index 0b29fae..4b9d8b8 100644
--- a/devel/dbus/BUILD
+++ b/devel/dbus/BUILD
@@ -2,31 +2,23 @@
 
   if module_installed qt3 ; then
     . /etc/profile.d/qt3.rc
-  fi
+  fi  &&
 
-  if module_installed gtk-sharp ; then
-    OPTS="$OPTS --enable-mono"
-  else
-    OPTS="$OPTS --disable-mono"
-  fi
-
-  export LDFLAGS="$LDFLAGS -lexpat"
-
-  OPTS="$OPTS --with-x --enable-checks --enable-verbose-mode              \
-        --with-xml=libxml --with-system-pid-file=/var/run/messagebus.pid  \
-        --with-system-socket=/var/lib/dbus/system_bus_socket              \
-        --with-session-socket-dir=/tmp  --with-dbus-user=messagebus       \
-        --disable-xml-docs --with-init-scripts=none"
+  OPTS="$OPTS --enable-checks --with-xml=expat                       \
+        --with-system-pid-file=/var/run/messagebus.pid               \
+        --with-system-socket=/var/lib/dbus/system_bus_socket         \
+        --with-session-socket-dir=/tmp  --with-dbus-user=messagebus  \
+        --disable-xml-docs --with-init-scripts=none --disable-verbose-mode"
 
   default_build  &&
 
   # The following used to be in POST_INSTALL but the service wasn't starting
   # on FIRST install due to the lack of existing /var/lib/dbus
-  add_priv_user messagebus:messagebus -d /dev/null -s /bin/false &&
+  add_priv_user messagebus:messagebus -d /dev/null -s /bin/false  &&
   mkdir -p /var/lib/dbus  &&
-  chown -R messagebus:messagebus /var/lib/dbus &&
+  chown -R messagebus:messagebus /var/lib/dbus  &&
 
-  mkdir -p /etc/X11/xinit/xinitrc.d/ &&
+  mkdir -p /etc/X11/xinit/xinitrc.d/  &&
   install -m755 $SCRIPT_DIRECTORY/30-dbus /etc/X11/xinit/xinitrc.d/ 
 
 ) > $C_FIFO 2>&1
diff --git a/devel/dbus/DEPENDS b/devel/dbus/DEPENDS
index 9743b5f..3d3b99d 100644
--- a/devel/dbus/DEPENDS
+++ b/devel/dbus/DEPENDS
@@ -1,2 +1,2 @@
-depends  pkgconfig  &&
-depends  libxml2
+depends pkgconfig
+depends expat
diff --git a/devel/dbus/DETAILS b/devel/dbus/DETAILS
index 44ac94f..355ba23 100644
--- a/devel/dbus/DETAILS
+++ b/devel/dbus/DETAILS
@@ -1,17 +1,17 @@
           MODULE=dbus
-         VERSION=1.0.2
+         VERSION=1.2.16
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://$MODULE.freedesktop.org/releases/$MODULE/
-      SOURCE_VFY=sha1:2870efd6ea0b5b0d14e52195f560238a74bb1e0e
-        WEB_SITE=http://dbus.freedesktop.org/
+      SOURCE_URL=http://$MODULE.freedesktop.org/releases/$MODULE
+      SOURCE_VFY=sha1:28aa5c8839e60d82eb9ce934e3e244abdda913f7
+        WEB_SITE=http://dbus.freedesktop.org
          ENTERED=20031219
-         UPDATED=20070112
-      MAINTAINER=nhudson at lunar-linux.org
+         UPDATED=20090801
            SHORT="A message bus system for applications"
+LUNAR_RESTART_SERVICES=off
 
 cat << EOF
 D-BUS is a message bus system, a simple way for applications to talk
-to one another.  It supplies both a system daemon and a 
+to one another. It supplies both a system daemon and a
 per-user-login-session daemon.  Also, the message bus is built on top
 of general one-to-one message passing framework, which can be used by
 any two apps to communicate directly.
diff --git a/doc-tools/doxygen/BUILD b/doc-tools/doxygen/BUILD
index a95d69f..03aa7fa 100644
--- a/doc-tools/doxygen/BUILD
+++ b/doc-tools/doxygen/BUILD
@@ -1,17 +1,19 @@
 (
   if in_depends doxygen qt3; then
     . /etc/profile.d/qt3.rc
-  fi
+  fi &&
+
+  if in_depends doxygen qt4; then
+    . /etc/profile.d/qt4.rc
+  fi &&
 
   if [ -f src/Makefile ]; then
     message "${MESSAGE_COLOR}Makefile's detected, doing make distclean before compiling${DEFAULT_COLOR}" &&
-    ./configure &&
+    ./configure 
     make distclean
   fi &&
 
-  ./configure --platform linux-g++        \
-              --prefix /usr               \
-              --install /usr/bin/install  \
+  ./configure --prefix /usr               \
               $OPTS                      &&
 
   make             &&
diff --git a/doc-tools/doxygen/DEPENDS b/doc-tools/doxygen/DEPENDS
index 208b401..4c9e82c 100644
--- a/doc-tools/doxygen/DEPENDS
+++ b/doc-tools/doxygen/DEPENDS
@@ -1,7 +1,9 @@
 depends  sed
-depends  %GHOSTSCRIPT
+depends  ghostscript
 depends  teTeX
 
-optional_depends "Python"   ""                  "" "Build the doc files     "
-optional_depends "qt3"      "--with-doxywizard" "" "Graphical wizard support"
+optional_depends "Python"   ""                  "" "Build the doc files"
 optional_depends "graphviz" ""                  "" "Dot support" 
+
+optional_depends "qt3"      "--with-doxywizard" "" "Graphical wizard support"
+optional_depends "qt4"      ""                  "" "Needs qmake to make"
diff --git a/doc-tools/doxygen/DETAILS b/doc-tools/doxygen/DETAILS
index 471a23b..37b440a 100644
--- a/doc-tools/doxygen/DETAILS
+++ b/doc-tools/doxygen/DETAILS
@@ -1,13 +1,14 @@
           MODULE=doxygen
-         VERSION=1.5.4
+         VERSION=1.6.2
           SOURCE=$MODULE-$VERSION.src.tar.gz
-      SOURCE_URL=ftp://ftp.stack.nl/pub/users/dimitri/
-      SOURCE_VFY=sha1:1a815f7de6b412f7852d57dec9eb50f7c4b03268
-        WEB_SITE=http://www.stack.nl/~dimitri/$MODULE/
+      SOURCE_URL=ftp://ftp.stack.nl/pub/users/dimitri
+      SOURCE_VFY=sha1:7e0281a78455c43ff6ed058191ba4a9aac361f4f
+        WEB_SITE=http://www.stack.nl/~dimitri/$MODULE
          ENTERED=20020529
-         UPDATED=20071027
+         UPDATED=20091231
            SHORT="Documentation system for C++, Java, IDL (Corba, Microsoft and KDE-DCOP flavors) and C"
 
+PSAFE=no
 cat << EOF
 Doxygen is a documentation system for C++, Java, IDL (Corba, Microsoft and
 KDE-DCOP flavors) and C.
diff --git a/editors/eric/DEPENDS b/editors/eric/DEPENDS
index d7bbac9..8d15869 100644
--- a/editors/eric/DEPENDS
+++ b/editors/eric/DEPENDS
@@ -1,2 +1,2 @@
-depends  qscintilla  &&
+depends  qscintilla
 depends  PyQt 
diff --git a/games/ggz-client-libs/DETAILS b/games/ggz-client-libs/DETAILS
index aedd02e..d807528 100644
--- a/games/ggz-client-libs/DETAILS
+++ b/games/ggz-client-libs/DETAILS
@@ -1,11 +1,11 @@
           MODULE=ggz-client-libs
-         VERSION=0.0.14
+         VERSION=0.0.14.1
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION/
-      SOURCE_VFY=sha1:d36740e939828a1253788efe998a4109a49bed10
-        WEB_SITE=http://www.ggzgamingzone.org/
+      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION
+      SOURCE_VFY=sha1:1328095d0f7e3415e1748208438127f0ee67a573
+        WEB_SITE=http://www.ggzgamingzone.org
          ENTERED=20020727
-         UPDATED=20071028
+         UPDATED=20080218
            SHORT="the client libs of ggz - multiplayer gaming"
 
 cat <<EOF
diff --git a/games/ggz-gnome-client/DEPENDS b/games/ggz-gnome-client/DEPENDS
index 4dd03c7..8b13e9b 100644
--- a/games/ggz-gnome-client/DEPENDS
+++ b/games/ggz-gnome-client/DEPENDS
@@ -1,3 +1,3 @@
-depends libgnomeui        &&
-depends ggz-client-libs   &&
+depends libgnomeui
+depends ggz-client-libs
 depends ggz-gtk-games
diff --git a/games/ggz-gnome-client/DETAILS b/games/ggz-gnome-client/DETAILS
index 6ed1beb..5340783 100644
--- a/games/ggz-gnome-client/DETAILS
+++ b/games/ggz-gnome-client/DETAILS
@@ -1,11 +1,11 @@
           MODULE=ggz-gnome-client
-         VERSION=0.0.14
+         VERSION=0.0.14.1
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION/
-      SOURCE_VFY=sha1:fb6667529723b1e78acf5ab3643d9b13e8188883
-        WEB_SITE=http://www.ggzgamingzone.org/
+      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION
+      SOURCE_VFY=sha1:1328095d0f7e3415e1748208438127f0ee67a573
+        WEB_SITE=http://www.ggzgamingzone.org
          ENTERED=20020727
-         UPDATED=20071028
+         UPDATED=20080218
            SHORT="the gnome client of ggz - multiplayer gaming"
 
 cat <<EOF
diff --git a/games/ggz-grubby/DETAILS b/games/ggz-grubby/DETAILS
index cdd1f3a..80fa924 100644
--- a/games/ggz-grubby/DETAILS
+++ b/games/ggz-grubby/DETAILS
@@ -1,12 +1,12 @@
           MODULE=ggz-grubby
-         VERSION=0.0.14
+         VERSION=0.0.14.1
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION/
-      SOURCE_VFY=sha1:001ddbcdd6587718d9a10fd69dadfd1c618ecd76
-        WEB_SITE=http://www.ggzgamingzone.org/
+      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION
+      SOURCE_VFY=sha1:7e2d3e4cb7bfc7034902f35bf2350b1cdd6ea505
+        WEB_SITE=http://www.ggzgamingzone.org
          ENTERED=20040719
-         UPDATED=20071028
-           SHORT="ggz chat bot."
+         UPDATED=20080218
+           SHORT="ggz chat bot"
 
 cat <<EOF
 This package contains grubby, the almighty chatbot. It's a single binary, but
diff --git a/games/ggz-gtk-client/DEPENDS b/games/ggz-gtk-client/DEPENDS
index 25904d9..8185ba8 100644
--- a/games/ggz-gtk-client/DEPENDS
+++ b/games/ggz-gtk-client/DEPENDS
@@ -1,2 +1 @@
-depends ggz-client-libs  &&
-depends ggz-gtk-games
+depends ggz-client-libs
diff --git a/games/ggz-gtk-client/DETAILS b/games/ggz-gtk-client/DETAILS
index a571983..937b048 100644
--- a/games/ggz-gtk-client/DETAILS
+++ b/games/ggz-gtk-client/DETAILS
@@ -1,11 +1,11 @@
           MODULE=ggz-gtk-client
-         VERSION=0.0.14
+         VERSION=0.0.14.1
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION/
-      SOURCE_VFY=sha1:a84ac23e86347e9ce9bf87bff185b931ff5813d6
-        WEB_SITE=http://www.ggzgamingzone.org/
+      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION
+      SOURCE_VFY=sha1:066a2e0d5f913f3f65a3c44005d012bce74fb7c7
+        WEB_SITE=http://www.ggzgamingzone.org
          ENTERED=20020727
-         UPDATED=20071028
+         UPDATED=20080218
            SHORT="the gtk client of ggz - multiplayer gaming"
 
 cat <<EOF
diff --git a/games/ggz-gtk-games/DEPENDS b/games/ggz-gtk-games/DEPENDS
index 14ba8be..e21e284 100644
--- a/games/ggz-gtk-games/DEPENDS
+++ b/games/ggz-gtk-games/DEPENDS
@@ -1,4 +1,3 @@
-depends expat    &&
-depends popt     &&
-depends gtk+-2   &&
+depends popt
+depends gtk+-2
 depends libggz
diff --git a/games/ggz-gtk-games/DETAILS b/games/ggz-gtk-games/DETAILS
index dcb929e..bd380b4 100644
--- a/games/ggz-gtk-games/DETAILS
+++ b/games/ggz-gtk-games/DETAILS
@@ -1,11 +1,11 @@
           MODULE=ggz-gtk-games
-         VERSION=0.0.14
+         VERSION=0.0.14.1
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION/
-      SOURCE_VFY=sha1:f812a6294786aa78a3639e166312397ca5ff5b65
-        WEB_SITE=http://www.ggzgamingzone.org/
+      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION
+      SOURCE_VFY=sha1:f3f3f8d69822f1cc4dff4d93a4549bca8da8d974
+        WEB_SITE=http://www.ggzgamingzone.org
          ENTERED=20020727
-         UPDATED=20071028
+         UPDATED=20080218
            SHORT="the gtk game modules of ggz - multiplayer gaming"
 
 cat <<EOF
diff --git a/games/ggz-kde-client/DEPENDS b/games/ggz-kde-client/DEPENDS
index 2ea1441..8185ba8 100644
--- a/games/ggz-kde-client/DEPENDS
+++ b/games/ggz-kde-client/DEPENDS
@@ -1,2 +1 @@
-depends ggz-client-libs  &&
-depends ggz-kde-games
+depends ggz-client-libs
diff --git a/games/ggz-kde-client/DETAILS b/games/ggz-kde-client/DETAILS
index e610518..92cec48 100644
--- a/games/ggz-kde-client/DETAILS
+++ b/games/ggz-kde-client/DETAILS
@@ -1,12 +1,12 @@
           MODULE=ggz-kde-client
-         VERSION=0.0.11
+         VERSION=0.0.14.1
           SOURCE=$MODULE-$VERSION.tar.gz
-   SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION/
-       SOURCE_VFY=sha1:fc41b99da3be9c40bcb3f12c321617e7aba7e339
-        WEB_SITE=http://www.ggzgamingzone.org/
+      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION
+      SOURCE_VFY=sha1:21dccea106e9a49acfaf95d71e9cd3cf109783d1
+        WEB_SITE=http://www.ggzgamingzone.org
          ENTERED=20020727
-         UPDATED=20050523
-        SHORT="the kde client of ggz - multiplayer gaming"
+         UPDATED=20080218
+           SHORT="the kde client of ggz - multiplayer gaming"
 
 cat <<EOF
 GGZ Gaming Zone is a way for people to play a variety of games across the
diff --git a/games/ggz-kde-games/BUILD b/games/ggz-kde-games/BUILD
index aee15fa..242ce21 100644
--- a/games/ggz-kde-games/BUILD
+++ b/games/ggz-kde-games/BUILD
@@ -1,5 +1,7 @@
 (
 
+  . /etc/profile.d/qt3.rc
+
   ./configure  --prefix=${KDE_PREFIX:-$KDEDIR}     \
                --with-qt-dir=${QT_PREFIX:-$QTDIR}  \
                --disable-debug                     \
diff --git a/games/ggz-kde-games/DEPENDS b/games/ggz-kde-games/DEPENDS
index c39f9bb..6aa219b 100644
--- a/games/ggz-kde-games/DEPENDS
+++ b/games/ggz-kde-games/DEPENDS
@@ -1,4 +1,3 @@
-depends expat    &&
-depends popt     &&
-depends qt3      &&
+depends popt
+depends qt3
 depends libggz
diff --git a/games/ggz-kde-games/DETAILS b/games/ggz-kde-games/DETAILS
index faf6178..c65a2be 100644
--- a/games/ggz-kde-games/DETAILS
+++ b/games/ggz-kde-games/DETAILS
@@ -1,12 +1,12 @@
           MODULE=ggz-kde-games
-         VERSION=0.0.11
+         VERSION=0.0.14.1
           SOURCE=$MODULE-$VERSION.tar.gz
-   SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION/
-       SOURCE_VFY=sha1:9f401c843762f5b09105f682a346a1ca568e39f4
-        WEB_SITE=http://www.ggzgamingzone.org/
+      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION
+      SOURCE_VFY=sha1:ddcca5be5dce9a4469593bbcd20e3ca52876e619
+        WEB_SITE=http://www.ggzgamingzone.org
          ENTERED=20020727
-         UPDATED=20050523
-        SHORT="the kde game modules of ggz - multiplayer gaming"
+         UPDATED=20080218
+           SHORT="the kde game modules of ggz - multiplayer gaming"
 
 cat <<EOF
 GGZ Gaming Zone is a way for people to play a variety of games across the
diff --git a/games/ggz-python/BUILD b/games/ggz-python/BUILD
new file mode 100644
index 0000000..242ce21
--- /dev/null
+++ b/games/ggz-python/BUILD
@@ -0,0 +1,15 @@
+(
+
+  . /etc/profile.d/qt3.rc
+
+  ./configure  --prefix=${KDE_PREFIX:-$KDEDIR}     \
+               --with-qt-dir=${QT_PREFIX:-$QTDIR}  \
+               --disable-debug                     \
+               --enable-final                      \
+               --enable-fast-malloc=full           \
+               --with-xinerama                     \
+               $OPTS                              &&
+
+  default_make
+ 
+) > $C_FIFO 2>&1
diff --git a/games/ggz-python/DEPENDS b/games/ggz-python/DEPENDS
new file mode 100644
index 0000000..335fb3d
--- /dev/null
+++ b/games/ggz-python/DEPENDS
@@ -0,0 +1,2 @@
+depends Python
+depends libggz
diff --git a/games/ggz-python/DETAILS b/games/ggz-python/DETAILS
new file mode 100644
index 0000000..370d8c2
--- /dev/null
+++ b/games/ggz-python/DETAILS
@@ -0,0 +1,19 @@
+          MODULE=ggz-python
+         VERSION=0.0.14.1
+          SOURCE=$MODULE-$VERSION.tar.gz
+      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION
+      SOURCE_VFY=sha1:9a95c11bb8ea31761ee092477eada93ccbc6e096
+        WEB_SITE=http://www.ggzgamingzone.org
+         ENTERED=20080226
+         UPDATED=20080226
+           SHORT="the kde game modules of ggz - multiplayer gaming"
+
+cat <<EOF
+GGZ Gaming Zone is a way for people to play a variety of games across the
+Internet with both human and computer opponents. Similar to other such
+endeavors (by Microsoft and Yahoo), GGZ will support multiple rooms
+where players can login and chat across a table while they play their
+favorite games.
+
+This are the python libraries and games module pack.
+EOF
diff --git a/games/ggz-sdl-games/DEPENDS b/games/ggz-sdl-games/DEPENDS
index 503035a..bbc538d 100644
--- a/games/ggz-sdl-games/DEPENDS
+++ b/games/ggz-sdl-games/DEPENDS
@@ -1,5 +1,4 @@
-depends SDL_image   &&
-depends SDL_ttf     &&
-depends expat       &&
-depends popt        &&
+depends SDL_image
+depends SDL_ttf
+depends popt
 depends libggz
diff --git a/games/ggz-sdl-games/DETAILS b/games/ggz-sdl-games/DETAILS
index 14fa295..153739d 100644
--- a/games/ggz-sdl-games/DETAILS
+++ b/games/ggz-sdl-games/DETAILS
@@ -1,11 +1,11 @@
           MODULE=ggz-sdl-games
-         VERSION=0.0.14
+         VERSION=0.0.14.1
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION/
-      SOURCE_VFY=sha1:e8878a5e794f8d7093f43c4dfa414e7095a8c6b8
-        WEB_SITE=http://www.ggzgamingzone.org/
+      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION
+      SOURCE_VFY=sha1:e1a0366d80e6c19d459741fd633e5f15eae92fa6
+        WEB_SITE=http://www.ggzgamingzone.org
          ENTERED=20020727
-         UPDATED=20071026
+         UPDATED=20080218
            SHORT="the SDL game modules of ggz - multiplayer gaming"
 
 cat <<EOF
diff --git a/games/ggz-server/DEPENDS b/games/ggz-server/DEPENDS
index 3465a43..2218de9 100644
--- a/games/ggz-server/DEPENDS
+++ b/games/ggz-server/DEPENDS
@@ -1,2 +1 @@
-depends libggz  &&
-depends db
+depends libggz
diff --git a/games/ggz-server/DETAILS b/games/ggz-server/DETAILS
index 37a7cba..82189eb 100644
--- a/games/ggz-server/DETAILS
+++ b/games/ggz-server/DETAILS
@@ -1,11 +1,11 @@
           MODULE=ggz-server
-         VERSION=0.0.14
+         VERSION=0.0.14.1
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION/
-      SOURCE_VFY=sha1:8be05511beee0e537beeb8f3cba37625edac41ea
-        WEB_SITE=http://www.ggzgamingzone.org/
+      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION
+      SOURCE_VFY=sha1:18c7d0abd385738ceb064ec702fadcb7dbab6c22
+        WEB_SITE=http://www.ggzgamingzone.org
          ENTERED=20020727
-         UPDATED=20071028
+         UPDATED=20080218
            SHORT="the server of ggz - multiplayer gaming"
 
 cat <<EOF
diff --git a/games/ggz-txt-client/DEPENDS b/games/ggz-txt-client/DEPENDS
index c91a539..2fc5320 100644
--- a/games/ggz-txt-client/DEPENDS
+++ b/games/ggz-txt-client/DEPENDS
@@ -1,2 +1,2 @@
-depends popt  &&
+depends popt
 depends ggz-client-libs
diff --git a/games/ggz-txt-client/DETAILS b/games/ggz-txt-client/DETAILS
index 40d1efe..85bfab5 100644
--- a/games/ggz-txt-client/DETAILS
+++ b/games/ggz-txt-client/DETAILS
@@ -1,11 +1,11 @@
           MODULE=ggz-txt-client
-         VERSION=0.0.14
+         VERSION=0.0.14.1
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION/
-      SOURCE_VFY=sha1:c2ac998edbdda9744bd992fbbb36e85b21800a4d
-        WEB_SITE=http://www.ggzgamingzone.org/
+      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION
+      SOURCE_VFY=sha1:40dcf0a8504e6b9f1adb23bb212d03ad4db536aa
+        WEB_SITE=http://www.ggzgamingzone.org
          ENTERED=20020727
-         UPDATED=20071028
+         UPDATED=20080229
            SHORT="the txt client of ggz - multiplayer gaming"
 
 cat <<EOF
diff --git a/games/ggz-utils/DETAILS b/games/ggz-utils/DETAILS
index 74bd018..7c20f9a 100644
--- a/games/ggz-utils/DETAILS
+++ b/games/ggz-utils/DETAILS
@@ -1,11 +1,11 @@
           MODULE=ggz-utils
-         VERSION=0.0.14
+         VERSION=0.0.14.1
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION/
-      SOURCE_VFY=sha1:97064fe091b6fe645bd14b916c3575a762ce3b9f
-        WEB_SITE=http://www.ggzgamingzone.org/
+      SOURCE_URL=http://ftp.ggzgamingzone.org/pub/ggz/$VERSION
+      SOURCE_VFY=sha1:66acabe48ce4a3343b35cdd637bf8a58b6359723
+        WEB_SITE=http://www.ggzgamingzone.org
          ENTERED=20050125
-         UPDATED=20071028
+         UPDATED=20080218
            SHORT="the utils of ggz - multiplayer gaming"
 
 cat <<EOF
diff --git a/graphics/GraphicsMagick/BUILD b/graphics/GraphicsMagick/BUILD
index 310155c..fdba6a4 100644
--- a/graphics/GraphicsMagick/BUILD
+++ b/graphics/GraphicsMagick/BUILD
@@ -1,16 +1,19 @@
 (
 
-  . /etc/profile.d/qt3.rc
-  . /etc/profile.d/kde3.rc
+  if module_installed qt3 ; then
+    . /etc/profile.d/qt3.rc   &&
+    . /etc/profile.d/kde3.rc
+  fi &&
 
 # These sedits are temporary and should be fixed in the next release.
 # Check to be sure.
 
-  sedit "s:png_access_version:png_access_version_number:" coders/png.c
-  sedit "s:flags(png_ptr):flags(ping):" coders/png.c
-  sedit "s:flags(png_ptr,:flags(ping,:" coders/png.c
+  sedit "s:png_access_version:png_access_version_number:" coders/png.c &&
+  sedit "s:flags(png_ptr):flags(ping):" coders/png.c  &&
+  sedit "s:flags(png_ptr,:flags(ping,:" coders/png.c  &&
+
+  OPTS="$OPTS --enable-shared --enable-symbol-prefix --with-modules" &&
 
-  OPTS="$OPTS --enable-shared --enable-symbol-prefix --with-modules"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/graphics/GraphicsMagick/DEPENDS b/graphics/GraphicsMagick/DEPENDS
index 63d5f03..4f7db4e 100644
--- a/graphics/GraphicsMagick/DEPENDS
+++ b/graphics/GraphicsMagick/DEPENDS
@@ -1,12 +1,12 @@
-depends  %X  &&
+depends  %X
 
-optional_depends "hp2xx"    ""  ""  "to convert HP-GL foramts"     &&
-optional_depends "lcms"     ""  ""  "for color management"         &&
-optional_depends "transfig" ""  ""  "to read fig image format"     &&
-optional_depends "gnuplot"  ""  ""  "to read plot files"           &&
-optional_depends "jbigkit"  ""  ""  "bi-level image compression"   &&
-optional_depends "jasper"   ""  ""  "JPEG-2000 support"            &&
-optional_depends "sane-backends" "" "" "for scanner support"       &&
-optional_depends "libwmf"   ""  ""  "for Windows Metafile support" &&
-optional_depends "libfpx"   ""  ""  "for flash pix support"        &&
+optional_depends "hp2xx"    ""  ""  "to convert HP-GL foramts"
+optional_depends "lcms"     ""  ""  "for color management"
+optional_depends "transfig" ""  ""  "to read fig image format"
+optional_depends "gnuplot"  ""  ""  "to read plot files"
+optional_depends "jbigkit"  ""  ""  "bi-level image compression"
+optional_depends "jasper"   ""  ""  "JPEG-2000 support"
+optional_depends "sane-backends" "" "" "for scanner support"
+optional_depends "libwmf"   ""  ""  "for Windows Metafile support"
+optional_depends "libfpx"   ""  ""  "for flash pix support"
 optional_depends "ufraw"    ""  ""  "for RAW image support"
diff --git a/graphics/GraphicsMagick/DETAILS b/graphics/GraphicsMagick/DETAILS
index caf75e2..c7d473f 100644
--- a/graphics/GraphicsMagick/DETAILS
+++ b/graphics/GraphicsMagick/DETAILS
@@ -1,12 +1,12 @@
           MODULE=GraphicsMagick
-         VERSION=1.1.10
+         VERSION=1.3.7
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$SFORGE_URL/graphicsmagick
-      SOURCE_VFY=sha1:52027fd146a648b0d80c11a444b6038a29269454
-        WEB_SITE=http://www.graphicsmagick.org/
+      SOURCE_VFY=sha1:e65c4d799704245216821374f66de5796795c263
+        WEB_SITE=http://www.graphicsmagick.org
          ENTERED=20061117
-         UPDATED=20070921
-           SHORT="swiss army knife of image processing"
+         UPDATED=20091116
+           SHORT="A swiss army knife of image processing"
 
 cat << EOF
 GraphicsMagick is the swiss army knife of image processing. It provides
diff --git a/graphics/djvulibre/BUILD b/graphics/djvulibre/BUILD
new file mode 100644
index 0000000..a8b4ab4
--- /dev/null
+++ b/graphics/djvulibre/BUILD
@@ -0,0 +1,6 @@
+(
+ 
+  patch_it $SOURCE2 0  &&
+  default_build
+
+) > $C_FIFO 2>&1
diff --git a/graphics/djvulibre/DEPENDS b/graphics/djvulibre/DEPENDS
index c8195ca..efe379d 100644
--- a/graphics/djvulibre/DEPENDS
+++ b/graphics/djvulibre/DEPENDS
@@ -1,3 +1,4 @@
 depends tiff
 depends jpeg
+
 optional_depends "qt3" "" "" "Builds the qt front-end for djvu tools"
diff --git a/graphics/djvulibre/DETAILS b/graphics/djvulibre/DETAILS
index b6207a4..142a966 100644
--- a/graphics/djvulibre/DETAILS
+++ b/graphics/djvulibre/DETAILS
@@ -1,13 +1,17 @@
           MODULE=djvulibre
-         VERSION=3.5.20
+         VERSION=3.5.22
           SOURCE=$MODULE-$VERSION.tar.gz
+         SOURCE2=$MODULE-3.5.21-gcc-4.3.x.patch
       SOURCE_URL=$SFORGE_URL/djvu
-      SOURCE_VFY=sha1:88ec94512f3f7845b42c2585f75e07a9cf147380
-        WEB_SITE=http://djvu.sourceforge.net/
+     SOURCE2_URL=$PATCH_URL
+      SOURCE_VFY=sha1:f869d4114052a7df7b8da2d334d124934f1293a6
+     SOURCE2_VFY=sha1:3441460691f78fb760bc2f30790778bc289ef558
+        WEB_SITE=http://djvu.sourceforge.net
          ENTERED=20071027
-         UPDATED=20071204
+         UPDATED=20090623
            SHORT="web-centric platform for distributing documents and images"
            PSAFE=no
+   
 cat << EOF
 DjVu is a web-centric format and software platform for distributing documents
 and images. DjVu can advantageously replace PDF, PS, TIFF, JPEG, and GIF for
@@ -17,7 +21,4 @@ screen, and consume less client resources than competing formats. DjVu images
 display instantly and can be smoothly zoomed and panned with no lengthy
 re-rendering. DjVu is used by hundreds of academic, commercial, governmental,
 and non-commercial web sites around the world.
-
-DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers,
-browser plugins, decoders, simple encoders, and utilities.
 EOF
diff --git a/graphics/libkexiv2/DETAILS b/graphics/libkexiv2/DETAILS
index 97f0222..2d359ff 100644
--- a/graphics/libkexiv2/DETAILS
+++ b/graphics/libkexiv2/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libkexiv2
-         VERSION=0.1.6
+         VERSION=0.1.9
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$SFORGE_URL/kipi
-      SOURCE_VFY=sha1:725a718df0f87e8af5e8e37cbfff9cf198ef6243
+      SOURCE_VFY=sha1:252243b105f0f0e0565219b61aed6f223cbb4000
    MODULE_PREFIX=${KDE_PREFIX:-/opt/lunar/kde/3}
         WEB_SITE=http://www.kipi-plugins.org/drupal/?q=node
          ENTERED=20070301
-         UPDATED=20071229
+         UPDATED=20090319
            SHORT="exiv2 library wrapper"
 
 cat << EOF
diff --git a/graphics/pfstools/BUILD b/graphics/pfstools/BUILD
new file mode 100644
index 0000000..f746ec2
--- /dev/null
+++ b/graphics/pfstools/BUILD
@@ -0,0 +1,14 @@
+(
+
+# A gcc-4.x.x twiddle here.
+  sedit 's:tion(const char \*name):tion(char \*name):' src/filter/pfspanoramic.cpp &&
+
+  if module_installed qt3 ; then
+    . /etc/profile.d/qt3.rc
+  else
+    OPTS="$OPTS --disable-qt"
+  fi &&
+
+  default_build
+
+) > $C_FIFO 2>&1
diff --git a/graphics/pfstools/DETAILS b/graphics/pfstools/DETAILS
index 7c71f4f..7a637d8 100644
--- a/graphics/pfstools/DETAILS
+++ b/graphics/pfstools/DETAILS
@@ -1,11 +1,11 @@
           MODULE=pfstools
-         VERSION=1.6.2
+         VERSION=1.8.1
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=$SFORGE_URL/$MODULE
-      SOURCE_VFY=sha1:50970c4d9d97907b36a9a789099442316e61ea5a
+      SOURCE_VFY=sha1:4d2f3a18c270d2d5c4442eb6f6750eca2aa99976
         WEB_SITE=http://www.mpi-inf.mpg.de/resources/pfstools/
          ENTERED=20070822
-         UPDATED=20070822
+         UPDATED=20091116
            SHORT="manipulating and viewing HDR images and video frames"
 
 cat << EOF
diff --git a/libs/aqbanking/DEPENDS b/libs/aqbanking/DEPENDS
index 998fb38..8e3fa8f 100644
--- a/libs/aqbanking/DEPENDS
+++ b/libs/aqbanking/DEPENDS
@@ -7,8 +7,5 @@ optional_depends  libchipcard "--enable-chipcard-client" "--disable-chipcard-cli
 optional_depends  qt3         "--enable-qt3 --enable-qt3-threads" \
                               "--disable-qt3 --disable-qt3-threads"  "for Qt3 support"
 
-optional_depends  kdebase3    "--enable-kde3 --with-kde3-libs=/opt/lunar/kde/3/lib" \
-                              "--disable-kde3" "for KDE support"
-
 optional_depends  Python      "--enable-python" "" "for Python bindings support"
 
diff --git a/libs/libmcs/DEPENDS b/libs/libmcs/DEPENDS
index 5dcd5e4..b51b41d 100644
--- a/libs/libmcs/DEPENDS
+++ b/libs/libmcs/DEPENDS
@@ -1,11 +1,6 @@
 depends libmowgli
 
-optional_depends  "GConf"               \
-                  "--enable-gconf"       \
-                  "--disable-gconf"      \
+optional_depends  "GConf"            \
+                  "--enable-gconf"   \
+                  "--disable-gconf"  \
                   "for GConf support"
-
-optional_depends  "kdelibs3"             \
-                  "--enable-kconfig"     \
-                  "--disable-kconfig"    \
-                  "for KConfig support"
diff --git a/libs/libmcs/DETAILS b/libs/libmcs/DETAILS
index 4fa08fb..bccedb0 100644
--- a/libs/libmcs/DETAILS
+++ b/libs/libmcs/DETAILS
@@ -1,7 +1,7 @@
             MODULE=libmcs
            VERSION=0.7.1
             SOURCE=$MODULE-$VERSION.tbz2
-        SOURCE_URL=http://distfiles.atheme.org/
+        SOURCE_URL=http://distfiles.atheme.org
         SOURCE_VFY=sha1:2e731c74597454380ce113f35f89346c7da03e0a
           WEB_SITE=http://packages.pardus.org.tr/contrib/source/libmcs.html
            ENTERED=20070307
diff --git a/net/avahi/BUILD b/net/avahi/BUILD
index 5edb197..0c8a3ba 100644
--- a/net/avahi/BUILD
+++ b/net/avahi/BUILD
@@ -1,28 +1,34 @@
 (
 
+   if module_installed qt3; then
    . /etc/profile.d/qt3.rc
+   fi &&
 
    if module_installed qt4; then
     . /etc/profile.d/qt4.rc
    fi &&
 
-   patch_it $SOURCE_CACHE/$SOURCE1 0 &&
-   add_priv_user avahi:avahi -d /dev/null -s /bin/false
+   patch_it $SOURCE_CACHE/$SOURCE1 0  &&
+   add_priv_user avahi:avahi -d /dev/null -s /bin/false &&
+   add_priv_user avahi-autoipd:avahi-autoipd -d /dev/null -s /bin/false &&
+
+# Add this missing group. It is used in /etc/dbus-1/system.d/avahi-dbus.conf
+   add_priv_group netdev &&
 
 #   export ac_cv_func_realloc_0_nonnull=yes
 #   export ac_cv_func_malloc_0_nonnull=yes
 
    OPTS="$OPTS --enable-compat-howl --enable-compat-libdns_sd"
 
-   ./configure  --prefix=/usr             \
-                --build=$BUILD            \
-                --sysconfdir=/etc         \
-                --localstatedir=/var      \
-                --with-distro=none        \
-                --disable-lynx            \
-                --disable-gdbm            \
-                --disable-stack-protector \
-                $OPTS                    &&
+   ./configure  --prefix=/usr              \
+                --build=$BUILD             \
+                --sysconfdir=/etc          \
+                --localstatedir=/var       \
+                --with-distro=none         \
+                --disable-lynx             \
+                --disable-gdbm             \
+                --disable-stack-protector  \
+                $OPTS                     &&
 
     default_make
 
diff --git a/net/avahi/CONFLICTS b/net/avahi/CONFLICTS
index 698da5c..8fe4961 100644
--- a/net/avahi/CONFLICTS
+++ b/net/avahi/CONFLICTS
@@ -1,2 +1 @@
-conflicts mDNSResponder &&
-conflicts howl
+conflicts  mDNSResponder
diff --git a/net/avahi/DEPENDS b/net/avahi/DEPENDS
index 41920a7..e31671d 100644
--- a/net/avahi/DEPENDS
+++ b/net/avahi/DEPENDS
@@ -1,5 +1,7 @@
 depends libdaemon
 
+optional_depends "nss-mdns" "" "" "for Name Switching Services Support"
+
 optional_depends "qt3" \
                  "--enable-qt3" \
                  "--disable-qt3" \
@@ -10,12 +12,12 @@ optional_depends "qt4" \
                  "--disable-qt4" \
                  "building of Qt4 mainloop integration"
                  
-optional_depends "gtk+-2" \
+optional_depends "libglade" \
                  "--enable-gtk" \
                  "--disable-gtk" \
                  "for the use of GTK+"
 
-optional_depends "pygtk2" \
+optional_depends "pygtk" \
                  "--enable-pygtk" \
                  "--disable-pygtk" \
                  "for the use of pyGTK"
@@ -23,12 +25,12 @@ optional_depends "pygtk2" \
 optional_depends "dbus-python" \
                  "--enable-python-dbus --enable-python" \
                  "--disable-python-dbus --disable-python" \
-                 "Disable use of D-Bus in Python"
+                 "Enable use of D-Bus in Python"
 
 optional_depends "xmlto" \
                  "--enable-xmltoman" \
                  "--disable-xmltoman" \
                  "to build the manpages"
 
-optional_depends "gtk-sharp2"  "--enable-mono"  "--disable-mono"  \
+optional_depends "gtk-sharp"  "--enable-mono"  "--disable-mono"  \
                  "to build the Mono/.NET avahi-sharp library"
diff --git a/net/avahi/DETAILS b/net/avahi/DETAILS
index 95ddeb7..f1dce0d 100644
--- a/net/avahi/DETAILS
+++ b/net/avahi/DETAILS
@@ -1,15 +1,15 @@
           MODULE=avahi
-         VERSION=0.6.21
+         VERSION=0.6.25
           SOURCE=$MODULE-$VERSION.tar.gz
          SOURCE1=avahi-0.6.21-dbus-1.0.2.patch
-      SOURCE_URL=http://avahi.org/download/
+      SOURCE_URL=http://avahi.org/download
      SOURCE1_URL=$PATCH_URL
-      SOURCE_VFY=sha1:3675f83b294b87a5cfa947d2f68518f0da8ed7b9
+      SOURCE_VFY=sha1:7ce8ed5a494d72401dd81f64594fda59d2ec91fd
      SOURCE1_VFY=sha1:f1766c9cf660e8d9ab6ac0ad70d726b80b272fff
         WEB_SITE=http://avahi.org
          ENTERED=20060808
-         UPDATED=20071021
-           SHORT="service discovery on a local network"
+         UPDATED=20090612
+           SHORT="A service discovery on a local network"
 
 cat << EOF
 Avahi is a system which facilitates service discovery on a local network.
diff --git a/net/wvstreams/BUILD b/net/wvstreams/BUILD
index ffc8c5c..2a72acf 100644
--- a/net/wvstreams/BUILD
+++ b/net/wvstreams/BUILD
@@ -2,11 +2,13 @@
 
   export CFLAGS="$CFLAGS -fPIC"
 
+  export DBUS_LIBDIR="/usr/lib/"
+
   if in_depends $MODULE qt3; then
     if module_installed qt3; then
       . /etc/profile.d/qt3.rc
       . /etc/profile.d/kde3.rc
-      sedit "s:/usr/lib/libqt-mt.so:/opt/lunar/qt/3/lib:g" vars.mk
+#      sedit "s:/usr/lib/libqt-mt.so:/opt/lunar/qt/3/lib:g" vars.mk
     fi
   fi  &&
 
diff --git a/net/wvstreams/DEPENDS b/net/wvstreams/DEPENDS
index 1f1cd94..654324e 100644
--- a/net/wvstreams/DEPENDS
+++ b/net/wvstreams/DEPENDS
@@ -1,43 +1,21 @@
-depends db       &&
-depends openssl  &&
-depends zlib     &&
+depends zlib     
 
-optional_depends  "gamin"               \
-                  "--with-fam"          \
-                  "--without-fam"       \
-                  "FAM support"        
+optional_depends  "dbus"               \
+                  "--with-dbus"        \
+                  "--without-dbus"     \
+                  "Dbus support"       
 
-optional_depends  "fftw"                \
-                  "--with-fftw"         \
-                  "--without-fftw"      \
-                  "FFTW support"       
-
-optional_depends  "gdbm"                \
-                  "--with-gdbm"         \
-                  "--without-gdbm"      \
-                  "GDBM support"       
-
-optional_depends  "gtk+"                \
-                  "--with-gtk"          \
-                  "--without-gtk"       \
-                  "GTK+ support"       
-
-optional_depends  "libogg"              \
-                  "--with-ogg"          \
-                  "--without-ogg"       \
-                  "lib OGG support"    
-
-optional_depends  "Linux-PAM"           \
-                  "--with-pam"          \
-                  "--without-pam"       \
+optional_depends  "Linux-PAM"          \
+                  "--with-pam"         \
+                  "--without-pam"      \
                   "PAM support"        
 
-optional_depends  "speex"               \
-                  "--with-speex"        \
-                  "--without-speex"     \
+optional_depends  "openssl"            \
+                  "--with-openssl"     \
+                  "--without-openssl"  \
                   "Speex support"      
 
-optional_depends  "qt3"                 \
-                  "--with-qt"           \
-                  "--without-qt"        \
+optional_depends  "qt3"                \
+                  "--with-qt"          \
+                  "--without-qt"       \
                   "Qt support"
diff --git a/net/wvstreams/DETAILS b/net/wvstreams/DETAILS
index 58b8c4d..ce26445 100644
--- a/net/wvstreams/DETAILS
+++ b/net/wvstreams/DETAILS
@@ -1,12 +1,13 @@
           MODULE=wvstreams
-         VERSION=4.4.1
+         VERSION=4.6
           SOURCE=$MODULE-$VERSION.tar.gz
-   SOURCE_URL[0]=http://$MODULE.googlecode.com/files/
-      SOURCE_VFY=sha1:1c84bb50f1528a4014f62c1bd645815fedea713a
-        WEB_SITE=http://open.nit.ca/
+      SOURCE_URL=http://$MODULE.googlecode.com/files/
+      SOURCE_VFY=sha1:5ea10abdadcc9b3abe74cb3d429d63a5a55b71bc
+        WEB_SITE="http://alumnit.ca/wiki/?page=WvStreams"
          ENTERED=20020425
-         UPDATED=20070917
+         UPDATED=20090810
            SHORT="A networking C++ library"
+PSAFE=no
 cat << EOF
 WvStreams aims to be an efficient, secure, and easy-to-use library
 for doing network applications development.
diff --git a/printer/hplip/BUILD b/printer/hplip/BUILD
index d3699d0..b686b1e 100644
--- a/printer/hplip/BUILD
+++ b/printer/hplip/BUILD
@@ -1,11 +1,17 @@
 (
 
-  if module_installed qt3; then
-    . /etc/profile.d/qt3.rc;
-  fi
+  if in_depends $MODULE PyQt; then
+    . /etc/profile.d/qt3.rc
+  fi &&
+
+  if in_depends $MODULE PyQt4; then
+     . /etc/profile.d/qt4.rc
+  fi &&
+
   if [[ "$PP" == "y" ]] ; then
     OPTS="$OPTS --disable-pp-build"
-  fi
+  fi &&
+
   if [[ "$FAX" == "n" ]] ; then
     OPTS="$OPTS --disable-fax-build"
   fi &&
diff --git a/printer/hplip/CONFIGURE b/printer/hplip/CONFIGURE
index c2e89ab..25fbb02 100644
--- a/printer/hplip/CONFIGURE
+++ b/printer/hplip/CONFIGURE
@@ -1,2 +1,3 @@
 mquery PP "Disable HP parallel port printing support (if your HP printer is USB only)?" y
 mquery FAX "Enable builtin fax in your HP printer?" n
+mquery FOOMATIC "Install foomatic ppd's (required for PSC and Photosmart printers)?" y "--enable-foomatic-ppd-install --enable-foomatic-rip-hplip-install"
diff --git a/printer/hplip/DEPENDS b/printer/hplip/DEPENDS
index 10d699e..f823e32 100644
--- a/printer/hplip/DEPENDS
+++ b/printer/hplip/DEPENDS
@@ -1,18 +1,28 @@
 depends  jpeg
 depends  cups
-depends  libusb
+depends  libusb-compat
 
-optional_depends "sane-backends" \
-                 "" \
-                 "--disable-scan-build" \
+optional_depends "sane-backends"         \
+                 "--enable-scan-build"   \
+                 "--disable-scan-build"  \
                  "for builtin scanner support" 
 
-optional_depends "PyQt" \
-                 "" \
-                 "" \
+optional_depends "PyQt"           \
+                 "--enable-qt3"   \
+                 "--disable-qt3"  \
                  "for HP gui support" 
 
-optional_depends "net-snmp" \
-                 "--enable-network-build" \
-                 "--disable-network-build" \
+optional_depends "PyQt4"          \
+                 "--enable-qt4"   \
+                 "--disable-qt4"  \
+                 "for HP Qt4 GUI Support"  
+
+optional_depends "reportlab"  \
+                 ""           \
+                 ""           \
+                 "for PDF and Fax cover page support"
+
+optional_depends "net-snmp"                 \
+                 "--enable-network-build"   \
+                 "--disable-network-build"  \
                  "for network printing support"
diff --git a/printer/hplip/DETAILS b/printer/hplip/DETAILS
index 61f4e74..dee05a9 100644
--- a/printer/hplip/DETAILS
+++ b/printer/hplip/DETAILS
@@ -1,11 +1,11 @@
           MODULE=hplip
-         VERSION=2.7.12
+         VERSION=3.9.12
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=$SFORGE_URL/hplip
-      SOURCE_VFY=sha1:4a80e46a633674db53d8063349b8bbb3f9070d49
+      SOURCE_VFY=sha1:d4d659ae52f01055bfc7060e0d4e3c7354c1dee3
         WEB_SITE=http://hplip.sourceforge.net
          ENTERED=20061216
-         UPDATED=20071216
+         UPDATED=20091224
            SHORT="Hewlett Packard's drivers for HP printers"
 
 cat << EOF
diff --git a/printer/pdfedit/DETAILS b/printer/pdfedit/DETAILS
index e5b6e01..eb2a612 100644
--- a/printer/pdfedit/DETAILS
+++ b/printer/pdfedit/DETAILS
@@ -1,17 +1,18 @@
           MODULE=pdfedit
-         VERSION=0.3.2
+         VERSION=0.4.3
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$SFORGE_URL/$MODULE
-      SOURCE_VFY=sha1:d3954c6ede18d2d5b3e25c4b399aa9f36b36b32e
+      SOURCE_VFY=sha1:ae3fcdba0560bde0ca3c21596eb7fb96c15f3a60
         WEB_SITE=http://pdfedit.petricek.net/pdfedit.index_e
    MODULE_PREFIX=${QT3_PREFIX:-/opt/lunar/qt/3}
          ENTERED=20071213
-         UPDATED=20071213
+         UPDATED=20091022
            SHORT="manipulate PDF documents"
            PSAFE=no
+	   
 cat << EOF
 Free (and open source) editor for manipulating PDF documents. GUI version +
-commandline interface.  Scripting is used to a great extent in editor and
+commandline interface. Scripting is used to a great extent in editor and
 almost anything can be scripted, it is possible to create own scripts or
 plugins.
 EOF
diff --git a/python/PyQt/DETAILS b/python/PyQt/DETAILS
index 52aa019..cdf4744 100644
--- a/python/PyQt/DETAILS
+++ b/python/PyQt/DETAILS
@@ -1,13 +1,13 @@
           MODULE=PyQt
            EXTRA=x11-gpl
-         VERSION=3.17.3
+         VERSION=3.18.1
           SOURCE=$MODULE-$EXTRA-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$EXTRA-$VERSION
-      SOURCE_URL=http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/
-      SOURCE_VFY=sha1:ab74c9090564a09e90c57148f9193843b37fd53f
+      SOURCE_URL=http://www.riverbankcomputing.com/static/Downloads/PyQt3
+      SOURCE_VFY=sha1:310c17bd3b0f81f8b516c5b755250171fa9c9a04
         WEB_SITE=http://www.riverbankcomputing.co.uk/pyqt/index.php
          ENTERED=20020520
-         UPDATED=20070731
+         UPDATED=20090617
            SHORT="A set of Python bindings for the Qt toolkit"
 
 cat << EOF
diff --git a/python/PyQt/PRE_BUILD b/python/PyQt/PRE_BUILD
index 267ac42..d667d24 100644
--- a/python/PyQt/PRE_BUILD
+++ b/python/PyQt/PRE_BUILD
@@ -1,3 +1,4 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
+. /etc/profile.d/qt3.rc &&
 echo "yes" | python ./configure.py $OPTS
diff --git a/qt4-apps/qscintilla2/BUILD b/qt4-apps/qscintilla2/BUILD
new file mode 100644
index 0000000..ffb1da2
--- /dev/null
+++ b/qt4-apps/qscintilla2/BUILD
@@ -0,0 +1,24 @@
+(
+
+# install the editor class
+
+  export PATH=$QTDIR/bin:$PATH
+  if module_installed qt4; then
+    source /etc/profile.d/qt4.rc
+    cd Qt4
+  else
+    if module_installed qt3; then
+      source /etc/profile.d/qt3.rc
+      cd Qt3
+    fi
+  fi
+  qmake -o Makefile qscintilla.pro
+  default_make
+
+# install the Pythom bindings
+
+  cd ../Python           &&
+  python ./configure.py  &&
+  default_make
+
+) > $C_FIFO 2>&1
diff --git a/qt4-apps/qscintilla2/DEPENDS b/qt4-apps/qscintilla2/DEPENDS
new file mode 100644
index 0000000..3157cda
--- /dev/null
+++ b/qt4-apps/qscintilla2/DEPENDS
@@ -0,0 +1,2 @@
+optional_depends  qt3 ""  ""  "for qt3 version of QScintilla"
+optional_depends  qt4 ""  ""  "for qt4 version of QScintilla"
diff --git a/qt4-apps/qscintilla2/DETAILS b/qt4-apps/qscintilla2/DETAILS
new file mode 100644
index 0000000..23f4777
--- /dev/null
+++ b/qt4-apps/qscintilla2/DETAILS
@@ -0,0 +1,17 @@
+          MODULE=qscintilla2
+         VERSION=gpl-2.4
+          SOURCE=QScintilla-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/QScintilla-$VERSION
+      SOURCE_URL=http://www.riverbankcomputing.com/static/Downloads/QScintilla2
+      SOURCE_VFY=sha1:17962bb64d2641f9e181b39fdca39228170488a3
+   MODULE_PREFIX=${QTDIR:-/opt/lunar/qt/4}
+        WEB_SITE=http://www.riverbankcomputing.co.uk/qscintilla
+         ENTERED=20070528
+         UPDATED=20090606
+           SHORT="Port to Qt of Scintilla C++ editor class"
+
+cat << EOF
+QScintilla includes features especially useful when editing and 
+debugging source code. These include support for syntax styling, 
+error indicators, code completion and call tips.
+EOF
diff --git a/qt4-apps/qwt/BUILD b/qt4-apps/qwt/BUILD
new file mode 100644
index 0000000..2a5d88f
--- /dev/null
+++ b/qt4-apps/qwt/BUILD
@@ -0,0 +1,18 @@
+(
+
+  if in_depends $MODULE qt4; then
+      source /etc/profile.d/qt4.rc
+      MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}      
+      sedit "s:/usr/local:$MODULE_PREFIX:" qwt.prf
+      sedit "s:/usr/local:$MODULE_PREFIX:" qwtconfig.pri
+   else
+      source /etc/profile.d/qt3.rc
+      MODULE_PREFIX=${QT_PREFIX:-/opt/lunar/qt/3}
+      sedit "s:/usr/local:$MODULE_PREFIX:" qwt.prf
+      sedit "s:/usr/local:$MODULE_PREFIX:" qwtconfig.pri
+  fi &&
+
+  qmake &&
+  default_make
+
+) > $C_FIFO 2>&1
diff --git a/qt4-apps/qwt/DEPENDS b/qt4-apps/qwt/DEPENDS
new file mode 100644
index 0000000..f97b4fb
--- /dev/null
+++ b/qt4-apps/qwt/DEPENDS
@@ -0,0 +1,2 @@
+optional_depends qt4 "" "" "for Graph display support"
+optional_depends qt3 "" "" "for Graph display support"
diff --git a/qt4-apps/qwt/DETAILS b/qt4-apps/qwt/DETAILS
new file mode 100644
index 0000000..d888d48
--- /dev/null
+++ b/qt4-apps/qwt/DETAILS
@@ -0,0 +1,17 @@
+          MODULE=qwt
+         VERSION=5.2.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$SFORGE_URL/$MODULE
+      SOURCE_VFY=sha1:8830498b87d99d4b7e95ee643f1f7ff178204ba9
+        WEB_SITE=http://qwt.sourceforge.net/
+         ENTERED=20090621
+         UPDATED=20090621
+           SHORT="Qt Widgets for Technical Applications"
+
+PSAFE=no
+cat << EOF
+The Qwt library contains GUI Components and utility classes which are primarily
+useful for programs with a technical background. Beside a 2D plot widget it 
+provides scales, sliders, dials, compasses, thermometers, wheels and knobs to 
+control or display values, arrays, or ranges of type double.
+EOF
diff --git a/security/fwbuilder/BUILD b/security/fwbuilder/BUILD
index 7529d93..107ff3f 100644
--- a/security/fwbuilder/BUILD
+++ b/security/fwbuilder/BUILD
@@ -1,9 +1,9 @@
 (
 
   # This is a good idea for people with both qt3 and qt4 on their sys
-  . /etc/profile.d/qt3.rc &&
+  . /etc/profile.d/qt4.rc &&
 
   # uses cvs build because ./autogen.sh is suggested to be run
-  default_cvs_build
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/security/fwbuilder/DETAILS b/security/fwbuilder/DETAILS
index 0987a0d..943f1f1 100644
--- a/security/fwbuilder/DETAILS
+++ b/security/fwbuilder/DETAILS
@@ -1,12 +1,12 @@
           MODULE=fwbuilder
-         VERSION=2.1.15
+         VERSION=3.0.7
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=$SFORGE_URL/fwbuilder/
-      SOURCE_VFY=sha1:1597c28af5b002c357c646943d2fd99fce0c35c4
+      SOURCE_VFY=sha1:c08411bcf5b686ef86e1da6f0954d8685bf49d61
         WEB_SITE=http://www.fwbuilder.org/
       MAINTAINER=ratler at lunar-linux.org
          ENTERED=20040730
-         UPDATED=20071216
+         UPDATED=20091020
            SHORT="A firewall configuration and management tool"
 
 cat << EOF
diff --git a/security/qca-sasl/BUILD b/security/qca-sasl/BUILD
new file mode 100644
index 0000000..f6c2aec
--- /dev/null
+++ b/security/qca-sasl/BUILD
@@ -0,0 +1,8 @@
+(
+
+  . /etc/profile.d/qt3.rc
+
+  ./configure &&
+  default_make
+
+) > $C_FIFO 2>&1
diff --git a/security/qca-sasl/DEPENDS b/security/qca-sasl/DEPENDS
new file mode 100644
index 0000000..b6896c1
--- /dev/null
+++ b/security/qca-sasl/DEPENDS
@@ -0,0 +1,2 @@
+depends qca
+depends cyrus-sasl
diff --git a/security/qca-sasl/DETAILS b/security/qca-sasl/DETAILS
new file mode 100644
index 0000000..48f121a
--- /dev/null
+++ b/security/qca-sasl/DETAILS
@@ -0,0 +1,13 @@
+       MODULE=qca-sasl
+      VERSION=1.0
+       SOURCE=$MODULE-$VERSION.tar.bz2
+   SOURCE_URL=http://delta.affinix.com/download/qca/
+   SOURCE_VFY=sha1:1f1e21c0fb11eb980a817a319e6751f6ee720571
+     WEB_SITE=http://delta.affinix.com/
+      ENTERED=20080923
+      UPDATED=20080923
+        SHORT="Qt plugin to provide SASL capability"
+cat << EOF
+plugin to provide SASL capability to programs that utilize the
+Qt Cryptographic Architecturtecture (QCA).
+EOF
diff --git a/security/qca-tls/BUILD b/security/qca-tls/BUILD
index 8e3c911..143f2c8 100644
--- a/security/qca-tls/BUILD
+++ b/security/qca-tls/BUILD
@@ -1,5 +1,7 @@
 (
 
+    . /etc/profile.d/qt3.rc
+
     # Fix for openssl 0.9.8
     sedit "457 s/unsigned/const unsigned/; 801 s/unsigned/const unsigned/" qca-tls.cpp &&
 
diff --git a/security/qca-tls/DEPENDS b/security/qca-tls/DEPENDS
index 6f82b86..fef2e7c 100644
--- a/security/qca-tls/DEPENDS
+++ b/security/qca-tls/DEPENDS
@@ -1,2 +1,2 @@
-depends qt3 &&
-depends openssl
\ No newline at end of file
+depends qca
+depends openssl
diff --git a/sql/unixODBC/BUILD b/sql/unixODBC/BUILD
index 571ade1..27121cc 100644
--- a/sql/unixODBC/BUILD
+++ b/sql/unixODBC/BUILD
@@ -1,6 +1,13 @@
 (
-   
-   OPTS+="--disable-gui" &&
-   default_build
+
+  if module_installed qt3 ; then
+    OPTS="$OPTS --enable-gui"
+   else
+    OPTS="$OPTS --disable-gui"
+  fi &&
+
+  OPTS="$OPTS --enable-fdb"
+
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/sql/unixODBC/DEPENDS b/sql/unixODBC/DEPENDS
new file mode 100644
index 0000000..f376c7f
--- /dev/null
+++ b/sql/unixODBC/DEPENDS
@@ -0,0 +1,3 @@
+optional_depends readline "" ""   "For readline support"
+optional_depends pth      "" ""   "For threaded lib support"
+optional_depends qt3      "" ""   "For gui support"
diff --git a/sql/unixODBC/DETAILS b/sql/unixODBC/DETAILS
index 7486805..97bf950 100644
--- a/sql/unixODBC/DETAILS
+++ b/sql/unixODBC/DETAILS
@@ -1,11 +1,11 @@
       MODULE=unixODBC
-     VERSION=2.2.12
+     VERSION=2.2.14
       SOURCE=$MODULE-$VERSION.tar.gz
   SOURCE_URL=http://www.unixodbc.org/
-  SOURCE_VFY=sha1:d1cb286fb538c664549153165e2b9183b58a627b
+  SOURCE_VFY=sha1:ab18464c83d30d7b38b8bb58e1dd01e3ec211488
     WEB_SITE=http://www.unixodbc.org/
      ENTERED=20070515
-     UPDATED=20070515
+     UPDATED=20090129
        SHORT="standard software API method for using database management systems"
 
 cat << EOF
diff --git a/video/avifile/BUILD b/video/avifile/BUILD
index 43f4912..9d769e7 100644
--- a/video/avifile/BUILD
+++ b/video/avifile/BUILD
@@ -4,7 +4,7 @@
 
 # This sedit is an adaptation from some patches sent by V4hn. Simpler than uploading
 # to the mirror.
-  sedit "s:(int\*):(unsigned int\*):" samples/qtvidcap/v4lxif.cpp samples/qtvidcap/kv4lsetup.cpp &&
+  sedit "s:(int\*):(unsigned int\*):" samples/qtvidcap/v4lxif.cpp samples/qtvidcap/kv4lsetup.cpp  &&
 
 
   sedit "s:freetype/freetype.h>:ft2build.h>\n#include FT_FREETYPE_H:" lib/video/sub_ft.cpp  &&
diff --git a/video/avifile/DEPENDS b/video/avifile/DEPENDS
index d197b5c..a31435a 100644
--- a/video/avifile/DEPENDS
+++ b/video/avifile/DEPENDS
@@ -1,4 +1,5 @@
-depends  qt3       &&
-depends  w32codec  &&
-optional_depends  "libmad"     ""  ""  "for MAD audio decoder plugin"  &&
+depends  qt3
+depends  w32codec
+
+optional_depends  "libmad"     ""  ""  "for MAD audio decoder plugin"
 optional_depends  "libvorbis"  ""  ""  "for Vorbis plugin"
diff --git a/video/avifile/DETAILS b/video/avifile/DETAILS
index 569c2bd..b2cbfb2 100644
--- a/video/avifile/DETAILS
+++ b/video/avifile/DETAILS
@@ -2,13 +2,15 @@
          VERSION=0.7.45
         LVERSION=0.7
           SOURCE=$MODULE-$LVERSION-$VERSION.tar.bz2
-         SOURCE2=$MODULE-$LVERSION-$VERSION-gcc4-1.patch.bz2
+         SOURCE2=$MODULE-$LVERSION-$VERSION-gcc44.patch.bz2
          SOURCE3=$MODULE-$LVERSION-$VERSION-kv4lsetup.patch.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$LVERSION-$VERSION
-      SOURCE_URL=$SFORGE_URL/$MODULE/
+      SOURCE_URL=$SFORGE_URL/$MODULE
      SOURCE2_URL=$PATCH_URL
      SOURCE3_URL=$PATCH_URL
       SOURCE_VFY=sha1:464640de8a06809ef9e96d1ea268a35cd15f7d95
+     SOURCE2_VFY=sha1:c697cdcdafb08ba0a84a7e8919ea052252eeae7f
+     SOURCE3_VFY=sha1:2c6c0d7ca868d98a8e42527473fd305efbdc871e
         WEB_SITE=http://avifile.sourceforge.net
          ENTERED=20020111
          UPDATED=20070527
diff --git a/video/transcode/BUILD b/video/transcode/BUILD
index d105ad7..1d34ab0 100644
--- a/video/transcode/BUILD
+++ b/video/transcode/BUILD
@@ -1,10 +1,6 @@
 (
 
-# fixes a compile failure and is temporary. This will be corrected
-# in version 1.0.4 then this BUILD can be deleted.
-  sedit "s:register_avcodec(&mp2_encoder);::" export/aud_aux.c
-  sedit "s:register_avcodec(&ac3_encoder);::" export/aud_aux.c
-  sedit "365cavcodec_register_all();" export/aud_aux.c
+  OPTS="$OPTS --enable-v4l"
 
   default_build
 
diff --git a/video/transcode/DEPENDS b/video/transcode/DEPENDS
index e09bb42..5e81361 100644
--- a/video/transcode/DEPENDS
+++ b/video/transcode/DEPENDS
@@ -2,33 +2,40 @@ depends  nasm
 depends  ffmpeg
 depends  mpeg2dec
 
-optional_depends freetype2   ""  "--disable-freetype2" "ttf fonts support"  
-optional_depends mjpegtools  "--enable-mjpegtools"  "" "MPEG support"       
-optional_depends avifile     "--enable-avifile"     "" "avifile support"    
-optional_depends a52dec      "--enable-a52"         "" "a52 support"        
-optional_depends libdv       "--enable-libdv"       "" "libdv support"      
-optional_depends libxml2     "--enable-libxml2"     "" "XML support"        
+optional_depends mjpegtools  "--enable-mjpegtools"  "" "MPEG support"
+optional_depends avifile     "--enable-avifile"     "" "avifile support"
+optional_depends libdv       "--enable-libdv"       "" "libdv support"
+optional_depends libxml2     "--enable-libxml2"     "" "XML support"
 optional_depends ImageMagick "--enable-imagemagick" "" "ImageMagick support"
 optional_depends SDL         "--enable-sdl"         "" "SDL support"
 
-optional_depends  "libvorbis"                                        \
+optional_depends  libvorbis                                          \
                   "--enable-ogg --enable-vorbis"                     \
                   "--disable-ogg --disable-vorbis"                   \
-                  "Ogg-Vorbis support"                               
+                  "Ogg-Vorbis support"
 
-optional_depends  "libtheora"                                        \
+optional_depends  libtheora                                          \
                   "--enable-theora"        "--disable-theora"        \
-                  "Theora support"                                   
+                  "Theora support"
 
-optional_depends  "lame"                                             \
+optional_depends  lame                                               \
                   "--enable-lame"          "--disable-lame"          \
-                  "MP3 support"                                      
+                  "MP3 support"
 
-optional_depends  "libdvdread"                                       \
+optional_depends  libdvdread                                         \
                   "--enable-libdvdread"    "--disable-libdvdread"    \
-                  "DVD support"                                      
+                  "DVD support"
 
-optional_depends  "libquicktime"                                     \
+optional_depends  libquicktime                                       \
                   "--enable-libquicktime"  "--disable-libquicktime"  \
-                  "QuickTime support"                                
+                  "QuickTime support"
 
+optional_depends  a52dec    "--enable-a52 --enable-a52-default-decoder" \
+                            "--disable-a52"                             \
+                            "a52 support"
+
+optional_depends freetype2  "--enable-freetype2"  "--disable-freetype2" \
+                            "ttf fonts support"
+
+optional_depends lzo        "--enable-lzo --with-lzo-includes=/usr/include/lzo"  \
+                            "--disable-lzo"    "For compression support"
diff --git a/video/transcode/DETAILS b/video/transcode/DETAILS
index 3bc8f29..b4a7503 100644
--- a/video/transcode/DETAILS
+++ b/video/transcode/DETAILS
@@ -1,13 +1,11 @@
           MODULE=transcode
-         VERSION=1.0.5
+         VERSION=1.1.5
           SOURCE=$MODULE-$VERSION.tar.bz2
-   SOURCE_URL[0]=http://fromani.exit1.org/
-   SOURCE_URL[1]=http://www.jakemsr.com/transcode/
-   SOURCE_URL[2]=http://dl.fkb.wormulon.net/transcode/
-      SOURCE_VFY=sha1:96f8746a8d54c3ed78f0b5eb32ff7c72313e8e6b
-        WEB_SITE=http://www.transcoding.org/cgi-bin/transcode/
+      SOURCE_URL=http://download.berlios.de/tcforge
+      SOURCE_VFY=sha1:48c36e06ca0cd1cdc1a9c6a241e231f896eefd26
+        WEB_SITE=http://www.transcoding.org/cgi-bin/transcode
          ENTERED=20020408
-         UPDATED=20080110
+         UPDATED=20091101
            SHORT="A video stream processor"
 
 cat << EOF
diff --git a/wifi/wpa_supplicant/BUILD b/wifi/wpa_supplicant/BUILD
index 1cc3711..ed74486 100644
--- a/wifi/wpa_supplicant/BUILD
+++ b/wifi/wpa_supplicant/BUILD
@@ -1,6 +1,8 @@
 (
-  sedit "s/\/usr\/local/\/usr/g" Makefile &&
-  sedit "s/dynamic_eap_methods//" Makefile &&
+
+  cd wpa_supplicant  &&
+  sedit "s/\/usr\/local/\/usr/g" Makefile   &&
+  sedit "s/dynamic_eap_methods//" Makefile  &&
 
   for option in \
       DNET_PCAP CTRL_IFACE CTRL_IFACE_DBUS \
@@ -9,24 +11,24 @@
       EAP_{MD5,TLS,PEAP,TTLS,GTC,OTP,SIM,AKA,PSK,LEAP}
   do
     echo "CONFIG_${option}=y" >> .config
-  done &&
+  done  &&
 
-  make &&
+  make  &&
 
   if in_depends $MODULE qt3 ; then
     . /etc/profile.d/qt3.rc
     make wpa_gui
-  fi &&
+  fi  &&
 
-  prepare_install &&
-  make install    &&
+  prepare_install  &&
+  make install     &&
 
   if in_depends $MODULE qt3 ; then
     install -m755 wpa_gui/wpa_gui /usr/bin
-  fi &&
+  fi  &&
 
-  install -m644 dbus-wpa_supplicant.conf /etc/dbus-1/system.d/ &&
-  install -m644 wpa_supplicant.conf /etc/wpa_supplicant.conf.example &&  
+  install -m644 dbus-wpa_supplicant.conf /etc/dbus-1/system.d/  &&
+  install -m644 wpa_supplicant.conf /etc/wpa_supplicant.conf.example  &&  
 
   gather_docs developer.txt wpa_supplicant.conf
 
diff --git a/wifi/wpa_supplicant/DEPENDS b/wifi/wpa_supplicant/DEPENDS
index 4e77040..f7c2846 100644
--- a/wifi/wpa_supplicant/DEPENDS
+++ b/wifi/wpa_supplicant/DEPENDS
@@ -3,4 +3,5 @@ depends libpcap
 depends libdnet
 depends openssl
 depends dbus 
+
 optional_depends qt3 "" "" "to build the wpa_gui utility"
diff --git a/wifi/wpa_supplicant/DETAILS b/wifi/wpa_supplicant/DETAILS
index 5796dae..32241f7 100644
--- a/wifi/wpa_supplicant/DETAILS
+++ b/wifi/wpa_supplicant/DETAILS
@@ -1,11 +1,11 @@
           MODULE=wpa_supplicant
-         VERSION=0.5.9
+         VERSION=0.6.9
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://hostap.epitest.fi/releases/
-      SOURCE_VFY=sha1:c197852585b069341f5d90dec9143a2b27a64320
+      SOURCE_VFY=sha1:3764f7bda4e5c87caac2b9e134cb59996f073f09
         WEB_SITE=http://hostap.epitest.fi/wpa_supplicant/
          ENTERED=20041019
-         UPDATED=20080109
+         UPDATED=20090323
            SHORT="WPA key management for Linux"
 
 cat << EOF
@@ -14,7 +14,6 @@ WPA and WPA2 (IEEE 802.11i / RSN). Supplicant is the IEEE 802.1X/WPA
 component that is used in the client stations. It implements
 key negotiation with a WPA Authenticator and it controls the
 roaming and IEEE 802.11 authentication/association of the wlan driver.
-
 wpa_supplicant is designed to be a "daemon" program that runs in the
 background and acts as the backend component controlling the wireless
 connection. wpa_supplicant supports separate frontend programs and an
diff --git a/x11-apps/openoffice-src/DEPENDS b/x11-apps/openoffice-src/DEPENDS
index 7091d27..1e56f61 100644
--- a/x11-apps/openoffice-src/DEPENDS
+++ b/x11-apps/openoffice-src/DEPENDS
@@ -86,17 +86,12 @@ optional_depends "gnome-vfs"                             \
                  "--disable-gnome-vfs --disable-lockdown --enable-gio" \
                  "for GNOME-vfs integration"
 
-optional_depends "kdelibs3"             \
-                 "--enable-kde --enable-kdeab"   \
-                 "--disable-kde --disable-kdeab" \
-                 "to enable KDE support"
-
 optional_depends "Linux-PAM"            \
                  "--enable-pam-link"    \
                  "--disable-pam"        \
                  "for Linux-PAM support"
 
-optional_depends "vigra"                         \
-                 "--with-system-vigra"           \
-                 "--without-system-vigra"        \
+optional_depends "vigra"                   \
+                 "--with-system-vigra"     \
+                 "--without-system-vigra"  \
                  "For generic algorithm support"
diff --git a/x11-utils/pinentry/BUILD b/x11-utils/pinentry/BUILD
new file mode 100644
index 0000000..0612490
--- /dev/null
+++ b/x11-utils/pinentry/BUILD
@@ -0,0 +1,9 @@
+(
+
+sedit 's/gulong/gsize/g' gtk+-2/gtksecentry.c &&
+if module_installed qt3; then
+. /etc/profile.d/qt3.rc
+fi &&
+default_build
+
+) > $C_FIFO 2>&1
diff --git a/x11-utils/pinentry/DETAILS b/x11-utils/pinentry/DETAILS
index e7721e6..96d26b3 100644
--- a/x11-utils/pinentry/DETAILS
+++ b/x11-utils/pinentry/DETAILS
@@ -1,10 +1,11 @@
           MODULE=pinentry
-         VERSION=0.7.2
+         VERSION=0.7.5
           SOURCE=$MODULE-$VERSION.tar.gz
    SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/pinentry/
+      SOURCE_VFY=sha1:6699a1ff94c649e8905199d480c6412cc43bad3d
         WEB_SITE=http://www.gnupg.org/aegypten/development.en.html
          ENTERED=20030310
-         UPDATED=20050421
+         UPDATED=20090402
       MAINTAINER=michalsc at email.uc.edu
            SHORT="collection of simple PIN or passphrase entry dialogs"
 cat << EOF
diff --git a/xorg7/x11-profiles/XOrg7/DEPENDS b/xorg7/x11-profiles/XOrg7/DEPENDS
index 1d4d55d..7358635 100644
--- a/xorg7/x11-profiles/XOrg7/DEPENDS
+++ b/xorg7/x11-profiles/XOrg7/DEPENDS
@@ -7,8 +7,6 @@ depends xauth
 depends xinit 
 depends xkeyboard-config 
 # DEPENDS: libxkbui
-depends xf86-input-keyboard 
-depends xf86-input-mouse 
 depends font-alias 
 depends font-cursor-misc 
 depends font-adobe-100dpi 
@@ -29,6 +27,7 @@ depends font-bitstream-type1
 depends font-cursor-misc 
 depends font-xfree86-type1 
 depends font-misc-misc 
+depends libXdmcp
 depends libXdamage  
 # DEPENDS: xextproto, libXfixes, fixesproto, damageproto
 depends libXcursor  
@@ -63,5 +62,10 @@ depends gccmakedep
 #startkde needs this 
 depends xprop  
 
-#and Samuel wants at least one driver...
-depends xf86-video-vesa
+#and optional, a video driver ...
+optional_depends "xf86-video-vesa"  ""  ""  "install VESA driver"
+
+# evdev is optional, some people want a manual setup
+optional_depends "xf86-input-evdev"  \
+                 ""  ""              \
+                 "automatic input device configuration (RECOMMENDED)"


More information about the Lunar-commits mailing list