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

22 files changed, 177 insertions, 259 deletions

diff --git a/arch/3.5.13/trinity-base/hal/PKGBUILD b/arch/3.5.13/trinity-base/hal/PKGBUILD
index 8408f8c3e..f4a30f075 100644
--- a/arch/3.5.13/trinity-base/hal/PKGBUILD
+++ b/arch/3.5.13/trinity-base/hal/PKGBUILD
@@ -86,7 +86,7 @@ package() {
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/etc/rc.d"
   install -m755 -d "${pkgdir}/media"
-  install -m755 "${srcdir}/hald" "${pkgdir}/etc/rc.d/"
+  install -m755 "${srcdir}/hald" "${pkgdir}/etc/rc.d/hal"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD
index 417343986..01f86aefa 100644
--- a/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD
@@ -27,7 +27,7 @@ pkgname=('trinity-i18n-af' 'trinity-i18n-ar' 'trinity-i18n-az'
          'trinity-i18n-uz-cyrillic' 'trinity-i18n-vi' 'trinity-i18n-wa' '
          trinity-i18n-zh_cn' 'trinity-i18n-zh_tw')
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -39,36 +39,34 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kde-i18n-3.5.13.tar.gz)
 md5sums=('7c919c7cb85f454fed46767082a87773')
 
-_prefix=/opt/trinity
-
 build() {
-  msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-  cd $srcdir/kde-i18n
-  rm HOW.TO.BUILD TRINITY.RELEASE
-
-  for _filename in *.tar.bz2; do
-     _dir=`echo "$_filename" | cut -d'.' -f1-3`
-     _newname=`echo "$_dir" | cut -d'-' -f2-4`
-
-     if [ ! -d trinity-${newname} ]; then
-       msg "Extracting $_filename..."
-       tar xfj $_filename
-       mv $_dir trinity-${_newname}
-     fi
-
-     cd trinity-${_newname}
-     
-     msg "Starting trinity-${_newname} configure..."
-     ./configure --prefix=${_prefix} > /dev/null
-     
-     msg "Building trinity-${_newname}..."
-     make > /dev/null
-     
-     cd ..
-  done
+   msg "Setting Trinity Environment variables"
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
+
+   cd $srcdir/kde-i18n
+   rm HOW.TO.BUILD TRINITY.RELEASE
+
+   for _filename in *.tar.bz2; do
+      _dir=`echo "$_filename" | cut -d'.' -f1-3`
+      _newname=`echo "$_dir" | cut -d'-' -f2-4`
+
+      if [ ! -d trinity-${newname} ]; then
+         msg "Extracting $_filename..."
+         tar xfj $_filename
+         mv $_dir trinity-${_newname}
+      fi
+
+      cd trinity-${_newname}
+
+      msg "Starting trinity-${_newname} configure..."
+      ./configure --prefix=${TDEDIR} > /dev/null
+
+      msg "Building trinity-${_newname}..."
+      make > /dev/null
+
+      cd ..
+   done
 }
 
 package_trinity-i18n-af() {
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD
index cff62b43b..0b24cbf04 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdeaccessibility
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,37 +15,32 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeaccessibility-3.5.13.tar.gz)
 md5sums=('ce31b01c1831046fb28aab172f2423bf')
 
-_prefix=/opt/trinity
-
 build() {
-
-  msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < kdeaccessibility.patch
+   msg "Setting Trinity Environment variables"
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh 
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
   
-  msg "Starting automake..."
-  cd "$srcdir/kdeaccessibility"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --enable-closure \
-     --with-alsa \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
+   msg "Starting automake..."
+   cd "$srcdir/kdeaccessibility"
+   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+   sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
+   make -f admin/Makefile.common
+
+   msg "Starting configure..."
+   ./configure --with-qt-dir=${QTDIR} \
+      --prefix=${TDEDIR} \
+      --enable-closure \
+      --with-alsa \
+      #--with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+      #--with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+   msg "Building ${pkgname}..."
+   make
 }
 
 package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kdeaccesibility
-  make DESTDIR="${pkgdir}" install
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/kdeaccesibility
+   make DESTDIR="${pkgdir}" install
 }
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD
index abe0836fa..8ceafefde 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD
@@ -19,30 +19,25 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeaddons-3.5.13.tar.gz)
 md5sums=('f5fa96a5d99d1bc33600f609881eaee6')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < kdeaddons.patch
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
   
   msg "Starting automake..."
   cd "$srcdir/kdeaddons"
   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
   make -f admin/Makefile.common
 
   msg "Starting configure..."
   ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
+     --prefix=${TDEDIR} \
      --enable-closure \
      --with-{sdl,xmms} \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD
index 69928cf46..6ba924328 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdeadmin
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -11,38 +11,29 @@ groups=('trinity-extras')
 pkgdesc="Trinity system administration utils"
 depends=('trinity-kdelibs')
 makedepends=('pkgconfig' 'autoconf' 'automake')
-optdepends=()
-provides=($pkgname)
-conflicts=()
-replaces=()
 options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeadmin-3.5.13.tar.gz)
 md5sums=('b8bbabf353070a3e730464e0ce2960e2')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < kdeadmin.patch
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
   
   msg "Starting automake..."
   cd "$srcdir/kdeadmin"
   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
   make -f admin/Makefile.common
 
   msg "Starting configure..."
   ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
+     --prefix=${TDEDIR} \
      --enable-closure \
      --with-shadow \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     --with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
+     --with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD
index 18960152d..3561960d5 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdeartwork
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -17,12 +17,8 @@ md5sums=('24f85eb3e5a9106de48a3e81d2575ffe')
 
 build() {
   msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
-  _prefix="/opt/trinity"
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
 
   cd $srcdir
   msg "Creating out-of-source build directory: ${srcdir}/build"
@@ -31,7 +27,7 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/kdeartwork \
-    -DCMAKE_INSTALL_PREFIX=${_prefix} \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DWITH_XSCREENSAVER=ON \
     -DWITH_LIBART=ON \
@@ -45,5 +41,5 @@ package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 }
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD
index 9cb3418d7..e50e88bab 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdeedu
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,29 +15,25 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeedu-3.5.13.tar.gz)
 md5sums=('37a14a67c4d00babc3015c6a31698cb0')
 
-_prefix=/opt/trinity
-
 build() {
 
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < kdeedu.patch
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
   
   msg "Starting automake..."
   cd "$srcdir/kdeedu"
   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
   make -f admin/Makefile.common
 
   msg "Starting configure..."
   ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --enable-closure \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     --prefix=${TDEDIR} \
+     --enable-closure
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make
diff --git a/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD
index 8a6df3f6a..6cdc98e0d 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdegames
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,29 +15,26 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdegames-3.5.13.tar.gz)
 md5sums=('6c63e161050939f53921bfceb923a19e')
 
-_prefix=/opt/trinity
-
 build() {
 
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < kdegames.patch
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
+  
   
   msg "Starting automake..."
   cd "$srcdir/kdegames"
   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
   make -f admin/Makefile.common
 
   msg "Starting configure..."
   ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --enable-closure \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     --prefix=${TDEDIR} \
+     --enable-closure
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make
diff --git a/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD
index 8f1ed8b4c..49650579a 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdegraphics
 pkgver=3513
-pkgrel=1.0
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.com'
 license=('GPL')
@@ -20,16 +20,10 @@ options=('libtool' '!strip')
 source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdegraphics-3.5.13.tar.gz' 'ksnapshot.patch')
 md5sums=('a75c254cd1060343cd04c6744bce6798' '635ed9478cb3edde4fda84f3bac85438')
 
-_prefix="/opt/trinity"
-
 build() {
    msg "Setting PATH, CMAKE and Trinity Environment variables"
-   . /etc/profile.d/qt3.sh
-
-   export CMAKE_PREFIX_PATH=/opt/qt:${_prefix}
-   export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr:/usr/include:/usr/include/lcms
-   export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:/usr/lib:$LD_LIBRARY_PATH
-   export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
 
    msg "Patching..."
    patch -p0 -i ${srcdir}/ksnapshot.patch
@@ -41,7 +35,7 @@ build() {
 
    msg "Starting cmake..."
    cmake ${srcdir}/kdegraphics \
-      -DCMAKE_INSTALL_PREFIX=${_prefix} \
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
       -DCMAKE_VERBOSE_MAKEFILE=ON \
       -DQT_VERSION=3 \
       -DCMAKE_CXX_FLAGS="-fpermissive" \
@@ -59,8 +53,6 @@ build() {
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-
    make DESTDIR="$pkgdir" install
-
    cd ${startdir}
 }
diff --git a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD
index 12e75db87..b812735ba 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdemultimedia
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,13 +15,10 @@ options=('libtool' '!strip')
 source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdemultimedia-3.5.13.tar.gz' 'xine_artsplugin.patch')
 md5sums=('6d906b8a8fd0928e01ecd600175381c0' 'bb045d94e8dca80d73af4add43b7fc15')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
 
   msg "Patching..."
   patch -p0 -i ${srcdir}/xine_artsplugin.patch
@@ -30,13 +27,12 @@ build() {
   cd "$srcdir/kdemultimedia"
   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
   make -f admin/Makefile.common
 
   msg "Starting configure..."
   ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig \
+     --prefix=${TDEDIR} \
      --enable-closure \
      --with-vorbis \
      --with-alsa \
@@ -49,6 +45,8 @@ build() {
      --with-xine
      #--with-gstreamer
      #--with-akode \
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig \
 
   msg "Building ${pkgname}..."
   make
diff --git a/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD
index 82d8bebab..a24800eef 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdenetwork
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -26,12 +26,8 @@ md5sums=('349f197c9af4bf0d9b8773f26829415e'
 
 build() {
   msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
-  _prefix="/opt/trinity"
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
 
   patch -p0 -i ${srcdir}/kdenetwork.patch
   mv ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/tqname.cc
@@ -44,7 +40,7 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/kdenetwork \
-    -DCMAKE_INSTALL_PREFIX=${_prefix} \
+    -DCMAKE_INSTALL_PREFIX=$TDEDIR \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DWITH_JINGLE=ON \
     -DWITH_SPEEX=ON \
@@ -60,6 +56,5 @@ build() {
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 }
diff --git a/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD
index 7a49f3bcf..dcb645557 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD
@@ -25,18 +25,11 @@ source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdepim-3.5.13.tar.gz')
 source=('http://anduin.linuxfromscratch.org/sources/trinity/kdepim-3.5.13.tar.gz')
 md5sums=('4488062d5400bdd99642fe0b72ebcf9a')
 
-_prefix="/opt/trinity"
-
 build() {
-
   msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  . /etc/profile.d/qt3.sh
-
-   export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr:/usr/include
-   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
-
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
+  
   cd $srcdir
   msg "Creating out-of-source build directory: ${srcdir}/build"
   mkdir -p build
@@ -44,7 +37,7 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/kdepim \
-    -DCMAKE_INSTALL_PREFIX=${_prefix} \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DWITH_SASL=ON \
     -DWITH_NEWDISTRLISTS=ON \
@@ -71,8 +64,6 @@ build() {
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-
   make DESTDIR="$pkgdir" install
-
   cd ${startdir}
 }
diff --git a/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD
index ace4fc543..b7cec01c2 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdesdk
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -19,38 +19,33 @@ md5sums=('130662f683be1a49d56a713c5ae87e46'
 
 build() {
    msg "Setting PATH, CMAKE and Trinity Environment variables"
-   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/kde
-   export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde:$LD_LIBRARY_PATH
-   export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
-   _prefix="/opt/trinity"
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
 
    patch -N -d ${srcdir} -p0 < kdesdk.patch
 
    cd $srcdir/kdesdk
 
    msg "Starting configure..."
-
    cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
    cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+   sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
    make -f admin/Makefile.common
 
    msg "Starting configure..."
    ./configure --with-qt-dir=${QTDIR} \
-      --prefix=${_prefix} \
+      --prefix=${TDEDIR} \
       --enable-closure \
-      --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-      --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig \
       --with-berkeley-db \
       --with-subversion
+      #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
+      #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig \
 
    make
 
-
    #msg "Starting cmake..."
    #cmake ${srcdir}/kdesdk \
-   #  -DCMAKE_INSTALL_PREFIX=${_prefix} \
+   #  -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
    #  -DCMAKE_VERBOSE_MAKEFILE=ON \
    #  -DWITH_DBSEARCHENGINE=ON \
    #  -DWITH_KCAL=ON \
@@ -76,6 +71,5 @@ build() {
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/kdesdk
-
   make DESTDIR="$pkgdir" install
 }
diff --git a/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD
index 1de2a3b95..bd20aa2e7 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdetoys
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,26 +15,24 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdetoys-3.5.13.tar.gz)
 md5sums=('823dd778c1e9e15972a509f4eee4434d')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
 
   msg "Starting automake..."
   cd "$srcdir/kdetoys"
   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
   make -f admin/Makefile.common
 
   msg "Starting configure..."
   ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --enable-closure \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     --prefix=${TDEDIR} \
+     --enable-closure 
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD
index 38633c7fd..bd9a4da9d 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdeutils
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,27 +15,24 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeutils-3.5.13.tar.gz)
 md5sums=('e2cd6695606c5c91b3380dcc7f1a6a83')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
   
   msg "Starting automake..."
   cd "$srcdir/kdeutils"
   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
   make -f admin/Makefile.common
 
   msg "Starting configure..."
   ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --enable-closure \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     --prefix=${TDEDIR} \
+     --enable-closure 
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
      #--with-xmms
      #--with-snmp \
 
diff --git a/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD
index 2e3945c16..ff47e08f4 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 
 pkgname=trinity-kdevelop
-pkgver=12345
-pkgrel=1.0
+pkgver=3513
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -17,14 +17,9 @@ md5sums=('777bd77e4f2dc6a5b5b45a370dcf6da0'
          'ab23854b1658adc1da4621cb589ec1be')
 
 build() {
-
   msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  CMAKE_INCLUDE_PATH=/opt/qt/include:/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
-
-  _prefix="/opt/trinity"
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
 
   msg "Patching..."
   # apply second part of Francois Andriot patch
@@ -37,7 +32,7 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/kdevelop \
-    -DCMAKE_INSTALL_PREFIX=${_prefix} \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DQT_VERSION=3 \
     -DWITH_QT3=ON \
@@ -51,6 +46,5 @@ build() {
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-
   make DESTDIR="$pkgdir/" install
 }
diff --git a/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD
index 49e067fd6..aeb365b82 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trinity-webdev
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -18,13 +18,8 @@ md5sums=('4f56a6c4b5916615ca3615f8e8f868c6'
 
 build() {
   msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
-  _prefix="/opt/trinity"
-
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
   patch -N -d ${srcdir} -p0 < kdewebdev.patch
 
   cd $srcdir
@@ -34,7 +29,7 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/kdewebdev \
-    -DCMAKE_INSTALL_PREFIX=${_prefix} \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DBUILD_ALL=ON
   make
@@ -43,5 +38,5 @@ build() {
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 }
diff --git a/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD
index 933a98c7d..97ce89858 100644
--- a/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD
@@ -20,9 +20,10 @@ md5sums=('fba66a6c605a6d7be67a638cd29667b6'
          '5ce5bd3c1ed4d5004a864130a971f737'
          'c136e14af1923c2cf6dc5beb93da2ba4')
 
-_prefix=/usr
-
 build() {
+   msg "Setting enviroment variables..."
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
 
   # patch for Changelog version
   patch -p0 -i ${srcdir}/Changelog.patch || return 1
@@ -31,10 +32,10 @@ build() {
 
   cd ${srcdir}/libcaldav-${pkgver}
   msg "Running ./autogen.sh for autoreconf"
-  ./autogen.sh --prefix=${_prefix}
+  ./autogen.sh --prefix=${TDEDIR}
 #    --includedir=/usr/include
 #   msg "Running configure"
-#   ./configure --prefix=${_prefix}
+#   ./configure --prefix=${TDEDIR}
 
   make || return 1
 }
diff --git a/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD
index 918d9a853..f08419908 100644
--- a/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD
@@ -18,10 +18,11 @@ source=("http://quickbuild.pearsoncomputing.net:58080/2056019/libcarddav_${pkgve
 md5sums=('42a0fe57ba4c639aad53024f6c8d5614'
          '63ef0b91ff27dfb7c48ca0f07866af79')
 
-_prefix=/usr
-
 build() {
    cd ${srcdir}
+   msg "setting environment variables..."
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
 
    # apply libcarddav patch
    msg "Applying Patch: libcarddav.patch"
@@ -29,9 +30,9 @@ build() {
 
    cd ${srcdir}/libcarddav-${pkgver}
    msg "Running ./autogen.sh for autoreconf"
-   ./autogen.sh --prefix=${_prefix}
+   ./autogen.sh --prefix=${TDEDIR}
    #   msg "Running configure"
-   #   ./configure --prefix=${_prefix}
+   #   ./configure --prefix=${TDEDIR}
 
    make || return 1
 }
diff --git a/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD
index 6fdf2d303..17e05aa0b 100644
--- a/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD
@@ -3,40 +3,38 @@
 
 pkgname=trinity-libkdcraw
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-extras')
 pkgdesc="Trinity DCRaw library"
 depends=('trinity-kdelibs')
-#openmpi
+         #openmpi
 makedepends=('pkgconfig' 'autoconf' 'automake')
 options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkdcraw-3.5.13.tar.gz)
 md5sums=('770dd734dc427337a1a2e61b6b0874ae')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
 
   msg "Starting automake..."
   cd "$srcdir/libraries/libkdcraw"
   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
   make -f admin/Makefile.common
 
   msg "Starting configure..."
   ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
+     --prefix=${TDEDIR} \
      --enable-closure \
-     --enable-openmp \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     --enable-openmp
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make
diff --git a/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD
index 20dd82265..585cc5010 100644
--- a/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trinity-libkexiv2
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,26 +15,24 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkexiv2-3.5.13.tar.gz)
 md5sums=('74b160da8ea95f25048757b5fe692f85')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
 
   msg "Starting automake..."
   cd "$srcdir/libraries/libkexiv2"
   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
   make -f admin/Makefile.common
 
   msg "Starting configure..."
   ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --enable-closure \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     --prefix=${TDEDIR} \
+     --enable-closure
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make
diff --git a/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD
index e66eb1a4a..6ff3593c5 100644
--- a/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trinity-libkipi
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,26 +15,24 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkipi-3.5.13.tar.gz)
 md5sums=('22cb0ba7507cac99140cd1c0180cbe99')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
   
   msg "Starting automake..."
   cd "$srcdir/libraries/libkipi"
   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
   make -f admin/Makefile.common
 
   msg "Starting configure..."
   ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --enable-closure \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     --prefix=${TDEDIR} \
+     --enable-closure
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make