[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (e5787e1a3b65e79e54dc59c96d629e035fbeeeac)

Eric Sandall scm at sourcemage.org
Wed Mar 7 22:20:44 EST 2012


GIT changes to devel-xorg-modular grimoire by Eric Sandall <sandalle at sourcemage.org>:

 ChangeLog                         |    4 ++++
 antivirus/clamav/BUILD            |    3 +++
 antivirus/clamav/DEPENDS          |    5 ++---
 antivirus/clamav/DETAILS          |    9 +++++----
 antivirus/clamav/FINAL            |   11 +++--------
 antivirus/clamav/HISTORY          |   10 ++++++++++
 antivirus/clamav/INSTALL          |    3 +++
 antivirus/clamav/PRE_BUILD        |    9 ---------
 antivirus/clamav/init.d/freshclam |    5 ++++-
 audio-players/mpg123/DETAILS      |    2 +-
 audio-players/mpg123/HISTORY      |    6 +++---
 chat-im/vacuum/BUILD              |    5 +----
 chat-im/vacuum/DEPENDS            |    1 +
 chat-im/vacuum/HISTORY            |    4 ++++
 devel/wdiff/DEPENDS               |    1 +
 devel/wdiff/DETAILS               |   18 ++++++++++++++++++
 devel/wdiff/HISTORY               |    3 +++
 x11-libs/wine/DEPENDS             |   23 ++++-------------------
 x11-libs/wine/DETAILS             |    4 ++--
 x11-libs/wine/HISTORY             |    6 ++++++
 20 files changed, 78 insertions(+), 54 deletions(-)

New commits:
commit cf4ca29383ba1cd489f4eb9f51fa640d00700a4e
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    wine: Updated stable to 1.4
    esd, jack, nas are no longer used
    libxext dependency no longer implies Xshm extension

commit 3d6e9308195523f330ecbabc82b1b544e50384b8
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    wine: Updated devel to 1.4

commit 56f830754da3563eac6551186b7ea6a3e2b9ba57
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    chat-im/vacuum: switched to cmake build system

commit 0fe7b0e75faea3c0e671ef0f7655cf3f53ee3454
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    devel/wdiff: new spell, a front end to diff for comparing files on a
    word per word basis

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

    clamav: corrected pidfile dir

commit 666e2113f9d0e803d88c716553cee13f5bc51559
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    mpg123: bump to 1.13.5

diff --git a/ChangeLog b/ChangeLog
index 95194ba..1874357 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-07 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* devel/wdiff: new spell, a front end to diff for comparing files on a word
+	  per word basis
+
 2012-03-05 Vlad Glagolev <stealth at sourcemage.org>
 	* mail/greyfix: new spell, greylisting policy daemon for Postfix
 
diff --git a/antivirus/clamav/BUILD b/antivirus/clamav/BUILD
index 9dd0fcf..8be896f 100755
--- a/antivirus/clamav/BUILD
+++ b/antivirus/clamav/BUILD
@@ -1,2 +1,5 @@
+create_account clamav &&
+
 OPTS="${CLAM_EXP} $OPTS"   &&
+
 default_build
diff --git a/antivirus/clamav/DEPENDS b/antivirus/clamav/DEPENDS
index e0845a2..381c07b 100755
--- a/antivirus/clamav/DEPENDS
+++ b/antivirus/clamav/DEPENDS
@@ -1,5 +1,5 @@
 depends -sub CXX gcc &&
-depends zlib		&&
+depends zlib &&
 optional_depends bzip2  "--enable-bzip2"           \
                         "--disable-bzip2"          \
                         "for bzip2 support"        &&
@@ -12,5 +12,4 @@ optional_depends gmp    "--enable-dsig"            \
                         "--disable-dsig"           \
                         "for digital signature support"	&&
 
-optional_depends SYSTEM-LOGGER "" "" "to log activity"		
-
+optional_depends SYSTEM-LOGGER "" "" "to log activity"
diff --git a/antivirus/clamav/DETAILS b/antivirus/clamav/DETAILS
index 30311fb..771c726 100755
--- a/antivirus/clamav/DETAILS
+++ b/antivirus/clamav/DETAILS
@@ -1,10 +1,11 @@
             SPELL=clamav
           VERSION=0.97.3
+       PATCHLEVEL=1
            SOURCE=$SPELL-$VERSION.tar.gz
-          SOURCE2=$SPELL-$VERSION.tar.gz.sig
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//-/}
-       SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE   
-      SOURCE2_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE2   
+          SOURCE2=$SOURCE.sig
+ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION//-/}"
+       SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
+      SOURCE2_URL=$SOURCE_URL.sig
    SOURCE2_IGNORE=signature
        SOURCE_GPG=vendor_clamav.gpg:$SOURCE2:UPSTREAM_KEY
          WEB_SITE=http://www.clamav.net
diff --git a/antivirus/clamav/FINAL b/antivirus/clamav/FINAL
index 23b347f..0a134a2 100755
--- a/antivirus/clamav/FINAL
+++ b/antivirus/clamav/FINAL
@@ -1,10 +1,5 @@
-
-for LOG in /var/log/clam-update.log /var/log/clamd.log;do
-  touch $LOG
-  chown clamav $LOG
-  chmod 600 $LOG
-done
-echo -e "\033[1mThis is a test of the virus scanner\033[0m"
+message "This is a test of the virus scanner:" &&
 clamscan -r -i $SOURCE_DIRECTORY/test
-echo -e "\033[1mTest complete\033[0m"
+message "Test complete." &&
+
 ldconfig
diff --git a/antivirus/clamav/HISTORY b/antivirus/clamav/HISTORY
index c716977..88a0c64 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,13 @@
+2012-03-07 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: PATCHLEVEL++; quoting paths; optimized variables
+	* DEPENDS: removed <tab>s
+	* BUILD: create clamav system account here
+	* PRE_BUILD: removed
+	* INSTALL: added, to install run dir
+	* FINAL: don't do anything for SA
+	  (see 31fd01824fc63c45617e1a300c3265adcf9448ee)
+	* init.d/freshclam: use default pid file inplace
+
 2011-10-18 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.97.3
 
diff --git a/antivirus/clamav/INSTALL b/antivirus/clamav/INSTALL
new file mode 100755
index 0000000..8b6b33e
--- /dev/null
+++ b/antivirus/clamav/INSTALL
@@ -0,0 +1,3 @@
+default_install &&
+
+install -vm 755 -d -o clamav -g clamav "$INSTALL_ROOT/var/run/clamav"
diff --git a/antivirus/clamav/PRE_BUILD b/antivirus/clamav/PRE_BUILD
deleted file mode 100755
index 008c750..0000000
--- a/antivirus/clamav/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-create_account clamav				&&
-
-# use the following command to recreate ./clam.gpg
-#gpg --no-default-keyring --keyring ./clam.gpg --keyserver \
-#hkp://subkeys.pgp.net --recv-keys 985A444B
-
-#gpg 	--keyring $SCRIPT_DIRECTORY/clam.gpg	\
-#	--verify $SOURCE_CACHE/$SOURCE2 	&&
-default_pre_build
diff --git a/antivirus/clamav/init.d/freshclam b/antivirus/clamav/init.d/freshclam
index 2722569..8fac2a4 100755
--- a/antivirus/clamav/init.d/freshclam
+++ b/antivirus/clamav/init.d/freshclam
@@ -1,6 +1,9 @@
 #!/bin/bash
+
 PROGRAM=/usr/bin/freshclam
+PIDFILE="/var/run/clamav/freshclam.pid"
+ARGS="-d --pid=$PIDFILE"
 RUNLEVEL=3
 NEEDS="+network"
-ARGS="-d"
+
 . /etc/init.d/smgl_init
diff --git a/audio-players/mpg123/DETAILS b/audio-players/mpg123/DETAILS
index a14839e..bf66ff5 100755
--- a/audio-players/mpg123/DETAILS
+++ b/audio-players/mpg123/DETAILS
@@ -1,5 +1,5 @@
            SPELL=mpg123
-         VERSION=1.13.4
+         VERSION=1.13.5
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
       SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index 3abede9..e1bd9d7 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,9 +1,9 @@
+2012-03-07 Thomas Orgis <sobukus at sourcemage.org>
+	* DETAILS: Update to 1.13.5
+
 2011-10-12 Bor Kraljič <pyrobor at ver.si>
 	* CONFIGURE,DEPENDS: removed optional dependency on arts
 
-2011-09-08 Thomas Orgis <sobukus at sourcemage.org>
-	* DETAILS: Update to 1.13.4
-
 2011-04-22 Thomas Orgis <sobukus at sourcemage.org>
 	* DETAILS: Update to 1.13.3
 
diff --git a/chat-im/vacuum/BUILD b/chat-im/vacuum/BUILD
index d246419..2113434 100755
--- a/chat-im/vacuum/BUILD
+++ b/chat-im/vacuum/BUILD
@@ -1,4 +1 @@
-QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
-PATH="$QTDIR/bin/qt4:$PATH"
-qmake PREFIX=$INSTALL_ROOT/usr INSTALL_PREFIX=$INSTALL_ROOT/usr -recursive vacuum.pro &&
-make
+qt4_cmake_build
diff --git a/chat-im/vacuum/DEPENDS b/chat-im/vacuum/DEPENDS
index d26b7ab..5342c99 100755
--- a/chat-im/vacuum/DEPENDS
+++ b/chat-im/vacuum/DEPENDS
@@ -1,3 +1,4 @@
+depends cmake &&
 depends qt4 &&
 depends openssl &&
 depends subversion
diff --git a/chat-im/vacuum/HISTORY b/chat-im/vacuum/HISTORY
index 5b93d50..393c51a 100644
--- a/chat-im/vacuum/HISTORY
+++ b/chat-im/vacuum/HISTORY
@@ -1,3 +1,7 @@
+2012-03-07 Pol Vinogradov <vin.public at gmail.com>
+	* BUILD: switched to qt4_cmake_build
+	* DEPENDS: added cmake
+
 2011-10-14 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed long description wrap (scripted)
 
diff --git a/devel/wdiff/DEPENDS b/devel/wdiff/DEPENDS
new file mode 100755
index 0000000..5764a9c
--- /dev/null
+++ b/devel/wdiff/DEPENDS
@@ -0,0 +1 @@
+depends ncurses
diff --git a/devel/wdiff/DETAILS b/devel/wdiff/DETAILS
new file mode 100755
index 0000000..365997f
--- /dev/null
+++ b/devel/wdiff/DETAILS
@@ -0,0 +1,18 @@
+           SPELL=wdiff
+         VERSION=1.1.0
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   SOURCE_URL[0]=http://ftp.gnu.org/gnu/${SPELL}/${SOURCE}
+     SOURCE_HASH=sha512:09cf6284dd306db1d0ddf4911a178f2ef6bd5565e0b6627bcef67f0db5bc4284c562b94170ba1d508d2cbc611b4bbf2a044202a3f1c1302242d6b7b8874d2d76
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://www.gnu.org/software/wdiff/"
+      LICENSE[0]=GPL
+         ENTERED=20120307
+           SHORT="a front end to diff for comparing files on a word per word basis"
+cat << EOF
+The GNU wdiff program is a front end to diff for comparing files on a word per
+word basis. A word is anything between whitespace. This is useful for comparing
+two texts in which a few words have been changed and for which paragraphs have
+been refilled. It works by creating two temporary files, one word per line,
+and then executes diff on these files. It collects the diff output and uses
+it to produce a nicer display of word differences between the original files.
+EOF
diff --git a/devel/wdiff/HISTORY b/devel/wdiff/HISTORY
new file mode 100644
index 0000000..1088e61
--- /dev/null
+++ b/devel/wdiff/HISTORY
@@ -0,0 +1,3 @@
+2012-03-07 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS, DETAILS: spell created
+
diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS
index 8d4b27f..1b6eee8 100755
--- a/x11-libs/wine/DEPENDS
+++ b/x11-libs/wine/DEPENDS
@@ -26,11 +26,6 @@ optional_depends  docbook-utils             \
                   ""                        \
                   "for building wine documentation"  &&
 
-optional_depends  esound                                     \
-                  '--with-esd'                               \
-                  '--without-esd'                            \
-                  'for Enhanced Sound Daemon mixer support'  &&
-
 optional_depends  fontconfig                  \
                   '--with-fontconfig'         \
                   '--without-fontconfig'      \
@@ -51,11 +46,6 @@ optional_depends  hal                                \
                   '--without-hal'                    \
                   'for dynamic drive configuration'  &&
 
-optional_depends  JACK-DRIVER               \
-                  '--with-jack'             \
-                  '--without-jack'          \
-                  'for JACK audio support'  &&
-
 optional_depends  JPEG                      \
                   '--with-jpeg'             \
                   '--without-jpeg'          \
@@ -87,11 +77,6 @@ optional_depends  MSTTF                                  \
                   'for original MS TrueType fonts'       \
                   'z-rejected'                           &&
 
-optional_depends  nas                                    \
-                  '--with-nas'                           \
-                  '--without-nas'                        \
-                  'for NAS audio support'                &&
-
 # the --with-curses option fails
 # because it can't find libncurses
 #optional_depends  ncurses               \
@@ -166,10 +151,10 @@ optional_depends  libxrender                            \
                   '--without-xrender'                   \
                   'for X11 XRender extension support'   &&
 
-optional_depends  libxext                               \
-                  '--with-xshape --with-xshm'           \
-                  '--without-xshape --without-xshm'     \
-                  'for X11 XShape and Xshmextension support'  &&
+optional_depends  libxext                             \
+                  '--with-xshape'                     \
+                  '--without-xshape'                  \
+                  'for X11 XShape extension support'  &&
 
 optional_depends  xf86vidmodeproto                      \
                   '--with-xxf86vm'                      \
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index e772903..750fac1 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,9 +12,9 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
   FORCE_DOWNLOAD=1
 else
   if [[ $WINE_BRANCH == devel ]]; then
-         VERSION=1.4-rc6
+         VERSION=1.4
   else
-         VERSION=1.2.3
+         VERSION=1.4
   fi
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index f0f34d7..3557868 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,9 @@
+2012-03-07 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated devel to 1.4
+	  Updated stable to 1.4
+	* DEPENDS: esd, jack, nas are no longer used
+	  libxext dependency no longer implies Xshm extension
+
 2012-03-02 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated devel to 1.4-rc6
 


More information about the SM-Commit mailing list