[SM-Commit] GIT changes to stable-0.4 grimoire by Eric Sandall (4666e829fd26775f941cd618cdd7c8088a2a0dab)

Eric Sandall scm at mail.sourcemage.org
Fri Nov 17 18:35:20 EST 2006


GIT changes to stable-0.4 grimoire by Eric Sandall <sandalle at sourcemage.org>:

 ChangeLog                                     |   11 +-
 accounts                                      |    1 
 archive/arc/BUILD                             |    1 
 archive/arc/HISTORY                           |    3 
 archive/arc/makefnam.patch                    |   11 ++
 archive/zip/BUILD                             |    2 
 archive/zip/HISTORY                           |    3 
 audio-plugins/xmms-crossfade/DETAILS          |    9 --
 audio-plugins/xmms-crossfade/HISTORY          |    4 
 chat-im/eb-lite/BUILD                         |   14 ---
 chat-im/eb-lite/DEPENDS                       |    1 
 chat-im/eb-lite/DETAILS                       |   19 ----
 chat-im/eb-lite/HISTORY                       |   11 --
 chat-im/eb-lite/INSTALL                       |    4 
 cluster/atlas/BUILD                           |    6 +
 cluster/atlas/DEPENDS                         |    1 
 cluster/atlas/DETAILS                         |    7 +
 cluster/atlas/HISTORY                         |    6 +
 cluster/atlas/atlas-3.6.0.config              |    7 -
 cluster/atlas/atlas-nog77.config              |    9 ++
 collab/minimalist/BUILD                       |   37 --------
 collab/minimalist/DETAILS                     |    2 
 collab/minimalist/FINAL                       |    3 
 collab/minimalist/HISTORY                     |    4 
 collab/minimalist/INSTALL                     |   32 +++++++
 collab/minimalist/POST_INSTALL                |    6 -
 collab/minimalist/POST_REMOVE                 |    8 -
 collab/minimalist/PRE_REMOVE                  |    6 -
 editors/lyx/DEPENDS                           |    2 
 editors/lyx/HISTORY                           |    4 
 editors/lyx/PRE_BUILD                         |    6 -
 groups                                        |    2 
 http/bfilter/DEPENDS                          |    2 
 http/bfilter/HISTORY                          |    5 -
 kde-core/kde-i18n/CONFIGURE                   |   16 +--
 kde-core/kde-i18n/HISTORY                     |    4 
 kde-core/kdegames/BUILD                       |    3 
 kde-core/kdegames/CONFIGURE                   |   11 +-
 kde-core/kdegames/DEPENDS                     |   22 ++++
 kde-core/kdegames/DETAILS                     |   12 +-
 kde-core/kdegames/HISTORY                     |   10 ++
 kde-core/kdegames/INSTALL                     |    6 +
 libs/apr-util/DETAILS                         |    3 
 libs/apr-util/HISTORY                         |    5 +
 libs/apr-util/TRIGGERS                        |   12 ++
 libs/apr-util0/DETAILS                        |    3 
 libs/apr-util0/HISTORY                        |    5 +
 libs/apr-util0/TRIGGERS                       |   12 ++
 libs/sdl_pango/CONFIGURE                      |    2 
 libs/sdl_pango/DEPENDS                        |    3 
 libs/sdl_pango/DETAILS                        |   14 +++
 libs/sdl_pango/HISTORY                        |    2 
 libs/sdl_pango/PRE_BUILD                      |    7 +
 libs/sdl_pango/SDL_Pango-0.1.2-API-adds.patch |  116 ++++++++++++++++++++++++++
 security/iplog/BUILD                          |    6 -
 security/iplog/HISTORY                        |    5 +
 security/iplog/INSTALL                        |    1 
 security/iplog/PREPARE                        |   13 --
 security/iplog/PRE_BUILD                      |    6 +
 security/oinkmaster/BUILD                     |   14 ---
 security/oinkmaster/DEPENDS                   |    5 -
 security/oinkmaster/DETAILS                   |   12 +-
 security/oinkmaster/FINAL                     |    9 ++
 security/oinkmaster/HISTORY                   |   11 ++
 security/oinkmaster/INSTALL                   |    4 
 security/oinkmaster/POST_INSTALL              |    9 --
 security/oinkmaster/PREPARE                   |   13 --
 security/oinkmaster/PRE_BUILD                 |    3 
 shell-term-fm/screen/DETAILS                  |    7 -
 shell-term-fm/screen/HISTORY                  |    4 
 utils/console-tools/DEPENDS                   |    8 +
 utils/console-tools/DETAILS                   |    1 
 utils/console-tools/HISTORY                   |   11 ++
 utils/console-tools/INSTALL                   |    2 
 utils/console-tools/PRE_BUILD                 |    6 -
 video-libs/qc-usb/HISTORY                     |    5 +
 video-libs/qc-usb/INSTALL                     |    3 
 video-libs/qc-usb/PRE_BUILD                   |    5 +
 video-libs/qc-usb/qc-usb_gcc4.patch           |   40 ++++++++
 79 files changed, 485 insertions(+), 235 deletions(-)

New commits:
commit 4666e829fd26775f941cd618cdd7c8088a2a0dab
Author: George Sherwood <chat at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    eb-lite: Removed spell.  Not developed.  Won't build anymore.
    
    Conflicts:
    
    	ChangeLog
    	chat-im/eb-lite/DETAILS
    	chat-im/eb-lite/HISTORY

commit a1d378b8c7159ea8116adb02af66079a2d154f4d
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    xmms-crossfade: fix #12281
    thanks to Lubomir Blaha for a patch
    
    Conflicts:
    
    	audio-plugins/xmms-crossfade/DETAILS
    	audio-plugins/xmms-crossfade/HISTORY

commit 4d70cabdceb5175bff78681384aba85294859f8c
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    bfilter: DEPENDS: updated to use gtkmm2 instead of gtkmm #12653
    
    Conflicts:
    
    	http/bfilter/HISTORY

commit 8c7ff6545338de102d616b5c755b5acfe361bd20
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    iplog: fix #12980 and make it build
    
    Conflicts:
    
    	ChangeLog
    	accounts
    	groups
    	security/iplog/HISTORY

commit 3518259deef8a3414209d699d140de2425270cda
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    lyx: s/GECKO/WEB-BROWSER #13062
    
    Conflicts:
    
    	editors/lyx/DEPENDS
    	editors/lyx/HISTORY
    	editors/lyx/PRE_BUILD

commit 1d3b9f0b3d977fc8dbb42619c78f657209753770
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    arc: added RH patch to make it build #13147
    
    Conflicts:
    
    	archive/arc/HISTORY

commit 15b13eb72c2432b0ba39d899241a83bd4c9f9fed
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    qc-usb: Fix compile with gcc4, bug #13171.
    
    Conflicts:
    
    	video-libs/qc-usb/HISTORY
    	video-libs/qc-usb/INSTALL

commit bb3b44214740c608eec5d0d08f1dbea42870e7a7
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    apr-util0: Fixed broken trigger, bug #13197.
    
    Conflicts:
    
    	libs/apr-util0/DETAILS
    	libs/apr-util0/HISTORY

commit 3fecc54d2d7123a2f5bb41f5b80786394341b5ff
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    apr-util: Fixed broken trigger, bug #13197.
    
    Conflicts:
    
    	libs/apr-util/DETAILS
    	libs/apr-util/HISTORY

commit 5062ecb29128dcde7f07e5a47ccef37304c9923a
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    kdegames: Bug 13203 + minor fixes.
    
    Conflicts:
    
    	kde-core/kdegames/DEPENDS
    	kde-core/kdegames/HISTORY

commit 4dea733a09c2ec5255d702c3721639743932ba55
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libs/sdl_pango: new spell (guess what it does) #13217
      thanks go to Puppet_Master
    
    Conflicts:
    
    	ChangeLog

commit dd913575fa11745604bc669fbdaaeff5a44ebfc6
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Eric Sandall <sandalle at sourcemage.org>

    screen: SECURITY_PATCH=1, version update to 4.0.3, http://secunia.com/advisories/22583/
    
    Conflicts:
    
    	shell-term-fm/screen/DETAILS
    	shell-term-fm/screen/HISTORY

commit b112e77dcae0ff475d6c9ee2ac32c81d18ca2cbf
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    we do not want to reconfigure kde-i18n every time
    
    Conflicts:
    
    	kde-core/kde-i18n/HISTORY

commit e7f64d5dba388cc9a7291a4f09a0123bfda01d99
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    minimalist:
    
    fix #5216
    converted to BUILD_API=2
    
    Conflicts:
    
    	collab/minimalist/DETAILS
    	collab/minimalist/HISTORY

commit 4496d1a4453786d54ac9a23816b826e039b694aa
Author: George Sherwood <chat at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Updated oinkmaster to version 2.0.  Also updated to BUILD_API=2
    
    Conflicts:
    
    	security/oinkmaster/DETAILS
    	security/oinkmaster/HISTORY

commit 726987cac3423667b9569ad2a4cee4f11fccb9ad
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    atlas: fix #9380 infinite queries and missing dependency
    
    Conflicts:
    
    	cluster/atlas/HISTORY

commit 293d06e70c9d630cca2cc0c3a3674ce820ebb2e6
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    zip: fix #10554
    
    Conflicts:
    
    	archive/zip/HISTORY

commit f5451adcdb89774417022e54f2241673c4ea327c
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    console-tools: properly fix #10112
    
    Conflicts:
    
    	utils/console-tools/DEPENDS
    	utils/console-tools/DETAILS

commit 61374ab1e7caf700f43e8fc4a4349e81d50abbd2
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    console-tools: install all the manpages #10112
    
    Conflicts:
    
    	utils/console-tools/DETAILS
    	utils/console-tools/HISTORY

diff --git a/ChangeLog b/ChangeLog
index 87751d3..3d532f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
-2006-08-15 Flavien Bridault <vlaaad at sourcemage.org>
-	* graphics/povray,megapov: moved to z-rejected/z-graphics,
-	  have licensing issues (bug #12963)
+2006-11-11 George Sherwood <george at beernabeer.com>
+	* chat-im/eb-lite: removed. Not developed.  Won't build.
+
+2006-10-29 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* libs/sdl_pango: new spell (guess what it does) #13217
+
+2006-10-21 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* accounts, groups: added iplog
 
 2006-06-21 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* libcompat: replaced fast_up_depends with show_up_depends, bug #12665,
diff --git a/accounts b/accounts
index abb6756..fb5df8a 100755
--- a/accounts
+++ b/accounts
@@ -54,3 +54,4 @@ silcd:147:145
 anubis:148:146
 nagios:149:149
 nagcmd:150:150
+iplog:156:156
diff --git a/archive/arc/BUILD b/archive/arc/BUILD
index 94a7d55..da02b75 100755
--- a/archive/arc/BUILD
+++ b/archive/arc/BUILD
@@ -1,4 +1,5 @@
   sedit  "s:-O:$CFLAGS:"  Makefile                  &&
   patch -p1 < $SCRIPT_DIRECTORY/arc521e-linux.diff  &&
+  patch -p1 < $SCRIPT_DIRECTORY/makefnam.patch  &&
   make
 
diff --git a/archive/arc/HISTORY b/archive/arc/HISTORY
index f54075d..2cc8f77 100644
--- a/archive/arc/HISTORY
+++ b/archive/arc/HISTORY
@@ -1,3 +1,6 @@
+2006-10-22 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* makefnam.patch: added RH patch to make it build #13147
+
 2005-11-29 Seth Woolley <seth at tautology.org>
 	* DETAILS: MD5 -> SHA512
 
diff --git a/archive/arc/makefnam.patch b/archive/arc/makefnam.patch
new file mode 100644
index 0000000..2cabd18
--- /dev/null
+++ b/archive/arc/makefnam.patch
@@ -0,0 +1,11 @@
+diff -uNr arc-5.21/marc.c arc-5.21/marc.c
+--- arc-5.21/marc.c	2003-10-31 03:22:36.000000000 +0100
++++ arc-5.21/marc.c	2005-05-21 10:40:22.000000000 +0200
+@@ -48,7 +48,6 @@
+ int nargs;			       /* number of arguments */
+ char *arg[];			       /* pointers to arguments */
+ {
+-    char *makefnam();		       /* filename fixup routine */
+     char *envfind();
+ #if	!_MTS
+     char *arctemp2, *mktemp();		/* temp file stuff */
diff --git a/archive/zip/BUILD b/archive/zip/BUILD
index f0ccd7c..4e02060 100755
--- a/archive/zip/BUILD
+++ b/archive/zip/BUILD
@@ -1,5 +1,5 @@
 cp  unix/Makefile  .  &&
-sedit  "s/-O2/$CFLAGS/"        Makefile  &&
+sedit  "s/CFLAGS = -O2/CFLAGS := \$(CFLAGS)/" Makefile &&
 sedit  "s:/usr/local:/usr:"    Makefile  &&
 sedit  "s:/man/:/share/man/:"  Makefile  &&
 
diff --git a/archive/zip/HISTORY b/archive/zip/HISTORY
index 1f8ebf8..053afa4 100644
--- a/archive/zip/HISTORY
+++ b/archive/zip/HISTORY
@@ -1,3 +1,6 @@
+2006-10-21 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* BUILD: use a better CFLAGS sedit #10554
+
 2005-11-29 Seth Woolley <seth at tautology.org>
 	* DETAILS: MD5 -> SHA512
 
diff --git a/audio-plugins/xmms-crossfade/DETAILS b/audio-plugins/xmms-crossfade/DETAILS
index d53be82..6569141 100755
--- a/audio-plugins/xmms-crossfade/DETAILS
+++ b/audio-plugins/xmms-crossfade/DETAILS
@@ -1,12 +1,11 @@
            SPELL=xmms-crossfade
-         VERSION=0.2.9
+         VERSION=0.3.11
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://www.netcologne.de/~nc-eisenlpe2/$SPELL/$SOURCE
-        WEB_SITE=http://www.netcologne.de/~nc-eisenlpe2/xmms-crossfade/
+   SOURCE_URL[0]=http://www.eisenlohr.org/$SPELL/$SOURCE
+        WEB_SITE=http://www.eisenlohr.org/xmms-crossfade/index.html
          ENTERED=20020129
-         UPDATED=20020129
-   SOURCE_HASH=sha512:40044dd3c7823353452bcc7c407139ed7a63c68e69008dc9e09754a43c62f6874dfbc667ef78c8d12c21f05a85bb992ce583253227b7536bf55be206d8f0b166
+   SOURCE_HASH=sha512:e5d80d1dd04c6aef11c0c47de66cb2b166582fe40339fc76b56997c1f6c678cf0d7238bb9b8b024d3c18ad44eb94d916b477306b94ea15631e853c6c0401440b
 	LICENSE[0]=GPL
 	MAINTAINER=unet at sourcemage.org
            SHORT="A XMMS Crossfader."
diff --git a/audio-plugins/xmms-crossfade/HISTORY b/audio-plugins/xmms-crossfade/HISTORY
index 21a862c..c474fec 100644
--- a/audio-plugins/xmms-crossfade/HISTORY
+++ b/audio-plugins/xmms-crossfade/HISTORY
@@ -1,3 +1,7 @@
+2006-10-08 Lubomir Blaha <tritol at trilogic.cz>
+	* Upgrade to version 0.3.11 - fixes #12281
+	* DETAILS: SOURCE_URL and WEB_SITE updated.
+
 2005-11-29 Seth Woolley <seth at tautology.org>
 	* DETAILS: MD5 -> SHA512
 
diff --git a/chat-im/eb-lite/BUILD b/chat-im/eb-lite/BUILD
deleted file mode 100755
index 9f1a9f2..0000000
--- a/chat-im/eb-lite/BUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-  export COREDIR=$SOURCE_DIRECTORY/core                     &&
-  export EBQTDIR=$SOURCE_DIRECTORY/ebqt                     && 
-#core
-  cd $COREDIR                                              &&
-  ./configure --prefix=${INSTALL_ROOT}/usr  \
-          --sysconfdir=${INSTALL_ROOT}/etc  \
-       --localstatedir=${INSTALL_ROOT}/var                  &&
-  make                                                      &&
-#ebqt
-  cd $EBQTDIR                                           &&
-    ./configure --prefix=${INSTALL_ROOT}/usr  \
-          --sysconfdir=${INSTALL_ROOT}/etc  \
-       --localstatedir=${INSTALL_ROOT}/var                  &&
-  make
diff --git a/chat-im/eb-lite/DEPENDS b/chat-im/eb-lite/DEPENDS
deleted file mode 100755
index 006d2d1..0000000
--- a/chat-im/eb-lite/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends	 qt-x11
diff --git a/chat-im/eb-lite/DETAILS b/chat-im/eb-lite/DETAILS
deleted file mode 100755
index 68f623a..0000000
--- a/chat-im/eb-lite/DETAILS
+++ /dev/null
@@ -1,19 +0,0 @@
-           SPELL=eb-lite
-         VERSION=alpha-13
-          SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://www.everybuddy.com/eb-lite/files/$SOURCE
-        WEB_SITE=http://www.everybuddy.com/eb-lite
-	BUILD_API=2
-         ENTERED=20040628
-         UPDATED=20040628
-      LICENSE[0]=GPL
-     SOURCE_HASH=sha512:0835b21b8e45860f3c50f9538bd6283b0b263e96a9f4056b2feb8cccac2f821f76b52f37e70a8af88375e73d056f4a7f792ba1b0aefa00b6c37764fdd3465e1c
-           SHORT="EB-lite is a universal instant messaging client"
-cat << EOF
-EB-lite is the name of the rewrite that is being developed of the instant
- messaging client Everybuddy.  It carries many major advances on the
- current codebase, the biggest of which is that the user interface is
- not contained in the same process as the core.  Currently only stable 
-UI is ebqt.  
-EOF
diff --git a/chat-im/eb-lite/HISTORY b/chat-im/eb-lite/HISTORY
deleted file mode 100644
index 659711c..0000000
--- a/chat-im/eb-lite/HISTORY
+++ /dev/null
@@ -1,11 +0,0 @@
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2004-11-25 George Sherwood <george at beernabeer.com>
-	* DETAILS: Added BUILD_API=2
-	* BUILD: fixed for BUILD_API=2
-	* INSTALL: added file for BUILD_API=2
-
-2004-06-29 George Sherwood <george at beernabeer.com>
-	* Added this spell
-
diff --git a/chat-im/eb-lite/INSTALL b/chat-im/eb-lite/INSTALL
deleted file mode 100755
index 053c39a..0000000
--- a/chat-im/eb-lite/INSTALL
+++ /dev/null
@@ -1,4 +0,0 @@
-  cd $COREDIR                                               &&
-  make install                                              &&
-  cd $EBQTDIR                                               &&
-  make install
diff --git a/cluster/atlas/BUILD b/cluster/atlas/BUILD
index 7976124..7d40b47 100755
--- a/cluster/atlas/BUILD
+++ b/cluster/atlas/BUILD
@@ -1,6 +1,10 @@
 persistent_add  SOURCE_LIB                           &&
 make_single                                          &&
-make < $SCRIPT_DIRECTORY/atlas-${VERSION}.config     &&
+local config=$(<$SCRIPT_DIRECTORY/atlas-nog77.config) &&
+if is_depends_enabled $SPELL fortran; then
+  config=$(sed 's/0$/\ngfortran/' <<< "$config")
+fi &&
+echo "$config" | make      &&
 ARCH=`ls -1 Make.Linux* | sed -e 's/Make.//'`        &&
 make  install  arch=$ARCH                            &&
 SOURCE_LIB=$SOURCE_DIRECTORY/lib/$ARCH
diff --git a/cluster/atlas/DEPENDS b/cluster/atlas/DEPENDS
new file mode 100755
index 0000000..0497e32
--- /dev/null
+++ b/cluster/atlas/DEPENDS
@@ -0,0 +1 @@
+optional_depends fortran "" "" "for fortran bindings"
diff --git a/cluster/atlas/DETAILS b/cluster/atlas/DETAILS
index 963f020..c5a7461 100755
--- a/cluster/atlas/DETAILS
+++ b/cluster/atlas/DETAILS
@@ -6,10 +6,13 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/ATLAS
      SOURCE_HASH=sha512:0272f94e4e452d240741336a65450d9767150c886681e3f88bcdbebeb18ceba7d489f848ec2824ef0ce1dd33f8cb122e8d87e64d5f19407d02801b775fce2f73
         WEB_SITE=http://math-atlas.sourceforge.net
          ENTERED=20020514
-         UPDATED=20021014
+      PATCHLEVEL=1
       LICENSE[0]=BSD
        BUILD_API=2
            SHORT="Automatically Tuned Linear Algebra Software (ATLAS)"
 cat << EOF
-ATLAS (Automatically Tuned Linear Algebra Software) provides highly optimized Linear Algebra kernels for arbitrary cache-based architectures. ATLAS provides ANSI C and Fortran77 interfaces for the entire BLAS API, and a small portion of the LAPACK API.
+ATLAS (Automatically Tuned Linear Algebra Software) provides highly optimized
+Linear Algebra kernels for arbitrary cache-based architectures. ATLAS provides
+ANSI C and Fortran77 interfaces for the entire BLAS API, and a small portion of
+the LAPACK API.
 EOF
diff --git a/cluster/atlas/HISTORY b/cluster/atlas/HISTORY
index 25c36ce..c689e0b 100644
--- a/cluster/atlas/HISTORY
+++ b/cluster/atlas/HISTORY
@@ -1,3 +1,9 @@
+2006-11-01 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DEPENDS: add optional fortran
+	* BUILD: add fortran when requested and fix #9380
+	* atlas-nog77.config: renamed; make doesn't like <, part of #9380
+	* DETAILS: ++PATCHLEVEL
+
 2005-11-29 Seth Woolley <seth at tautology.org>
 	* DETAILS: MD5 -> SHA512
 
diff --git a/cluster/atlas/atlas-3.6.0.config b/cluster/atlas/atlas-3.6.0.config
deleted file mode 100644
index efdac28..0000000
--- a/cluster/atlas/atlas-3.6.0.config
+++ /dev/null
@@ -1,7 +0,0 @@
-025
-y
-y
-y
-
-0
-y
diff --git a/cluster/atlas/atlas-nog77.config b/cluster/atlas/atlas-nog77.config
new file mode 100644
index 0000000..8b96497
--- /dev/null
+++ b/cluster/atlas/atlas-nog77.config
@@ -0,0 +1,9 @@
+025
+y
+y
+n
+y
+
+
+0
+
diff --git a/collab/minimalist/BUILD b/collab/minimalist/BUILD
index 9d68310..27ba77d 100755
--- a/collab/minimalist/BUILD
+++ b/collab/minimalist/BUILD
@@ -1,36 +1 @@
-# $Id: BUILD,v 1.2 2002/06/03 03:42:23 sergeyli Exp $
-{
-# First, add the global entry in aliases
-echo " " > /etc/aliases.minimalist-sample &&
-echo "# minimalist global entry:" >> /etc/aliases.minimalist-sample &&
-echo "minimalist:	\"|/usr/sbin/minimalist.pl -d /etc/minimalist\"" >> /etc/aliases.minimalist-sample &&
-echo "#" >> /etc/aliases.minimalist-sample &&
-echo "# sample mailing list:" >> /etc/aliases.minimalist-sample &&
-echo "list-sample:	\"|/usr/sbin/minimalist.pl -d /etc/minimalist list-sample\"" >> /etc/aliases.minimalist-sample &&
-echo "list-sample-owner:	owner at myhost.mydomain.myzone" >> /etc/aliases.minimalist-sample &&
-
-# Create config files directory
-mkdir -p /etc/minimalist						&&
-
-# Copy sample files
-cp ./sample/lists.lst /etc/minimalist/lists.lst-sample			&&
-cp -r ./sample/sample /etc/minimalist/					&&
-cp ./minimalist.conf-sample /etc/minimalist/				&&
-
-# Copy the progam file...
-cp -v ./minimalist.pl /usr/sbin						&&
-
-# Make spool dir
-mkdir -p /var/spool/minimalist						&&
-mkdir -p /var/spool/minimalist/list-sample				&&
-echo "user at domain.zone" > /var/spool/minimalist/list-sample/list	&&
-chown nobody.nogroup /var/spool/minimalist/list-sample			&&
-chown nobody.nogroup /var/spool/minimalist/list-sample/list		&&
-
-# Copy the help files
-mkdir -p /usr/doc/minimalist						&&
-cp -r ./docs /usr/doc/minimalist
-
-} > $C_FIFO 2>&1
-
-
+true
diff --git a/collab/minimalist/DETAILS b/collab/minimalist/DETAILS
index 3993612..e7bb1ba 100755
--- a/collab/minimalist/DETAILS
+++ b/collab/minimalist/DETAILS
@@ -1,6 +1,6 @@
            SPELL=minimalist
          VERSION=2.5.3
-     SOURCE_HASH='sha1:b3693cfb67c4d6be0518d5d70d6205b2f65fbced'
+     SOURCE_HASH=sha512:e2a7e915fd6277d6b2a8efc2c243ca57c620329f47d698e925f20bb5344ed53b472158ca09b4d986a47b3a8633838fd156db8536d4ff89f2b6c4680350910156
           SOURCE=$SPELL-$VERSION.tar.gz
       LICENSE[0]=BSD
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/collab/minimalist/FINAL b/collab/minimalist/FINAL
new file mode 100755
index 0000000..545820a
--- /dev/null
+++ b/collab/minimalist/FINAL
@@ -0,0 +1,3 @@
+message " "
+message "${MESSAGE_COLOR}Don't forget to read docs when using postfix (!) ${DEFAULT_COLOR}"
+message " "
diff --git a/collab/minimalist/HISTORY b/collab/minimalist/HISTORY
index eb62132..4995816 100644
--- a/collab/minimalist/HISTORY
+++ b/collab/minimalist/HISTORY
@@ -1,3 +1,7 @@
+2006-10-23 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* POST_REMOVE, PRE_REMOVE: REMOVED #5216
+	* converted to BUILD_API=2
+
 2005-10-03 Sergey Lipnevich <sergey at sourcemage.org>
 	* DETAILS: upgrade to 2.5.3; minor changes.
 
diff --git a/collab/minimalist/INSTALL b/collab/minimalist/INSTALL
new file mode 100755
index 0000000..94e767a
--- /dev/null
+++ b/collab/minimalist/INSTALL
@@ -0,0 +1,32 @@
+# First, add the global entry in aliases
+cat << EOF > /etc/aliases.minimalist-sample
+
+# minimalist global entry:
+minimalist:	"|/usr/sbin/minimalist.pl -d /etc/minimalist" 
+#
+# sample mailing list:
+list-sample:	"|/usr/sbin/minimalist.pl -d /etc/minimalist list-sample"
+list-sample-owner:	owner at myhost.mydomain.myzone
+EOF
+
+# Create config files directory
+mkdir -p /etc/minimalist						&&
+
+# Copy sample files
+cp ./sample/lists.lst /etc/minimalist/lists.lst-sample			&&
+cp -r ./sample/sample /etc/minimalist/					&&
+cp ./minimalist.conf-sample /etc/minimalist/				&&
+
+# Copy the progam file...
+cp -v ./minimalist.pl /usr/sbin						&&
+
+# Make spool dir
+mkdir -p /var/spool/minimalist						&&
+mkdir -p /var/spool/minimalist/list-sample				&&
+echo "user at domain.zone" > /var/spool/minimalist/list-sample/list	&&
+chown nobody.nogroup /var/spool/minimalist/list-sample			&&
+chown nobody.nogroup /var/spool/minimalist/list-sample/list		&&
+
+# Copy the help files
+mkdir -p /usr/doc/minimalist						&&
+cp -r ./docs /usr/doc/minimalist
diff --git a/collab/minimalist/POST_INSTALL b/collab/minimalist/POST_INSTALL
deleted file mode 100755
index 93bd9bc..0000000
--- a/collab/minimalist/POST_INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-# $Id: POST_INSTALL,v 1.2 2002/06/03 03:42:23 sergeyli Exp $
-{
-message " "
-message "${MESSAGE_COLOR}Don't forget to read docs when using postfix (!) ${DEFAULT_COLOR}"
-message " "
-}
diff --git a/collab/minimalist/POST_REMOVE b/collab/minimalist/POST_REMOVE
deleted file mode 100755
index c7670cd..0000000
--- a/collab/minimalist/POST_REMOVE
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id: POST_REMOVE,v 1.2 2002/06/03 03:42:23 sergeyli Exp $
-{
-# Clean /etc
-rm -f /etc/aliases.minimalist-sample
-# Clean work dir
-rm -r -f /var/spool/minimalist/list-sample
-rmdir --ignore-fail-on-non-empty /var/spool/minimalist
-}
diff --git a/collab/minimalist/PRE_REMOVE b/collab/minimalist/PRE_REMOVE
deleted file mode 100755
index 30f159c..0000000
--- a/collab/minimalist/PRE_REMOVE
+++ /dev/null
@@ -1,6 +0,0 @@
-# $Id: PRE_REMOVE,v 1.2 2002/06/03 03:42:23 sergeyli Exp $
-if query "Backup package config ?" y
-then
- CUR_DATE=`date +%s`
- tar -c --use-compress-program=bzip2 -f "/etc/minimalist-backup-$CUR_DATE.tar.bz2" /etc/minimalist /var/spool/minimalist 1>/dev/null 2>&1
-fi
diff --git a/editors/lyx/DEPENDS b/editors/lyx/DEPENDS
index 1e33d9d..221020b 100755
--- a/editors/lyx/DEPENDS
+++ b/editors/lyx/DEPENDS
@@ -73,5 +73,5 @@ optional_depends  xdvi "" ""
                   "for dvi viewer integration."                          &&
 optional_depends  xpdf "" ""                                              \
                   "for xpdf .pdf viewer integration."                    &&
-optional_depends  GECKO "" ""                                             \
+runtime_depends  WEB-BROWSER  ""                                             \
                   "for html previewing."
diff --git a/editors/lyx/HISTORY b/editors/lyx/HISTORY
index b2c765a..576ed3e 100644
--- a/editors/lyx/HISTORY
+++ b/editors/lyx/HISTORY
@@ -1,3 +1,7 @@
+2006-11-12 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DEPENDS: use runtime_depends; generic browser
+	* PRE_BUILD: fix the substitution for WEB-BROWSER #13062
+
 2006-01-19 Arwed v. Merkatz <v.merkatz at gmx.net>
 	* PRE_BUILD: handle GECKO providers
 
diff --git a/editors/lyx/PRE_BUILD b/editors/lyx/PRE_BUILD
index 6d60624..a236fa1 100755
--- a/editors/lyx/PRE_BUILD
+++ b/editors/lyx/PRE_BUILD
@@ -1,7 +1,3 @@
 default_pre_build      &&
 cd  $SOURCE_DIRECTORY  &&
-if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
-  sedit  's/mozilla/firefox/'  lib/configure
-elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
-  sedit  's/mozilla/seamonkey/'  lib/configure
-fi
+sed -i "s/mozilla/$(get_spell_provider $SPELL WEB-BROWSER)/" lib/configure.py
diff --git a/groups b/groups
index 2a8d4bc..c325e35 100755
--- a/groups
+++ b/groups
@@ -57,5 +57,5 @@ silcd:145:
 anubis:146:
 nagios:149:
 nagcmd:150:
-nogroup:65534:
 scanner:151:
+iplog:156:
diff --git a/http/bfilter/DEPENDS b/http/bfilter/DEPENDS
index ff58e62..570882b 100755
--- a/http/bfilter/DEPENDS
+++ b/http/bfilter/DEPENDS
@@ -2,4 +2,4 @@ depends g++ &&
 depends ace &&
 depends libsigc++3 &&
 depends zlib &&
-optional_depends gtkmm "--with-gui=yes" "--with-gui=no" "enable GUI support"
+optional_depends gtkmm2 "--with-gui=yes" "--with-gui=no" "enable GUI support"
diff --git a/http/bfilter/HISTORY b/http/bfilter/HISTORY
index bc00b05..0c89a1e 100644
--- a/http/bfilter/HISTORY
+++ b/http/bfilter/HISTORY
@@ -1,4 +1,7 @@
-2006-02-17 Andrew "ruskie" Levstik <ruskie at mages.ath.cx>
+2006-11-11 <dinolinux at gmail.com>
+	* DEPENDS: updated to use gtkmm2 instead of gtkmm #12653
+
+2006-02-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: version update 0.10.3
 
 2005-11-02 Andrew "ruskie" Levstik <ruskie at mages.ath.cx>
diff --git a/kde-core/kde-i18n/CONFIGURE b/kde-core/kde-i18n/CONFIGURE
index 8a00645..0c000c9 100755
--- a/kde-core/kde-i18n/CONFIGURE
+++ b/kde-core/kde-i18n/CONFIGURE
@@ -4,8 +4,6 @@ CFG=$SPELL_CONFIG
 
 get_kdelanguages()  {
   local  i  LANGUAGE  LANGUAGES  &&
-  if  [  "$KDE_I18N_CONFIGURE"  =  "y"  ]
-  then
     rm  -f  $CFG                                                   &&
     touch  $CFG                                                    &&
     LANGUAGES=`cat $SCRIPT_DIRECTORY/kde.languages`                &&
@@ -44,14 +42,14 @@ get_kdelanguages()  {
 #      echo  SOURCE_URL[0]=${SITE/$SPELL\//}/\$SOURCE   >>  $CFG  &&
 #      echo  MD5[0]="b178f0c33f5f1c70d3bc1e9d31cd7cae"  >>  $CFG
     fi
-  else
-    message  "${MESSAGE_COLOR}Using existing config${DEFAULT_COLOR}"  &&
-    sedit  "s/3\.[0-9]\.[0-9]\?/$VERSION/g"  $CFG
-  fi
 }
 
-config_query  KDE_I18N_CONFIGURE  "Reconfigure?"  n  &&
-
-get_kdelanguages  &&
+if query "Reconfigure?"  n
+then
+  get_kdelanguages
+else
+  message  "${MESSAGE_COLOR}Using existing config${DEFAULT_COLOR}"  &&
+  sedit  "s/3\.[0-9]\.[0-9]\?/$VERSION/g"  $CFG
+fi &&
 
 .  $CFG
diff --git a/kde-core/kde-i18n/HISTORY b/kde-core/kde-i18n/HISTORY
index 4aeb956..7514127 100644
--- a/kde-core/kde-i18n/HISTORY
+++ b/kde-core/kde-i18n/HISTORY
@@ -1,3 +1,7 @@
+2006-11-12 Thomas Orgis <sobukus at sourcemage.org>
+	* CONFIGURE: reconfigure always shall dfault to n,
+	  removing the config_ from the query
+
 2006-02-02 Treeve Jelbert <treeve01 at pi.be>
 	* DETAILS: version 3.5.1
 
diff --git a/kde-core/kdegames/BUILD b/kde-core/kdegames/BUILD
index 9867507..fea0a6a 100755
--- a/kde-core/kdegames/BUILD
+++ b/kde-core/kdegames/BUILD
@@ -1,4 +1,5 @@
 OPTS="$KDEGAMES_HIGHSCORE  \
       $OPTS"               &&
 
-source  $SECTION_DIRECTORY/KDE_BUILD
+source  $SECTION_DIRECTORY/KDE_BUILD  &&
+create_account  games
diff --git a/kde-core/kdegames/CONFIGURE b/kde-core/kdegames/CONFIGURE
index a1bd619..2916c2e 100755
--- a/kde-core/kdegames/CONFIGURE
+++ b/kde-core/kdegames/CONFIGURE
@@ -1,4 +1,9 @@
-source  $SECTION_DIRECTORY/KDE_CONFIGURE  &&
+source  "$SECTION_DIRECTORY/KDE_CONFIGURE"  &&
 
-config_query_option  KDEGAMES_HIGHSCORE  'Use system-wide high scores?'  n  \
-                     '--enable-highscore-dir=/var/games'  ''
+# User has to be root, otherwise install will set it to games
+config_query_option  KDEGAMES_HIGHSCORE                        \
+                     "Enable system-wide highscore table?"  n  \
+                     "--enable-highscore-dir=/var/games        \
+                      --with-highscore-user=root               \
+                      --with-highscore-group=games"            \
+                     ""
diff --git a/kde-core/kdegames/DEPENDS b/kde-core/kdegames/DEPENDS
index be05387..f5729c5 100755
--- a/kde-core/kdegames/DEPENDS
+++ b/kde-core/kdegames/DEPENDS
@@ -1,3 +1,23 @@
 depends  kdebase  &&
 
-source  $SECTION_DIRECTORY/KDE_DEPENDS
+source  "$SECTION_DIRECTORY/KDE_DEPENDS"  &&
+
+optional_depends  libxml2                    \
+                  ''                         \
+                  ''                         \
+                  'for a C++ XML interface'  &&
+
+optional_depends  libxslt             \
+                  ''                  \
+                  ''                  \
+                  'for XSLT support'  &&
+
+optional_depends  freetype2               \
+                  ''                      \
+                  ''                      \
+                  'for FreeType support'  &&
+
+optional_depends  fontconfig                  \
+                  ''                          \
+                  ''                          \
+                  'to configure font access'
diff --git a/kde-core/kdegames/DETAILS b/kde-core/kdegames/DETAILS
index fc938c3..85e1f74 100755
--- a/kde-core/kdegames/DETAILS
+++ b/kde-core/kdegames/DETAILS
@@ -1,11 +1,10 @@
-source  $SECTION_DIRECTORY/KDE_DETAILS
+source  "$SECTION_DIRECTORY/KDE_DETAILS"  &&
 
            SPELL=kdegames
          VERSION=3.5.1
      SOURCE_HASH=sha512:a832163d9bb8850d9bf879b564f92ef3b2e29aaba5f4a77627fe4d4eae01fac5df36e5413f375964f43e874828880f3f8da838a8a3934e0b5634c207c34efa84
           SOURCE=$SPELL-$VERSION.tar.bz2
-
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
        BUILD_API=2
         WEB_SITE=http://www.kde.org
@@ -14,5 +13,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
       LICENSE[0]=GPL
            SHORT="Various games like mahjongg, snake, asteroids, and tetris."
 cat << EOF
-Various games like mahjongg, snake, asteroids, and tetris.
+This is a compilation of various games:
+
+atlantik, kasteroids, katomic, kbackgammon, kbattleship, kblackbox, kbounce, 
+keneloba, kfouleggs, kjumpingcube, klickety, klines, mahjongg, kmines, kolf, 
+konquest, kpat kpoker, kreversi, ksame, kshisen, ksirtet, ksmiletris, ksnake, 
+ksokoban, kspaceduel, ktron, ktuberling, kwin4, lskat.
 EOF
diff --git a/kde-core/kdegames/HISTORY b/kde-core/kdegames/HISTORY
index c7fee27..3d7af9f 100644
--- a/kde-core/kdegames/HISTORY
+++ b/kde-core/kdegames/HISTORY
@@ -1,3 +1,13 @@
+2006-10-23 Juuso Alasuutari <iuso at sourcemage.org>
+	* CONFIGURE: Set highscore files' group to games and user to 
+	  root for system-wide highscore table (user setting is needed, 
+	  otherwise install sets it to games).
+	* BUILD: Added 'create_account games'.
+	* INSTALL: Added, set group write perms for highscore files 
+	  (bug #13203).
+	* DEPENDS: Added missing &&, minor polish.
+	* DETAILS: Added missing &&, edited long description.
+
 2006-02-01 Treeve Jelbert <treeve01 at pi.be>
 	* DETAILS: version 3.5.1
 
diff --git a/kde-core/kdegames/INSTALL b/kde-core/kdegames/INSTALL
new file mode 100755
index 0000000..fb9884f
--- /dev/null
+++ b/kde-core/kdegames/INSTALL
@@ -0,0 +1,6 @@
+default_install  &&
+
+# bug 13203
+if [[ $KDEGAMES_HIGHSCORE ]]; then
+  chmod 664  ${INSTALL_ROOT}/var/games/*.scores
+fi
diff --git a/libs/apr-util/DETAILS b/libs/apr-util/DETAILS
index c3b4f64..9100202 100755
--- a/libs/apr-util/DETAILS
+++ b/libs/apr-util/DETAILS
@@ -17,7 +17,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
       LICENSE[0]=APACHE
        BUILD_API=2
          ENTERED=20030302
-         UPDATED=20050531
+      PATCHLEVEL=1
+        KEYWORDS="libs"
            SHORT='Apache Portable Runtime Utility (APU) Library'
 cat << EOF
 Apache Portable Runtime Utility library provides various services
diff --git a/libs/apr-util/HISTORY b/libs/apr-util/HISTORY
index a9776a4..efe873e 100644
--- a/libs/apr-util/HISTORY
+++ b/libs/apr-util/HISTORY
@@ -1,3 +1,8 @@
+2006-10-20 Juuso Alasuutari <iuso at sourcemage.org>
+	* TRIGGERS: Substituted broken conditional with 
+	  is_depends_enabled, changed 'on_cast db cast_self' to 
+	  check_self, added PATCHLEVEL=1, removed UPDATED.
+
 2005-12-29 Eric Sandall <eric at sandall.us>
 	* DETAILS: Use archive.apache.org instead of www.apache.org as
 	  www.apache.org only hosts the latest version while archive.apache.org
diff --git a/libs/apr-util/TRIGGERS b/libs/apr-util/TRIGGERS
index d3adcba..8ac69b7 100755
--- a/libs/apr-util/TRIGGERS
+++ b/libs/apr-util/TRIGGERS
@@ -1,4 +1,10 @@
-on_cast apr cast_self &&
-if grep -q '^apr-util:db:on:' /var/state/sorcery/depends; then
-  on_cast db cast_self
+on_cast  apr  cast_self  &&
+
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source  "$GRIMOIRE/is_depends_enabled.function"  &&
+
+if is_depends_enabled $SPELL db; then
+  on_cast  db  check_self
 fi
diff --git a/libs/apr-util0/DETAILS b/libs/apr-util0/DETAILS
index 555bbb6..98a9da7 100755
--- a/libs/apr-util0/DETAILS
+++ b/libs/apr-util0/DETAILS
@@ -17,7 +17,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/apr-ut
       LICENSE[0]=APACHE
        BUILD_API=2
          ENTERED=20030302
-         UPDATED=20050122
+      PATCHLEVEL=1
+        KEYWORDS="libs"
            SHORT='Apache Portable Runtime Utility (APU) Library'
 cat << EOF
 Apache Portable Runtime Utility library provides various services
diff --git a/libs/apr-util0/HISTORY b/libs/apr-util0/HISTORY
index 260f3ca..fa71690 100644
--- a/libs/apr-util0/HISTORY
+++ b/libs/apr-util0/HISTORY
@@ -1,3 +1,8 @@
+2006-10-20 Juuso Alasuutari <iuso at sourcemage.org>
+	* TRIGGERS: Substituted broken conditional with 
+	  is_depends_enabled, changed 'on_cast db cast_self' to 
+	  check_self, added PATCHLEVEL=1, removed UPDATED.
+
 2005-11-30 Seth Woolley <seth at tautology.org>
 	* DETAILS: MD5 IGNORE to SOURCE_HASH volatile
 
diff --git a/libs/apr-util0/TRIGGERS b/libs/apr-util0/TRIGGERS
index acf1474..6653e1c 100755
--- a/libs/apr-util0/TRIGGERS
+++ b/libs/apr-util0/TRIGGERS
@@ -1,4 +1,10 @@
-on_cast apr0 cast_self &&
-if grep -q '^apr-util0:db:on:' /var/state/sorcery/depends; then
-  on_cast db cast_self
+on_cast  apr0  cast_self  &&
+
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source  "$GRIMOIRE/is_depends_enabled.function"  &&
+
+if is_depends_enabled $SPELL db; then
+  on_cast  db  check_self
 fi
diff --git a/libs/sdl_pango/CONFIGURE b/libs/sdl_pango/CONFIGURE
new file mode 100755
index 0000000..59f138d
--- /dev/null
+++ b/libs/sdl_pango/CONFIGURE
@@ -0,0 +1,2 @@
+config_query FB_PATCH "Do you want to patch $SPELL for Frozen Bubble 2.0.0?" n
+
diff --git a/libs/sdl_pango/DEPENDS b/libs/sdl_pango/DEPENDS
new file mode 100755
index 0000000..73a7f16
--- /dev/null
+++ b/libs/sdl_pango/DEPENDS
@@ -0,0 +1,3 @@
+depends sdl  &&
+depends glib2 &&
+depends pango
diff --git a/libs/sdl_pango/DETAILS b/libs/sdl_pango/DETAILS
new file mode 100755
index 0000000..5f18ad7
--- /dev/null
+++ b/libs/sdl_pango/DETAILS
@@ -0,0 +1,14 @@
+           SPELL=sdl_pango
+         VERSION=0.1.2
+          SOURCE=SDL_Pango-${VERSION}.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/SDL_Pango-${VERSION}
+   SOURCE_URL[0]=${SOURCEFORGE_URL}/sdlpango/${SOURCE}
+     SOURCE_HASH=sha512:081ec57e0f55ce541c35393d6db7ea48b662a5008760781076d70c0a645d47f7e994f695c459ed51f8cb71494911a04cd416733fb57934321b806a1ac9878440
+      LICENSE[0]=GPL
+        WEB_SITE=http://sdlpango.sourceforge.net
+         ENTERED=20061028
+           SHORT="SDL_Pango connects pango to SDL"
+cat << EOF
+Pango is the text rendering engine of GNOME 2. SDL_Pango connects that engine
+to SDL, the Simple DirectMedia Layer.
+EOF
diff --git a/libs/sdl_pango/HISTORY b/libs/sdl_pango/HISTORY
new file mode 100644
index 0000000..0e440f1
--- /dev/null
+++ b/libs/sdl_pango/HISTORY
@@ -0,0 +1,2 @@
+2006-10-27 Philippe "Puppet_Master" Caseiro <caseiro.philippe at gmail.com>
+	* Initial spell
diff --git a/libs/sdl_pango/PRE_BUILD b/libs/sdl_pango/PRE_BUILD
new file mode 100755
index 0000000..8a0a433
--- /dev/null
+++ b/libs/sdl_pango/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+if [[  "$FB_PATCH"  ==  "y" ]];  then
+  cd $SOURCE_DIRECTORY
+  patch -p0 src/SDL_Pango.c $SPELL_DIRECTORY/SDL_Pango-0.1.2-API-adds.patch 
+fi   
+
+
diff --git a/libs/sdl_pango/SDL_Pango-0.1.2-API-adds.patch b/libs/sdl_pango/SDL_Pango-0.1.2-API-adds.patch
new file mode 100644
index 0000000..1535a56
--- /dev/null
+++ b/libs/sdl_pango/SDL_Pango-0.1.2-API-adds.patch
@@ -0,0 +1,116 @@
+--- src/SDL_Pango.c	2004-12-10 10:06:33.000000000 +0100
++++ src/SDL_Pango.c	2006-09-24 22:46:24.000000000 +0200
+@@ -723,13 +723,8 @@
+     SDL_UnlockSurface(surface);
+ }
+ 
+-/*!
+-    Create a context which contains Pango objects.
+-
+-    @return A pointer to the context as a SDLPango_Context*.
+-*/
+ SDLPango_Context*
+-SDLPango_CreateContext()
++SDLPango_CreateContext_GivenFontDesc(const char* font_desc)
+ {
+     SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context));
+     G_CONST_RETURN char *charset;
+@@ -743,8 +738,7 @@
+     pango_context_set_language (context->context, pango_language_from_string (charset));
+     pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR);
+ 
+-    context->font_desc = pango_font_description_from_string(
+-	MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
++    context->font_desc = pango_font_description_from_string(font_desc);
+ 
+     context->layout = pango_layout_new (context->context);
+ 
+@@ -762,6 +756,17 @@
+ }
+ 
+ /*!
++    Create a context which contains Pango objects.
++
++    @return A pointer to the context as a SDLPango_Context*.
++*/
++SDLPango_Context*
++SDLPango_CreateContext()
++{
++     SDLPango_CreateContext_GivenFontDesc(MAKE_FONT_NAME(DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
++}
++
++/*!
+     Free a context.
+ 
+     @param *context [i/o] Context to be free
+@@ -1053,6 +1058,20 @@
+     pango_layout_set_font_description (context->layout, context->font_desc);
+ }
+ 
++void
++SDLPango_SetText_GivenAlignment(
++    SDLPango_Context *context,
++    const char *text,
++    int length,
++    SDLPango_Alignment alignment)
++{
++    pango_layout_set_attributes(context->layout, NULL);
++    pango_layout_set_text (context->layout, text, length);
++    pango_layout_set_auto_dir (context->layout, TRUE);
++    pango_layout_set_alignment (context->layout, alignment);
++    pango_layout_set_font_description (context->layout, context->font_desc);
++}
++
+ /*!
+     Set plain text to context.
+     Text must be utf-8.
+@@ -1067,11 +1086,7 @@
+     const char *text,
+     int length)
+ {
+-    pango_layout_set_attributes(context->layout, NULL);
+-    pango_layout_set_text (context->layout, text, length);
+-    pango_layout_set_auto_dir (context->layout, TRUE);
+-    pango_layout_set_alignment (context->layout, PANGO_ALIGN_LEFT);
+-    pango_layout_set_font_description (context->layout, context->font_desc);
++     SDLPango_SetText_GivenAlignment(context, text, length, SDLPANGO_ALIGN_LEFT);
+ }
+ 
+ /*!
+--- src/SDL_Pango.h	2004-12-10 10:06:33.000000000 +0100
++++ src/SDL_Pango.h	2006-09-24 22:46:01.000000000 +0200
+@@ -109,12 +109,20 @@
+     SDLPANGO_DIRECTION_NEUTRAL	/*! Neutral */
+ } SDLPango_Direction;
+ 
+-
++/*!
++    Specifies alignment of text. See Pango reference for detail
++*/
++typedef enum {
++    SDLPANGO_ALIGN_LEFT,
++    SDLPANGO_ALIGN_CENTER,
++    SDLPANGO_ALIGN_RIGHT
++} SDLPango_Alignment;
+ 
+ extern DECLSPEC int SDLCALL SDLPango_Init();
+ 
+ extern DECLSPEC int SDLCALL SDLPango_WasInit();
+ 
++extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext_GivenFontDesc(const char* font_desc);
+ extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext();
+ 
+ extern DECLSPEC void SDLCALL SDLPango_FreeContext(
+@@ -157,6 +165,12 @@
+     const char *markup,
+     int length);
+ 
++extern DECLSPEC void SDLCALL SDLPango_SetText_GivenAlignment(
++    SDLPango_Context *context,
++    const char *text,
++    int length,
++    SDLPango_Alignment alignment);
++
+ extern DECLSPEC void SDLCALL SDLPango_SetText(
+     SDLPango_Context *context,
+     const char *markup,
diff --git a/security/iplog/BUILD b/security/iplog/BUILD
deleted file mode 100755
index 0406899..0000000
--- a/security/iplog/BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-./configure  --build=${BUILD}                     \
-             --prefix=${INSTALL_ROOT}/usr         \
-             --sysconfdir=${INSTALL_ROOT}/etc     \
-             --localstatedir=${INSTALL_ROOT}/var  \
-             ${OPTS}                              &&
-make
diff --git a/security/iplog/HISTORY b/security/iplog/HISTORY
index 96cbe81..732b2fb 100644
--- a/security/iplog/HISTORY
+++ b/security/iplog/HISTORY
@@ -1,3 +1,8 @@
+2006-10-21 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* PREPARE, BUILD: removed
+	* PRE_BUILD: added, fix compilation with sed
+	* INSTALL: added create_account #12980
+
 2005-11-29 Seth Woolley <seth at tautology.org>
 	* DETAILS: MD5 -> SHA512
 
diff --git a/security/iplog/INSTALL b/security/iplog/INSTALL
index f9fa671..a6abbe5 100755
--- a/security/iplog/INSTALL
+++ b/security/iplog/INSTALL
@@ -1,3 +1,4 @@
+create_account iplog &&
 default_install  &&
 
 touch  /var/log/iplog  &&
diff --git a/security/iplog/PREPARE b/security/iplog/PREPARE
deleted file mode 100755
index babe10b..0000000
--- a/security/iplog/PREPARE
+++ /dev/null
@@ -1,13 +0,0 @@
-message "Creation of ${SPELL} user ${MESSAGE_COLOR} iplog ${DEFAULT_COLOR}."
-
-if  !  exists_account  iplog;  then
-    message "${MESSAGE_COLOR} ERROR:${DEFAULT_COLOR} The ${SPELL} user and group was not yet defined.";
-    message "Solution: "
-    message "          echo "iplog:120:120" >> /etc/sorcery/accounts"
-    message "          echo "iplog:120:" >> /etc/sorcery/groups"
-    return  1
-else
-    if  [  "`grep  'iplog'  /etc/passwd`"  ==  ""  ];  then
-        create_account  iplog
-    fi
-fi
diff --git a/security/iplog/PRE_BUILD b/security/iplog/PRE_BUILD
new file mode 100755
index 0000000..6c28f04
--- /dev/null
+++ b/security/iplog/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i '/"Usage: " PACKAGE "/,/--log-null-sc/ {
+  s/^\([^"]\)/"\1/
+  s/\([^",]\)$/\1\\n"/
+}' src/iplog_options.c
diff --git a/security/oinkmaster/BUILD b/security/oinkmaster/BUILD
index 55f536b..e930d44 100755
--- a/security/oinkmaster/BUILD
+++ b/security/oinkmaster/BUILD
@@ -1,13 +1 @@
-(
-
-  sedit  "s:/usr/local/etc/:/etc/:"  oinkmaster.pl		&&
- 
-  prepare_install					&&
-
-  cp  oinkmaster.pl  /usr/bin/				&&
-  chown  snort.snort  /usr/bin/oinkmaster.pl		&&
-  if  [  !  -f  /etc/oinkmaster.conf  ];  then 
-      cp  oinkmaster.conf  /etc/
-  fi
-
-) > $C_FIFO 2>&1
+create_account snort
diff --git a/security/oinkmaster/DEPENDS b/security/oinkmaster/DEPENDS
index 9d9f208..f29d487 100755
--- a/security/oinkmaster/DEPENDS
+++ b/security/oinkmaster/DEPENDS
@@ -1,4 +1 @@
-depends	 perl	&&
-depends	 tar	&&
-depends  gzip	&&
-depends	 wget	
\ No newline at end of file
+depends	 perl	
diff --git a/security/oinkmaster/DETAILS b/security/oinkmaster/DETAILS
index 168ddbd..73d56a1 100755
--- a/security/oinkmaster/DETAILS
+++ b/security/oinkmaster/DETAILS
@@ -1,16 +1,14 @@
            SPELL=oinkmaster
-         VERSION=0.9
+         VERSION=2.0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-     SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-#   SOURCE_URL[0]=http://www.snort.org/dl/contrib/rule_management/${SPELL}/${SOURCE}
-#SOURCE_URL[1]=ftp://ftp.it.su.se/pub/users/andreas/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:df3065a45edc343ee28c8b5e874ec2607559600535779b99f21a80da1cec07a6db067fea39bd8373697b215ba238a8faa186ccca7ad1fe843b72fb109af00f4e
+   SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
+     SOURCE_HASH=sha512:03874462cff71e558d4383fef9e757eb4260b20f4b1de4741edcd49fec6effe32669e95edb637962b77b12c519deeb74adc3c15427d0e054e1b96e2f03ffdb3b
+       BUILD_API=2
       LICENSE[0]=BSD
          ENTERED=20030726
-         UPDATED=20030726
         WEB_SITE=http://oinkmaster.sourceforge.net
-      MAINTAINER=vydra at fria.fri.utc.sk
+        KEYWORDS="security perl"
            SHORT="oinkmaster is a perl script to automate proces of downloading and merging Snort rules."
 cat << EOF
 Oinkmaster is simple Perl script to help you update/manage your Snort 2.0+ rules 
diff --git a/security/oinkmaster/FINAL b/security/oinkmaster/FINAL
new file mode 100755
index 0000000..94bc7d3
--- /dev/null
+++ b/security/oinkmaster/FINAL
@@ -0,0 +1,9 @@
+
+ message "Before running ${SPELL} for the first time, modify the content"
+ message " of the /etc/oinkmaster.conf file."
+ message "(Example: change url to snortrules-current)"
+ message ""
+ message "For usage : log as user with write access to snort rules dir (aka snort)"
+ message "            execute oinkmaster.pl -o /etc/snort/rules/"
+ message "            for test new rules, execute: /etc/init.d/snort.sh test"
+ 
\ No newline at end of file
diff --git a/security/oinkmaster/HISTORY b/security/oinkmaster/HISTORY
index c920d16..6292292 100644
--- a/security/oinkmaster/HISTORY
+++ b/security/oinkmaster/HISTORY
@@ -1,3 +1,14 @@
+2006-08-27 George Sherwood <george at beernabeer.com>
+	* DETAILS: Updated to version 2.0.  Updated to BUILD_API=2
+	  Removed old SOURCE_URLS. Removed UPDATED & MAINTAINER
+	* DEPENDS: Removed depends that are part of basesystem
+	* PRE_BUILD: Added for sedit
+	* BUILD: Updated for BUILD_API=2
+	* INSTALL: Added for BUILD_API=2
+	* FINAL:  Added for BUILD_API=2
+	* POST_INSTALL: Removed for BUILD_API=2
+	* PREPARE: Removed.  Create account in BUILD
+
 2005-11-29 Seth Woolley <seth at tautology.org>
 	* DETAILS: MD5 -> SHA512
 
diff --git a/security/oinkmaster/INSTALL b/security/oinkmaster/INSTALL
new file mode 100755
index 0000000..e88fd70
--- /dev/null
+++ b/security/oinkmaster/INSTALL
@@ -0,0 +1,4 @@
+cd $SOURCE_DIRECTORY &&
+cp  oinkmaster.pl  $INSTALL_ROOT/usr/bin/ &&
+chown  snort.snort  /usr/bin/oinkmaster.pl  &&
+install_config_file oinkmaster.conf /etc/oinkmaster.conf
diff --git a/security/oinkmaster/POST_INSTALL b/security/oinkmaster/POST_INSTALL
deleted file mode 100755
index 94bc7d3..0000000
--- a/security/oinkmaster/POST_INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-
- message "Before running ${SPELL} for the first time, modify the content"
- message " of the /etc/oinkmaster.conf file."
- message "(Example: change url to snortrules-current)"
- message ""
- message "For usage : log as user with write access to snort rules dir (aka snort)"
- message "            execute oinkmaster.pl -o /etc/snort/rules/"
- message "            for test new rules, execute: /etc/init.d/snort.sh test"
- 
\ No newline at end of file
diff --git a/security/oinkmaster/PREPARE b/security/oinkmaster/PREPARE
deleted file mode 100755
index c7fb328..0000000
--- a/security/oinkmaster/PREPARE
+++ /dev/null
@@ -1,13 +0,0 @@
-message "Creation of ${SPELL} user ${MESSAGE_COLOR} snort ${DEFAULT_COLOR}."
-
-if  !  exists_account  snort;  then
-    message "${MESSAGE_COLOR} ERROR:${DEFAULT_COLOR} The ${SPELL} user and group was not yet defined.";
-    message "Solution: "
-    message "          echo "snort:118:118" >> /etc/sorcery/accounts"
-    message "          echo "snort:118:" >> /etc/sorcery/groups"
-    return  1
-else
-    if  [  "`grep  'snort'  /etc/passwd`"  ==  ""  ];  then
-        create_account  snort
-    fi
-fi
diff --git a/security/oinkmaster/PRE_BUILD b/security/oinkmaster/PRE_BUILD
new file mode 100755
index 0000000..259ffd3
--- /dev/null
+++ b/security/oinkmaster/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build  &&
+cd $SOURCE_DIRECTORY  &&
+sedit  "s:/usr/local/etc/:/etc/:"  oinkmaster.pl
diff --git a/shell-term-fm/screen/DETAILS b/shell-term-fm/screen/DETAILS
index 2a3ab32..b6eebea 100755
--- a/shell-term-fm/screen/DETAILS
+++ b/shell-term-fm/screen/DETAILS
@@ -1,15 +1,14 @@
            SPELL=screen
-         VERSION=4.0.2
+         VERSION=4.0.3
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.uni-erlangen.de/pub/utilities/${SPELL}/${SOURCE}
    SOURCE_URL[1]=ftp://ftp.sourcemage.sk/sources/${SOURCE}
    SOURCE_URL[2]=$GNU_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:a003f2703659644a08436f8c3c8ca4000f35309f1615a2e7a1a1c774f88e9a6129c93a933debf9aa6b3265a177b67a1f4dc94dd10680ed34279c4c1d6255521e
-        BUILD_API=2
+     SOURCE_HASH=sha512:24c1f598972f3dc9ed49cd2c05852190a0190d22fa01401eee8484627c8dd2815f0a422d9b2697faa8aaa0b3efc6730a94e2d5aa787dbe5e9ec719143176c338
         WEB_SITE=http://www.gnu.org/software/screen
          ENTERED=20010922
-         UPDATED=20040517
+  SECURITY_PATCH=1
       LICENSE[0]=GPL2
            SHORT="screen multiplexes a physical terminal"
 cat << EOF
diff --git a/shell-term-fm/screen/HISTORY b/shell-term-fm/screen/HISTORY
index ab4750e..cf48336 100644
--- a/shell-term-fm/screen/HISTORY
+++ b/shell-term-fm/screen/HISTORY
@@ -1,3 +1,7 @@
+2006-10-30 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: update to 4.0.3 + SECURITY_PATCH=1,
+	  http://secunia.com/advisories/22583/
+
 2005-11-29 Seth Woolley <seth at tautology.org>
 	* DETAILS: MD5 -> SHA512
 
diff --git a/utils/console-tools/DEPENDS b/utils/console-tools/DEPENDS
index 0657016..01eb603 100755
--- a/utils/console-tools/DEPENDS
+++ b/utils/console-tools/DEPENDS
@@ -2,4 +2,10 @@ depends  console-data  &&
 depends  flex          &&
 depends  gnupg         &&
 depends  perl          &&
-depends  smgl-fhs
+depends  smgl-fhs      &&
+
+# to fix bug #12830, to be removed eventually (during stable-rc 0.7 
+# should be sufficient)
+depends  init.d &&
+
+optional_depends linuxdoc-tools "" "" "for some SGML and HTML documentation"
diff --git a/utils/console-tools/DETAILS b/utils/console-tools/DETAILS
index c9bdea9..a2c8c53 100755
--- a/utils/console-tools/DETAILS
+++ b/utils/console-tools/DETAILS
@@ -8,6 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
          ENTERED=20010922
          UPDATED=20031124
        BUILD_API=2
+      PATCHLEVEL=1
            SHORT="console-tools allows you to configure and manipulate Linux consoles."
 cat << EOF
 The console-tools package allows you to set-up and manipulate the Linux
diff --git a/utils/console-tools/HISTORY b/utils/console-tools/HISTORY
index 17517b4..a1d7986 100755
--- a/utils/console-tools/HISTORY
+++ b/utils/console-tools/HISTORY
@@ -1,3 +1,14 @@
+2006-11-08 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* PRE_BUILD: properly install all the manpages #10112 - build some first
+	  re-enabled the whole doc subdir, agressively disabled some of it when 
+	  there is no linuxdoc-tools
+	* DEPENDS: added optional on linuxdoc-tools
+	* DETAILS: ++PATCHLEVEL
+
+2006-11-01 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* INSTALL: install all the manpages #10112
+	* DETAILS: ++PATCHLEVEL
+
 2006-02-08 Eric Sandall <eric at sandall.us>
 	* DEPENDS: Depends on smgl-fhs (for directory structure)
 
diff --git a/utils/console-tools/INSTALL b/utils/console-tools/INSTALL
index 1613602..c0a9b60 100755
--- a/utils/console-tools/INSTALL
+++ b/utils/console-tools/INSTALL
@@ -5,6 +5,6 @@ mv  $INSTALL_ROOT/usr/bin/loadkeys  $INS
 # Install man pages.
 for  (( COUNT=1 ; COUNT < 9 ; COUNT++ ));  do
   mkdir -p $INSTALL_ROOT/usr/share/man/man$COUNT
-  cp  doc/man/*.$COUNT  $INSTALL_ROOT/usr/share/man/man$COUNT  2> /dev/null
+  cp  doc/man/*.$COUNT*  $INSTALL_ROOT/usr/share/man/man$COUNT  2> /dev/null
   true
 done
diff --git a/utils/console-tools/PRE_BUILD b/utils/console-tools/PRE_BUILD
index 178cd63..db580d1 100755
--- a/utils/console-tools/PRE_BUILD
+++ b/utils/console-tools/PRE_BUILD
@@ -3,7 +3,9 @@ cd  $SOURCE_DIRECTORY  &&
 patch  -p0  <  $SCRIPT_DIRECTORY/double-fclose-fix.patch  &&
 patch  -p1  <  $SCRIPT_DIRECTORY/gcc-3.4.patch            &&
 cp  $SCRIPT_DIRECTORY/config.sub  .                       &&
-sedit "s/doc//"       Makefile.am                         &&
-sedit "s/doc//"       Makefile.in                         &&
+if ! is_depends_enabled linuxdoc-tools; then
+  find -iname "*.sgml" -exec rm {} \; &&
+  sed -i -e 's/kbd.FAQ.html//' -e 's/lct.html//' doc/Makefile*
+fi &&
 sedit "s/examples//"  Makefile.am                         &&
 sedit "s/examples//"  Makefile.in
diff --git a/video-libs/qc-usb/HISTORY b/video-libs/qc-usb/HISTORY
index e19823f..5f1c33f 100644
--- a/video-libs/qc-usb/HISTORY
+++ b/video-libs/qc-usb/HISTORY
@@ -1,3 +1,8 @@
+2006-10-22 Juuso Alasuutari <iuso at sourcemage.org>
+	* qc-usb_gcc4.patch: Added, fix compile for gcc4 (bug #13171).
+	* PRE_BUILD: Added, apply patch.
+	* INSTALL: Added $INSTALL_ROOT to PREFIX.
+
 2005-11-29 Seth Woolley <seth at tautology.org>
 	* DETAILS: MD5 -> SHA512
 
diff --git a/video-libs/qc-usb/INSTALL b/video-libs/qc-usb/INSTALL
index 4413c93..c24820c 100755
--- a/video-libs/qc-usb/INSTALL
+++ b/video-libs/qc-usb/INSTALL
@@ -1,2 +1 @@
-default_install &&
-mv /usr/local/bin/qcset /usr/bin
+make PREFIX=$INSTALL_ROOT/usr MODULE_DIR=$INSTALL_ROOT/lib/modules/$(get_kernel_version) install
diff --git a/video-libs/qc-usb/PRE_BUILD b/video-libs/qc-usb/PRE_BUILD
new file mode 100755
index 0000000..fcafb57
--- /dev/null
+++ b/video-libs/qc-usb/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build        &&
+cd  "$SOURCE_DIRECTORY"  &&
+
+# Fix compile for gcc4, bug #13171.
+patch -p1 < "$SCRIPT_DIRECTORY/qc-usb_gcc4.patch"
diff --git a/video-libs/qc-usb/qc-usb_gcc4.patch b/video-libs/qc-usb/qc-usb_gcc4.patch
new file mode 100644
index 0000000..ef5345a
--- /dev/null
+++ b/video-libs/qc-usb/qc-usb_gcc4.patch
@@ -0,0 +1,40 @@
+diff -Naur qc-usb-0.6.4/qc-driver.c qc-usb-0.6.4/qc-driver.c
+--- qc-usb-0.6.4/qc-driver.c	2006-05-05 22:51:50.000000000 -0400
++++ qc-usb-0.6.4/qc-driver.c	2006-10-09 01:04:50.116022392 -0400
+@@ -867,7 +867,6 @@
+ 
+ 	out += sprintf(out, "\tGeneral driver status\n");
+ 	out += sprintf(out, "Driver version   : %s\n", VERSION);
+-	out += sprintf(out, "Kernel version   : %s\n", UTS_RELEASE);
+ 	if (qc->dev!=NULL) {
+ 	out += sprintf(out, "Device Id        : %04X:%04X\n", (int)GET_VENDORID(qc), (int)GET_PRODUCTID(qc));
+ 	out += sprintf(out, "USB bus number   : %i\n", qc->dev->bus->busnum);
+@@ -3266,8 +3265,8 @@
+ 
+ 	/* We found a QuickCam */
+ 	PRINTK(KERN_INFO,"QuickCam USB camera found (driver version %s)", VERSION);
+-	PRINTK(KERN_INFO,"Kernel:%s bus:%i class:%02X subclass:%02X vendor:%04X product:%04X",
+-		UTS_RELEASE, usbdev->bus->busnum, ifacedesc->bInterfaceClass, ifacedesc->bInterfaceSubClass,
++	PRINTK(KERN_INFO,"bus:%i class:%02X subclass:%02X vendor:%04X product:%04X",
++		usbdev->bus->busnum, ifacedesc->bInterfaceClass, ifacedesc->bInterfaceSubClass,
+ 		usbdev->descriptor.idVendor, usbdev->descriptor.idProduct);
+ 
+ 	/* The interface is claimed (bound) automatically to us when we return from this function (without error code) */
+diff -Naur qc-usb-0.6.4/quickcam.h qc-usb-0.6.4/quickcam.h
+--- qc-usb-0.6.4/quickcam.h	2006-05-05 23:00:26.000000000 -0400
++++ qc-usb-0.6.4/quickcam.h	2006-10-09 01:05:31.006577891 -0400
+@@ -93,12 +93,13 @@
+ #endif
+ 
+ #include <linux/videodev.h>
++#include <media/v4l2-dev.h>
+ #include <linux/usb.h>
+ #include <asm/pgtable.h>		/* This is required for testing pte_offset_map */
+ #include <linux/spinlock.h>
+ 
+ /* {{{ [fold] SECTION: user configuration */
+-#define VERSION		"QuickCam USB 0.6.4 $Date: 2006/05/06 03:00:26 $"
++#define VERSION		"QuickCam USB 0.6.4 $Date: 2006/05/02 13:05:20 $"
+ #ifndef COMPRESS
+ #define COMPRESS	1		/* 1=include compression support, 0=otherwise */
+ #endif



More information about the SM-Commit mailing list