Updated

4 files changed, 63 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed6ba466f502..01d05bcd3a01 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cwdaemon
 	pkgdesc = Ham Radio Morse Code transmitter - text input is sent via udp port 6789.
-	pkgver = 0.10.1
+	pkgver = 0.10.2.4
 	pkgrel = 1
 	url = http://cwdaemon.sourceforge.net
 	arch = i686
@@ -8,15 +8,15 @@ pkgbase = cwdaemon
 	license = GPL
 	depends = unixcw>=3.3.1
 	depends = netcat
-	source = http://downloads.sourceforge.net/sourceforge/cwdaemon/cwdaemon-0.10.1.tar.gz
+	source = cwdaemon::git+https://github.com/acerion/cwdaemon#branch=master
 	source = diff.Makefile.am
-	source = diff.Makefile.am.test
-	md5sums = 681e02e48fb5a05c2e7bea0e63f5d94d
-	md5sums = 4b641dbb07f9d9918ccbfb1e65a320cb
-	md5sums = 4c8fa7d9783c6e00a57ed2376aad0f2c
-	sha256sums = 5c914140aba395b5d52ba5d822bec9c22e05e93e38af9cfd212242adcaf6abcc
-	sha256sums = abf5edafe536066ae299d72347035acd452ca93e73359fffcf3b40eee22dae5e
-	sha256sums = ceab7697484eda01a322db232e8e1ab4a853db45ddabe3c84b916ab412f0aede
+	source = diff.Makefile.am.example
+	md5sums = SKIP
+	md5sums = 9afaea52e53c3140388633ed608bf0ed
+	md5sums = db518d891fb68c02168111f46340899d
+	sha256sums = SKIP
+	sha256sums = af0343ee5691c256ccb206284d683f88b551132446cd9ecd1dc3cc87af72e833
+	sha256sums = fb40a17f6cc5b0910e588c8c815a5340069b013af3207017073eff6ca58cca26
 
 pkgname = cwdaemon
 
diff --git a/PKGBUILD b/PKGBUILD
index 901913db7412..a7ff0afb737d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,27 +2,38 @@
 # Original Submission: Bob Finch <w9ya@qrparci.net>
 
 pkgname=cwdaemon
-pkgver=0.10.1
+_author=acerion
+pkgver=0.10.2.4
+#.r4.g44f36eb
 pkgrel=1
 pkgdesc="Ham Radio Morse Code transmitter - text input is sent via udp port 6789."
 arch=('i686' 'x86_64')
 url="http://cwdaemon.sourceforge.net"
 license=('GPL')
 depends=('unixcw>=3.3.1' 'netcat')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+source=("$pkgname::git+https://github.com/$_author/$pkgname#branch=master"
+#http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
 	diff.Makefile.am
-	diff.Makefile.am.test)
+	diff.Makefile.am.example)
+
+pkgver() {
+	cd "$pkgname"
+
+	git describe --long | sed -r 's/-([0-9,a-g,A-G]{7}.*)//' | sed 's/-/./'
+#	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+
+}
 
 prepare () {
-	cd $srcdir/$pkgname-$pkgver
+	cd $srcdir/$pkgname
 
 	patch -p0 < ../diff.Makefile.am
 	sed -i s:sbin:bin: src/Makefile.am
-	patch -p0 < ../diff.Makefile.am.test
+	patch -p0 < ../diff.Makefile.am.example
 }
 
 build() {
-	cd $srcdir/$pkgname-$pkgver
+	cd $srcdir/$pkgname
 
 	aclocal --force
 	libtoolize --force
@@ -35,13 +46,13 @@ build() {
 }
 
 package() {
-	cd $srcdir/$pkgname-$pkgver
+	cd $srcdir/$pkgname
 
 	make prefix=$pkgdir/usr install
 }                                                  
-md5sums=('681e02e48fb5a05c2e7bea0e63f5d94d'
-         '4b641dbb07f9d9918ccbfb1e65a320cb'
-         '4c8fa7d9783c6e00a57ed2376aad0f2c')
-sha256sums=('5c914140aba395b5d52ba5d822bec9c22e05e93e38af9cfd212242adcaf6abcc'
-            'abf5edafe536066ae299d72347035acd452ca93e73359fffcf3b40eee22dae5e'
-            'ceab7697484eda01a322db232e8e1ab4a853db45ddabe3c84b916ab412f0aede')
+md5sums=('SKIP'
+         '9afaea52e53c3140388633ed608bf0ed'
+         'db518d891fb68c02168111f46340899d')
+sha256sums=('SKIP'
+            'af0343ee5691c256ccb206284d683f88b551132446cd9ecd1dc3cc87af72e833'
+            'fb40a17f6cc5b0910e588c8c815a5340069b013af3207017073eff6ca58cca26')
diff --git a/diff.Makefile.am b/diff.Makefile.am
index 70fbabc2b115..b2982e5ca7d8 100644
--- a/diff.Makefile.am
+++ b/diff.Makefile.am
@@ -1,15 +1,21 @@
---- Makefile.am	2013-12-17 15:06:00.000000000 -0700
-+++ Makefile.am	2015-01-20 16:42:26.459618573 -0700
-@@ -19 +19 @@
+--- Makefile.am	2017-01-16 16:58:55.192035682 -0700
++++ Makefile.am	2017-01-17 01:38:14.327267806 -0700
+@@ -46 +46 @@
 -	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 +	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/test
-@@ -27 +27,4 @@
--	$(INSTALL_SCRIPT) $(srcdir)/test/cwtest.sh $(DESTDIR)$(pkgdatadir)
-+	$(INSTALL_SCRIPT) $(srcdir)/test/cwtest.sh $(DESTDIR)$(pkgdatadir)/test
-+	$(INSTALL_SCRIPT) $(srcdir)/test/cwtest.pl $(DESTDIR)$(pkgdatadir)/test
-+	$(INSTALL_SCRIPT) $(srcdir)/test/cwtest2.pl $(DESTDIR)$(pkgdatadir)/test
-+	$(INSTALL_SCRIPT) $(srcdir)/test/cwtest3.pl $(DESTDIR)$(pkgdatadir)/test
-@@ -30 +33,2 @@
--	$(INSTALL_DATA) $(srcdir)/test/cwtest.c $(DESTDIR)$(pkgdatadir)
-+	$(INSTALL_DATA) $(srcdir)/test/cwtest.c $(DESTDIR)$(pkgdatadir)/test
-+	$(INSTALL_DATA) $(srcdir)/test/hanging.c $(DESTDIR)$(pkgdatadir)/test
+@@ -54,3 +54,3 @@
+-	$(INSTALL_SCRIPT) $(srcdir)/examples/example.sh $(DESTDIR)$(pkgdatadir)
+-	$(INSTALL_SCRIPT) $(srcdir)/examples/example.pl $(DESTDIR)$(pkgdatadir)
+-	$(INSTALL_SCRIPT) $(srcdir)/cwsetup.sh $(DESTDIR)$(pkgdatadir)
++	$(INSTALL_SCRIPT) $(srcdir)/examples/example.sh $(DESTDIR)$(pkgdatadir)/test
++	$(INSTALL_SCRIPT) $(srcdir)/examples/example.pl $(DESTDIR)$(pkgdatadir)/test
++	$(INSTALL_SCRIPT) $(srcdir)/cwsetup.sh $(DESTDIR)$(pkgdatadir)/test
+@@ -58,4 +58,4 @@
+-	$(INSTALL_DATA) $(srcdir)/examples/README $(DESTDIR)$(pkgdatadir)
+-	$(INSTALL_DATA) $(srcdir)/examples/example.c $(DESTDIR)$(pkgdatadir)
+-	$(INSTALL_DATA) $(srcdir)/examples/Makefile.am $(DESTDIR)$(pkgdatadir)
+-	$(INSTALL_DATA) $(srcdir)/examples/Makefile.in $(DESTDIR)$(pkgdatadir)
++	$(INSTALL_DATA) $(srcdir)/examples/README $(DESTDIR)$(pkgdatadir)/test
++	$(INSTALL_DATA) $(srcdir)/examples/example.c $(DESTDIR)$(pkgdatadir)/test
++	$(INSTALL_DATA) $(srcdir)/examples/Makefile.am $(DESTDIR)$(pkgdatadir)/test
++	$(INSTALL_DATA) $(srcdir)/examples/Makefile.in $(DESTDIR)$(pkgdatadir)/test
diff --git a/diff.Makefile.am.example b/diff.Makefile.am.example
new file mode 100644
index 000000000000..7bf97df1f9e4
--- /dev/null
+++ b/diff.Makefile.am.example
@@ -0,0 +1,11 @@
+--- examples/Makefile.am	2017-01-17 02:13:53.753614165 -0700
++++ examples/Makefile.am	2017-01-17 02:16:34.331538590 -0700
+@@ -20 +20 @@
+-noinst_PROGRAMS = example
++bin_PROGRAMS = example
+@@ -25 +25 @@
+-# example_CPPFLAGS =
++example_CPPFLAGS = -I$(top_srcdir)/src/
+@@ -27 +27 @@
+-# example_LDADD =
++example_LDADD = ${LIBCW_LIBS}