[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (6bbbd6fa5446adcae937e090854c7fc4b3285a0a)

Vlad Glagolev scm at sourcemage.org
Wed Aug 3 19:01:19 EDT 2011


GIT changes to devel-xorg-modular grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 dev/null                               |binary
 devel/pkgconfig/DEPENDS                |    4 ++
 devel/pkgconfig/DETAILS                |    7 ++++
 devel/pkgconfig/HISTORY                |    3 ++
 http/seamonkey/BUILD                   |    7 ----
 http/seamonkey/CONFIGURE               |   48 ++++++---------------------------
 http/seamonkey/DEPENDS                 |    6 ++--
 http/seamonkey/HISTORY                 |   13 ++++++++
 http/seamonkey/PRE_BUILD               |   26 ++++++++---------
 http/seamonkey/blfs-mozconfig          |   13 ++------
 libs/clucene/DEPENDS                   |    3 --
 libs/clucene/DETAILS                   |   19 -------------
 libs/clucene/HISTORY                   |    4 ++
 libs/clucene/PREPARE                   |    5 ---
 mail/dspam/BUILD                       |    7 ++--
 mail/dspam/CONFIGURE                   |   46 ++++++++++++++++++++++++++-----
 mail/dspam/DEPENDS                     |   21 ++++++++------
 mail/dspam/DETAILS                     |   19 ++++++-------
 mail/dspam/HISTORY                     |    9 ++++++
 mail/dspam/PREPARE                     |   14 ++++-----
 mail/dspam/dspam.gpg                   |binary
 net/net-snmp/DETAILS                   |    2 -
 net/net-snmp/HISTORY                   |    5 ---
 net/net-snmp/net-snmp.gpg              |binary
 net/openswan/DETAILS                   |    2 -
 net/openswan/HISTORY                   |    3 ++
 news/liferea/DEPENDS                   |   16 +++++++----
 news/liferea/DETAILS                   |    4 +-
 news/liferea/HISTORY                   |    5 +++
 news/liferea/liferea-1.6.5.tar.gz.sig  |    0 
 news/liferea/liferea-1.6.6b.tar.gz.sig |binary
 news/liferea/liferea-1.7.4.tar.gz.sig  |    0 
 news/liferea/liferea-1.7.6.tar.gz.sig  |binary
 printer/hplip/DETAILS                  |    2 -
 printer/hplip/HISTORY                  |    4 ++
 printer/hplip/PRE_BUILD                |    3 ++
 ruby-raa/ruby-1.9/DEPENDS              |    1 
 ruby-raa/ruby-1.9/DETAILS              |    4 +-
 ruby-raa/ruby-1.9/HISTORY              |    4 ++
 utils/dbus/DETAILS                     |    4 +-
 utils/dbus/HISTORY                     |    3 ++
 utils/nbench-byte/BUILD                |    8 +++--
 utils/nbench-byte/DETAILS              |    6 ++--
 utils/nbench-byte/HISTORY              |    5 +++
 44 files changed, 194 insertions(+), 161 deletions(-)

New commits:
commit 446bc103b9ec9c4a90dea903f759ebc90769f021
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    Revert "net-snmp: => 5.7"
    
    This reverts commit 94bbc259cf4067b64358ccf8e728fc7d9f5924ca.
    
    not stable for production yet

commit 8371eee2b4b43f921057a13c961ff9e9ef717adb
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    dspam: => 3.10.0

commit e876ee1e9a4ccef071b78af4b31a4e5f724e5571
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    openswan: => 2.6.35

commit 2c9352b96c219f0caf10b3cc56ee0ac1ed253d9b
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    hplip 3.11.7
    
    prnt/hpps/hppsfilter.c: In function 'require_bod':
    prnt/hpps/hppsfilter.c:119: error: 'ppd_attr_t' undeclared (first use in
    this fu
    nction)
    prnt/hpps/hppsfilter.c:119: error: (Each undeclared identifier is
    reported only
    once
    prnt/hpps/hppsfilter.c:119: error: for each function it appears in.)
    prnt/hpps/hppsfilter.c:119: error: 'pattr' undeclared (first use in this
    functio
    n)
    prnt/hpps/hppsfilter.c:120: error: 'ppd_file_t' undeclared (first use in
    this fu
    nction)
    prnt/hpps/hppsfilter.c:120: error: 'pppd' undeclared (first use in this
    function
    )
    make: *** [hppsfilter.o] Error 1
     ! Problem Detected !

commit 05f3ef8d2989f2411c6cd241cfbb59728091a04f
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    dbus 1.4.14

commit 948cf0e1e069e2f701a6f33934b4a9ff51c9af2f
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    ruby-1.9: => 1.9.2-p290

commit 3b45ac186aac5b7a3d6ad8d811af02591f4371ea
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    clucene - remove svn support

commit b7b5d6a21b8570c113af2326a119737704d61945
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    nbench-byte: updated version to 2.2.3, fixed SOURCE_URL, switched
    SOURCE_HASH to sha512 instead of sha1, BUILD now uses make_single to fix
    compilation issue with multiple jobs

commit ffa19dceaf791c73b7f03f4eedf479d1252176ad
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    liferea: Updated stable to version 1.6.6b and devel to version 1.7.6.
    Cleaned up depends.

commit 23a16a576c5dc08e6d5ea75905daff0c59ad59c9
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    seamonkey: Major update to the spell. Now builds for me.  Hopefully fixes
    http://www.sourcemage.org/issues/7

commit bbc81239fb0611a5a3b1ef313e7439928a653460
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    pkgconfig: added version 0.25 for fresh install / without glib2

diff --git a/devel/pkgconfig/DEPENDS b/devel/pkgconfig/DEPENDS
index 150d45a..329e0ab 100755
--- a/devel/pkgconfig/DEPENDS
+++ b/devel/pkgconfig/DEPENDS
@@ -1 +1,3 @@
-depends glib2
+if [[ "$VERSION" != "0.25" ]]; then
+   depends glib2
+fi
diff --git a/devel/pkgconfig/DETAILS b/devel/pkgconfig/DETAILS
index ef95a61..a2a73fc 100755
--- a/devel/pkgconfig/DETAILS
+++ b/devel/pkgconfig/DETAILS
@@ -1,6 +1,13 @@
            SPELL=pkgconfig
+
+if spell_ok glib2; then
          VERSION=0.26
      SOURCE_HASH=sha512:9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4
+    else
+         VERSION=0.25
+     SOURCE_HASH=sha512:6c50ca542733feeb10301097ade32075c5417ada5bdd195957de8521a28b20e0e7a54ed553fa3e022b24969e9deb97d72e289192cb2a3afc2c86241dc6cafa02
+fi
+
           SOURCE=pkg-config-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/pkg-config-$VERSION
    SOURCE_URL[0]=http://www.freedesktop.org/software/$SPELL/releases/$SOURCE
diff --git a/devel/pkgconfig/HISTORY b/devel/pkgconfig/HISTORY
index 7fbfa21..13bb575 100644
--- a/devel/pkgconfig/HISTORY
+++ b/devel/pkgconfig/HISTORY
@@ -1,3 +1,6 @@
+2011-08-02 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS, DEPENDS: added version 0.25 for fresh install / without glib2
+
 2011-08-01 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.26
 	* DEPENDS: embedded glib has been removed, depends on glib2 now
diff --git a/http/seamonkey/BUILD b/http/seamonkey/BUILD
index 882898a..7450676 100755
--- a/http/seamonkey/BUILD
+++ b/http/seamonkey/BUILD
@@ -2,13 +2,6 @@ cd $SOURCE_DIRECTORY/comm-release &&
 MOZILLA_HOME=$INSTALL_ROOT/usr/lib/seamonkey  &&
 
 #
-# Only strip if the user wants us to
-#
-if  echo  $LDFLAGS  |  grep  -q  --  '-s';  then
-  OPTS="--enable-strip $OPTS"
-fi  &&
-
-#
 # No fast optimization for Mozilla, bit us so many times...
 #
 CFLAGS="${CFLAGS//-O3/-O2}"      &&
diff --git a/http/seamonkey/CONFIGURE b/http/seamonkey/CONFIGURE
index 37e0587..051ba87 100755
--- a/http/seamonkey/CONFIGURE
+++ b/http/seamonkey/CONFIGURE
@@ -1,54 +1,26 @@
-#Few hacks to keep old defaults set correctly
+config_query SEAMONKEY_OFFICIAL "Enable official branding? If enabled, you may \
+be restricted in distributing these binaries IAW mozilla policies" n &&
 
-if [[ "$SEAMONKEY_MAILNEWS" == "--enable-mailnews" ||     \
-      "$SEAMONKEY_MAILNEWS" == "y" ]]; then
-   SEAMONKEY_MAILNEWS=y
-else
-   SEAMONKEY_MAILNEWS=n
-fi &&
-config_query  SEAMONKEY_MAILNEWS                          \
-                     'Build Mail/News client?'            \
-                     n                                    &&
+config_query  SEAMONKEY_MAILNEWS                             \
+                     "Build Mail News client?"        \
+                      n                                   &&
 
-if [[ "$SEAMONKEY_COMPOSER" == "--enable-composer" ||     \
-      "$SEAMONKEY_COMPOSER" == "y" ]]; then
-   SEAMONKEY_COMPOSER=y
-else
-   SEAMONKEY_COMPOSER=n
-fi &&
 config_query  SEAMONKEY_COMPOSER                          \
-                     'Build Composer component'           \
+                     'Build Composer component?'           \
                      n                                    &&
 
-if [[ "$SEAMONKEY_JS" == "--enable-xpctools" ||           \
-      "$SEAMONKEY_JS" == "y" ]]; then
-   SEAMONKEY_JS=y
-else
-   SEAMONKEY_JS=n
-fi &&
-config_query  SEAMONKEY_JS                                \
-                     'Build JavaScript profile tool'      \
-                     n                                    &&
-
-if [[ "$SEAMONKEY_XINERAMA" == "--enable-xinerama" ||     \
-      "$SEAMONKEY_XINERAMA" == "y" ]]; then
-   SEAMONKEY_XINERAMA=y
-else
-   SEAMONKEY_XINERAMA=n
-fi &&
-
 config_query  SEAMONKEY_CAIRO                             \
                      "Use system installed cairo?"        \
                       n                                   &&
 
-config_query  SEAMONKEY_XINERAMA                          \
-                     'Enable Xinerama support?'           \
-                     n                                    &&
-
 config_query  SEAMONKEY_PANGO                             \
                      'Enable Pango support for complex font rendering?' \
                      n                                    &&
 
+config_query  SEAMONKEY_STRIP                              \
+                     'Remove debugging symbols?' \
+                     n                                    &&
+
 #Getting rid of that annoying nullplugin
 config_query  SEAMONKEY_NULLPLUGIN                       \
 "Do you want nullplugin installed (to enable auto search and install of other plugins)" \
diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS
index eef6581..73d1390 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -4,20 +4,20 @@ fi &&
 depends  gtk+2  &&
 depends  JPEG   &&
 depends  libidl  &&
-depends -sub APNG libpng &&
 depends  libxft &&
 depends  nspr &&
 depends  nss &&
 depends  perl  &&
 depends  zip &&
 depends  zlib &&
-
 depends  libxt &&
 depends  dbus-glib &&
+depends  yasm &&
+depends  autoconf-2.13
 
 if [[ "$SEAMONKEY_PANGO" == "y" ]]; then
    depends pango 
 fi &&
 
 optional_depends alsa-lib "" "" "for audio support" &&
-optional_depends openldap "" "" "for LDAP support"
+optional_depends wireless_tools "" "" "for geolocation via WiFi access points"
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 9e4ec54..c61d865 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,16 @@
+2011-08-02 George Sherwood <gsherwood at sourcemage.org>
+	* CONFIGURE: Removed old useless options
+	  Added option to strip and official branding
+	  Removed Xinerama option
+	* PRE_BUILD: Added code to properly build correct .mozconfig file
+	* DEPENDS: Removed depends libpng. Needs newer version
+	  Added depends yasm for WebM video.
+	  Added optional wireless_tools
+	  Added depends autoconf-2.13 IAW Mozilla website
+	  Removed openldap. Not an optional_depends
+	* BUILD: Removed old strip option
+	* blfs-mozconfig: Tweaked various options to match configuration
+
 2011-07-08 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.2, SECURITY_PATCH=33
 	* PRE_BUILD, BUILD: comm-2.0 -> comm-release
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index 00b9e31..858a9bb 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -5,10 +5,8 @@ cd             comm-release       &&
 
 cp -v $SPELL_DIRECTORY/blfs-mozconfig .mozconfig &&
 
-if [[ "$SEAMONKEY_CAIRO" == "y" ]]; then
-   sed -i '78iac_add_options --enable-system-cairo' .mozconfig
-else
-   sed -i '78iac_add_options --disable-system-cairo' .mozconfig
+if [[ "$SEAMONKEY_OFFICIAL" == "y" ]]; then
+   sed -i '78iac_add_options --enable-official-branding' .mozconfig
 fi &&
 
 if [[ "$SEAMONKEY_MAILNEWS" == "n" ]]; then
@@ -19,24 +17,24 @@ if [[ "$SEAMONKEY_COMPOSER" == "n" ]]; then
    sed -i '78iac_add_options --disable-composer' .mozconfig
 fi &&
 
-if [[ "$SEAMONKEY_JS" == "y" ]]; then
-   sed -i '78iac_add_options --enable-xpctools' .mozconfig
+if [[ "$SEAMONKEY_CAIRO" == "y" ]]; then
+   sed -i '78iac_add_options --enable-system-cairo' .mozconfig
 else
-   sed -i '78iac_add_options --disable-xpctools' .mozconfig
-fi &&
-
-if [[ "$SEAMONKEY_XINERAMA" == "y" ]]; then
-   sed -i '78iac_add_options --enable-xinerama' .mozconfig
+   sed -i '78iac_add_options --disable-system-cairo' .mozconfig
 fi &&
 
 if [[ "$SEAMONKEY_PANGO" == "y" ]]; then
    sed -i '78iac_add_options --enable-pango' .mozconfig
 fi &&
 
-if is_depends_enabled $SPELL openldap; then
-   sed -i '78iac_add_options --enable-ldap' .mozconfig
+if [[ "$SEAMONKEY_STRIP" == "y" ]]; then
+   sed -i '78iac_add_options --enable-strip' .mozconfig
+fi &&
+
+if is_depends_enabled $SPELL wireless_tools; then
+   sed -i '78iac_add_options --enable-necko-wifi' .mozconfig
 else
-   sed -i '78iac_add_options --disable-ldap' .mozconfig
+   sed -i '78iac_add_options --disable-necko-wifi' .mozconfig
 fi &&
 
 if ! is_depends_enabled $SPELL alsa-lib; then
diff --git a/http/seamonkey/blfs-mozconfig b/http/seamonkey/blfs-mozconfig
index fb0d7ee..e2fc65d 100644
--- a/http/seamonkey/blfs-mozconfig
+++ b/http/seamonkey/blfs-mozconfig
@@ -15,6 +15,7 @@
 # to a directory inside the source tree by removing '../' from the
 # line below.
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/seamonkey-build
+mk_add_options AUTOCONF=autoconf2.13
 
 # This option is used to specify that the SeaMonkey suite is
 # being built and to use all the default options for SeaMonkey.
@@ -30,21 +31,13 @@ ac_add_options --prefix=/usr
 # the system-installed copies of the specified libraries instead of
 # the source tree code which may not be the most recent versions.
 ac_add_options --with-system-zlib
-ac_add_options --with-system-png
+ac_add_options --without-system-png
 ac_add_options --with-system-jpeg
-#ac_add_options --enable-system-cairo
 
 # This option specifies to include support for rendering the HTML
 # <canvas></canvas> tag in the SeaMonkey browser.
 ac_add_options --enable-canvas
 
-# This option is used so that the debugging symbols are removed from
-# the installed binaries during the installation process. Comment out
-# this option if you may have a need to retain the debugging symbols
-# in the installed binaries. Note that this can substantially
-# increase the size of the installed binaries.
-#ac_add_options --enable-strip
-
 # This option is added so that test libraries and programs are not
 # built. These would only be required for debugging purposes.
 ac_add_options --disable-tests
@@ -64,7 +57,7 @@ ac_add_options --enable-svg
 
 # This option is used to enable source tree included LDAP support in
 # the SeaMonkey binaries.
-#ac_add_options --enable-ldap
+ac_add_options --enable-ldap
 
 # Uncomment this option if you desire support for dual-monitor
 # display of SeaMonkey using the X-Window Xinerama libraries.
diff --git a/libs/clucene/DEPENDS b/libs/clucene/DEPENDS
index a9c6681..20382a0 100755
--- a/libs/clucene/DEPENDS
+++ b/libs/clucene/DEPENDS
@@ -1,7 +1,4 @@
 depends -sub CXX gcc  &&
 if [[ $CLUC_VER != stable ]];then
   depends cmake
-fi &&
-if [[ $CLUC_VER == svn ]]; then
-  depends subversion
 fi
diff --git a/libs/clucene/DETAILS b/libs/clucene/DETAILS
index 81f479e..c8973d2 100755
--- a/libs/clucene/DETAILS
+++ b/libs/clucene/DETAILS
@@ -1,28 +1,9 @@
            SPELL=clucene
-if [[ $CLUC_VER == svn ]];then
-  if [[ "$CLUC_SVN_AUTOUPDATE" == "y" ]]; then
-         VERSION=$(date +%Y%m%d)
-  else
-         VERSION=svn
-  fi
-  FORCE_DOWNLOAD=on
-          SPELLX=$SPELL-svn
-          SOURCE=$SPELLX.tar.bz2
-   SOURCE_IGNORE=volatile
-   SOURCE_URL[0]=svn_http://clucene.svn.sourceforge.net/svnroot/clucene/trunk:clucene
-else
-#  if [[ $CLUC_VER == devel ]];then
-#         VERSION=0.9.23.0
-#     SOURCE_HASH=sha512:
-#          SPELLX=$SPELL-core-$VERSION-Source
-#  else
          VERSION=0.9.21b
      SOURCE_HASH=sha512:706e8ad1fc944ffe12f0b0057169bca63131ae2263a3e46dd9750bfe2e7401870dac8dc494e0159f9302afb285473d89b5bd62f9c2339a1a1954e4cb98391ee3
           SPELLX=$SPELL-core-$VERSION
-#  fi
           SOURCE=$SPELLX.tar.bz2
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX
         WEB_SITE=http://sourceforge.net/projects/clucene/
          ENTERED=20050531
diff --git a/libs/clucene/HISTORY b/libs/clucene/HISTORY
index 9cb56c3..60c26b1 100644
--- a/libs/clucene/HISTORY
+++ b/libs/clucene/HISTORY
@@ -1,3 +1,7 @@
+2011-08-03 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS, PREPARE, DETAILS: remove svn support
+	  they now use git
+
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
 	  sub-depends on CXX (scripted)
diff --git a/libs/clucene/PREPARE b/libs/clucene/PREPARE
deleted file mode 100755
index b3c11c8..0000000
--- a/libs/clucene/PREPARE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_list CLUC_VER 'which version?' stable svn
-if [[ $CLUC_VER == svn ]]; then
-  config_query CLUC_SVN_AUTOUPDATE "Update to the latest SVN on every cast?" ${DEFAULT:-n}
-fi
-
diff --git a/mail/dspam/BUILD b/mail/dspam/BUILD
index aeba885..3edbe13 100755
--- a/mail/dspam/BUILD
+++ b/mail/dspam/BUILD
@@ -4,6 +4,7 @@ OPTS="--with-dspam-home=$INSTALL_ROOT/var/spool/dspam \
      --with-dspam-group=dspam \
 --with-dspam-home-group=dspam \
           --with-logdir=$INSTALL_ROOT/var/log/dspam \
+              --disable-mysql4-initialization \
                         $DSPAM_OPTS \
                         $OPTS" &&
 
@@ -27,9 +28,9 @@ fi &&
 OPTS="--with-storage-driver=$STORAGE_DRIVERS $OPTS" &&
 
 case "$DSPAM_SCALE" in
-  "none") ;;
-  "Large Scale") OPTS="$OPTS --enable-large-scale" ;;
-  "Domain Scale") OPTS="$OPTS --enable-domain-scale" ;;
+  "none") OPTS="--disable-large-scale --disable-domain-scale" ;;
+  "Large Scale") OPTS="$OPTS --enable-large-scale --disable-domain-scale" ;;
+  "Domain Scale") OPTS="$OPTS --enable-domain-scale --disable-large-scale" ;;
 esac  &&
 
 default_build
diff --git a/mail/dspam/CONFIGURE b/mail/dspam/CONFIGURE
index 88bc89c..6a7647a 100755
--- a/mail/dspam/CONFIGURE
+++ b/mail/dspam/CONFIGURE
@@ -1,16 +1,46 @@
 config_query DSPAM_GD     'Use gd for pretty graphs?' n  &&
 
 config_query_option DSPAM_OPTS 'Enable debug mode?' n \
-             '--enable-debug' '--disable-debug' &&
+                               '--enable-debug --enable-bnr-debug' \
+                               '--disable-debug --disable-bnr-debug' &&
+
+if list_find "$DSPAM_OPTS" "--enable-debug"; then
+  config_query_option DSPAM_OPTS 'Enable verbose debug mode?' n \
+                                 '--enable-verbose-debug' \
+                                 '--disable-verbose-debug'
+else
+  DSPAM_OPTS="--disable-verbose-debug $DSPAM_OPTS"
+fi &&
+
 config_query_option DSPAM_OPTS 'Enable daemon mode?' y \
-             '--enable-daemon' '--disable-daemon' &&
+                               '--enable-daemon' \
+                               '--disable-daemon' &&
+
 config_query_option DSPAM_OPTS 'Enable preferences extension?' y \
-             '--enable-preferences-extension' '--disable-preferences-extension' &&
+                               '--enable-preferences-extension' \
+                               '--disable-preferences-extension' &&
+
+config_query_option DSPAM_OPTS 'Enable trusted user security?' y \
+                               '--enable-trusted-user-security' \
+                               '--disable-trusted-user-security' &&
+
 config_query_option DSPAM_OPTS 'Enable split configuration file support?' y \
-             '--enable-split-configuration' '--disable--split-configuration' &&
+                               '--enable-split-configuration' \
+                               '--disable--split-configuration' &&
+
 config_query_option DSPAM_OPTS 'Enable long usernames?' y \
-             '--enable-long-usernames' '--disable-long-usernames' &&
+                               '--enable-long-usernames' \
+                               '--disable-long-usernames' &&
+
+config_query_option DSPAM_OPTS 'Enable home directory filesystem storage driver?' n \
+                               '--enable-homedir' \
+                               '--disable-homedir' &&
+
+config_query_option DSPAM_OPTS 'Enable performance profiling?' n \
+                               '--enable-profiling' \
+                               '--disable-profiling' &&
+
 config_query_list DSPAM_SCALE 'Select a filesystem organization method:'\
-             'None'         \
-             'Domain Scale' \
-             'Large Scale'
+                              'None'         \
+                              'Domain Scale' \
+                              'Large Scale'
diff --git a/mail/dspam/DEPENDS b/mail/dspam/DEPENDS
index c7d9310..103b2d5 100755
--- a/mail/dspam/DEPENDS
+++ b/mail/dspam/DEPENDS
@@ -6,22 +6,25 @@ optional_depends MAIL-TRANSPORT-AGENT \
 optional_depends db \
                  '' \
                  '' \
-                 'Enable DB driver' &&
+                 'Enable DB storage driver' &&
+
 optional_depends sqlite \
                  '' \
                  '' \
-                 'Enable SQLite driver' &&
+                 'Enable SQLite storage driver' &&
+
 optional_depends MYSQL \
                  '--with-mysql-includes=/usr/include/mysql' \
                  '' \
-                 'Enable MYSQL driver' &&
+                 'Enable MYSQL storage driver' &&
+
 optional_depends postgresql \
                  '--with-pgsql-includes=/usr/include/postgresql' \
                  '' \
-                 'Enable PostgreSQL driver' &&
+                 'Enable PostgreSQL storage driver' &&
 
 if is_depends_enabled $SPELL postgresql ||
-   is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL); then
+  is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL); then
   config_query_option DSPAM_OPTS "Enable virtual users?" n \
                                  "--enable-virtual-users" \
                                  "--disable-virtual-users"
@@ -35,16 +38,18 @@ if [[ "$DSPAM_GD"  == y ]]; then
   depends gd-text       &&
   depends perl-cgi; 
 fi                      &&
+
 optional_depends openldap \
-                 '--enable-external-lookup --enable-ldap' \
-                 '--disable-ldap' \
+                 '--enable-external-lookup' \
+                 '--disable-external-lookup' \
                  'for LDAP support' &&
+
 optional_depends clamav \
                  '--enable-clamav' \
                  '--disable-clamav' \
                  'for virus detection' &&
+
 optional_depends SYSTEM-LOGGER \
                  '--enable-syslog' \
                  '--disable-syslog' \
                  'for logging through syslog'
-
diff --git a/mail/dspam/DETAILS b/mail/dspam/DETAILS
index 0563d59..d51ae2d 100755
--- a/mail/dspam/DETAILS
+++ b/mail/dspam/DETAILS
@@ -1,10 +1,10 @@
            SPELL=dspam
 if [[ $DSPAM_BRANCH == scm ]]; then
-if [[ $DSPAM_SCM_AUTO == y ]]; then
+  if [[ $DSPAM_SCM_AUTO == y ]]; then
          VERSION=$(date +%Y%m%d)
-else
+  else
          VERSION=scm
-fi
+  fi
           SOURCE="${SPELL}-git.tar.bz2"
    SOURCE_URL[0]=git://dspam.git.sourceforge.net/gitroot/dspam/dspam:dspam-scm
    SOURCE_IGNORE=volatile
@@ -17,19 +17,20 @@ elif [[ $DSPAM_BRANCH == devel ]]; then
      SOURCE_HASH=sha512:fd70938b3ef368fbfb992921a596972dc665ce9c6869ca362274c4bd02174fbfd3419438f63c1cdef06167fcde1ceea30fe359228642010bef4d77036e6bcf2f
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 else
-         VERSION=3.9.0
-      PATCHLEVEL=1
+         VERSION=3.10.0
           SOURCE="${SPELL}-${VERSION}.tar.gz"
-     SOURCE_HASH=sha512:9208e973855e4527802603570ae7a8fbdafe9c4a40aaa55eda91810d98c13a234e1e1f681c9a219869fbb58c5be10d908d8a974d63d75dab965641b29ef557e6
+         SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.asc
+      SOURCE_GPG=dspam.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 fi
         WEB_SITE="http://dspam.sourceforge.net/"
             DOCS="$DOCS RELEASE.NOTES UPGRADING"
-      LICENSE[0]='GPL'
-      PATCHLEVEL=0
+      LICENSE[0]='AGPL'
         KEYWORDS="email mail spam filter"
-           SHORT='A server-side anti-spam agent for UNIX email servers'
+           SHORT='server-side anti-spam agent for UNIX email servers'
 cat << EOF
 DSPAM is a scalable and open-source content-based spam filter designed for 
 multi-user enterprise systems. On a properly configured system, many users 
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index 567ada0..1c99ad1 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,12 @@
+2011-08-04 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 3.10.0; converted to upstream gpg checking;
+	  changed license to AGPL; readability++
+	* BUILD: added missing configure options
+	* CONFIGURE: added missing configure options; readability++
+	* DEPENDS: corrected flags for current dependencies
+	* PREPARE: readability++
+	* dspam.gpg: added
+
 2011-01-31 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: added mta optional dependencies
 	* BUILD: use loyal rights if compiled with mta support
diff --git a/mail/dspam/PREPARE b/mail/dspam/PREPARE
index 251710b..2dcda1b 100755
--- a/mail/dspam/PREPARE
+++ b/mail/dspam/PREPARE
@@ -1,12 +1,10 @@
 config_query_list DSPAM_BRANCH "What branch do you want to use?" \
-              release \
-              devel \
-              scm &&
+                               release \
+                               devel \
+                               scm &&
 
 if [[ $DSPAM_BRANCH == scm ]]; then
-if [[ $DSPAM_SCM == y ]]; then
-config_query DSPAM_SCM_AUTO \
-             "Automaticaly update the spell on sorcery queue/system-update?" \
-						 n
-fi
+  if [[ $DSPAM_SCM == y ]]; then
+    config_query DSPAM_SCM_AUTO "Automaticaly update the spell on sorcery queue/system-update?" n
+  fi
 fi
diff --git a/mail/dspam/dspam.gpg b/mail/dspam/dspam.gpg
new file mode 100644
index 0000000..f07ff15
Binary files /dev/null and b/mail/dspam/dspam.gpg differ
diff --git a/net/net-snmp/DETAILS b/net/net-snmp/DETAILS
index bab3858..35a9413 100755
--- a/net/net-snmp/DETAILS
+++ b/net/net-snmp/DETAILS
@@ -1,5 +1,5 @@
            SPELL=net-snmp
-         VERSION=5.7
+         VERSION=5.6.1.1
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
diff --git a/net/net-snmp/HISTORY b/net/net-snmp/HISTORY
index d97d252..f99810b 100644
--- a/net/net-snmp/HISTORY
+++ b/net/net-snmp/HISTORY
@@ -1,8 +1,3 @@
-2011-07-02 Vlad Glagolev <stealth at sourcemage.org>
-	* DETAILS: updated spell to 5.7
-	* net-snmp: added A77C5329 public key (Net-SNMP Administrators
-	  <net-snmp-admin at lists.sourceforge.net>)
-
 2011-06-07 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 5.6.1.1
 
diff --git a/net/net-snmp/net-snmp.gpg b/net/net-snmp/net-snmp.gpg
index b97fa4d..8593ab3 100644
Binary files a/net/net-snmp/net-snmp.gpg and b/net/net-snmp/net-snmp.gpg differ
diff --git a/net/openswan/DETAILS b/net/openswan/DETAILS
index d656b5f..b6cf805 100755
--- a/net/openswan/DETAILS
+++ b/net/openswan/DETAILS
@@ -1,5 +1,5 @@
             SPELL=openswan
-          VERSION=2.6.34
+          VERSION=2.6.35
    SECURITY_PATCH=1
            SOURCE=$SPELL-$VERSION.tar.gz
           SOURCE2=$SOURCE.asc
diff --git a/net/openswan/HISTORY b/net/openswan/HISTORY
index 2d48929..ea0d6e9 100644
--- a/net/openswan/HISTORY
+++ b/net/openswan/HISTORY
@@ -1,3 +1,6 @@
+2011-08-04 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.6.35
+
 2011-06-24 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: use is_version_less() to compare versions carefully
 
diff --git a/news/liferea/DEPENDS b/news/liferea/DEPENDS
index 4899b28..f721e4b 100755
--- a/news/liferea/DEPENDS
+++ b/news/liferea/DEPENDS
@@ -10,19 +10,25 @@ depends  pango      &&
 depends  libxslt    &&
 depends  libsoup    &&
 
+if [[ "$LIFEREA_DEVEL" == "y" ]]; then
+  depends json-glib
+else
+  optional_depends  lua                                 \
+                  ""                                  \
+                  "--disable-lua"                     \
+                  "for LUA scripting support"        
+fi &&
+
+
 optional_depends  libnotify                           \
                   ""                                  \
                   "--disable-libnotify"               \
                   "to build libnotify pluging"       &&
-optional_depends  lua                                 \
-                  ""                                  \
-                  "--disable-lua"                     \
-                  "for LUA scripting support"        &&
 
 optional_depends  dbus                                \
                   ""                                  \
                   "--disable-dbus"                    \
-                  "for dbus support"
+                  "for dbus support"                 &&
 
 optional_depends libsm                                \
                  "--enable-sm"                        \
diff --git a/news/liferea/DETAILS b/news/liferea/DETAILS
index 75b20dc..b49d1b0 100755
--- a/news/liferea/DETAILS
+++ b/news/liferea/DETAILS
@@ -1,9 +1,9 @@
            SPELL=liferea
 if [ "$LIFEREA_DEVEL" == "y" ]; then
-         VERSION=1.7.4
+         VERSION=1.7.6
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 else
-         VERSION=1.6.5
+         VERSION=1.6.6b
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 fi
           SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/news/liferea/HISTORY b/news/liferea/HISTORY
index 9845ac0..8d9e287 100644
--- a/news/liferea/HISTORY
+++ b/news/liferea/HISTORY
@@ -1,3 +1,8 @@
+2011-08-02 George Sherwood <gsherwood at sourcemage.org>
+	* DEPENDS: for devel depends json-glib and removed optional lua
+	* DETAILS: Updated stable to 1.6.6b.
+	  Updated devel to 1.7.6
+
 2010-10-03 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated stable to version 1.6.5
 
diff --git a/news/liferea/liferea-1.6.5.tar.gz.sig b/news/liferea/liferea-1.6.5.tar.gz.sig
deleted file mode 100644
index 3acc3aa..0000000
Binary files a/news/liferea/liferea-1.6.5.tar.gz.sig and /dev/null differ
diff --git a/news/liferea/liferea-1.6.6b.tar.gz.sig b/news/liferea/liferea-1.6.6b.tar.gz.sig
new file mode 100644
index 0000000..7ad30ab
Binary files /dev/null and b/news/liferea/liferea-1.6.6b.tar.gz.sig differ
diff --git a/news/liferea/liferea-1.7.4.tar.gz.sig b/news/liferea/liferea-1.7.4.tar.gz.sig
deleted file mode 100644
index bba8f9d..0000000
Binary files a/news/liferea/liferea-1.7.4.tar.gz.sig and /dev/null differ
diff --git a/news/liferea/liferea-1.7.6.tar.gz.sig b/news/liferea/liferea-1.7.6.tar.gz.sig
new file mode 100644
index 0000000..0e55923
Binary files /dev/null and b/news/liferea/liferea-1.7.6.tar.gz.sig differ
diff --git a/printer/hplip/DETAILS b/printer/hplip/DETAILS
index 5b5b1e5..02235ff 100755
--- a/printer/hplip/DETAILS
+++ b/printer/hplip/DETAILS
@@ -1,5 +1,5 @@
            SPELL=hplip
-         VERSION=3.11.5
+         VERSION=3.11.7
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
   SOURCE2_IGNORE=signature
diff --git a/printer/hplip/HISTORY b/printer/hplip/HISTORY
index 81d1601..6929555 100644
--- a/printer/hplip/HISTORY
+++ b/printer/hplip/HISTORY
@@ -1,3 +1,7 @@
+2011-08-03 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.11.7
+	* PRE_BUILD: sedit added due to cups 1.5.0
+
 2011-06-12 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.11.5
 
diff --git a/printer/hplip/PRE_BUILD b/printer/hplip/PRE_BUILD
index ac93b47..275dc10 100755
--- a/printer/hplip/PRE_BUILD
+++ b/printer/hplip/PRE_BUILD
@@ -1,6 +1,9 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
+# cups 1.5.0 fix
+sedit "41i#include <cups/ppd.h>" prnt/hpps/hppsfilter.c &&
+
 patch -p0 < "$SPELL_DIRECTORY/interactive.patch" &&
 
 sed -i "s:SYSFS:ATTRS:g" data/rules/55-hpmud.rules \
diff --git a/ruby-raa/ruby-1.9/DEPENDS b/ruby-raa/ruby-1.9/DEPENDS
index 888f0b4..f42ce5e 100755
--- a/ruby-raa/ruby-1.9/DEPENDS
+++ b/ruby-raa/ruby-1.9/DEPENDS
@@ -1,3 +1,4 @@
+optional_depends doxygen  "" "--disable-install-doc" "install documentation" &&
 optional_depends db "" "" "for db support" &&
 optional_depends gdbm "" "" "for gdbm support" &&
 optional_depends tk "" "" "for tk support" &&
diff --git a/ruby-raa/ruby-1.9/DETAILS b/ruby-raa/ruby-1.9/DETAILS
index a14ce43..d5c4d87 100755
--- a/ruby-raa/ruby-1.9/DETAILS
+++ b/ruby-raa/ruby-1.9/DETAILS
@@ -1,7 +1,7 @@
            SPELL=ruby-1.9
          PACKAGE=ruby
-         VERSION=1.9.2-p180
-     SOURCE_HASH=sha512:6b018b4b1d3e61a68f6065cf276545ae1613242d8d3065d1b0c1c476e99d6306a09382d4b36cab779390feb030f791bbb4fce9a3fecdebe1a85a7cb1df62d925
+         VERSION=1.9.2-p290
+     SOURCE_HASH=sha512:d9c3b13f52a565fcacec1916a68309efea012f583c886feb04580b536cd52e150dacb154a84d5f9e30d1f562eb0b3d360421b8ebfca75ec69b7824df3072c1d8
           SOURCE=$PACKAGE-$VERSION.tar.gz
   SECURITY_PATCH=3
    SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/ruby/1.9/$SOURCE
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index bc002a3..b2d7660 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,3 +1,7 @@
+2011-08-03 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.9.2-p290
+	* DEPENDS: add optional doxygen
+
 2011-02-21 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.9.2-p180
 	  SECURITY_PATCH++
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index 97ddb26..3ec22ef 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,6 +1,6 @@
            SPELL=dbus
-         VERSION=1.4.12
-     SOURCE_HASH=sha512:71154e42e98b172b6abad91abff7fb83f646bb2c4601922b4355eb10aaab4e23aca0607a66346d4e38b64433b0501149f3a498a80f18f0e5ac69cd83e883229d
+         VERSION=1.4.14
+     SOURCE_HASH=sha512:d1309b8fc5e84cfe3d2a27cf2a45737af693031b31d84870fdf19916cb4c758c23cfc0aa5cb0d7653624dca0ef90b551360770044a3b210cf1d77f5c76679a9f
   SECURITY_PATCH=7
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 40be66f..5754e00 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2011-08-03 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.4.14
+
 2011-06-12 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.4.12, SECURITY_PATCH=7
 
diff --git a/utils/nbench-byte/BUILD b/utils/nbench-byte/BUILD
index 40377d3..7771c99 100755
--- a/utils/nbench-byte/BUILD
+++ b/utils/nbench-byte/BUILD
@@ -1,6 +1,8 @@
-  if [ "$ARCH_SPECIFIC" == "y" ]; then
+if [ "$ARCH_SPECIFIC" == "y" ]; then
     sedit "s#CFLAGS = -s -static -Wall -O3#CFLAGS = -s -static -Wall -O3 $CFLAGS#" Makefile 	&&
     sedit "s/#LINKFLAGS = -s/LINKFLAGS = $LDFLAGS/" Makefile
-  fi	&&
+fi &&
 
-  make
+make_single &&
+make        &&
+make_normal
diff --git a/utils/nbench-byte/DETAILS b/utils/nbench-byte/DETAILS
index 2be0d3b..0ad86fa 100755
--- a/utils/nbench-byte/DETAILS
+++ b/utils/nbench-byte/DETAILS
@@ -1,12 +1,12 @@
            SPELL=nbench-byte
-         VERSION=2.2.2
+         VERSION=2.2.3
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=ftp://ftp.tux.org/pub/tux/mayer/$SOURCE
+   SOURCE_URL[0]=http://www.tux.org/~mayer/linux/$SOURCE
         WEB_SITE=http://www.tux.org/~mayer/linux/bmark.html
  	 ENTERED=20030125
          UPDATED=20030318
-     SOURCE_HASH=sha1:2ad7c76fb88f80e475650dd3802c187195cc80c1
+     SOURCE_HASH=sha512:68ae34c083e2e01f0114e6ff9ce04df41d70facbb05533b4cb9432fd9856048fde28e5c024d92f202e5f2de10fe223fdb46570873b1e2f69b2c847779645dec8
       LICENSE[0]=PD
         KEYWORDS="utils"
            SHORT="BYTE Magazine's BYTEmark benchmark program."
diff --git a/utils/nbench-byte/HISTORY b/utils/nbench-byte/HISTORY
index 185687e..4d51a9a 100644
--- a/utils/nbench-byte/HISTORY
+++ b/utils/nbench-byte/HISTORY
@@ -1,3 +1,8 @@
+2011-08-03 Julien "_kaze_" ROZO <julien at rozo.org>
+	* DETAILS: updated version to 2.2.3, fixed SOURCE_URL, switched
+	  SOURCE_HASH to sha512 instead of sha1
+	* BUILD: added make_single to fix compilation issue with multiple jobs
+
 2006-06-28 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
 


More information about the SM-Commit mailing list