2 files changed, 82 insertions, 31 deletions
diff --git a/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD
index 925f2e4fd..b4ea81676 100644
--- a/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD
@@ -1,54 +1,54 @@
-# $Id$
 # Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-#
-# All modifications and uses of this file are licensed under
-# the software for which this file was made for, should the software
-# be under an Open Source License, at least version 1.9, defined
-# by the Open Source Initiative. In other cases, this file is automatically
-# released to the Public Domain.
-#
 
 pkgname=trinity-konversation
 pkgver=3513
 pkgrel=1
+
 arch=('i686' 'x86_64')
+
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity')
-pkgdesc="Trinity - Konversation IRC client"
-depends=('trinity-kdelibs' 'trinity-qt3' 'trinity-tqtinterface')
+pkgdesc="Trinity - pkgdesc"
+
+depends=('trinity-kdelibs')
 makedepends=('pkgconfig' 'autoconf' 'automake')
+
 options=('libtool' '!strip')
+
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/konversation-3.5.13.tar.gz)
 md5sums=('0f0e0415dad4c19bc885c9addadf4026')
 
-build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export 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
+_builddir=applications/konversation
+_prefix=/opt/trinity
 
-  export CFLAGS=-I/opt/triniy/include/tqt
-  export CXXFLAGS=-I/opt/trinity/include/tqt
-
-  trinity_prefix="/opt/trinity"
-  
-  msg "Starting cmake..."
+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/applications/konversation"
+  msg "Starting autoconf..."
+  cd "$srcdir/$cmpdir"
+  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
-  ./configure --with-qt-dir=/opt/qt/ --prefix=/opt/trinity
+
+  msg "Starting configure..."
+  ./configure \
+     --with-qt-dir=${QTDIR} \
+     --with-qt-inculdes=${QTDIR}/include \
+     --with-qt-libraries=${QTDIR}/lib \
+     --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
+
+  msg "Building ${pkgname}..."
   make
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
-#   cd ${srcdir}/${_svnmod}
-  cd ${srcdir}/build
-
-  make DESTDIR="$pkgdir/" install
-
-#   rm -r ${srcdir}/${_svnmod}
+#  cd ${srcdir}/build
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/arch/3.5.13/trinity-extras/trinity-lipstik/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-lipstik/PKGBUILD
new file mode 100644
index 000000000..6c652dcab
--- /dev/null
+++ b/arch/3.5.13/trinity-extras/trinity-lipstik/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-kde-style-lipstik
+pkgver=3513
+pkgrel=1
+
+arch=('i686' 'x86_64')
+
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - Lipstik style"
+
+depends=('trinity-kdelibs' 'trinity-kdebase')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+
+options=('libtool' '!strip')
+
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/kde-style-lipstik-3.5.13.tar.gz)
+md5sums=('1585d4df7f0c68499fafa0b8ecb82dab')
+
+_builddir=applications/kde-style-lipstik
+_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 "Starting autoconf..."
+  cd "$srcdir/${_builddir}"
+  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} \
+     --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}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}