From ba8871e16db9c824eeb6b1b12490b2ea5908278c Mon Sep 17 00:00:00 2001
From: "Pawel \"l0ner\" Soltys" <pwslts@gmail.com>
Date: Tue, 7 Feb 2012 18:13:57 +0100
Subject: kdeadmin:  minor fixups, dropped _prefix variable

---
 .../trinity-extras/trinity-kdeadmin/PKGBUILD       | 23 +++++++---------------
 1 file changed, 7 insertions(+), 16 deletions(-)

(limited to 'arch')

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
-- 
cgit v1.2.3