misc updatesHEADmaster

Signed-off-by: Florian Pritz <bluewind@xinu.at>

6 files changed, 78 insertions, 73 deletions

diff --git a/extract/PKGBUILD b/extract/PKGBUILD
index a6525a7..3edc5d7 100644
--- a/extract/PKGBUILD
+++ b/extract/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Florian Pritz <f-p@gmx.at>
+# Maintainer: Florian Pritz <bluewind@xinu.at>
 
 pkgname=extract
 pkgver=0.2.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Script to extract multiple archives"
 arch=(any)
 url="http://bluewind.at"
@@ -10,8 +10,10 @@ license=('WTFPLv2')
 depends=('gzip' 'tar' 'p7zip' 'unrar' 'unzip' 'bzip2' 'file' 'xz')
 conflicts=(csound)
 source=("http://bluewind.at/stuff/mirror/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('b78eea927daa99d48085c0d99e6d78fc')
+sha256sums=('302374f5a4fd87c3a509ce2c7abed682a61a26fe9074d3bb630800dfa6359052')
 
-build() {
+package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   install -D -m 755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
 
@@ -20,5 +22,3 @@ build() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('b78eea927daa99d48085c0d99e6d78fc')
-sha256sums=('302374f5a4fd87c3a509ce2c7abed682a61a26fe9074d3bb630800dfa6359052')
diff --git a/gspoof/PKGBUILD b/gspoof/PKGBUILD
index 89f5274..bc6e8a5 100755..100644
--- a/gspoof/PKGBUILD
+++ b/gspoof/PKGBUILD
@@ -1,12 +1,12 @@
-# Maintainer: Florian Pritz <f-p@gmx.at>
+# Maintainer: Florian Pritz <bluewind@xinu.at>
 pkgname=gspoof
 pkgver=3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="IP package generator"
 arch=('i686' 'x86_64')
 url="http://gspoof.sourceforge.net/"
 license=('GPL')
-depends=('libnet>=1.1.1' 'gtk')
+depends=('libnet>=1.1.1' 'gtk2')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
 noextract=()
 md5sums=('7a1d124a1d0bed87e19b239d559ba880')
@@ -15,9 +15,13 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr
-  make || return 1
-  install -D -m755 $pkgname $pkgdir/usr/sbin/$pkgname
-  install -d $pkgdir/usr/share/$pkgname
-  cp -r pixmap $pkgdir/usr/share/$pkgname/pixmap/
+  make
 }
 
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  install -D -m755 "$pkgname" "$pkgdir/usr/sbin/$pkgname"
+  install -d "$pkgdir/usr/share/$pkgname"
+  cp -r pixmap "$pkgdir/usr/share/$pkgname/pixmap/"
+}
diff --git a/jabberbot/PKGBUILD b/jabberbot/PKGBUILD
index 73c60bf..f8a2f16 100644
--- a/jabberbot/PKGBUILD
+++ b/jabberbot/PKGBUILD
@@ -1,19 +1,19 @@
-# Maintainer: Florian Pritz <f-p@gmx.at>
+# Maintainer: Florian Pritz <bluewind@xinu.at>
 pkgname=jabberbot
 pkgver=0.15
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple Jabber Bot for Python"
 arch=('any')
 url="http://thpinfo.com/2007/python-jabberbot/"
 license=('GPLv3')
 depends=('python2' 'xmpppy')
 source=("http://thpinfo.com/2007/python-jabberbot/jabberbot-$pkgver.tar.gz")
+md5sums=('081be2f6d8c82740b9906bf5b8562e7d')
 
-build() {
+package() {
   cd "$srcdir/$pkgname-$pkgver"
   export PYTHON=python2
   python2 setup.py install --prefix="$pkgdir/usr/" install
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('081be2f6d8c82740b9906bf5b8562e7d')
diff --git a/lanchat/PKGBUILD b/lanchat/PKGBUILD
index 218af14..92e22a6 100644
--- a/lanchat/PKGBUILD
+++ b/lanchat/PKGBUILD
@@ -1,22 +1,26 @@
-# Maintainer: Florian Pritz <f-p@gmx.at>
+# Maintainer: Florian Pritz <bluewind@xinu.at>
 
 pkgname=lanchat
 pkgver=0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple chat over LAN"
 arch=('i686' 'x86_64')
 url="http://scriptkiller.de/lanchat.php"
 license=('GPL')
-depends=("gtk")
+depends=("gtk2")
 source=("http://scriptkiller.de/pub/${pkgname}/${pkgname}_$pkgver.tar.gz")
+md5sums=('f3fd493028978a8e1e8c6165ecddd34b')
+sha256sums=('f03dd1e03cda6f2b1d55bed7aec76493a7a593532ef8e97a23a91260ac5cc144')
 
 build() {
   cd "$srcdir/$pkgname"
 
-  make || return 1
-  install -D $pkgname $pkgdir/usr/bin/$pkgname
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+  install -D "$pkgname" "$pkgdir/usr/bin/$pkgname"
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('f3fd493028978a8e1e8c6165ecddd34b')
-sha256sums=('f03dd1e03cda6f2b1d55bed7aec76493a7a593532ef8e97a23a91260ac5cc144')
diff --git a/perl-mail-checkuser/PKGBUILD b/perl-mail-checkuser/PKGBUILD
index af9c2cb..6bb435d 100644
--- a/perl-mail-checkuser/PKGBUILD
+++ b/perl-mail-checkuser/PKGBUILD
@@ -1,54 +1,46 @@
-# Maintainer: Florian Pritz <flo@xssn.at>
-# PKGBUILD generated by pacpan
+# Packager: Florian Pritz <bluewind@xinu.at>
+
 pkgname=perl-mail-checkuser
-_realname=Mail-CheckUser
 pkgver=1.21
 pkgrel=1
-pkgdesc="no description available"
-arch=(i686 x86_64)
-license=('unknown: check http://search.cpan.org/src/ILYAM/Mail-CheckUser-1.21/README.txt')
-url="http://search.cpan.org/~ilyam/Mail-CheckUser"
+pkgdesc='check email addresses for validity'
+arch=(any)
+license=(PerlArtistic GPL)
 options=(!emptydirs)
+depends=(perl perl-net-dns)
+url=https://metacpan.org/release/Mail-CheckUser
+source=("http://search.cpan.org/CPAN/authors/id/I/IL/ILYAM/Mail-CheckUser-$pkgver.tar.gz")
+md5sums=(32a57a4679e2bde8a85201617776d69f)
+sha512sums=(9fbfc4698ca1ed4c0b953724b91f593b6ab2a5a08076874c531c3ec2e330c741f44d53c165262b51a7d9124b7cb6678eb0ed008ab3065a683857667950cd91ee)
+_ddir="Mail-CheckUser-$pkgver"
 
-depends=('perl')
-
-#provides=('Mail-CheckUser')
-provides=('perl-mail-checkuser=1.21' 'perl-mail-checkuser=1.21')
+build()
+(
+  cd "$srcdir/$_ddir"
+  export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps
+  unset PERL5LIB PERL_MM_OPT
+  /usr/bin/perl Makefile.PL
+  make
+)
 
-source=(http://search.cpan.org/CPAN/authors/id/I/IL/ILYAM/Mail-CheckUser-1.21.tar.gz)
-md5sums=('32a57a4679e2bde8a85201617776d69f')
+check()
+(
+  cd "$srcdir/$_ddir"
+  export PERL_MM_USE_DEFAULT=1
+  unset PERL5LIB
+  # tests fail
+  #make test
+)
 
-build() {
-  _expected_dir="${srcdir}/${_realname}-${pkgver}"
-  if [ -d "$_expected_dir" ]; then
-    cd "$_expected_dir"
-  else
-    _expected_dir="${srcdir}/$(bsdtar -t -f $(basename $source) | head -n1)"
-    if [ -d "$_expected_dir" ]; then
-      cd "$_expected_dir"
-    else
-      _makefile=$(find $srcdir -iname Makefile.PL)
-      if [ ! -z "$_makefile" ]; then
-        _expected_dir=$(dirname $_makefile)
-        if [ -d "$_expected_dir" ]; then
-          cd "$_expected_dir"
-        else
-          echo "ERROR unable to detect source directory"
-          echo "--> this is often due to CPAN's lack of standard naming conventions"
-          echo "--> it may be possible to fix this by adjusting the build function in the PKGBUILD"
-        fi
-      fi
-    fi
-  fi
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-  make  || return 1
-  make install DESTDIR=${pkgdir} || return 1
-
-  # remove perllocal.pod and .packlist
-  find ${pkgdir} -name perllocal.pod -delete
-  find ${pkgdir} -name .packlist -delete
-}
+package()
+(
+  cd "$srcdir/$_ddir"
+  make install INSTALLDIRS=vendor DESTDIR="$pkgdir"
+  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
+)
 
+# Local Variables:
+# mode: shell-script
+# sh-basic-offset: 2
+# End:
 # vim:set ts=2 sw=2 et:
-
diff --git a/wf/PKGBUILD b/wf/PKGBUILD
index 2768c38..1757c38 100644
--- a/wf/PKGBUILD
+++ b/wf/PKGBUILD
@@ -1,22 +1,27 @@
-# Maintainer: Florian Pritz <f-p@gmx.at>
+# Maintainer: Florian Pritz <bluewind@xinu.at>
 
 pkgname=wf
 pkgver=0.41
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple word frequency counter"
 arch=('i686' 'x86_64')
 url="http://www.async.com.br/~marcelo/wf/"
 license=('GPL')
 source=("http://www.async.com.br/~marcelo/$pkgname/$pkgname-$pkgver.tar.bz2")
+md5sums=('2506603e8eafe0fab0c8e809b984d834')
+sha256sums=('807d5b5d4af317c7719d73c892839a3fc9d23af1d911235328d1fa292b7f8a5a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   make DESTDIR="$pkgdir/" install
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('2506603e8eafe0fab0c8e809b984d834')
-sha256sums=('807d5b5d4af317c7719d73c892839a3fc9d23af1d911235328d1fa292b7f8a5a')