1 files changed, 28 insertions, 26 deletions
diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
index a5425bd21..adc2d5b83 100644
--- a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
@@ -3,65 +3,67 @@
 pkgname=trinity-dbus-tqt
 pkgver=3513
 pkgrel=1
+
 arch=('i686' 'x86_64')
+
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-base')
-pkgdesc="Trinity TQt Dbus wrapper"
+pkgdesc="Trinity TQt DBus wrapper"
+
 depends=('trinity-tqtinterface')
 makedepends=('pkgconfig' 'cmake')
+
 provides=('trinity-dbus-tqt')
 conflicts=('trinity-dbus-tqt')
 replaces=('trinity-dbus-tqt')
+
 options=('libtool' '!strip')
+
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/dbus-tqt-3.5.13.tar.gz)
 md5sums=('46ae165c068271485c827f6fc6687a9a')
 
-
 _svnmod=dependencies/dbus-tqt
-_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
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:\
-/usr/include/dbus-1.0:\
-/opt/trinity/include:\
-/opt/trinity/include/libkrandr
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
-
+  #  [[ -n $QTDIR ]] && _qtdir=$QTDIR
+  #else
+  #  [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+  #fi
+  export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
+  export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt:\
+     /usr/include/dbus-1.0:\
+     ${_prefix}/include:\
+     ${_prefix}/include/libkrandr
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
 
   cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
+  msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
+  mkdir -p ${_builddir}
+  cd ${_builddir}
 
   msg "Starting cmake..."
   cmake ${srcdir}/${_svnmod} \
     -DCMAKE_INSTALL_PREFIX=${_prefix} \
     -DCMAKE_VERBOSE_MAKEFILE=ON 
-  make
 #     -DWITH_QT3=ON \
 #     -DQTDIR=/opt/qt \
 #     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+
+  msg "Building - $pkgname..."
+  make
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
 #   cd ${srcdir}/${_svnmod}
-  cd ${srcdir}/build
-
-  make DESTDIR="$pkgdir/" install
-
-  cd ${startdir}
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
 }