Updated

4 files changed, 19 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a29d5728725d..52999f58774b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = xfhell
 	pkgdesc = Ham Radio - GTK+ app - de/en-codes Hellschreiber signals.
-	pkgver = 3.1
+	pkgver = 3.2
 	pkgrel = 1
 	url = http://www.qsl.net/5b4az/pkg/xfhell/xfhell.html
-	install = xfhell.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
@@ -13,21 +12,22 @@ pkgbase = xfhell
 	makedepends = pkg-config
 	depends = gtk2
 	depends = alsa-lib
-	depends = desktop-file-utils
-	source = http://www.qsl.net/5b4az/pkg/xfhell/xfhell-3.1.tar.bz2
+	optdepends = hamradio-menus: XDG compliant menuing
+	options = !emptydirs
+	source = http://www.qsl.net/5b4az/pkg/xfhell/xfhell-3.2.tar.bz2
 	source = diff.autogen.sh
 	source = diff.Makefile.am
 	source = xfhell.desktop
 	source = xdemorse.png
 	source = xfhell.1
-	md5sums = 25ed5f477ba38f0c296734ec4e82ff99
-	md5sums = ad6b0e6dd69c1d0efd01efef63ace093
+	md5sums = 7119dee2d51402fea2d036f210c22a59
+	md5sums = 0dc3caa8b1acd87b453bd0acef17b034
 	md5sums = f5b10bc9c510cb359b6cb626d628aab9
 	md5sums = 9a3568a6dbdd2bfb90aa76adf2dc531f
 	md5sums = edcd3f301ec8ea95453d40534beb6ede
 	md5sums = f1b4aee1d96afc2a5aa2aed475914ce4
-	sha256sums = 819b319b83813fef48198dbfa0c8bbcb269aabe3b84ce0d3f4cd98b81c533451
-	sha256sums = cc38902be0fc1026cc027cd0fdab7e78bbfb336df36b90b8f25060775636924a
+	sha256sums = 2cdfd266f866d439d991fc9a7cabc9f2d504812e0da4764aff3c7be8ebe49d8a
+	sha256sums = 335a1b0407d45a2abd6260564ca50bea04e02485cc41c59a835341fa0e5dd1ee
 	sha256sums = 2484d70e867515fbe49fff2463a1ef8ecee02f1feb36ef4deec8fd24fcea0f7b
 	sha256sums = a4bdba7b601bace48e15bd2dc6f0daadd8a10511242cbb2fdc17bf78a19647b5
 	sha256sums = 857eb46c32c12333a7110fb3ea99d2246084724856638f2e04324fc2a576626d
diff --git a/PKGBUILD b/PKGBUILD
index 78ca1652cb1b..73fed98e2ac8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,18 @@
 # Maintainer: not_anonymous <nmlibertarian@gmail.com>
+# Original Contributor: Bob Finch <w9ya@arrl.net>
 
 pkgname=xfhell
-pkgver=3.1
+pkgver=3.2
 pkgrel=1
 pkgdesc="Ham Radio - GTK+ app - de/en-codes Hellschreiber signals."
 arch=('i686' 'x86_64')
 url="http://www.qsl.net/5b4az/pkg/xfhell/xfhell.html"
 license=(GPL3)
-depends=('gtk2' 'alsa-lib' 'desktop-file-utils')
-makedepends=('autoconf' 'automake' 'intltool'
-# 'imagemagick'
- 'pkg-config')
-install=$pkgname.install
+depends=('gtk2' 'alsa-lib')
+optdepends=('hamradio-menus: XDG compliant menuing')
+makedepends=('autoconf' 'automake' 'intltool' 'pkg-config')
+# 'imagemagick: used IF you want to convert icons/images')
+options=('!emptydirs')
 source=("http://www.qsl.net/5b4az/pkg/$pkgname/$pkgname-$pkgver.tar.bz2"
 	diff.autogen.sh
 	diff.Makefile.am
@@ -35,7 +36,6 @@ prepare() {
 build() {
 	cd $srcdir/$pkgname-$pkgver
 
-#	export LDFLAGS="-lm $LDFLAGS"
 	./autogen.sh
 	./configure --prefix=/usr
 	make
@@ -58,14 +58,14 @@ package() {
 	mv $pkgdir/usr/bin/$pkgname $pkgdir/usr/bin/$pkgname.1
 	install -D -m 755 ../$pkgname.1 $pkgdir/usr/bin/$pkgname
 }
-md5sums=('25ed5f477ba38f0c296734ec4e82ff99'
-         'ad6b0e6dd69c1d0efd01efef63ace093'
+md5sums=('7119dee2d51402fea2d036f210c22a59'
+         '0dc3caa8b1acd87b453bd0acef17b034'
          'f5b10bc9c510cb359b6cb626d628aab9'
          '9a3568a6dbdd2bfb90aa76adf2dc531f'
          'edcd3f301ec8ea95453d40534beb6ede'
          'f1b4aee1d96afc2a5aa2aed475914ce4')
-sha256sums=('819b319b83813fef48198dbfa0c8bbcb269aabe3b84ce0d3f4cd98b81c533451'
-            'cc38902be0fc1026cc027cd0fdab7e78bbfb336df36b90b8f25060775636924a'
+sha256sums=('2cdfd266f866d439d991fc9a7cabc9f2d504812e0da4764aff3c7be8ebe49d8a'
+            '335a1b0407d45a2abd6260564ca50bea04e02485cc41c59a835341fa0e5dd1ee'
             '2484d70e867515fbe49fff2463a1ef8ecee02f1feb36ef4deec8fd24fcea0f7b'
             'a4bdba7b601bace48e15bd2dc6f0daadd8a10511242cbb2fdc17bf78a19647b5'
             '857eb46c32c12333a7110fb3ea99d2246084724856638f2e04324fc2a576626d'
diff --git a/diff.autogen.sh b/diff.autogen.sh
index afd272c70050..b748ef50d84f 100644
--- a/diff.autogen.sh
+++ b/diff.autogen.sh
@@ -3,5 +3,3 @@
 @@ -10 +10 @@
 -test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.9
 +test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.15
-@@ -357,0 +358 @@
-+    1.15*) automake_progs="automake-1.15 " ;;
diff --git a/xfhell.install b/xfhell.install
deleted file mode 100644
index 2eaa60550d51..000000000000
--- a/xfhell.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}