Update to 2.3.

3 files changed, 27 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82ef14f77e48..2a2c818d56c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Wed Nov  9 03:50:32 UTC 2016
 pkgbase = scrollz
 	pkgdesc = An advanced IRC client based on ircII client.
-	pkgver = 2.2.3
-	pkgrel = 5
+	pkgver = 2.3
+	pkgrel = 1
 	url = http://www.scrollz.info/
 	arch = i686
 	arch = x86_64
@@ -10,14 +12,10 @@ pkgbase = scrollz
 	depends = openssl
 	provides = scrollz
 	conflicts = scrollz-git
-	source = http://www.scrollz.info/download/ScrollZ-2.2.3.tar.gz
-	source = makefile.diff
-	md5sums = b99a247b627fb6d482549878e893d185
-	md5sums = cc7fc58e616e18f8175ec6225bdc4fa2
-	sha1sums = 81acfc32f13369e30878ead9f52c598f62f90abd
-	sha1sums = bb4743475792db6699fab3069a8ef3497acc49d0
-	sha256sums = 7d95d323168d117b6cb6e73fe1de85b863de7c681b5004545b6eceb76c208d03
-	sha256sums = b2f99fba728da5f806b80691f9e045f086179c3a8216365fdfd928d0fad45032
+	source = http://www.scrollz.info/download/ScrollZ-2.3.tar.gz
+	md5sums = ffdebe0f0d0e0290c054002904d89d6c
+	sha1sums = 991e6acfdf95d84ca159a37336c2d45a624d432f
+	sha256sums = 22535bcc54ad752107ab181775d90d9cf1b37648f500d627f428388a9d3710e6
 
 pkgname = scrollz
 
diff --git a/PKGBUILD b/PKGBUILD
index 899c9a30d07f..f7747309d1fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Contributor: Karol "Kenji Takahashi" Wozniak <wozniakk@gmail.com>
 # Contributor: Nathan Owe <ndowens04 at gmail>
 # Maintainer: aksr <aksr at t-com dot me>
-pkgname=scrollz
 _pkgname=ScrollZ
-pkgver=2.2.3
-pkgrel=5
+pkgname=scrollz
+pkgver=2.3
+pkgrel=1
 epoch=
 pkgdesc="An advanced IRC client based on ircII client."
 arch=('i686' 'x86_64')
@@ -21,37 +21,27 @@ replaces=()
 backup=()
 install=
 changelog=
-source=(http://www.scrollz.info/download/$_pkgname-$pkgver.tar.gz
-        makefile.diff)
+source=(http://www.scrollz.info/download/$_pkgname-$pkgver.tar.gz)
 noextract=()
-md5sums=('b99a247b627fb6d482549878e893d185'
-         'cc7fc58e616e18f8175ec6225bdc4fa2')
-sha1sums=('81acfc32f13369e30878ead9f52c598f62f90abd'
-          'bb4743475792db6699fab3069a8ef3497acc49d0')
-sha256sums=('7d95d323168d117b6cb6e73fe1de85b863de7c681b5004545b6eceb76c208d03'
-            'b2f99fba728da5f806b80691f9e045f086179c3a8216365fdfd928d0fad45032')
-options=()
-
-prepare() {
-    cd $srcdir/$_pkgname-$pkgver
-    patch -p1 -i $srcdir/makefile.diff
-}
+md5sums=('ffdebe0f0d0e0290c054002904d89d6c')
+sha1sums=('991e6acfdf95d84ca159a37336c2d45a624d432f')
+sha256sums=('22535bcc54ad752107ab181775d90d9cf1b37648f500d627f428388a9d3710e6')
 
 build() {
-    cd $srcdir/$_pkgname-$pkgver
-    unset CPPFLAGS
-    ./configure --prefix=/usr \
-                --enable-regexp \
-                --enable-fish \
-                --enable-ipv6 \
-                --with-openssl \
-                --with-default-server='!chat.freenode.net:6697'
-    make
+  cd $srcdir/$_pkgname-$_pkgname-$pkgver
+  unset CPPFLAGS
+  ./configure --prefix=/usr \
+              --enable-regexp \
+              --enable-fish \
+              --enable-ipv6 \
+              --with-openssl \
+              --with-default-server='!chat.freenode.net:6697'
+  make
 }
 
 package() {
-    cd $srcdir/$_pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
-    install -Dm644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
+  cd $srcdir/$_pkgname-$_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
 }
 
diff --git a/makefile.diff b/makefile.diff
deleted file mode 100644
index 3a6ee97d993b..000000000000
--- a/makefile.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -120,8 +120,8 @@ RM = @RM@
- LN = @LN@
- CP = cp
- MV = mv
--INSTALL = ./bsdinstall -c -m 755
--INSTALL_DATA = ../bsdinstall -c -m 644
-+INSTALL = install -c -m 755
-+INSTALL_DATA = install -c -m 644
- 
- VERSION = @VERSION@
-