Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master z-rejected grimoire by Vlad Glagolev 
<stealth AT sourcemage.org>:

 dev/null                                                            |binary
 z-net/ts3_client/BUILD                                              |    6 --
 z-net/ts3_client/DEPENDS                                            |    2 
 z-net/ts3_client/DETAILS                                            |   24 
+++-----
 z-net/ts3_client/HISTORY                                            |    9 
+++
 z-net/ts3_client/INSTALL                                            |   27 
+---------
 z-net/ts3_client/PRE_BUILD                                          |   25 
+++------
 z-net/ts3_client/TeamSpeak3-Client-linux_amd64-3.0.0-beta32.run.sig |    0 
 z-net/ts3_client/TeamSpeak3-Client-linux_amd64-3.0.2.run.sig        |binary
 z-net/ts3_client/TeamSpeak3-Client-linux_x86-3.0.0-beta32.run.sig   |    0 
 z-net/ts3_client/TeamSpeak3-Client-linux_x86-3.0.2.run.sig          |binary
 z-net/ts3_client/desktop/teamspeak3.desktop                         |    7 ++
 z-net/ts3_client/jpegsrc.v6b.tar.gz.sig                             |    0 
 13 files changed, 42 insertions(+), 58 deletions(-)

New commits:
commit f377eb839b73bf57c4b686c63f353f9f380472f2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    ts3_client: => 3.0.2

diff --git a/z-net/ts3_client/BUILD b/z-net/ts3_client/BUILD
index 7748da8..27ba77d 100755
--- a/z-net/ts3_client/BUILD
+++ b/z-net/ts3_client/BUILD
@@ -1,5 +1 @@
-cd $SOURCE_DIRECTORY/jpeg-6b &&
-OPTS="--enable-shared $OPTS" &&
-./ltconfig --no-verify ./ltmain.sh $HOST &&
-default_build &&
-cd $SOURCE_DIRECTORY
+true
diff --git a/z-net/ts3_client/DEPENDS b/z-net/ts3_client/DEPENDS
index d30cfc5..c96b420 100755
--- a/z-net/ts3_client/DEPENDS
+++ b/z-net/ts3_client/DEPENDS
@@ -1,7 +1,7 @@
 depends expat &&
 depends fontconfig &&
 depends freetype2 &&
-depends g++ &&
+depends -sub CXX gcc &&
 depends libx11 &&
 depends libxau &&
 depends libxdmcp &&
diff --git a/z-net/ts3_client/DETAILS b/z-net/ts3_client/DETAILS
index 6a02b31..2f75184 100755
--- a/z-net/ts3_client/DETAILS
+++ b/z-net/ts3_client/DETAILS
@@ -1,24 +1,18 @@
            SPELL=ts3_client
-         VERSION=3.0.0-beta32
+         VERSION=3.0.2
 if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
-          SOURCE=TeamSpeak3-Client-linux_amd64-${VERSION}.run
+            ARCH=amd64
 else
-          SOURCE=TeamSpeak3-Client-linux_x86-${VERSION}.run
+            ARCH=x86
 fi
+          SOURCE=TeamSpeak3-Client-linux_${ARCH}-${VERSION}.run
       SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
-if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
-  SOURCE_DIRECTORY=$BUILD_DIRECTORY/TeamSpeak3-Client-linux_amd64
-else
-  SOURCE_DIRECTORY=$BUILD_DIRECTORY/TeamSpeak3-Client-linux_x86
-fi
-   
SOURCE_URL[0]=http://ftp.4players.de/pub/hosted/ts3/releases/beta-32/$SOURCE
-         SOURCE2=jpegsrc.v6b.tar.gz
-     SOURCE2_GPG="gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME"
-  SOURCE2_URL[0]=http://www.ijg.org/files/$SOURCE2
-        WEB_SITE=http://www.goteamspeak.com/
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/TeamSpeak3-Client-linux_${ARCH}"
+   
SOURCE_URL[0]=http://ftp.4players.de/pub/hosted/ts3/releases/$VERSION/$SOURCE
+   
SOURCE_URL[1]=http://teamspeak.gameserver.gamed.de/ts3/releases/$VERSION/$SOURCE
+        WEB_SITE=http://www.teamspeak.com/
          ENTERED=20100501
-      
LICENCE[0]=http://www.teamspeak.com/?page=downloads&type=ts3_linux_client_latest
-      PATCHLEVEL=1
+      LICENCE[0]=http://www.teamspeak.com/?page=downloads
           REJECT="has licensing issues"
            SHORT="P2P talking over the net (client side)"
 cat << EOF
diff --git a/z-net/ts3_client/HISTORY b/z-net/ts3_client/HISTORY
index 724cb81..425485c 100644
--- a/z-net/ts3_client/HISTORY
+++ b/z-net/ts3_client/HISTORY
@@ -1,3 +1,12 @@
+2011-12-25 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 3.0.2; removed 2nd source data; added 2nd
+         mirror; quoting paths
+       * BUILD: not required
+       * DEPENDS: switched to CXX subdependency for gcc
+       * INSTALL: properly install stuff with a sane verbosity level
+       * PRE_BUILD: removed dirty hacks and hardcodings
+       * desktop/teamspeak3.desktop: created, moved from INSTALL
+
 2010-10-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Add jpeg 6b as SOURCE2
          PATCHLEVEL++
diff --git a/z-net/ts3_client/INSTALL b/z-net/ts3_client/INSTALL
index f1f5a66..60884ed 100755
--- a/z-net/ts3_client/INSTALL
+++ b/z-net/ts3_client/INSTALL
@@ -1,24 +1,7 @@
-local INSTALLDIR=/usr/libexec/$SPELL &&
+cp -av "$SOURCE_DIRECTORY" "$INSTALL_ROOT/usr/libexec/$SPELL" &&
 
-# Copy custom-build libjpeg.so, stupid binaries
-mkdir -p $INSTALL_ROOT/usr/libexec/ts3_client/imageformats &&
-cp -v $SOURCE_DIRECTORY/jpeg-6b/.libs/libjpeg.so \
-  $INSTALL_ROOT/usr/libexec/ts3_client/imageformats/libjpeg.so.62 &&
-rm -rf $SOURCE_DIRECTORY/jpeg-6b &&
+install -vm 755 -d "$INSTALL_ROOT/usr/share/pixmaps" &&
+ln -vsf "$TRACK_ROOT/usr/libexec/$SPELL/gfx/default/32x32_whisperlists.png" \
+        "$INSTALL_ROOT/usr/share/pixmaps/32x32_whisperlists.png" &&
 
-# create dirs and install.
-mkdir -p $INSTALLDIR &&
-cp -rv ./*    $INSTALLDIR/ &&
-cp -rv $SCRIPT_DIRECTORY/teamspeak3 /usr/bin &&
-chmod 755 /usr/bin/teamspeak3 &&
-
-# Create Desktop file
-cat << EOF > $INSTALL_ROOT/usr/share/applications/$SPELL.desktop
-[Desktop Entry]
-Name=TeamSpeak 3
-Comment=Internet-based conferencing
-Exec=teamspeak3
-Type=Application
-Icon=$INSTALL_ROOT/usr/libexec/ts3_client/gfx/default/32x32_whisperlists.png
-Categories=Internet
-EOF
+install -vm 755 "$SPELL_DIRECTORY/teamspeak3" "$INSTALL_ROOT/usr/bin"
diff --git a/z-net/ts3_client/PRE_BUILD b/z-net/ts3_client/PRE_BUILD
index 4951a0a..2358520 100755
--- a/z-net/ts3_client/PRE_BUILD
+++ b/z-net/ts3_client/PRE_BUILD
@@ -1,16 +1,11 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $SOURCE_DIRECTORY &&
-verify_source '' &&
-verify_file '2' &&
-unpack_file '2' &&
+default_pre_build &&
 
-#
-# Untar the files and bypass the annoying license query in
-# sh $SOURCE_CACHE/$SOURCE --nox11 --target $SOURCE_DIRECTORY &&
-#
-local filesize=16937816 &&
-local blocks=`expr $filesize / 1024` &&
-local bytes=`expr $filesize % 1024` &&
-dd if="$SOURCE_CACHE/$SOURCE" ibs=$(head -n 594 "$SOURCE_CACHE/$SOURCE" | wc 
-c | tr -d " ") skip=1 obs=1024 conv=sync |
-  { test $blocks -gt 0 && dd ibs=1024 obs=1024 count=$blocks ; \
-  test $bytes  -gt 0 && dd ibs=1 obs=1024 count=$bytes ; } 2> /dev/null | 
gzip -cd | tar xvf -
+# one-time replacement for extraction to display license
+function less() {
+  cat "$@"
+}
+
+export -f less &&
+yes yes | sh "$SOURCE_CACHE/$SOURCE" --noexec --nox11 --target \
+             "$SOURCE_DIRECTORY" &&
+export -n less
diff --git 
a/z-net/ts3_client/TeamSpeak3-Client-linux_amd64-3.0.0-beta32.run.sig 
b/z-net/ts3_client/TeamSpeak3-Client-linux_amd64-3.0.0-beta32.run.sig
deleted file mode 100644
index 3b3a782..0000000
Binary files 
a/z-net/ts3_client/TeamSpeak3-Client-linux_amd64-3.0.0-beta32.run.sig and 
/dev/null differ
diff --git a/z-net/ts3_client/TeamSpeak3-Client-linux_amd64-3.0.2.run.sig 
b/z-net/ts3_client/TeamSpeak3-Client-linux_amd64-3.0.2.run.sig
new file mode 100644
index 0000000..ba4853a
Binary files /dev/null and 
b/z-net/ts3_client/TeamSpeak3-Client-linux_amd64-3.0.2.run.sig differ
diff --git 
a/z-net/ts3_client/TeamSpeak3-Client-linux_x86-3.0.0-beta32.run.sig 
b/z-net/ts3_client/TeamSpeak3-Client-linux_x86-3.0.0-beta32.run.sig
deleted file mode 100644
index e3a5313..0000000
Binary files 
a/z-net/ts3_client/TeamSpeak3-Client-linux_x86-3.0.0-beta32.run.sig and 
/dev/null differ
diff --git a/z-net/ts3_client/TeamSpeak3-Client-linux_x86-3.0.2.run.sig 
b/z-net/ts3_client/TeamSpeak3-Client-linux_x86-3.0.2.run.sig
new file mode 100644
index 0000000..e972fec
Binary files /dev/null and 
b/z-net/ts3_client/TeamSpeak3-Client-linux_x86-3.0.2.run.sig differ
diff --git a/z-net/ts3_client/desktop/teamspeak3.desktop 
b/z-net/ts3_client/desktop/teamspeak3.desktop
new file mode 100644
index 0000000..cca9c8f
--- /dev/null
+++ b/z-net/ts3_client/desktop/teamspeak3.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=TeamSpeak 3
+Comment=Internet-based conferencing
+Exec=teamspeak3
+Type=Application
+Icon=32x32_whisperlists.png
+Categories=Internet
diff --git a/z-net/ts3_client/jpegsrc.v6b.tar.gz.sig 
b/z-net/ts3_client/jpegsrc.v6b.tar.gz.sig
deleted file mode 100644
index eef6a8e..0000000
Binary files a/z-net/ts3_client/jpegsrc.v6b.tar.gz.sig and /dev/null differ