Updated

3 files changed, 31 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 298d3b284806..3812ba7295c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xpsk31
 	pkgdesc = Ham Radio PSK31 engine using X/GTK+
-	pkgver = 3.3
+	pkgver = 3.6.1
 	pkgrel = 1
 	url = http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31.html
 	arch = i686
@@ -10,27 +10,20 @@ pkgbase = xpsk31
 	makedepends = automake
 	makedepends = intltool
 	makedepends = pkg-config
-	depends = gtk2
-	depends = alsa-lib
+	depends = gtk3
 	depends = hamradio-menus
-	source = http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31-3.3.tar.bz2
-	source = diff.Makefile.am
+	source = http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31-3.6.1.tar.bz2
 	source = xpsk31.desktop
 	source = xpsk31.1
 	source = xdemorse.png
-	source = xpsk31.man.1.gz
-	md5sums = b4c52b7456390ab5361e6d035354c87e
-	md5sums = ed09102ed5862054b0f8579f78ab475f
+	md5sums = 346093bdef71823451e11a304cb1007d
 	md5sums = c784ec5d71a3897c515add6aa370cccd
-	md5sums = 856292e1d2c0f01745218c24e1bf690a
+	md5sums = 27f0893852750dbbb51239c4725442c2
 	md5sums = edcd3f301ec8ea95453d40534beb6ede
-	md5sums = 633652b8446b6970576444e0b8c4e3d9
-	sha256sums = 9b51cf4988a71d54022fff5eaa8c896c92f05cbd47ec70d5842af8071cca6946
-	sha256sums = 2377350a73d13e78a567ab4dd035dac445cc59056d123d75d370755dfddc2e7f
+	sha256sums = 3ac59f04fe694e920c887508d5c1df8006cebac3dc5d27cf869139d9f8c39e70
 	sha256sums = d1afe06070b7a6eec1967194c2d7a5a38cf29e73dca35976a72d52707dece0a5
-	sha256sums = 1286f9c1a67f7e96440d5a218bad5e7b745642f17b72750e37089779bf75eec9
+	sha256sums = ee8bb6a89eb145b4da83c4a737bc0fcc1856b5e032dad35161bc6dc514e3ac90
 	sha256sums = 857eb46c32c12333a7110fb3ea99d2246084724856638f2e04324fc2a576626d
-	sha256sums = 64b381591216ea16c35d94eea52d2de846ce7a628f92c2e0f26a72f27442a033
 
 pkgname = xpsk31
 
diff --git a/PKGBUILD b/PKGBUILD
index 317aad19e2b5..7bb914e4722b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,32 +3,32 @@
 # Original Contributor: Bob Finch <w9ya@arrl.net>
 
 pkgname=xpsk31
-pkgver=3.3
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="Ham Radio PSK31 engine using X/GTK+"
 arch=('i686' 'x86_64')
 url="http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31.html"
 license=(GPL)
-depends=('gtk2' 'alsa-lib' 'hamradio-menus')
+depends=('gtk3' 'hamradio-menus')
 makedepends=('autoconf' 'automake' 'intltool' 'pkg-config')
 # 'imagemagick: used IF you want to convert icons/images')
 source=(http://www.qsl.net/5b4az/pkg/psk31/$pkgname/$pkgname-$pkgver.tar.bz2
-	diff.Makefile.am
+#	diff.Makefile.am
 	$pkgname.desktop
 	$pkgname.1
 	xdemorse.png
-	$pkgname.man.1.gz
+#	$pkgname.man.1.gz
 )
 
-prepare() {
-	cd $srcdir/$pkgname-$pkgver
-
-	patch -p0 < ../diff.Makefile.am
-
-#	sed -i s:xpm:png: Makefile.am
-#	convert files/$pkgname.xpm files/$pkgname.png
-#	install -m644 ../$pkgname.desktop files/$pkgname.desktop
-}
+#prepare() {
+#	cd $srcdir/$pkgname-$pkgver
+#
+#	patch -p0 < ../diff.Makefile.am
+#
+##	sed -i s:xpm:png: Makefile.am
+##	convert files/$pkgname.xpm files/$pkgname.png
+##	install -m644 ../$pkgname.desktop files/$pkgname.desktop
+#}
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
@@ -51,7 +51,7 @@ package() {
 	cd $srcdir/$pkgname-$pkgver
 
 	mkdir -p $pkgdir/usr/share/doc/$pkgname/examples/
-	mkdir -p $pkgdir/usr/share/{applications,pixmaps}
+	mkdir -p $pkgdir/usr/share/{applications,pixmaps,man/man1}
 	make DESTDIR=$pkgdir install
 
 	mkdir -p $pkgdir/usr/bin
@@ -60,17 +60,15 @@ package() {
 
 	install -Dm644 ../$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
 	install -Dm644 ../xdemorse.png $pkgdir/usr/share/pixmaps/$pkgname.png
-	install -Dm644 ../$pkgname.man.1.gz $pkgdir/usr/share/man/man1/$pkgname.1.gz
+	install -Dm644 $pkgname/xpsk31rc $pkgdir/usr/share/doc/$pkgname/examples/xpsk31rc.example
+
+	rm $pkgdir/usr/share/doc/$pkgname/$pkgname.1.gz
 }
-md5sums=('b4c52b7456390ab5361e6d035354c87e'
-         'ed09102ed5862054b0f8579f78ab475f'
+md5sums=('346093bdef71823451e11a304cb1007d'
          'c784ec5d71a3897c515add6aa370cccd'
-         '856292e1d2c0f01745218c24e1bf690a'
-         'edcd3f301ec8ea95453d40534beb6ede'
-         '633652b8446b6970576444e0b8c4e3d9')
-sha256sums=('9b51cf4988a71d54022fff5eaa8c896c92f05cbd47ec70d5842af8071cca6946'
-            '2377350a73d13e78a567ab4dd035dac445cc59056d123d75d370755dfddc2e7f'
+         '27f0893852750dbbb51239c4725442c2'
+         'edcd3f301ec8ea95453d40534beb6ede')
+sha256sums=('3ac59f04fe694e920c887508d5c1df8006cebac3dc5d27cf869139d9f8c39e70'
             'd1afe06070b7a6eec1967194c2d7a5a38cf29e73dca35976a72d52707dece0a5'
-            '1286f9c1a67f7e96440d5a218bad5e7b745642f17b72750e37089779bf75eec9'
-            '857eb46c32c12333a7110fb3ea99d2246084724856638f2e04324fc2a576626d'
-            '64b381591216ea16c35d94eea52d2de846ce7a628f92c2e0f26a72f27442a033')
+            'ee8bb6a89eb145b4da83c4a737bc0fcc1856b5e032dad35161bc6dc514e3ac90'
+            '857eb46c32c12333a7110fb3ea99d2246084724856638f2e04324fc2a576626d')
diff --git a/xpsk31.1 b/xpsk31.1
index ca10dbb3e1e2..e372c8057ea4 100644
--- a/xpsk31.1
+++ b/xpsk31.1
@@ -1,6 +1,6 @@
 #!/bin/bash
 if [ ! -f ~/xpsk31/xpsk31rc ] ; then
        mkdir -p ~/xpsk31
-       cp /usr/share/doc/xpsk31/examples/xpsk31rc.example ~/xpsk31/xpsk31rc
     fi
+cp -ua /usr/share/doc/xpsk31/examples/xpsk31rc.example ~/xpsk31/xpsk31rc
 /usr/bin/xpsk31.1 $1