Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

1 files changed, 16 insertions, 17 deletions

diff --git a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
index d8cff8a28..4d4bb09a5 100644
--- a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
@@ -7,13 +7,13 @@ arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.com'
 license=('GPL')
 groups=('trinity-base')
-pkgdesc="Trinity - arts"
+pkgdesc="Trinity arts Sound System and libraries"
 depends=('audiofile'
-        'alsa-lib'
-        'libmad'
-	'libvorbis'
-	'trinity-tqtinterface')
-makedepends=('pkgconfig' 'cmake' 'autoconf')
+         'alsa-lib'
+         'libmad'
+         'libvorbis'
+         'trinity-tqtinterface')
+makedepends=('pkgconfig' 'cmake')
 provides=('trinity-arts')
 conflicts=('trinity-arts')
 replaces=('trinity-arts')
@@ -22,26 +22,25 @@ source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/ar
 md5sums=('109124dabb1aaa9d44eb32e43b549142')
 
 # set Qt location (not needed if profile.d/q3.sh present, set prefix (not used)
-_qtdir=/opt/qt
-_prefix=${_qtdir}
+#_qtdir=/opt/qt
+_builddir=build
+_prefix="/opt/trinity"
 
 build() {
 
 
   msg "Setting PATH, CMAKE and Trinity Environment variables"
-  if [[ -r /etc/profile.d/qt3.sh ]]; then
+  #if [[ -r /etc/profile.d/qt3.sh ]]; then
     . /etc/profile.d/qt3.sh
-    [[ -n $QTDIR ]] && _qtdir=$QTDIR
-  else
-    [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
-  fi
+  #  [[ -n $QTDIR ]] && _qtdir=$QTDIR
+  #else
+  #  [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+  #fi
 
   # exports not required with /opt/qt/include in the right place
   # export CMAKE_PREFIX_PATH=$QTDIR
   # export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt
 
-  trinity_prefix="/opt/trinity"
-
   cd $srcdir
   msg "Creating out-of-source build directory: ${srcdir}/build"
   mkdir -p build
@@ -49,13 +48,13 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/dependencies/arts/ \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_INSTALL_PREFIX=${_prefix} \
     -DQT_VERSION=3 || return 1
 
 #     -DQT_VERSION=3 \
 #     -DWITH_QT3=ON \
 #     -DQT_LIBRARY_DIRS=/opt/qt/lib
-
+  msg "Building $pkgname..."
   make VERBOSE=1
 
 }