[Lunar-commits] <moonbase> audio/hydrogen, doc-tools/semantik, audio/liblastfm, docs/kdevelop-php-docs, python/PyQt4, science/avogadro, utils/rbutil, video/smplayer, web/google-gadgets-for-linux: Adjusting for the qt/kde move.

Dennis `stumbles` Veatch stumbles at lunar-linux.org
Fri Sep 3 16:58:33 CEST 2010


commit 23ab195dff6b6a597f09210a762e626f9ca89841
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Fri Sep 3 10:58:33 2010 -0400

    audio/hydrogen, doc-tools/semantik, audio/liblastfm, docs/kdevelop-php-docs, python/PyQt4, science/avogadro, utils/rbutil, video/smplayer, web/google-gadgets-for-linux: Adjusting for the qt/kde move.
---
 audio/hydrogen/BUILD               |    2 +-
 audio/hydrogen/DEPENDS             |    2 +-
 audio/hydrogen/DETAILS             |    1 -
 audio/liblastfm/DETAILS            |    2 +-
 doc-tools/semantik/DETAILS         |    2 +-
 docs/kdevelop-php-docs/BUILD       |    2 +-
 docs/kdevelop-php-docs/DETAILS     |    2 +-
 python/PyQt4/DETAILS               |    2 +-
 science/avogadro/DETAILS           |    2 +-
 utils/rbutil/DETAILS               |    2 +-
 video/smplayer/BUILD               |    4 ++--
 video/smplayer/DETAILS             |    2 +-
 web/google-gadgets-for-linux/BUILD |    2 +-
 13 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/audio/hydrogen/BUILD b/audio/hydrogen/BUILD
index 8d878e2..e336bb6 100644
--- a/audio/hydrogen/BUILD
+++ b/audio/hydrogen/BUILD
@@ -2,7 +2,7 @@
 
   . /etc/profile.d/qt4.rc &&
 
-  scons prefix=$MODULE_PREFIX &&
+  scons prefix=$QTDIR &&
   prepare_install &&
   scons install
 
diff --git a/audio/hydrogen/DEPENDS b/audio/hydrogen/DEPENDS
index b45d0fc..c042d6c 100644
--- a/audio/hydrogen/DEPENDS
+++ b/audio/hydrogen/DEPENDS
@@ -1,8 +1,8 @@
 depends libtar
 depends scons
-depends qt4
 depends libsndfile
 depends flac
+depends qt4
 
 optional_depends jack     "--enable-jack-support" "--disable-jack-support" "for JACK audio server"
 optional_depends alsa-lib "--enable-alsa"         "--disable-alsa"         "for ALSA support"
diff --git a/audio/hydrogen/DETAILS b/audio/hydrogen/DETAILS
index ac395b9..0ed7a39 100644
--- a/audio/hydrogen/DETAILS
+++ b/audio/hydrogen/DETAILS
@@ -3,7 +3,6 @@
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=$SFORGE_URL/$MODULE/
       SOURCE_VFY=sha1:e988710f82af858c0c688cb1d1e19d789fca49ef
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
         WEB_SITE=http://www.hydrogen-music.org/
          ENTERED=20060604
          UPDATED=20091116
diff --git a/audio/liblastfm/DETAILS b/audio/liblastfm/DETAILS
index 8f67a94..c6dd2a6 100644
--- a/audio/liblastfm/DETAILS
+++ b/audio/liblastfm/DETAILS
@@ -4,7 +4,7 @@
       SOURCE_URL=http://github.com/mxcl/liblastfm/tarball/0.3.1/
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mxcl-liblastfm-c6f4348/
       SOURCE_VFY=sha1:1910a0232cbded764cd7aef5ae483c6e60a2e7ed
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://github.com/mxcl/liblastfm/tree/master
          ENTERED=20090910
          UPDATED=20100622
diff --git a/doc-tools/semantik/DETAILS b/doc-tools/semantik/DETAILS
index 6aff071..12bc113 100644
--- a/doc-tools/semantik/DETAILS
+++ b/doc-tools/semantik/DETAILS
@@ -3,7 +3,7 @@
           SOURCE=${MODULE}-${VERSION}.tar.bz2
       SOURCE_URL=http://semantik.googlecode.com/files/
       SOURCE_VFY=sha1:4ddf0e63e05dd16e2d91dd2b4e75f8b1ebbc5293
-   MODULE_PREFIX=${KDE4_INSTALL_DIR:-/opt/lunar/kde/4}
+   MODULE_PREFIX=${KDE4_INSTALL_DIR:-/usr}
         WEB_SITE="http://freehackers.org/~tnagy/semantik.html"
          ENTERED=20071028
          UPDATED=20100624
diff --git a/docs/kdevelop-php-docs/BUILD b/docs/kdevelop-php-docs/BUILD
index b41d53d..72c0611 100644
--- a/docs/kdevelop-php-docs/BUILD
+++ b/docs/kdevelop-php-docs/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build"
+  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
 
   source /etc/profile.d/qt4.rc  &&
   source /etc/profile.d/kde4.rc &&
diff --git a/docs/kdevelop-php-docs/DETAILS b/docs/kdevelop-php-docs/DETAILS
index 2366b3a..e8d8338 100644
--- a/docs/kdevelop-php-docs/DETAILS
+++ b/docs/kdevelop-php-docs/DETAILS
@@ -5,7 +5,7 @@
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$KDE_URL/stable/kdevelop/$MAJOR/src/
       SOURCE_VFY=sha1:daa12167593de93ec6f13cdaf8eb963fa8ad1870
-   MODULE_PREFIX=${KDE_PREFIX:-/opt/lunar/kde/4}
+   MODULE_PREFIX=${KDE_PREFIX:-/usr}
         WEB_SITE=http://www.kde.org
          ENTERED=20100511
          UPDATED=20100511
diff --git a/python/PyQt4/DETAILS b/python/PyQt4/DETAILS
index edae019..f4ed205 100644
--- a/python/PyQt4/DETAILS
+++ b/python/PyQt4/DETAILS
@@ -5,7 +5,7 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/PyQt-$EXTRA-$VERSION
       SOURCE_URL=http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4
       SOURCE_VFY=sha1:dd1d9eb22f9780c54e3811c8958512847eacc302
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://www.riverbankcomputing.co.uk/news
          ENTERED=20080102
          UPDATED=20100713
diff --git a/science/avogadro/DETAILS b/science/avogadro/DETAILS
index 78404b7..d30e0d0 100644
--- a/science/avogadro/DETAILS
+++ b/science/avogadro/DETAILS
@@ -3,7 +3,7 @@
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$SFORGE_URL/$MODULE
       SOURCE_VFY=sha1:ba45826d904f58161334b4182f092e07a021d4ff
-   MODULE_PREFIX=${AVO_INSTALL_DIR:-/opt/lunar/avogadro}
+   MODULE_PREFIX=${AVO_INSTALL_DIR:-/usr}
         WEB_SITE=http://avogadro.openmolecules.net/wiki/Main_Page
          ENTERED=20090411
          UPDATED=20100621
diff --git a/utils/rbutil/DETAILS b/utils/rbutil/DETAILS
index b14c93c..4243de9 100644
--- a/utils/rbutil/DETAILS
+++ b/utils/rbutil/DETAILS
@@ -4,7 +4,7 @@
       SOURCE_URL=http://download.rockbox.org/rbutil/source/
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE\_1.2.4
       SOURCE_VFY=sha1:12792c9b56b6c09b109ae1cb484f35e02a40c1c1
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://www.rockbox.org/
          ENTERED=20100211
          UPDATED=20100211
diff --git a/video/smplayer/BUILD b/video/smplayer/BUILD
index 5d028a4..8711a68 100644
--- a/video/smplayer/BUILD
+++ b/video/smplayer/BUILD
@@ -1,7 +1,7 @@
 (
 
-  . /etc/profile.d/qt4.rc
-  . /etc/profile.d/kde4.rc
+  . /etc/profile.d/qt4.rc  &&
+  . /etc/profile.d/kde4.rc &&
 
 # These two lines gets around a make failure relating to some translation
 # character issues. This is temporary and needs to be looked at on the next
diff --git a/video/smplayer/DETAILS b/video/smplayer/DETAILS
index 50ba25e..4b2f6e4 100644
--- a/video/smplayer/DETAILS
+++ b/video/smplayer/DETAILS
@@ -3,7 +3,7 @@
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$SFORGE_URL/$MODULE
       SOURCE_VFY=sha1:1879839c229b7ef2dcd6d7e34e2e2057fae5182c
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://smplayer.sourceforge.net
          ENTERED=20090311
          UPDATED=20100308
diff --git a/web/google-gadgets-for-linux/BUILD b/web/google-gadgets-for-linux/BUILD
index ace59d6..47ecb68 100644
--- a/web/google-gadgets-for-linux/BUILD
+++ b/web/google-gadgets-for-linux/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS+=" --disable-werror"
+  OPTS+=" --disable-werror --disable-static" &&
 
   default_build
 


More information about the Lunar-commits mailing list