Source Mage code commit list

[Arwed von Merkatz <scm AT sourcemage.org>]

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

 net/howl/BUILD        |    3 ---
 video/xawtv/DEPENDS   |    6 ++++++
 video/xawtv/HISTORY   |    4 ++++
 video/xawtv/INSTALL   |    5 +++++
 video/xawtv/PRE_BUILD |    8 ++++++--
 5 files changed, 21 insertions(+), 5 deletions(-)

New commits:
commit 6a419cb9d0e4c9901aa5c7d1547f2287601b5751
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    howl: forgot to commit the removed BUILD

commit 3e0e131edce276d849c32ec6705de2ed38d084c4
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    xawtv: fixed to work with xorg-modular, bug 13014

diff --git a/net/howl/BUILD b/net/howl/BUILD
deleted file mode 100755
index 2b305c9..0000000
--- a/net/howl/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-# fix the pkgconfig file to use the correct include path
-sedit "s:-@VERSION@::"  howl.pc.in  &&
-default_build
diff --git a/video/xawtv/DEPENDS b/video/xawtv/DEPENDS
index afffbe6..19ce46d 100755
--- a/video/xawtv/DEPENDS
+++ b/video/xawtv/DEPENDS
@@ -2,6 +2,12 @@ depends gcc34        &&
 depends  X11-SERVER  &&
 depends  jpeg        &&
 
+. $GRIMOIRE/FUNCTIONS  &&
+if check_if_xorg_modular_server; then
+  depends  libfs  &&
+  depends  xset
+fi  &&
+
 optional_depends  libpng                                    \
                   ""                                        \
                   ""                                        \
diff --git a/video/xawtv/HISTORY b/video/xawtv/HISTORY
index 95cedc4..8eabeb0 100644
--- a/video/xawtv/HISTORY
+++ b/video/xawtv/HISTORY
@@ -1,3 +1,7 @@
+2007-10-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
+       * DEPENDS: depends on libfs and xset if using xorg-modular, bug 13014
+       * PRE_BUILD, INSTALL: added path adjustments for xorg-modular
+
 2006-04-13 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * BUILD: disable use of libquicktime as xawtv is incompatible to the
          current one
diff --git a/video/xawtv/INSTALL b/video/xawtv/INSTALL
index db1afc0..fdc3470 100755
--- a/video/xawtv/INSTALL
+++ b/video/xawtv/INSTALL
@@ -2,5 +2,10 @@ yes | make  install                           &&
 
 # Install fonts
 cd  ${SOURCE2/.tar.bz2/}                      &&
+if check_if_xorg_modular_server; then
+install  -m  644  *.pcf.gz                    \
+${INSTALL_ROOT}/usr/lib/X11/fonts/misc
+else
 install  -m  644  *.pcf.gz                    \
 ${INSTALL_ROOT}/usr/X11R6/lib/X11/fonts/misc
+fi
diff --git a/video/xawtv/PRE_BUILD b/video/xawtv/PRE_BUILD
index edf2367..74d5c1f 100755
--- a/video/xawtv/PRE_BUILD
+++ b/video/xawtv/PRE_BUILD
@@ -1,4 +1,8 @@
 default_pre_build            &&
 cd      ${SOURCE_DIRECTORY}  &&
-unpack_file 2 
-# patch  -p0  <  $SCRIPT_DIRECTORY/gcc-4.0.patch
+unpack_file 2                &&
+if check_if_xorg_modular_server; then
+  sed -i 's:FSlib.h:X11/fonts/FSlib.h:'  console/fs.h   &&
+  sed -i 's:-L@x_libraries@ @FSLIB@:-lFS:' Makefile.in  &&
+  sed -i 's:/usr/X11R6/lib/X11:/usr/lib/X11:'  configure
+fi