Update to latest revision, PKGBUILd fixes

2 files changed, 13 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 67c85e59a8e0..e0a50f37260c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pd-l2ork
 	pkgdesc = L2Ork (Linux Laptop Orchestra) version of PureData
-	pkgver = 1571.38e474c
+	pkgver = 1612.fff97fe
 	pkgrel = 1
 	url = http://l2ork.music.vt.edu/main/?page_id=56
 	install = pd-l2ork.install
@@ -47,11 +47,7 @@ pkgbase = pd-l2ork
 	depends = tk
 	depends = tkpng
 	depends = vlc
-	optdepends = puredata-utils
-	optdepends = pd
-	optdepends = pd-vanilla
-	optdepends = pd-extended
-	optdepends = xapian-tcl-bindings: improved help browser with search engine
+	depends = xapian-tcl-bindings
 	conflicts = pd-l2ork
 	options = !makeflags
 	source = pd-l2ork::git+https://github.com/pd-l2ork/pd.git
diff --git a/PKGBUILD b/PKGBUILD
index d4ac7bbf68f8..805345cb5bf8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: <aggraef at gmail.com>
 # Contributor: <fero dot kiraly at gmail.com>
 
-# This package can be installed along with pd, pd-vanilla or pd-extended. To
-# avoid conflicts with these, pdsend and pdreceive are *not* included. Use the
-# puredata-utils package to get pdsend and pdreceive if none of the other Pd
-# versions is installed.
+# This package can be installed along with pd or pd-extended. To avoid
+# conflicts with these, cyclist, pdsend and pdreceive can be found under
+# /usr/lib/pd-l2ork/bin instead. Likewise, the Gem include files get installed
+# under /usr/include/pd-l2ork.
 
 pkgname=pd-l2ork
-pkgver=1571.38e474c
+pkgver=1612.fff97fe
 pkgrel=1
 pkgdesc="L2Ork (Linux Laptop Orchestra) version of PureData"
 url="http://l2ork.music.vt.edu/main/?page_id=56"
@@ -18,10 +18,8 @@ depends=('bluez-libs' 'desktop-file-utils' 'dssi' 'fftw'
   'gsl' 'gsm' 'hicolor-icon-theme' 'imagemagick' 'jack' 'ladspa' 'lame'
   'libdc1394' 'libdv' 'libgl' 'libiec61883' 'libjpeg' 'libquicktime'
   'libraw1394' 'libsndobj-cvs' 'libv4l' 'libvorbis' 'lua51' 'portaudio'
-  'smpeg' 'speex' 'stk' 'tk' 'tkpng' 'vlc')
+  'smpeg' 'speex' 'stk' 'tk' 'tkpng' 'vlc' 'xapian-tcl-bindings')
 makedepends=('git' 'subversion' 'swig' 'curl' 'rsync')
-optdepends=('puredata-utils' 'pd' 'pd-vanilla' 'pd-extended'
-            'xapian-tcl-bindings: improved help browser with search engine')
 conflicts=('pd-l2ork')
 install=pd-l2ork.install
 options=('!makeflags')
@@ -53,8 +51,9 @@ package() {
   # Remove extra packaging files.
   cd "$pkgdir/usr"
   rm -f Makefile README.txt
-  # Remove pdsend and pdreceive to avoid conflicts with other Pd versions.
-  rm -f bin/cyclist bin/pdreceive bin/pdsend
+  # Move pdsend and pdreceive to avoid conflicts with other Pd versions.
+  mv bin/cyclist bin/pdreceive bin/pdsend lib/pd-l2ork/bin
+  # Get rid of the corresponding manpages
   rm -f share/man/man1/pdreceive.* share/man/man1/pdsend.*
   # Move the Gem include files into the pd-l2ork include directory to prevent
   # conflicts with other packages providing these files.
@@ -70,12 +69,8 @@ package() {
   cp -f pd-l2ork.gif "$pkgdir/usr/lib/pd-l2ork"
   install -d "$pkgdir/usr/share/icons/hicolor/128x128/apps"
   cp -f pd-l2ork*.png "$pkgdir/usr/share/icons/hicolor/128x128/apps/"
-  # XXXFIXME: This is also in the pd-extended package. For now we install it
-  # into /usr/share/pixmaps instead, to prevent file conflicts.
-  # install -d "$pkgdir/usr/share/icons/hicolor/128x128/mimetypes"
-  # cp -f text-x-puredata.png "$pkgdir/usr/share/icons/hicolor/128x128/mimetypes/"
-  install -d "$pkgdir/usr/share/pixmaps"
-  cp -f text-x-puredata.png "$pkgdir/usr/share/pixmaps/"
+  install -d "$pkgdir/usr/share/icons/hicolor/128x128/mimetypes"
+  cp -f text-x-pd-l2ork.png "$pkgdir/usr/share/icons/hicolor/128x128/mimetypes/"
   install -d "$pkgdir/usr/share/applications"
   cp -f pd-l2ork*.desktop "$pkgdir/usr/share/applications/"
   install -d "$pkgdir/usr/share/mime/packages"