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

1 files changed, 38 insertions, 50 deletions

diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
index 8ab915341..b7360f4f0 100644
--- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
@@ -7,65 +7,53 @@ arch=('i686' 'x86_64')
 url="http://trinity.pearsoncomputing.net"
 license=('GPL2')
 groups=('trinity-base')
-pkgdesc="Trinity - tqtinterface"
-depends=('python2-sip'
-	'trinity-qt3'
-	'trinity-pyqt3')
-makedepends=(
-             'pkgconfig'
-             'cmake'
-             'autoconf'
-             'libxi'
-             'libxft'
-             'libxrandr'
-             'libxcursor'
-             'libxinerama'
-             'mesa')
-provides=('trinity-tqtinterface')
-conflicts=('trinity-tqtinterface')
-replaces=('trinity-tqtinterface')
+pkgdesc="Trinity - TQt interface"
+depends=('python2-sip' 'trinity-qt3' 'trinity-pyqt3')
+makedepends=('pkgconfig' 'cmake' 'libxi' 'libxft' 'libxrandr' 'libxcursor' 'libxinerama' 'mesa')
+# optdepends=()
+provides=($pkgname)
+#conflicts=()
+#replaces=()
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz)
 md5sums=('d54cc9fd0b35555298efd17c32471a2b')
 
-_qtdir=/opt/qt
 _prefix=/usr
+_builddir=build
 
 build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  if [[ -r /etc/profile.d/qt3.sh ]]; then
-    . /etc/profile.d/qt3.sh
-  else
-    [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
-  fi
-
-  echo $PATH 
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake "../dependencies/tqtinterface" -DCMAKE_INSTALL_PREFIX=${_prefix} -DQT_PREFIX_DIR=/opt/qt/ -DQT_LIBRARY_DIRS=/opt/qt/lib -DQT_INCLUDE_DIR=/opt/qt/include -DQT_VERSION=3 -DMOC_EXECUTABLE=${_qtdir}/bin/moc || return 1
-#     -DQT_INCLUDE_DIR=${_prefix}/include/tqt/Qt
-#     -DWITH_QT3=ON \
-#     -DQT_LIBRARY_DIRS=/opt/qt/lib \
-#     -DCMAKE_SKIP_RPATH=ON || return 1
-  make
+   msg "Setting PATH, CMAKE and Trinity Environment variables"
+   . /etc/profile.d/qt3.sh
+
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd build
+
+   msg "Starting cmake..."
+   cmake "../dependencies/tqtinterface" \
+     -DCMAKE_INSTALL_PREFIX=${_prefix} \
+     -DQT_PREFIX_DIR=${_qtdir} \
+     -DQT_INCLUDE_DIR=${_qtdir}/include \
+     -DQT_VERSION=3 \
+     -DMOC_EXECUTABLE=${_qtdir}/bin/moc || return 1
+   #     -DQT_INCLUDE_DIR=${_prefix}/include/tqt/Qt
+   #     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+   #     -DWITH_QT3=ON \
+   #     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+   #     -DCMAKE_SKIP_RPATH=ON || return 1
+   make
 }
 
 package() {
+   msg "Packaging - $pkgname-$pkgver"
+   #   cd ${_svnmod}
+   cd ${srcdir}/${_builddir}
+   make DESTDIR="${pkgdir}" install
 
-  msg "Packaging - $pkgname-$pkgver"
-
-#   cd ${_svnmod}
-  cd ${srcdir}/build
-  make DESTDIR="$pkgdir/" install
-
-  # include uic-tqt in package
-#   cd ${srcdir}
-#   mkdir -p ${pkgdir}/usr/bin
-#   cp -Rp ${srcdir}/${_svnmod}/qtinterface/uic-tqt ${pkgdir}/usr/bin
+   # include uic-tqt in package
+   #   cd ${srcdir}
+   #   mkdir -p ${pkgdir}/usr/bin
+   #   cp -Rp ${srcdir}/${_svnmod}/qtinterface/uic-tqt ${pkgdir}/usr/bin
 
-#   rm -r ${srcdir}/${_svnmod}
+   #   rm -r ${srcdir}/${_svnmod}
 }