Update to 1.61-1

Signed-off-by: Masanori Ogino <masanori.ogino@gmail.com>

3 files changed, 56 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0447a98c92f0..d372f7f7aa79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = nuweb
 	pkgdesc = A Simple Literate Programming Tool
-	pkgver = 1.58
+	pkgver = 1.61
 	pkgrel = 1
 	url = http://nuweb.sourceforge.net/
 	install = nuweb.install
-	arch = any
-	license = unknown
+	arch = x86_64
+	arch = i686
+	license = custom:BSD-3-Clause
 	depends = texlive-core
-	source = http://downloads.sourceforge.net/project/nuweb/nuweb-1.58.tar.gz
+	source = http://downloads.sourceforge.net/project/nuweb/nuweb-1.61.tar.gz
 	source = nuweb.install
-	md5sums = 85ce11cfdf5d6ebc82309bcd3e26fd6f
-	md5sums = aa285f8379d9d62b469591e0a2dd0bd7
+	source = nuweb.LICENSE
+	sha256sums = fbf4ff8f27690027bceac799262b43cc27cad51261799111d512d2faf1044c9b
+	sha256sums = 93b550ff61543e6628a858cb28d70c7a850da8aa4fbfc7172830eae70fc78014
+	sha256sums = 86d9ee75add7cee2e21c0423182523e9525b2f5824dbf802fea3e337d0a49e77
 
 pkgname = nuweb
-
diff --git a/PKGBUILD b/PKGBUILD
index 75c1cb7fdced..40e5abde520c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,56 +1,50 @@
-# Maintainer: aksr <aksr at t-com dot me>
+# Maintainer: Masanori Ogino <masanori.ogino@gmail.com>
+# Contributor: aksr <aksr at t-com dot me>
+
 pkgname=nuweb
-pkgver=1.58
+pkgver=1.61
 pkgrel=1
 epoch=
 pkgdesc="A Simple Literate Programming Tool"
-arch=(any)
+arch=('x86_64' 'i686')
 url="http://nuweb.sourceforge.net/"
-license=('unknown')
-groups=()
+license=('custom:BSD-3-Clause')
 depends=('texlive-core')
-makedepends=()
-checkdepends=()
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
 install=nuweb.install
-changelog=
-source=("http://downloads.sourceforge.net/project/nuweb/$pkgname-$pkgver.tar.gz" "nuweb.install")
-noextract=()
-md5sums=('85ce11cfdf5d6ebc82309bcd3e26fd6f'
-         'aa285f8379d9d62b469591e0a2dd0bd7') #generate with 'makepkg -g'
+source=("http://downloads.sourceforge.net/project/nuweb/$pkgname-$pkgver.tar.gz" "nuweb.install" "nuweb.LICENSE")
+sha256sums=('fbf4ff8f27690027bceac799262b43cc27cad51261799111d512d2faf1044c9b'
+            '93b550ff61543e6628a858cb28d70c7a850da8aa4fbfc7172830eae70fc78014'
+            '86d9ee75add7cee2e21c0423182523e9525b2f5824dbf802fea3e337d0a49e77')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   latex nuwebdoc
   bibtex nuwebdoc
   latex nuwebdoc
   latex nuwebdoc
 
-	make nuweb
+  make nuweb
   ./nuweb nuweb.w
   ./nuweb nuwebsty.w
   pdflatex nuweb.tex
 }
 
 check() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make -k check
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-  mkdir -p $pkgdir/usr/share/{emacs/site-lisp,texmf/tex/latex,/doc/$pkgname,man/man1}
+  cp nuweb.LICENSE "$srcdir/$pkgname-$pkgver/LICENSE"
+  cd "$srcdir/$pkgname-$pkgver"
+  mkdir -p $pkgdir/usr/share/{emacs/site-lisp,texmf/tex/latex,doc/$pkgname,licenses/$pkgname,man/man1}
 
   install -D -m755 $srcdir/$pkgname-$pkgver/nuweb        $pkgdir/usr/bin/nuweb
   install -D -m644 $srcdir/$pkgname-$pkgver/nuweb.1      $pkgdir/usr/share/man/man1/nuweb.1
   install -D -m644 $srcdir/$pkgname-$pkgver/nuweb.el     $pkgdir/usr/share/emacs/site-lisp/nuweb.el
   install -D -m644 $srcdir/$pkgname-$pkgver/README       $pkgdir/usr/share/doc/$pkgname/README
+  install -D -m644 $srcdir/$pkgname-$pkgver/LICENSE      $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
   install -D -m644 $srcdir/$pkgname-$pkgver/bibnames.sty $pkgdir/usr/share/texmf/tex/latex/$pkgname/bibnames.sty
   install -D -m644 $srcdir/$pkgname-$pkgver/html.sty     $pkgdir/usr/share/texmf/tex/latex/$pkgname/html.sty
diff --git a/nuweb.LICENSE b/nuweb.LICENSE
new file mode 100644
index 000000000000..05a7cff820c4
--- /dev/null
+++ b/nuweb.LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 1996, Preston Briggs
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+Neither name of the product nor the names of its contributors may
+be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.