arts: added profile files, added post-install instructions

4 files changed, 91 insertions, 20 deletions

diff --git a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
index 228b59ec4..a626e79b2 100644
--- a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
@@ -3,47 +3,72 @@
 
 pkgname=trinity-arts
 pkgver=3513
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.com'
 license=('GPL')
 groups=('trinity-base')
-pkgdesc="Trinity arts Sound System and libraries"
+pkgdesc="Trinity ARTS Sound System and libraries"
 depends=('trinity-qt3'
          'audiofile' 'libmad' 'libvorbis'
          'glib2')
 makedepends=('pkgconfig' 'cmake')
-conflicts=('kdemod3-arts')
+conflicts=('kdemod3-arts' 'arts')
 options=('libtool' '!emptydirs')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz)
-md5sums=('109124dabb1aaa9d44eb32e43b549142')
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz'
+        'trinity.profile.sh' 'trinity.profile.csh')
+md5sums=('109124dabb1aaa9d44eb32e43b549142'
+         '72c6c4fb492c1f4b4741fad1dd70d62f'
+         '915e14c6264a6b9c46a6a20b16cdcd06')
+install='trinity-arts.install'
 
 _prefix="/opt/trinity"
 
 build() {
 
-  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
+   # Do we need this?
+   msg "Setting PATH, CMAKE and Trinity Environment variables"
+   # This should be done on system startup, neverthless, do it to be sure.
+   . /etc/profile.d/qt3.sh
 
-  msg "Starting cmake..."
-  cmake ${srcdir}/dependencies/arts/ \
-    -DCMAKE_INSTALL_PREFIX=${_prefix}
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd build
 
-  msg "Building $pkgname..."
-  make VERBOSE=1
+   msg "Starting cmake..."
+   cmake ${srcdir}/dependencies/arts/ \
+      -DCMAKE_INSTALL_PREFIX=${_prefix}
+
+   msg "Building $pkgname..."
+   make
 
 }
 
 package() {
-  msg "Packaging - $pkgname-$pkgver"
+   msg "Packaging - $pkgname-$pkgver"
+
+   cd ${srcdir}/build
+
+   make DESTDIR="$pkgdir" install
+
+   # since this is first package to provide
+   # binaries, include headers and libs from trinity
+   # it should contain sripts which would add
+   # their location into system variables
+   # this mean that this package should provide
+   # /etc/ld.so.conf.d/trinity.conf - lib locations for linker
+   # /etc/profile.d/trinity.sh - $PATH and other system variables for bash
+   # /etc/profile.d/trinity.csh - $PATH and other system variables for csh
+   # up until now it was done in the kdelibs PKGBUILD/package
 
-  cd ${srcdir}/build
+   # Create and install ld.so.conf.d file
+   install -d -m755 $pkgdir/etc/ld.so.conf.d/
+   echo $_prefix/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
+   echo $_prefix/lib/kde >> $pkgdir/etc/ld.so.conf.d/trinity.conf
 
-  make DESTDIR="$pkgdir/" install
+   # Install profiles
+   install -D -m644 $srcdir/trinity.profile.sh $pkgdir/etc/profile.d/trinity.sh
+   install -D -m644 $srcdir/trinity.profile.csh $pkgdir/etc/profile.d/trinity.csh
 
 }
diff --git a/arch/3.5.13/trinity-base/trinity-arts/trinity-arts.install b/arch/3.5.13/trinity-base/trinity-arts/trinity-arts.install
new file mode 100644
index 000000000..30e6e407f
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-arts/trinity-arts.install
@@ -0,0 +1,11 @@
+post_install() {
+   ldconfig &> /dev/null
+}
+
+post_upgrade() {
+   post_install
+}
+
+post_remove() {
+   post_install
+}
diff --git a/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.csh b/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.csh
new file mode 100644
index 000000000..7fc995130
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.csh
@@ -0,0 +1,21 @@
+setenv TDEDIR /opt/trinity
+setenv TDEDIRS /usr:$TDEDIR
+setenv PATH $PATH:$TDEDIR/bin
+
+if ( ! $?PKG_CONFIG_PATH ) then
+ setenv PKG_CONFIG_PATH $TDEDIR/lib/pkgconfig
+else
+ setenv PKG_CONFIG_PATH $TDEDIR/lib/pkgconfig:$PKG_CONFIG_PATH
+endif
+
+if ( ! $?XDG_DATA_DIRS ) then
+  setenv XDG_DATA_DIRS $TDEDIR/share
+else
+  setenv XDG_DATA_DIRS $TDEDIR/share:$XDG_DATA_DIRS
+endif
+
+if ( ! $?XDG_CONFIG_DIRS ) then
+  setenv XDG_CONFIG_DIRS $TDEDIR/etc/xdg
+else
+  setenv XDG_CONFIG_DIRS $TDEDIR/etc/xdg:$XDG_CONFIG_DIRS
+endif
diff --git a/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.sh b/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.sh
new file mode 100644
index 000000000..70e503534
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.sh
@@ -0,0 +1,14 @@
+export TDEDIR=/opt/trinity 
+export TDEDIRS=$TDEDIR
+export PATH=$PATH:$TDEDIR/bin
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$TDEDIR/lib/pkgconfig
+if [ ! -z $XDG_DATA_DIRS ]; then 
+  export XDG_DATA_DIRS=$XDG_DATA_DIRS:$TDEDIR/share 
+else 
+  export XDG_DATA_DIRS=$TDEDIR/share 
+fi 
+if [ ! -z $XDG_CONFIG_DIRS ]; then 
+  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$TDEDIR/etc/xdg 
+else 
+  export XDG_CONFIG_DIRS=$TDEDIR/etc/xdg 
+fi
\ No newline at end of file