Updated

4 files changed, 36 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3812ba7295c9..0da4855d520a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xpsk31
 	pkgdesc = Ham Radio PSK31 engine using X/GTK+
-	pkgver = 3.6.1
+	pkgver = 3.6.2
 	pkgrel = 1
 	url = http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31.html
 	arch = i686
@@ -12,18 +12,20 @@ pkgbase = xpsk31
 	makedepends = pkg-config
 	depends = gtk3
 	depends = hamradio-menus
-	source = http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31-3.6.1.tar.bz2
+	source = http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31-3.6.2.tar.bz2
+	source = diff.Makefile.am
 	source = xpsk31.desktop
 	source = xpsk31.1
 	source = xdemorse.png
-	md5sums = 346093bdef71823451e11a304cb1007d
+	md5sums = fe24677f3261b5d3b63fea7dd5b35c44
+	md5sums = 988264985f99e2869c590897c4219357
 	md5sums = c784ec5d71a3897c515add6aa370cccd
-	md5sums = 27f0893852750dbbb51239c4725442c2
+	md5sums = 0dd0a9e1cc2d745ef93333f97b2e138d
 	md5sums = edcd3f301ec8ea95453d40534beb6ede
-	sha256sums = 3ac59f04fe694e920c887508d5c1df8006cebac3dc5d27cf869139d9f8c39e70
+	sha256sums = a713c45b48fbb0f3c162a9b2125dda5dac36f9c57b7f7a289253188dd06ddbf4
+	sha256sums = 5259e4e44cf4adffdb7a6d506958aa523523e3317554d180c6346348a59801a4
 	sha256sums = d1afe06070b7a6eec1967194c2d7a5a38cf29e73dca35976a72d52707dece0a5
-	sha256sums = ee8bb6a89eb145b4da83c4a737bc0fcc1856b5e032dad35161bc6dc514e3ac90
+	sha256sums = 1095a3122d3d448b8c2c48d8810ca37dbd8b9ec06b6fc51bc75ceb39c8eef071
 	sha256sums = 857eb46c32c12333a7110fb3ea99d2246084724856638f2e04324fc2a576626d
 
 pkgname = xpsk31
-
diff --git a/PKGBUILD b/PKGBUILD
index 7bb914e4722b..8f5bd825f075 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Original Contributor: Bob Finch <w9ya@arrl.net>
 
 pkgname=xpsk31
-pkgver=3.6.1
+pkgver=3.6.2
 pkgrel=1
 pkgdesc="Ham Radio PSK31 engine using X/GTK+"
 arch=('i686' 'x86_64')
@@ -13,22 +13,22 @@ 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
 )
 
-#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
@@ -50,8 +50,8 @@ check() {
 package() {
 	cd $srcdir/$pkgname-$pkgver
 
-	mkdir -p $pkgdir/usr/share/doc/$pkgname/examples/
-	mkdir -p $pkgdir/usr/share/{applications,pixmaps,man/man1}
+#	mkdir -p $pkgdir/usr/share/doc/$pkgname/examples/
+#	mkdir -p $pkgdir/usr/share/{applications,pixmaps,man/man1}
 	make DESTDIR=$pkgdir install
 
 	mkdir -p $pkgdir/usr/bin
@@ -64,11 +64,13 @@ package() {
 
 	rm $pkgdir/usr/share/doc/$pkgname/$pkgname.1.gz
 }
-md5sums=('346093bdef71823451e11a304cb1007d'
+md5sums=('fe24677f3261b5d3b63fea7dd5b35c44'
+         '988264985f99e2869c590897c4219357'
          'c784ec5d71a3897c515add6aa370cccd'
-         '27f0893852750dbbb51239c4725442c2'
+         '0dd0a9e1cc2d745ef93333f97b2e138d'
          'edcd3f301ec8ea95453d40534beb6ede')
-sha256sums=('3ac59f04fe694e920c887508d5c1df8006cebac3dc5d27cf869139d9f8c39e70'
+sha256sums=('a713c45b48fbb0f3c162a9b2125dda5dac36f9c57b7f7a289253188dd06ddbf4'
+            '5259e4e44cf4adffdb7a6d506958aa523523e3317554d180c6346348a59801a4'
             'd1afe06070b7a6eec1967194c2d7a5a38cf29e73dca35976a72d52707dece0a5'
-            'ee8bb6a89eb145b4da83c4a737bc0fcc1856b5e032dad35161bc6dc514e3ac90'
+            '1095a3122d3d448b8c2c48d8810ca37dbd8b9ec06b6fc51bc75ceb39c8eef071'
             '857eb46c32c12333a7110fb3ea99d2246084724856638f2e04324fc2a576626d')
diff --git a/diff.Makefile.am b/diff.Makefile.am
index dc04fde28e35..d3670633ceca 100644
--- a/diff.Makefile.am
+++ b/diff.Makefile.am
@@ -1,28 +1,7 @@
---- Makefile.am	2013-12-02 00:01:29.000000000 -0700
-+++ Makefile.am	2015-02-18 20:18:22.333001926 -0700
-@@ -34,6 +34,19 @@
--	if test -d $(HOME)/$(PACKAGE); then \
--	  echo Working directory exists: $(HOME)/$(PACKAGE) - not copying; \
--	  else \
--	  echo Copying $(PACKAGE) working directory to $(HOME)/$(PACKAGE); \
--	  cp -r $(srcdir)/$(PACKAGE) $(HOME); \
--	  fi
-+	if test -d files/; then \
-+ 	  echo "cp files/$(PACKAGE).desktop $(DESTDIR)/usr/share/applications/"; \
-+ 	  cp files/$(PACKAGE).desktop $(DESTDIR)/usr/share/applications/; \
-+ 	  echo "cp files/$(PACKAGE).xpm $(DESTDIR)/usr/share/pixmaps/"; \
-+ 	  cp files/$(PACKAGE).xpm $(DESTDIR)/usr/share/pixmaps/; \
-+ 	fi
-+
-+	if test -d xpsk31/; then \
-+ 		if !(test -d $(DESTDIR)/usr/share/doc/$(PACKAGE)); then \
-+ 		  echo "mkdir $(DESTDIR)/usr/share/doc/$(PACKAGE)/"; \
-+ 		  mkdir $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \
-+  		  echo "mkdir $(DESTDIR)/usr/share/doc/$(PACKAGE)/examples/"; \
-+ 		  mkdir $(DESTDIR)/usr/share/doc/$(PACKAGE)/examples/; \
-+ 		fi; \
-+ 	  echo "cp -r doc/* $(DESTDIR)/usr/share/doc/$(PACKAGE)/"; \
-+ 	  cp -r doc/* $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \
-+ 	  echo "cp xpsk31/$(PACKAGE)rc $(DESTDIR)/usr/share/doc/$(PACKAGE)/examples/"; \
-+ 	  cp xpsk31/$(PACKAGE)rc $(DESTDIR)/usr/share/doc/$(PACKAGE)/examples/$(PACKAGE)rc.example; \
-+	fi
+--- Makefile.am	2021-04-14 02:51:35.000000000 -0600
++++ Makefile.am	2023-03-20 13:27:33.072902743 -0600
+@@ -60,2 +60,2 @@
+-	  $(MKDIR_P) $(DESTDIR)$(datarootdir)/examples/$(PACKAGE)/;\
+-	  cp -r $(PACKAGE)/* $(DESTDIR)$(datarootdir)/examples/$(PACKAGE)/; \
++	  $(MKDIR_P) $(DESTDIR)$(docdir)/examples/;\
++	  cp -r $(PACKAGE)/* $(DESTDIR)$(docdir)/examples/; \
diff --git a/xpsk31.1 b/xpsk31.1
index e372c8057ea4..2b19d24a3834 100644
--- a/xpsk31.1
+++ b/xpsk31.1
@@ -2,5 +2,5 @@
 if [ ! -f ~/xpsk31/xpsk31rc ] ; then
        mkdir -p ~/xpsk31
     fi
-cp -ua /usr/share/doc/xpsk31/examples/xpsk31rc.example ~/xpsk31/xpsk31rc
+cp -ua /usr/share/doc/xpsk31/examples/* ~/xpsk31/.
 /usr/bin/xpsk31.1 $1